Merge branch 'develop' of github.com:ocean-perception/oplab_pipeline …

…into develop
ocean-perception · Nov 22, 2023 · 1cdeeb5 · 1cdeeb5
2 parents e992c19 + 7fc30e1
commit 1cdeeb5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/src/auv_nav/auv_nav.py b/src/auv_nav/auv_nav.py
@@ -166,14 +166,10 @@ def main(args=None):
         help="Converts an already processed dive to ACFR format",
     )
     subparser_oplab_to_acfr.add_argument(
-        "-d",
-        "--dive-folder",
         dest="dive_folder",
         help="Input dive path.",
     )
     subparser_oplab_to_acfr.add_argument(
-        "-o",
-        "--output-folder",
         dest="output_folder",
         help="Path where results will be written.",
     )

diff --git a/src/auv_nav/convert.py b/src/auv_nav/convert.py
@@ -29,7 +29,7 @@
     epoch_to_datetime,
     string_to_epoch,
 )
-from oplab import Console, Mission, Vehicle, get_processed_folder
+from oplab import Console, Mission, Vehicle, get_raw_folder, get_processed_folder
 
 # fmt: on
 
@@ -221,16 +221,17 @@ def oplab_to_acfr(args):
         Console.quit("Default behaviour: not to overwrite results")
 
     Console.info("Loading mission.yaml")
-    path_processed = get_processed_folder(args.dive_folder)
-    mission_file = path_processed / "mission.yaml"
+    path_raw = get_raw_folder(args.dive_folder)
+    mission_file = path_raw / "mission.yaml"
     mission = Mission(mission_file)
 
-    vehicle_file = path_processed / "vehicle.yaml"
+    vehicle_file = path_raw / "vehicle.yaml"
     vehicle = Vehicle(vehicle_file)
 
     origin_lat = mission.origin.latitude
     origin_lon = mission.origin.longitude
 
+    path_processed = get_processed_folder(args.dive_folder)
     json_list = list(path_processed.glob("json_*"))
     if len(json_list) == 0:
         Console.quit(