flightdata 0.2.15__tar.gz → 0.2.16__tar.gz

{flightdata-0.2.15/flightdata.egg-info → flightdata-0.2.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flightdata
-Version: 0.2.15
+Version: 0.2.16
 Summary: Module for handling UAV flight log data
 Author-email: Thomas David <thomasdavid0@gmail.com>
 License: GNU GPL v3
@@ -11,12 +11,13 @@ License-File: LICENSE
 Requires-Dist: numpy
 Requires-Dist: pandas
 Requires-Dist: simplejson
-Requires-Dist: pfc-geometry>=0.2.7
+Requires-Dist: pfc-geometry>=0.2.8
+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.7; extra == "dev"
+Requires-Dist: pfc-geometry>=0.2.8; extra == "dev"
 Requires-Dist: ardupilot-log-reader>=0.3.3; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 

{flightdata-0.2.15 → flightdata-0.2.16}/flightdata/base/table.py

@@ -69,7 +69,11 @@ class Table:
     
     def __getitem__(self, sli):
         if isinstance(sli, slice):
-            return self.__class__(self.data.loc[slice(sli.start + self.data.index[0], sli.stop + self.data.index[0], sli.step)])
+            return self.__class__(self.data.loc[slice(
+                sli.start if sli.start else self.data.index[0], 
+                sli.stop if sli.stop else self.data.index[-1], 
+                sli.step
+            )])
         elif isinstance(sli, Number):
             if sli<0:
                 return self.__class__(self.data.iloc[[int(sli)], :])
@@ -87,7 +91,7 @@ class Table:
 
     def __iter__(self):
         for ind in list(self.data.index):
-            yield self[ind]
+            yield self[ind - self.data.index[0]]
 
 
     @classmethod

{flightdata-0.2.15 → flightdata-0.2.16}/flightdata/flight/fields.py

@@ -1,8 +1,7 @@
 
 from typing import Union, Self
 from itertools import chain
-import string
-import re
+
 
 class Field:
     def __init__(self, column: str, description: str = '', i: int = 0):

{flightdata-0.2.15 → flightdata-0.2.16}/flightdata/flight/flight.py

@@ -14,9 +14,8 @@ from typing import Self, Union, IO
 import numpy as np
 import pandas as pd
 from .fields import fields, Field
-from geometry import GPS, Point
+from geometry import GPS, Point, P0
 from geometry.testing import assert_almost_equal
-from pathlib import Path
 from time import time
 from json import load, dump
 from flightdata.base.numpy_encoder import NumpyEncoder
@@ -240,15 +239,14 @@ class Flight:
             return False
         
     @staticmethod
-    def from_log(log:Union[Ardupilot, str], extra_types: list[str] = None, **kwargs) -> Flight:
+    def from_log(log: str, extra_types: list[str] = None, **kwargs) -> Flight:
         """Constructor from an ardupilot bin file."""
         from ardupilot_log_reader.reader import Ardupilot
         extra_types = [] if extra_types is None else extra_types
         
-        if isinstance(log, str) or isinstance(log, Path):
+        parser = log
+        if not isinstance(log, Ardupilot):
             parser = Ardupilot.parse(str(log), types=list(set(Flight.ardupilot_types + extra_types)))
-        else:
-            parser = log
         
         params = Flight.build_cols(
             time_actual = parser.PARM.timestamp,
@@ -448,7 +446,10 @@ class Flight:
             return dfs
 
     @staticmethod
-    def parse_fcj_data(origin: Origin, df: pd.DataFrame):
+    def parse_fcj_data(df: pd.DataFrame | dict, origin: Origin, shift: Point=None):
+        
+        df = pd.DataFrame(df, dtype=float) if isinstance(df, dict) else df
+
         df = Flight.build_cols(
             time_actual = df['time']/1e6 + int(time()),
             time_flight = df['time']/1e6,
@@ -464,7 +465,10 @@ class Flight:
             wind_N = df['wN'] if 'wN' in df.columns else None,
             wind_E = df['wE'] if 'wE' in df.columns else None,
         )
-
+        shift = P0() if shift is None else shift
+        df['position_N'] = df['position_N'] + shift.x
+        df['position_E'] = df['position_E'] + shift.y
+        df['position_D'] = df['position_D'] + shift.z
         return Flight(df.set_index('time_flight', drop=False), None, origin, 'position')
     
     
@@ -477,42 +481,22 @@ class Flight:
         elif isinstance(fc_json, IO):
             fc_json = load(f)
         
-        df = pd.DataFrame.from_dict(fc_json['data'], dtype=float)
-                
-        df = Flight.build_cols(
-            time_actual = df['time']/1e6 + int(time()),
-            time_flight = df['time']/1e6,
-            attitude_roll = np.radians(df['r']),
-            attitude_pitch = np.radians(df['p']),
-            attitude_yaw = np.radians(df['yw']),
-            position_N = df['N'],
-            position_E = df['E'],
-            position_D = df['D'],
-            velocity_N = df['VN'],
-            velocity_E = df['VE'],
-            velocity_D = df['VD'],
-            wind_N = df['wN'] if 'wN' in df.columns else None,
-            wind_E = df['wE'] if 'wE' in df.columns else None,
-        )
-
         if 'parameters' in fc_json:
-            origin = Origin(
-                'fcj_origin',
-                GPS(
-                    float(fc_json['parameters']['pilotLat']), 
-                    float(fc_json['parameters']['pilotLng']), 
-                    float(fc_json['parameters']['pilotAlt'])
-                ).offset(-Point(
-                    fc_json['parameters']['moveNorth'],
-                    fc_json['parameters']['moveEast'],
-                    0,
-                )), 
+            origin = Origin.from_fcjson_parameters(fc_json['parameters'])
+            shift = origin.rotation.transform_point(Point(
+                fc_json['parameters']['moveEast'],
+                -fc_json['parameters']['moveNorth'],
                 0
-            )
+            ))
         else:
             origin = Origin('dummy_origin', GPS(0,0,0), -np.pi/2)
-            
-        return Flight(df.set_index('time_flight', drop=False), None, origin, 'position')#.remove_time_flutter()
+            shift=P0()
+
+        return Flight.parse_fcj_data(
+            pd.DataFrame(fc_json['data'], dtype=float),
+            origin, 
+            shift    
+        )
 
     def remove_time_flutter(self):
         #I think the best option is just to take the average of the timestep.

{flightdata-0.2.15 → flightdata-0.2.16}/flightdata/origin.py

@@ -1,19 +1,10 @@
-"""
-This program is free software: you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation, either version 3 of the License, or (at your option) any later
-version.
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-You should have received a copy of the GNU General Public License along with
-this program. If not, see <http://www.gnu.org/licenses/>.
-"""
-
 import geometry as g
 import numpy as np
 from json import load, dump
 from typing import Self
+import json_stream
+from pathlib import Path
+
 
 class Origin(object):
     '''This class defines an aerobatic box in the world, it uses the pilot position and the direction 
@@ -123,12 +114,21 @@ class Origin(object):
         )
 
     @staticmethod
-    def from_fcjson_parmameters(data: dict):
-        return Origin.from_points(
+    def from_fcjson_parameters(data: dict | str | Path):
+        if not isinstance(data, dict):
+            data = json_stream.to_standard_types(
+                json_stream.load(open(data, 'r'))['parameters']
+            )
+        return Origin(
             "FCJ_box",
-            g.GPS(float(data['pilotLat']), float(data['pilotLng']), float(data['pilotAlt'])),
-            g.GPS(float(data['centerLat']), float(data['centerLng']), float(data['centerAlt']))
+            g.GPS(
+                float(data['pilotLat']), 
+                float(data['pilotLng']), 
+                float(data['pilotAlt'])
+            ),
+            float(data['rotation'])
         )
+        
 
 
     def gps_to_point(self, gps: g.GPS) -> g.Point:

{flightdata-0.2.15 → flightdata-0.2.16}/flightdata/state.py

@@ -52,7 +52,7 @@ class State(Table):
         if rotation_only:
             self.back_transform.rotate(pin)
         else:
-            return self.back_transform.g.Point(pin)
+            return self.back_transform.point(pin)
 
     def fill(self, time: g.Time) -> State:
         '''Project forward through time assuming small angles and uniform circular motion'''
@@ -98,15 +98,13 @@ class State(Table):
                 origin = Origin.from_json(origin)
         elif origin is None:
             origin = flight.origin
-
+        
         time = g.Time.from_t(np.array(flight.data.time_flight))
 
         if all(flight.contains('gps')) and flight.primary_pos_source == 'gps':
-            pos = origin.rotation.transform_point(g.GPS(flight.gps.ffill().bfill()) - origin.pos[0])
+            pos = origin.rotation.transform_point(g.GPS(flight.gps.ffill().bfill()) - origin.pos)
         else: 
-            pos = origin.rotation.transform_point(
-                flight.origin.pos.offset(g.Point(flight.position.ffill().bfill())) - origin.pos[0]
-            )
+            pos = origin.rotation.transform_point(g.Point(flight.position.ffill().bfill()))
         
         att = origin.rotation * g.Euler(flight.attitude.ffill().bfill()) 
         vel =  att.inverse().transform_point(origin.rotation.transform_point(g.Point(flight.velocity.ffill().bfill()))) if all(flight.contains('velocity')) else None

{flightdata-0.2.15 → flightdata-0.2.16/flightdata.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flightdata
-Version: 0.2.15
+Version: 0.2.16
 Summary: Module for handling UAV flight log data
 Author-email: Thomas David <thomasdavid0@gmail.com>
 License: GNU GPL v3
@@ -11,12 +11,13 @@ License-File: LICENSE
 Requires-Dist: numpy
 Requires-Dist: pandas
 Requires-Dist: simplejson
-Requires-Dist: pfc-geometry>=0.2.7
+Requires-Dist: pfc-geometry>=0.2.8
+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.7; extra == "dev"
+Requires-Dist: pfc-geometry>=0.2.8; extra == "dev"
 Requires-Dist: ardupilot-log-reader>=0.3.3; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 

{flightdata-0.2.15 → flightdata-0.2.16}/flightdata.egg-info/requires.txt

@@ -1,12 +1,13 @@
 numpy
 pandas
 simplejson
-pfc-geometry>=0.2.7
+pfc-geometry>=0.2.8
+json_stream
 
 [dev]
 numpy
 pandas
 simplejson
-pfc-geometry>=0.2.7
+pfc-geometry>=0.2.8
 ardupilot-log-reader>=0.3.3
 pytest

{flightdata-0.2.15 → flightdata-0.2.16}/requirements-dev.txt

@@ -1,6 +1,6 @@
 numpy
 pandas
 simplejson
-pfc-geometry>=0.2.7
+pfc-geometry>=0.2.8
 ardupilot-log-reader>=0.3.3
 pytest

flightdata-0.2.16/requirements.txt

@@ -0,0 +1,5 @@
+numpy
+pandas
+simplejson
+pfc-geometry>=0.2.8
+json_stream

flightdata-0.2.15/requirements.txt

@@ -1,4 +0,0 @@
-numpy
-pandas
-simplejson
-pfc-geometry>=0.2.7