X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosFlightSeries.java;h=d130d3adcfa6ae6ca41f38da645c060fbf046b41;hb=23cf8fb4d5745ad76d9517c9702d03d10c58144a;hp=02bf64ff9772520b8e37d1aec713bce6c87734e5;hpb=98dc29a7a964f8d653b73989c6751695d168844c;p=fw%2Faltos

diff --git a/altoslib/AltosFlightSeries.java b/altoslib/AltosFlightSeries.java
index 02bf64ff..d130d3ad 100644
--- a/altoslib/AltosFlightSeries.java
+++ b/altoslib/AltosFlightSeries.java
@@ -489,13 +489,24 @@ public class AltosFlightSeries extends AltosDataListener {
 	public ArrayList<AltosGPSTimeValue> gps_series;
 
 	public AltosGPS gps_before(double time) {
-		AltosGPS gps = null;
-		for (AltosGPSTimeValue gtv : gps_series)
-			if (gtv.time <= time)
-				gps = gtv.gps;
-			else
-				break;
-		return gps;
+		AltosGPSTimeValue nearest = null;
+		for (AltosGPSTimeValue gtv : gps_series) {
+			if (nearest == null)
+				nearest = gtv;
+			else {
+				if (gtv.time <= time) {
+					if (nearest.time <= time && gtv.time > nearest.time)
+						nearest = gtv;
+				} else {
+					if (nearest.time > time && gtv.time < nearest.time)
+						nearest = gtv;
+				}
+			}
+		}
+		if (nearest != null)
+			return nearest.gps;
+		else
+			return null;
 	}
 
 	public AltosTimeSeries	sats_in_view;
@@ -521,6 +532,7 @@ public class AltosFlightSeries extends AltosDataListener {
 	public static final String gps_hdop_name = "GPS Horizontal Dilution of Precision";
 
 	public void set_gps(AltosGPS gps) {
+		super.set_gps(gps);
 		if (gps_series == null)
 			gps_series = new ArrayList<AltosGPSTimeValue>();
 		gps_series.add(new AltosGPSTimeValue(time(), gps));