X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosGPS.java;h=399e95b1376369de24c5ebaf491fe6da62f08938;hb=017ed54ff69ef2f7740ea2578e22bf72e88deafb;hp=ea0949ec7db58246a1c6c711db97871a7cde99c4;hpb=02d31db3d3255568cc348a41aa37a461d63ffde2;p=fw%2Faltos

diff --git a/altoslib/AltosGPS.java b/altoslib/AltosGPS.java
index ea0949ec..399e95b1 100644
--- a/altoslib/AltosGPS.java
+++ b/altoslib/AltosGPS.java
@@ -15,11 +15,11 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.AltosLib;
+package org.altusmetrum.altoslib_1;
 
 import java.text.*;
 
-public class AltosGPS {
+public class AltosGPS implements Cloneable {
 
 	public final static int MISSING = AltosRecord.MISSING;
 
@@ -28,7 +28,7 @@ public class AltosGPS {
 	public boolean	connected;
 	public double	lat;		/* degrees (+N -S) */
 	public double	lon;		/* degrees (+E -W) */
-	public int	alt;		/* m */
+	public double	alt;		/* m */
 	public int	year;
 	public int	month;
 	public int	day;
@@ -70,35 +70,35 @@ public class AltosGPS {
 	}
 
 	public AltosGPS(AltosTelemetryMap map) throws ParseException {
-		String	state = map.get_string(AltosTelemetry.AO_TELEM_GPS_STATE,
-					       AltosTelemetry.AO_TELEM_GPS_STATE_ERROR);
+		String	state = map.get_string(AltosTelemetryLegacy.AO_TELEM_GPS_STATE,
+					       AltosTelemetryLegacy.AO_TELEM_GPS_STATE_ERROR);
 
-		nsat = map.get_int(AltosTelemetry.AO_TELEM_GPS_NUM_SAT, 0);
-		if (state.equals(AltosTelemetry.AO_TELEM_GPS_STATE_LOCKED)) {
+		nsat = map.get_int(AltosTelemetryLegacy.AO_TELEM_GPS_NUM_SAT, 0);
+		if (state.equals(AltosTelemetryLegacy.AO_TELEM_GPS_STATE_LOCKED)) {
 			connected = true;
 			locked = true;
-			lat = map.get_double(AltosTelemetry.AO_TELEM_GPS_LATITUDE, MISSING, 1.0e-7);
-			lon = map.get_double(AltosTelemetry.AO_TELEM_GPS_LONGITUDE, MISSING, 1.0e-7);
-			alt = map.get_int(AltosTelemetry.AO_TELEM_GPS_ALTITUDE, MISSING);
-			year = map.get_int(AltosTelemetry.AO_TELEM_GPS_YEAR, MISSING);
+			lat = map.get_double(AltosTelemetryLegacy.AO_TELEM_GPS_LATITUDE, MISSING, 1.0e-7);
+			lon = map.get_double(AltosTelemetryLegacy.AO_TELEM_GPS_LONGITUDE, MISSING, 1.0e-7);
+			alt = map.get_int(AltosTelemetryLegacy.AO_TELEM_GPS_ALTITUDE, MISSING);
+			year = map.get_int(AltosTelemetryLegacy.AO_TELEM_GPS_YEAR, MISSING);
 			if (year != MISSING)
 				year += 2000;
-			month = map.get_int(AltosTelemetry.AO_TELEM_GPS_MONTH, MISSING);
-			day = map.get_int(AltosTelemetry.AO_TELEM_GPS_DAY, MISSING);
+			month = map.get_int(AltosTelemetryLegacy.AO_TELEM_GPS_MONTH, MISSING);
+			day = map.get_int(AltosTelemetryLegacy.AO_TELEM_GPS_DAY, MISSING);
 
-			hour = map.get_int(AltosTelemetry.AO_TELEM_GPS_HOUR, 0);
-			minute = map.get_int(AltosTelemetry.AO_TELEM_GPS_MINUTE, 0);
-			second = map.get_int(AltosTelemetry.AO_TELEM_GPS_SECOND, 0);
+			hour = map.get_int(AltosTelemetryLegacy.AO_TELEM_GPS_HOUR, 0);
+			minute = map.get_int(AltosTelemetryLegacy.AO_TELEM_GPS_MINUTE, 0);
+			second = map.get_int(AltosTelemetryLegacy.AO_TELEM_GPS_SECOND, 0);
 
-			ground_speed = map.get_double(AltosTelemetry.AO_TELEM_GPS_HORIZONTAL_SPEED,
+			ground_speed = map.get_double(AltosTelemetryLegacy.AO_TELEM_GPS_HORIZONTAL_SPEED,
 						      AltosRecord.MISSING, 1/100.0);
-			course = map.get_int(AltosTelemetry.AO_TELEM_GPS_COURSE,
+			course = map.get_int(AltosTelemetryLegacy.AO_TELEM_GPS_COURSE,
 					     AltosRecord.MISSING);
-			hdop = map.get_double(AltosTelemetry.AO_TELEM_GPS_HDOP, MISSING, 1.0);
-			vdop = map.get_double(AltosTelemetry.AO_TELEM_GPS_VDOP, MISSING, 1.0);
-			h_error = map.get_int(AltosTelemetry.AO_TELEM_GPS_HERROR, MISSING);
-			v_error = map.get_int(AltosTelemetry.AO_TELEM_GPS_VERROR, MISSING);
-		} else if (state.equals(AltosTelemetry.AO_TELEM_GPS_STATE_UNLOCKED)) {
+			hdop = map.get_double(AltosTelemetryLegacy.AO_TELEM_GPS_HDOP, MISSING, 1.0);
+			vdop = map.get_double(AltosTelemetryLegacy.AO_TELEM_GPS_VDOP, MISSING, 1.0);
+			h_error = map.get_int(AltosTelemetryLegacy.AO_TELEM_GPS_HERROR, MISSING);
+			v_error = map.get_int(AltosTelemetryLegacy.AO_TELEM_GPS_VERROR, MISSING);
+		} else if (state.equals(AltosTelemetryLegacy.AO_TELEM_GPS_STATE_UNLOCKED)) {
 			connected = true;
 			locked = false;
 		} else {
@@ -216,34 +216,72 @@ public class AltosGPS {
 		cc_gps_sat = null;
 	}
 
+	public AltosGPS clone() {
+		AltosGPS	g = new AltosGPS();
+
+		g.nsat = nsat;
+		g.locked = locked;
+		g.connected = connected;
+		g.lat = lat;		/* degrees (+N -S) */
+		g.lon = lon;		/* degrees (+E -W) */
+		g.alt = alt;		/* m */
+		g.year = year;
+		g.month = month;
+		g.day = day;
+		g.hour = hour;
+		g.minute = minute;
+		g.second = second;
+
+		g.ground_speed = ground_speed;	/* m/s */
+		g.course = course;		/* degrees */
+		g.climb_rate = climb_rate;	/* m/s */
+		g.hdop = hdop;		/* unitless? */
+		g.h_error = h_error;	/* m */
+		g.v_error = v_error;	/* m */
+
+		if (cc_gps_sat != null) {
+			g.cc_gps_sat = new AltosGPSSat[cc_gps_sat.length];
+			for (int i = 0; i < cc_gps_sat.length; i++) {
+				g.cc_gps_sat[i] = new AltosGPSSat(cc_gps_sat[i].svid,
+								  cc_gps_sat[i].c_n0);
+			}
+		}
+		return g;
+	}
+
 	public AltosGPS(AltosGPS old) {
-		nsat = old.nsat;
-		locked = old.locked;
-		connected = old.connected;
-		lat = old.lat;		/* degrees (+N -S) */
-		lon = old.lon;		/* degrees (+E -W) */
-		alt = old.alt;		/* m */
-		year = old.year;
-		month = old.month;
-		day = old.day;
-		hour = old.hour;
-		minute = old.minute;
-		second = old.second;
-
-		ground_speed = old.ground_speed;	/* m/s */
-		course = old.course;		/* degrees */
-		climb_rate = old.climb_rate;	/* m/s */
-		hdop = old.hdop;		/* unitless? */
-		h_error = old.h_error;	/* m */
-		v_error = old.v_error;	/* m */
-
-		if (old.cc_gps_sat != null) {
-			cc_gps_sat = new AltosGPSSat[old.cc_gps_sat.length];
-			for (int i = 0; i < old.cc_gps_sat.length; i++) {
-				cc_gps_sat[i] = new AltosGPSSat();
-				cc_gps_sat[i].svid = old.cc_gps_sat[i].svid;
-				cc_gps_sat[i].c_n0 = old.cc_gps_sat[i].c_n0;
+		if (old != null) {
+			nsat = old.nsat;
+			locked = old.locked;
+			connected = old.connected;
+			lat = old.lat;		/* degrees (+N -S) */
+			lon = old.lon;		/* degrees (+E -W) */
+			alt = old.alt;		/* m */
+			year = old.year;
+			month = old.month;
+			day = old.day;
+			hour = old.hour;
+			minute = old.minute;
+			second = old.second;
+
+			ground_speed = old.ground_speed;	/* m/s */
+			course = old.course;		/* degrees */
+			climb_rate = old.climb_rate;	/* m/s */
+			hdop = old.hdop;		/* unitless? */
+			h_error = old.h_error;	/* m */
+			v_error = old.v_error;	/* m */
+
+			if (old.cc_gps_sat != null) {
+				cc_gps_sat = new AltosGPSSat[old.cc_gps_sat.length];
+				for (int i = 0; i < old.cc_gps_sat.length; i++) {
+					cc_gps_sat[i] = new AltosGPSSat();
+					cc_gps_sat[i].svid = old.cc_gps_sat[i].svid;
+					cc_gps_sat[i].c_n0 = old.cc_gps_sat[i].c_n0;
+				}
 			}
+		} else {
+			ClearGPSTime();
+			cc_gps_sat = null;
 		}
 	}
 }