map-server: Add maps proxy server

[fw/altos] / altoslib / AltosTelemetryLocation.java

diff --git a/altoslib/AltosTelemetryLocation.java b/altoslib/AltosTelemetryLocation.java
index cf849f33d3eb43b9b3ce18a28a509528758901b3..25570bf934f8c923d3fed8da473eff1852136408 100644 (file)
--- a/altoslib/AltosTelemetryLocation.java
+++ b/altoslib/AltosTelemetryLocation.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_13;
 
 
 public class AltosTelemetryLocation extends AltosTelemetryStandard {
@@ -49,10 +49,12 @@ public class AltosTelemetryLocation extends AltosTelemetryStandard {
                super(bytes);
        }
 
-       public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
-               super.provide_data(listener, cal_data);
+       public void provide_data(AltosDataListener listener) {
+               super.provide_data(listener);
 
-               AltosGPS        gps = cal_data.make_temp_gps(tick(), false);
+               AltosCalData    cal_data = listener.cal_data();
+
+               AltosGPS        gps = listener.make_temp_gps(false);
 
                int flags = flags();
                gps.nsat = flags & 0xf;
@@ -75,12 +77,7 @@ public class AltosTelemetryLocation extends AltosTelemetryStandard {
                        gps.ground_speed = ground_speed() * 1.0e-2;
                        gps.course = course() * 2;
                        gps.climb_rate = climb_rate() * 1.0e-2;
-
-                       if (gps.nsat >= 4)
-                               cal_data.set_gps(gps);
                }
                listener.set_gps(gps);
-               cal_data.set_gps(gps);
-               cal_data.reset_temp_gps();
        }
 }