altosdroid: Add map types and map preloading UIs

[fw/altos] / altoslib / AltosGPS.java

diff --git a/altoslib/AltosGPS.java b/altoslib/AltosGPS.java
index 01e6fdbccf5575ba56ef838aeb3a8780163bd375..6793adf1e4776febd5fd5c13a9f58cf61bbdacf4 100644 (file)
--- a/altoslib/AltosGPS.java
+++ b/altoslib/AltosGPS.java
@@ -15,12 +15,13 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_7;
 
 import java.text.*;
 import java.util.concurrent.*;
+import java.io.*;
 
-public class AltosGPS implements Cloneable {
+public class AltosGPS implements Cloneable, Serializable {
 
        public final static int MISSING = AltosLib.MISSING;
 
@@ -40,10 +41,11 @@ public class AltosGPS implements Cloneable {
        public double   ground_speed;   /* m/s */
        public int      course;         /* degrees */
        public double   climb_rate;     /* m/s */
+       public double   pdop;           /* unitless */
        public double   hdop;           /* unitless */
        public double   vdop;           /* unitless */
-       public int      h_error;        /* m */
-       public int      v_error;        /* m */
+       public double   h_error;        /* m */
+       public double   v_error;        /* m */
 
        public AltosGPSSat[] cc_gps_sat;        /* tracking data */
 
@@ -95,6 +97,7 @@ public class AltosGPS implements Cloneable {
                                                      AltosLib.MISSING, 1/100.0);
                        course = map.get_int(AltosTelemetryLegacy.AO_TELEM_GPS_COURSE,
                                             AltosLib.MISSING);
+                       pdop = map.get_double(AltosTelemetryLegacy.AO_TELEM_GPS_PDOP, MISSING, 1.0);
                        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);
@@ -192,10 +195,10 @@ public class AltosGPS implements Cloneable {
                        lon = AltosParse.parse_coord(words[i++]);
                        alt = AltosParse.parse_int(words[i++]);
                        if (version > 1 || (i < words.length && !words[i].equals("SAT"))) {
-                               ground_speed = AltosParse.parse_double(AltosParse.strip_suffix(words[i++], "m/s(H)"));
+                               ground_speed = AltosParse.parse_double_net(AltosParse.strip_suffix(words[i++], "m/s(H)"));
                                course = AltosParse.parse_int(words[i++]);
-                               climb_rate = AltosParse.parse_double(AltosParse.strip_suffix(words[i++], "m/s(V)"));
-                               hdop = AltosParse.parse_double(AltosParse.strip_suffix(words[i++], "(hdop)"));
+                               climb_rate = AltosParse.parse_double_net(AltosParse.strip_suffix(words[i++], "m/s(V)"));
+                               hdop = AltosParse.parse_double_net(AltosParse.strip_suffix(words[i++], "(hdop)"));
                                h_error = AltosParse.parse_int(words[i++]);
                                v_error = AltosParse.parse_int(words[i++]);
                        }
@@ -268,14 +271,26 @@ public class AltosGPS implements Cloneable {
                cc_gps_sat[cc_gps_sat.length - 1] = sat;
        }
 
-       public AltosGPS() {
+       private void init() {
                lat = AltosLib.MISSING;
                lon = AltosLib.MISSING;
                alt = AltosLib.MISSING;
+               ground_speed = AltosLib.MISSING;
+               course = AltosLib.MISSING;
+               climb_rate = AltosLib.MISSING;
+               pdop = AltosLib.MISSING;
+               hdop = AltosLib.MISSING;
+               vdop = AltosLib.MISSING;
+               h_error = AltosLib.MISSING;
+               v_error = AltosLib.MISSING;
                ClearGPSTime();
                cc_gps_sat = null;
        }
 
+       public AltosGPS() {
+               init();
+       }
+
        public AltosGPS clone() {
                AltosGPS        g = new AltosGPS();
 
@@ -295,7 +310,9 @@ public class AltosGPS implements Cloneable {
                g.ground_speed = ground_speed;  /* m/s */
                g.course = course;              /* degrees */
                g.climb_rate = climb_rate;      /* m/s */
-               g.hdop = hdop;          /* unitless? */
+               g.pdop = pdop;          /* unitless */
+               g.hdop = hdop;          /* unitless */
+               g.vdop = vdop;          /* unitless */
                g.h_error = h_error;    /* m */
                g.v_error = v_error;    /* m */
 
@@ -327,9 +344,11 @@ public class AltosGPS implements Cloneable {
                        ground_speed = old.ground_speed;        /* m/s */
                        course = old.course;            /* degrees */
                        climb_rate = old.climb_rate;    /* m/s */
+                       pdop = old.pdop;                /* unitless? */
                        hdop = old.hdop;                /* unitless? */
-                       h_error = old.h_error;  /* m */
-                       v_error = old.v_error;  /* m */
+                       vdop = old.vdop;                /* 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];
@@ -340,11 +359,7 @@ public class AltosGPS implements Cloneable {
                                }
                        }
                } else {
-                       lat = AltosLib.MISSING;
-                       lon = AltosLib.MISSING;
-                       alt = AltosLib.MISSING;
-                       ClearGPSTime();
-                       cc_gps_sat = null;
+                       init();
                }
        }
 
@@ -363,6 +378,7 @@ public class AltosGPS implements Cloneable {
 
        public AltosGPS (AltosLink link, AltosConfigData config_data) throws TimeoutException, InterruptedException {
                boolean says_done = config_data.compare_version("1.0") >= 0;
+               init();
                link.printf("g\n");
                for (;;) {
                        String line = link.get_reply_no_dialog(5000);