X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosDataPointReader.java;h=821b0771b7f7101ee200dd358822b34958020a3c;hp=fa48013f3b1053a65678ee02f6535aa834cb5035;hb=branch-1.1;hpb=7f49d694e776819e03b2c708e1c4ee23ba311430

diff --git a/altosui/AltosDataPointReader.java b/altosui/AltosDataPointReader.java
index fa48013f..821b0771 100644
--- a/altosui/AltosDataPointReader.java
+++ b/altosui/AltosDataPointReader.java
@@ -9,6 +9,7 @@ import java.text.ParseException;
 import java.lang.UnsupportedOperationException;
 import java.util.NoSuchElementException;
 import java.util.Iterator;
+import org.altusmetrum.AltosLib.*;
 
 class AltosDataPointReader implements Iterable<AltosDataPoint> {
     Iterator<AltosRecord> iter;
@@ -69,10 +70,14 @@ class AltosDataPointReader implements Iterable<AltosDataPoint> {
                 throw new UnsupportedOperationException(); 
             }
             public boolean hasNext() {
+		if (record != null && record.state == Altos.ao_flight_landed)
+		    return false;
                 return iter.hasNext();
             }
             public AltosDataPoint next() {
-                read_next_record();
+		do {
+		    read_next_record();
+		} while (record.time < -1.0 && hasNext());
                 return current_dp();
             }
         };