altoslib/altosuilib/altosui: More work towards using AltosFlightSeries for analysis

[fw/altos] / altoslib / AltosCalData.java

diff --git a/altoslib/AltosCalData.java b/altoslib/AltosCalData.java
index 58d34abeb0e738dca8bcc0964fef69f650f41604..3da0e4009f5da00480cf786c42877a84e7d58552 100644 (file)
--- a/altoslib/AltosCalData.java
+++ b/altoslib/AltosCalData.java
@@ -204,12 +204,11 @@ public class AltosCalData {
                this.state = state;
        }
 
-       public double           gps_ground_altitude = AltosLib.MISSING;
+       public AltosGPS         gps_pad = null;
 
-       public void set_gps_altitude(double altitude) {
-               if ((state != AltosLib.MISSING && state < AltosLib.ao_flight_boost) ||
-                   gps_ground_altitude == AltosLib.MISSING)
-                       gps_ground_altitude = altitude;
+       public void set_gps(AltosGPS gps) {
+               if ((state != AltosLib.MISSING && state < AltosLib.ao_flight_boost) || gps_pad == null)
+                       gps_pad = gps;
        }
 
        /*
@@ -226,7 +225,7 @@ public class AltosCalData {
        public void reset_temp_gps() {
                if (temp_gps != null) {
                        if (temp_gps.locked && temp_gps.nsat >= 4)
-                               set_gps_altitude(temp_gps.alt);
+                               set_gps(temp_gps);
                }
                temp_gps = null;
        }