altoslib: Make sure AltosFlightSeries is filled in before use

[fw/altos] / altosui / AltosGraphUI.java

diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java
index 5314a3b6fb025e837593fc7b6653c3eac8683db5..db0cac2ffe178b60c58cfd27595893f23d49385a 100644 (file)
--- a/altosui/AltosGraphUI.java
+++ b/altosui/AltosGraphUI.java
@@ -44,19 +44,26 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
 
        void fill_map(AltosFlightSeries flight_series) {
                boolean                 any_gps = false;
+               AltosGPSTimeValue       gtv_last = null;
 
                for (AltosGPSTimeValue gtv : flight_series.gps_series) {
+                       gtv_last = gtv;
                        AltosGPS gps = gtv.gps;
                        if (gps != null &&
                            gps.locked &&
                            gps.nsat >= 4) {
                                if (map == null)
                                        map = new AltosUIMap();
-                               map.show(gps, AltosLib.ao_flight_pad);
+                               map.show(gps, (int) flight_series.value_before(AltosFlightSeries.state_name, gtv.time));
                                this.gps = gps;
                                has_gps = true;
                        }
                }
+               if (gtv_last != null) {
+                       int state = (int) flight_series.value_after(AltosFlightSeries.state_name, gtv_last.time);
+                       if (state == AltosLib.ao_flight_landed)
+                               map.show(gtv_last.gps, state);
+               }
        }
 
        public void font_size_changed(int font_size) {
@@ -86,7 +93,7 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
 
                set.capture_series(flight_series);
 
-               flight_series.fill_in();
+               flight_series.finish();
 
                stats = new AltosFlightStats(flight_series);