Move local_global_conversion (#213)

* Move local_global_conversion.py and its dependency to common repo * Refactored imports
UWARG · Nov 1, 2024 · 7543e3d · 7543e3d
1 parent 415829a
commit 7543e3d
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 249 deletions.
diff --git a/modules/common b/modules/common
diff --git a/modules/drone_odometry_local.py b/modules/drone_odometry_local.py
diff --git a/modules/flight_interface/flight_interface.py b/modules/flight_interface/flight_interface.py
@@ -2,13 +2,13 @@
 Creates flight controller and combines odometry data and timestamp.
 """
 
-from . import local_global_conversion
-from .. import drone_odometry_local
-from .. import odometry_and_time
 from .. import decision_command
+from .. import odometry_and_time
 from ..common.logger.modules import logger
 from ..common.mavlink.modules import drone_odometry
+from ..common.mavlink.modules import drone_odometry_local
 from ..common.mavlink.modules import flight_controller
+from ..common.mavlink.modules import local_global_conversion
 
 
 class FlightInterface:

diff --git a/modules/flight_interface/local_global_conversion.py b/modules/flight_interface/local_global_conversion.py
diff --git a/modules/merged_odometry_detections.py b/modules/merged_odometry_detections.py
@@ -3,7 +3,7 @@
 """
 
 from . import detections_and_time
-from . import drone_odometry_local
+from .common.mavlink.modules import drone_odometry_local
 
 
 class MergedOdometryDetections:

diff --git a/modules/odometry_and_time.py b/modules/odometry_and_time.py
@@ -4,7 +4,7 @@
 
 import time
 
-from . import drone_odometry_local
+from .common.mavlink.modules import drone_odometry_local
 
 
 class OdometryAndTime:

diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,6 @@
 # Packages listed in alphabetical order
 numpy
 opencv-python
-pymap3d
 pytest
 pyyaml
 scikit-learn

diff --git a/tests/integration/test_data_merge_worker.py b/tests/integration/test_data_merge_worker.py
@@ -7,15 +7,14 @@
 
 import numpy as np
 
-from modules import drone_odometry_local
 from modules import detections_and_time
 from modules import merged_odometry_detections
 from modules import odometry_and_time
+from modules.common.mavlink.modules import drone_odometry_local
 from modules.data_merge import data_merge_worker
 from utilities.workers import queue_proxy_wrapper
 from utilities.workers import worker_controller
 
-
 DATA_MERGE_WORKER_TIMEOUT = 10.0  # seconds
 
 

diff --git a/tests/integration/test_geolocation_worker.py b/tests/integration/test_geolocation_worker.py
@@ -8,14 +8,13 @@
 import numpy as np
 
 from modules import detections_and_time
-from modules import drone_odometry_local
 from modules import merged_odometry_detections
+from modules.common.mavlink.modules import drone_odometry_local
 from modules.geolocation import camera_properties
 from modules.geolocation import geolocation_worker
 from utilities.workers import queue_proxy_wrapper
 from utilities.workers import worker_controller
 
-
 WORK_COUNT = 3
 
 

diff --git a/tests/test_search_pattern.py b/tests/test_search_pattern.py
@@ -7,7 +7,7 @@
 
 from modules import decision_command
 from modules import odometry_and_time
-from modules import drone_odometry_local
+from modules.common.mavlink.modules import drone_odometry_local
 from modules.decision import search_pattern
 
 DISTANCE_SQUARED_THRESHOLD = 2.0

diff --git a/tests/unit/test_decision.py b/tests/unit/test_decision.py
@@ -8,7 +8,7 @@
 from modules import decision_command
 from modules import object_in_world
 from modules import odometry_and_time
-from modules import drone_odometry_local
+from modules.common.mavlink.modules import drone_odometry_local
 
 
 LANDING_PAD_LOCATION_TOLERANCE = 2

diff --git a/tests/unit/test_geolocation.py b/tests/unit/test_geolocation.py
@@ -7,12 +7,11 @@
 
 from modules import detection_in_world
 from modules import detections_and_time
-from modules import drone_odometry_local
 from modules import merged_odometry_detections
+from modules.common.logger.modules import logger
+from modules.common.mavlink.modules import drone_odometry_local
 from modules.geolocation import camera_properties
 from modules.geolocation import geolocation
-from modules.common.logger.modules import logger
-
 
 FLOAT_PRECISION_TOLERANCE = 4
+1 −1		logger/modules/config_logger.yaml
+84 −0		logger/modules/log_file_merger.py
+210 −0		logger/modules/log_file_merger_helpers.py
+336 −0		logger/test_log_file_merger.py
+133 −0		mavlink/modules/drone_odometry_local.py
+100 −0		mavlink/modules/local_global_conversion.py
+6 −0		requirements.txt
+2 −3		setup_project.ps1
+0 −1		setup_project.sh
+65 −0		test_connection.py
+78 −0		test_undervoltage.py