height correction, new defalt

flight_map/tracks.py

@@ -5,14 +5,13 @@ from itertools import groupby, pairwise
 from flight_map.curves import Cubic, interpolate
 from flight_map.geo import Projection
 from flight_map.storage import Observation
-from flight_map.terrain import Elevation
 
 
 @dataclass
 class Track:
     observations: list[Observation]
     curves: list[Cubic]
-    average_height: float | None
+    average_altitude: float | None
     start: float
     end: float
 
@@ -48,8 +47,6 @@ def split_tracks(observations: list[Observation], max_gap: float) -> list[list[O
 def make_tracks(
     observations: list[Observation],
     projection: Projection,
-    elevation: Elevation,
-    ground: float | None,
     max_gap: float,
 ) -> list[Track]:
     result = []
@@ -60,18 +57,18 @@ def make_tracks(
             continue
         total_time = 0.0
         altitude_integral = 0.0
-        missing_height = ground is None
+        missing_altitude = False
         start, end = math.inf, -math.inf
         for index, (first, last) in enumerate(pairwise(items)):
             duration = last.timestamp - first.timestamp
-            h0, h1 = elevation.aircraft_altitude(first), elevation.aircraft_altitude(last)
+            h0, h1 = first.baro_altitude, last.baro_altitude
             for f0, f1 in curves[index].inside_intervals(projection.rectangle.bounds):
                 inside_duration = duration * (f1 - f0)
                 total_time += inside_duration
                 start = min(start, first.timestamp + f0 * duration)
                 end = max(end, first.timestamp + f1 * duration)
                 if h0 is None or h1 is None:
-                    missing_height = True
+                    missing_altitude = True
                 else:
                     entry = h0 + (h1 - h0) * f0
                     exit_height = h0 + (h1 - h0) * f1
@@ -79,7 +76,7 @@ def make_tracks(
         if total_time == 0:
             continue
         average = None
-        if not missing_height and ground is not None:
-            average = altitude_integral / total_time - ground
+        if not missing_altitude:
+            average = altitude_integral / total_time
         result.append(Track(items, curves, average, start, end))
     return sorted(result, key=lambda track: (track.start, track.observations[0].icao24))