From: Keith Packard <keithp@keithp.com>
Date: Fri, 21 Jul 2017 23:09:55 +0000 (-0700)
Subject: altoslib: fix adjustment of landed time
X-Git-Tag: 1.8~16
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=2969f0af52dfbdea7593b208e510c7b17227064c;hp=30b308ad0189b4aa9dd5cc7ee876b55fee355a56

altoslib: fix adjustment of landed time

Push landed time out if we computed silliness.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/altoslib/AltosFlightStats.java b/altoslib/AltosFlightStats.java
index 7159cc35..6f8732cf 100644
--- a/altoslib/AltosFlightStats.java
+++ b/altoslib/AltosFlightStats.java
@@ -53,11 +53,14 @@ public class AltosFlightStats {
 	double landed_time(AltosFlightSeries series) {
 		double	landed_state_time = AltosLib.MISSING;
 
+		double	prev_state_time = AltosLib.MISSING;
 		if (series.state_series != null) {
 			for (AltosTimeValue state : series.state_series) {
 				if (state.value == AltosLib.ao_flight_landed) {
 					landed_state_time = state.time;
 					break;
+				} else {
+					prev_state_time = state.time;
 				}
 			}
 		}
@@ -95,7 +98,7 @@ public class AltosFlightStats {
 			}
 		}
 
-		if (landed_time == AltosLib.MISSING)
+		if (landed_time == AltosLib.MISSING || (prev_state_time != AltosLib.MISSING && landed_time < prev_state_time))
 			landed_time = landed_state_time;
 		return landed_time;
 	}