improve Flight.moving for stop detection of inbound traffic (#139)

xoolive · Jun 21, 2021 · 05681c9 · 05681c9
1 parent 8f65a97
commit 05681c9
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/traffic/algorithms/navigation.py b/traffic/algorithms/navigation.py
@@ -908,18 +908,17 @@ def moving(
         if moving is None:
             return None
 
-        first_segment = next(
-            (
-                segment
-                for segment in moving.split("1T")
-                if segment.longer_than(time_threshold)
-            ),
-            None,
-        )
-        if first_segment is None:
+        segment = None
+        first_segment = None
+        for segment in moving.split("1T"):
+            if segment.longer_than(time_threshold) and first_segment is None:
+                first_segment = segment
+        last_segment = segment
+
+        if first_segment is None or last_segment is None:
             return None
 
-        return self.after(first_segment.start)
+        return self.between(first_segment.start, last_segment.stop)
 
     def pushback(
         self,