flightdata 0.2.17__tar.gz → 0.2.18__tar.gz

{flightdata-0.2.17/flightdata.egg-info → flightdata-0.2.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flightdata
-Version: 0.2.17
+Version: 0.2.18
 Summary: Module for handling UAV flight log data
 Author-email: Thomas David <thomasdavid0@gmail.com>
 License: GNU GPL v3
@@ -11,13 +11,13 @@ License-File: LICENSE
 Requires-Dist: numpy
 Requires-Dist: pandas
 Requires-Dist: simplejson
-Requires-Dist: pfc-geometry>=0.2.8
+Requires-Dist: pfc-geometry>=0.2.10
 Requires-Dist: json_stream
 Provides-Extra: dev
 Requires-Dist: numpy; extra == "dev"
 Requires-Dist: pandas; extra == "dev"
 Requires-Dist: simplejson; extra == "dev"
-Requires-Dist: pfc-geometry>=0.2.8; extra == "dev"
+Requires-Dist: pfc-geometry>=0.2.9; extra == "dev"
 Requires-Dist: ardupilot-log-reader>=0.3.3; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 

{flightdata-0.2.17 → flightdata-0.2.18}/flightdata/flight/fields.py

@@ -57,7 +57,8 @@ class Fields:
             #raise AttributeError(f'Field {name} not found')
 
     def get_fields(self, names: list[str]) -> list[Field]:
-        _l = lambda v: [v] if isinstance(v, Field) else v
+        def _l(v):
+            return [v] if isinstance(v, Field) else v
         return list(chain(*[_l(getattr(self, n)) for n in names]))
     
     def get_cols(self, names: list[str]) -> list[str]:
@@ -80,6 +81,11 @@ fields = Fields([
         Field('gps_latitude', 'latitude, degrees'),
         Field('gps_longitude', 'longitude, degrees'),
         Field('gps_altitude', 'altitude, meters'),
+        Field('gps_satellites', 'number of satellites'),
+        Field('gps_hdop', 'number precision'),
+        Field('pos_latitude', 'latitude, degrees'),
+        Field('pos_longitude', 'longitude, degrees'),
+        Field('pos_altitude', 'altitude, meters'),
         Field('attitude_roll', 'roll angle, radians'),
         Field('attitude_pitch', 'pitch angle, radians'),
         Field('attitude_yaw', 'yaw angle, radians'),

{flightdata-0.2.17 → flightdata-0.2.18}/flightdata/flight/flight.py

@@ -309,7 +309,7 @@ class Flight:
     def from_log(
         log: str,
         extra_types: list[str] = None,
-        ppsource: str  = "pos",
+        ppsource: str = "pos",
         imu_instance=0,
         **kwargs,
     ) -> Flight:
@@ -318,12 +318,17 @@ class Flight:
         """
         from ardupilot_log_reader.reader import Ardupilot
 
-        extra_types = [] if extra_types is None else extra_types
-
         parser = log
         if not isinstance(log, Ardupilot):
             parser = Ardupilot.parse(
-                str(log), types=list(set(Flight.ardupilot_types + extra_types))
+                str(log),
+                types=list(
+                    set(
+                        Flight.ardupilot_types + []
+                        if extra_types is None
+                        else extra_types
+                    )
+                ),
             )
 
         params = Flight.build_cols(
@@ -364,9 +369,9 @@ class Flight:
             dfs.append(
                 Flight.build_cols(
                     time_actual=parser.POS.timestamp,
-                    gps_latitude=parser.POS.Lat,
-                    gps_longitude=parser.POS.Lng,
-                    gps_altitude=parser.POS.Alt,
+                    pos_latitude=parser.POS.Lat,
+                    pos_longitude=parser.POS.Lng,
+                    pos_altitude=parser.POS.Alt,
                 )
             )
         else:
@@ -387,7 +392,7 @@ class Flight:
                 ),
                 "C",
             )
-            
+
         if ekf2 is not None:
             dfs = dfs + Flight.parse_instances(
                 ekf2,
@@ -454,6 +459,18 @@ class Flight:
                 )
             )
 
+        if "GPS" in parser.dfs:
+            dfs.append(
+                Flight.build_cols(
+                    time_actual=parser.GPS.timestamp,
+                    gps_latitude=parser.GPS.Lat,
+                    gps_longitude=parser.GPS.Lng,
+                    gps_altitude=parser.GPS.Alt,
+                    gps_satellites=parser.GPS.NSats,
+                    gps_hdop=parser.GPS.HDop,
+                )
+            )
+
         if "MAG" in parser.dfs:
             dfs.append(
                 Flight.build_cols(