X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosTelemetryLocation.java;h=25570bf934f8c923d3fed8da473eff1852136408;hp=5eb727d651d30068cc3cd979d8cbea99e2fb8b39;hb=9ea50f00039c812ea6a4a4235d78c140a0252662;hpb=f26cfe417c6977cf1e7e75a4f050e25f64d41859

diff --git a/altoslib/AltosTelemetryLocation.java b/altoslib/AltosTelemetryLocation.java
index 5eb727d6..25570bf9 100644
--- 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,15 +49,20 @@ 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 = new AltosGPS();
+		AltosCalData	cal_data = listener.cal_data();
+
+		AltosGPS	gps = listener.make_temp_gps(false);
 
 		int flags = flags();
 		gps.nsat = flags & 0xf;
 		gps.locked = (flags & (1 << 4)) != 0;
 		gps.connected = (flags & (1 << 5)) != 0;
+		gps.pdop = pdop() / 10.0;
+		gps.hdop = hdop() / 10.0;
+		gps.vdop = vdop() / 10.0;
 
 		if (gps.locked) {
 			gps.lat = latitude() * 1.0e-7;
@@ -72,12 +77,6 @@ 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;
-			gps.pdop = pdop() / 10.0;
-			gps.hdop = hdop() / 10.0;
-			gps.vdop = vdop() / 10.0;
-
-			if (gps.nsat >= 4)
-				cal_data.set_gps_altitude(gps.alt);
 		}
 		listener.set_gps(gps);
 	}