water-column-sonar-annotation 26.1.8__py3-none-any.whl → 26.2.0__py3-none-any.whl

tests/astronomical/test_astronomical_manager.py

@@ -51,7 +51,7 @@ def test_phase_of_day_at_noon():
         latitude=39.9674884,  # Boulder
         longitude=-105.2532602,
     )
-    assert phase == 2
+    assert phase == "day"
 
 
 def test_phase_of_day_at_midnight():
@@ -61,7 +61,7 @@ def test_phase_of_day_at_midnight():
         latitude=39.9674884,  # Boulder
         longitude=-105.2532602,
     )
-    assert phase == 4
+    assert phase == "night"
 
 
 def test_phase_of_day_before_sunset():
@@ -72,7 +72,7 @@ def test_phase_of_day_before_sunset():
         latitude=39.9674884,  # Boulder
         longitude=-105.2532602,
     )
-    assert phase == 2  # day
+    assert phase == "day"  # day
 
 
 def test_phase_of_day_after_sunset():
@@ -83,7 +83,7 @@ def test_phase_of_day_after_sunset():
         latitude=39.9674884,  # Boulder
         longitude=-105.2532602,
     )
-    assert phase == 3  # dusk
+    assert phase == "dusk"  # dusk
 
 
 def test_phase_of_day_before_nautical_sunset():
@@ -94,7 +94,7 @@ def test_phase_of_day_before_nautical_sunset():
         latitude=39.9674884,  # Boulder
         longitude=-105.2532602,
     )
-    assert phase_before_nautical_sunset == 3  # dusk
+    assert phase_before_nautical_sunset == "dusk"  # dusk
 
 
 def test_phase_of_day_after_nautical_sunset():
@@ -104,7 +104,7 @@ def test_phase_of_day_after_nautical_sunset():
         latitude=39.9674884,  # Boulder
         longitude=-105.2532602,
     )
-    assert phase_after_nautical_sunset == 4  # night
+    assert phase_after_nautical_sunset == "night"  # night
 
 
 def test_phase_of_day_before_sunrise():
@@ -114,7 +114,7 @@ def test_phase_of_day_before_sunrise():
         latitude=39.9674884,  # Boulder
         longitude=-105.2532602,
     )
-    assert phase_at_sunrise == 1  # dusk
+    assert phase_at_sunrise == "dawn"  # dawn
 
 
 def test_phase_of_day_after_sunrise():
@@ -124,7 +124,7 @@ def test_phase_of_day_after_sunrise():
         latitude=39.9674884,  # Boulder
         longitude=-105.2532602,
     )
-    assert phase_at_sunrise == 2  # day
+    assert phase_at_sunrise == "day"  # day
 
 
 def test_phase_of_day_before_nautical_sunrise():
@@ -135,7 +135,7 @@ def test_phase_of_day_before_nautical_sunrise():
         latitude=39.9674884,  # Boulder
         longitude=-105.2532602,
     )
-    assert phase_before_nautical_sunrise == 4  # night
+    assert phase_before_nautical_sunrise == "night"  # night
 
 
 def test_phase_of_day_after_nautical_sunrise():
@@ -145,4 +145,4 @@ def test_phase_of_day_after_nautical_sunrise():
         latitude=39.9674884,  # Boulder
         longitude=-105.2532602,
     )
-    assert phase == 1
+    assert phase == "dawn"  # dawn

tests/conftest.py

@@ -1,60 +1,60 @@
-from pathlib import Path
-
-import pooch
-import pytest
-
-HERE = Path(__file__).parent.absolute()
-TEST_DATA_FOLDER = HERE / "test_resources"
-
-HB1906_DATA = pooch.create(
-    path=pooch.os_cache("water-column-sonar-annotation"),
-    base_url="https://github.com/CI-CMG/water-column-sonar-annotation/releases/download/v26.1.0/",
-    retry_if_failed=1,
-    registry={
-        "HB201906_BOTTOMS.zip": "sha256:20609581493ea3326c1084b6868e02aafbb6c0eae871d946f30b8b5f0e7ba059",
-        "HB201906_EVR.zip": "sha256:ceed912a25301be8f1b8f91e134d0ca4cff717f52b6623a58677832fd60c2990",
-        #
-        # "ne_50m_coastline.shp": "sha256:797d675af9613f80b51ab6049fa32e589974d7a97c6497ca56772965f179ed26",
-        # "ne_50m_coastline.shx": "sha256:0ff1792f2d16b58246d074215edd9d12fa280880ecaad61a91b9382fee854065",
-        #
-        "ne_10m_coastline.shp": "sha256:459a4a97c09db19aadf5244026612de9d43748be27f83a360242b99f7fabb3c1",
-        "ne_10m_coastline.shx": "sha256:f873afee7f56779ce52253f740ec251c2f12244aea911dc40f0a85d75de8d5f2",
-    },
-)
-
-
-def fetch_raw_files():
-    HB1906_DATA.fetch(fname="HB201906_BOTTOMS.zip", progressbar=True)
-    HB1906_DATA.fetch(fname="HB201906_EVR.zip", progressbar=True)
-
-    # HB1906_DATA.fetch(fname="ne_50m_coastline.shp", progressbar=True)
-    # HB1906_DATA.fetch(fname="ne_50m_coastline.shx", progressbar=True)
-
-    HB1906_DATA.fetch(fname="ne_10m_coastline.shp", progressbar=True)
-    HB1906_DATA.fetch(fname="ne_10m_coastline.shx", progressbar=True)
-
-    file_name = HB1906_DATA.fetch(fname="HB201906_EVR.zip", progressbar=True)
-
-    """
-    water-column-sonar-annotation user$ ls /Users/user/Library/Caches/water-column-sonar-annotation
-    HB201906_BOTTOMS.zip	HB201906_EVR.zip	ne_10m_coastline.shp	ne_10m_coastline.shx
-    """
-    return Path(file_name).parent
-
-
-@pytest.fixture(scope="session")
-def test_path():
-    return {
-        "DATA_TEST_PATH": fetch_raw_files(),
-    }
-
-
-# """
-# Folder locations in mac and windows:
-#
-# Windows
-# C:\Users\<user>\AppData\Local\echopype\Cache\2024.12.23.10.10
-#
-# MacOS
-# /Users//Library/Caches/echopype/2024.12.23.10.10
-# """
+# from pathlib import Path
+#
+# import pooch
+# import pytest
+#
+# HERE = Path(__file__).parent.absolute()
+# TEST_DATA_FOLDER = HERE / "test_resources"
+#
+# HB1906_DATA = pooch.create(
+#     path=pooch.os_cache("water-column-sonar-annotation"),
+#     base_url="https://github.com/CI-CMG/water-column-sonar-annotation/releases/download/v26.1.0/",
+#     retry_if_failed=1,
+#     registry={
+#         "HB201906_BOTTOMS.zip": "sha256:20609581493ea3326c1084b6868e02aafbb6c0eae871d946f30b8b5f0e7ba059",
+#         "HB201906_EVR.zip": "sha256:256778122e9c8b05884f5f2c5cf5cdad5502aa3dae61d417ec5e4278262d937a",
+#         #
+#         # "ne_50m_coastline.shp": "sha256:797d675af9613f80b51ab6049fa32e589974d7a97c6497ca56772965f179ed26",
+#         # "ne_50m_coastline.shx": "sha256:0ff1792f2d16b58246d074215edd9d12fa280880ecaad61a91b9382fee854065",
+#         #
+#         "ne_10m_coastline.shp": "sha256:459a4a97c09db19aadf5244026612de9d43748be27f83a360242b99f7fabb3c1",
+#         "ne_10m_coastline.shx": "sha256:f873afee7f56779ce52253f740ec251c2f12244aea911dc40f0a85d75de8d5f2",
+#     },
+# )
+#
+#
+# def fetch_raw_files():
+#     # HB1906_DATA.fetch(fname="HB201906_BOTTOMS.zip", progressbar=True)
+#     # HB1906_DATA.fetch(fname="HB201906_EVR.zip", progressbar=True)
+#
+#     # HB1906_DATA.fetch(fname="ne_50m_coastline.shp", progressbar=True)
+#     # HB1906_DATA.fetch(fname="ne_50m_coastline.shx", progressbar=True)
+#
+#     # HB1906_DATA.fetch(fname="ne_10m_coastline.shp", progressbar=True)
+#     # HB1906_DATA.fetch(fname="ne_10m_coastline.shx", progressbar=True)
+#
+#     file_name = HB1906_DATA.fetch(fname="HB201906_EVR.zip", progressbar=True)
+#
+#     """
+#     water-column-sonar-annotation user$ ls /Users/user/Library/Caches/water-column-sonar-annotation
+#     HB201906_BOTTOMS.zip	HB201906_EVR.zip	ne_10m_coastline.shp	ne_10m_coastline.shx
+#     """
+#     return Path(file_name).parent
+#
+#
+# @pytest.fixture(scope="session")
+# def test_path():
+#     return {
+#         "DATA_TEST_PATH": fetch_raw_files(),
+#     }
+#
+#
+# # """
+# # Folder locations in mac and windows:
+# #
+# # Windows
+# # C:\Users\<user>\AppData\Local\echopype\Cache\2024.12.23.10.10
+# #
+# # MacOS
+# # /Users//Library/Caches/echopype/2024.12.23.10.10
+# # """

tests/cruise/test_cruise_manager.py

@@ -1,5 +1,4 @@
 import numpy as np
-import pytest
 
 from water_column_sonar_annotation.cruise import CruiseManager
 
@@ -13,9 +12,9 @@ def teardown_module():
     print("teardown")
 
 
-@pytest.fixture
-def process_cruise_path(test_path):
-    return test_path["DATA_TEST_PATH"]
+# @pytest.fixture
+# def process_cruise_path(test_path):
+#     return test_path["DATA_TEST_PATH"]
 
 
 #######################################################
@@ -26,7 +25,7 @@ def process_cruise_path(test_path):
 #     assert len(cruise.Sv.shape) == 3
 
 
-def test_get_cruise(process_cruise_path, tmp_path):
+def test_get_cruise():
     cruise_manager = CruiseManager()
     cruise = cruise_manager.get_cruise()
     assert len(cruise.Sv.shape) == 3

tests/geospatial/test_geospatial_manager.py

@@ -1,5 +1,4 @@
 import numpy as np
-import pytest
 
 from water_column_sonar_annotation.geospatial import GeospatialManager
 
@@ -13,33 +12,30 @@ def teardown_module():
     print("teardown")
 
 
-@pytest.fixture
-def process_check_distance_from_coastline(test_path):
-    return test_path["DATA_TEST_PATH"]
+# @pytest.fixture
+# def process_check_distance_from_coastline(test_path):
+#     return test_path["DATA_TEST_PATH"]
 
 
 #######################################################
-def test_check_distance_from_coastline(process_check_distance_from_coastline, tmp_path):
+# def test_check_distance_from_coastline(process_check_distance_from_coastline, tmp_path):
+def test_check_distance_from_coastline():
     geospatial_manager = GeospatialManager()
     # Point in middle of atlantic https://wktmap.com/?ab28cbae
     distance = geospatial_manager.check_distance_from_coastline(
         latitude=51.508742,
         longitude=-30.410156,
-        shapefile_path=process_check_distance_from_coastline,
     )
-    # assert np.isclose(distance, 1_236_212.37356)  # 1,200 km
-    assert np.isclose(distance, 1_233_910.720702243)
+    # distance should be ~1,200 km away
+    assert np.isclose(distance, 1_233_911)  # 1_233_910.720702243
 
 
-def test_check_distance_from_coastline_woods_hole(
-    process_check_distance_from_coastline, tmp_path
-):
+def test_check_distance_from_coastline_woods_hole():
     geospatial_manager = GeospatialManager()
     # Point in middle of woods hole vineyard sound: https://wktmap.com/?9b405aa9
     distance = geospatial_manager.check_distance_from_coastline(
         latitude=41.494692,
         longitude=-70.647926,
-        shapefile_path=process_check_distance_from_coastline,
     )
     # The sound is 5 km across
     # assert np.isclose(distance, 4_457.0347)  # 4.5 km --> should be 2.5 km?

tests/record/test_echoview_record_manager.py

@@ -1,3 +1,4 @@
+import numpy as np
 import pytest
 
 from water_column_sonar_annotation.record import EchoviewRecordManager
@@ -92,7 +93,6 @@ AH_School
 20191106 1314583780 25.4929369108 20191106 1314583780 30.2941528987 20191106 1314593790 30.2941528987 20191106 1314593790 25.3008882713 20191106 1314583780 25.3008882713 1
 Region 23"""
 
-
 ah_school_example2 = """13 16 28 0 7 -1 1 20191106 1317305715  31.8305420148 20191106 1317335745  35.8635634446
 0
 10
@@ -120,41 +120,163 @@ atlantic_herring
 
 def test_process_evr_record_possible_herring():
     echoview_record_manager = EchoviewRecordManager()
-    echoview_record_manager.process_evr_record(
-        evr_record=possible_herring_example, filename="test.evr"
+    output = echoview_record_manager.process_evr_record_full_geometry(
+        evr_record=possible_herring_example, file_name="test.evr"
+    )
+    assert output.time_start == np.datetime64("2019-09-25 22:47:24.213000")
+    assert output.time_end == np.datetime64("2019-09-25 22:47:36.246000")
+    assert output.depth_min == 24.13
+    assert output.depth_max == 35.17
+    assert output.altitude == 1.62
+    assert output.latitude == 41.29728
+    assert output.longitude == -70.96354
+    assert output.distance_from_coastline == 11249
+    assert output.local_time == "2019-09-25T18:47:24.213000-04:00"
+    assert output.month == 9
+    assert output.solar_altitude == -2.92
+    assert output.phase_of_day == "dusk"
+    assert output.classification == "possible_herring"
+    assert output.filename == "test.evr"
+    assert output.region_id == 7
+    assert output.ship == "Henry_B._Bigelow"
+    assert output.cruise == "HB1906"
+    assert output.instrument == "EK60"
+    assert output.point_count == 4
+    assert (
+        output.geometry_hash
+        == "a5032c1ae6a14cb534ae2dfcfcf15056a9dfc23c04270f7e7f1e44f3d23beb7c"
     )
+    assert len(output.geometry) == 120  # TODO: elaborate
 
 
 def test_process_evr_record_fish_school():
     echoview_record_manager = EchoviewRecordManager()
-    echoview_record_manager.process_evr_record(
-        evr_record=fish_school_example, filename="test.evr"
+    output = echoview_record_manager.process_evr_record_full_geometry(
+        evr_record=fish_school_example, file_name="test.evr"
+    )
+    assert output.time_start == np.datetime64("2019-09-25 17:49:45.160500")
+    assert output.time_end == np.datetime64("2019-09-25 17:49:50.164500")
+    assert output.depth_min == 20.28
+    assert output.depth_max == 26.3
+    assert output.altitude == 6.83
+    assert output.latitude == 41.38583
+    assert output.longitude == -71.31283
+    assert output.distance_from_coastline == 8145
+    assert output.local_time == "2019-09-25T13:49:45.160500-04:00"
+    assert output.month == 9
+    assert output.solar_altitude == 44.57
+    assert output.phase_of_day == "day"
+    assert output.classification == "fish_school"
+    assert output.filename == "test.evr"
+    assert output.region_id == 8
+    assert output.ship == "Henry_B._Bigelow"
+    assert output.cruise == "HB1906"
+    assert output.instrument == "EK60"
+    assert output.point_count == 30
+    assert (
+        output.geometry_hash
+        == "e8f26554fa6ade664adc7c2b60896cf86d47092636ed8f2152c4cfa45dd962a9"
     )
+    assert len(output.geometry) == 898  # TODO: elaborate
 
 
 def test_process_evr_record_unclassified_regions():
     echoview_record_manager = EchoviewRecordManager()
-    echoview_record_manager.process_evr_record(
-        evr_record=unclassified_regions_example, filename="test.evr"
+    output = echoview_record_manager.process_evr_record_full_geometry(
+        evr_record=unclassified_regions_example, file_name="test.evr"
     )
+    # print(output)
+    assert output.time_start == np.datetime64("2019-09-25 20:53:45.895300")
+    assert output.time_end == np.datetime64("2019-09-25 20:54:11.931800")
+    assert output.depth_min == 9.28
+    assert output.depth_max == 11.53
+    assert output.altitude == 21.68
+    assert output.latitude == 41.346
+    assert output.longitude == -70.90754
+    assert output.distance_from_coastline == 5132
+    assert output.local_time == "2019-09-25T16:53:45.895300-04:00"
+    assert output.month == 9
+    assert output.solar_altitude == 18.07
+    assert output.phase_of_day == "day"
+    assert output.classification == "Unclassified regions"
+    assert output.filename == "test.evr"
+    assert output.region_id == 1
+    assert output.ship == "Henry_B._Bigelow"
+    assert output.cruise == "HB1906"
+    assert output.instrument == "EK60"
+    assert output.point_count == 12
+    assert (
+        output.geometry_hash
+        == "521b9994ebcc00cb4640a9e9cfddf7470f3903e3eab8c918604269c48e723d8a"
+    )
+    assert len(output.geometry) == 352  # TODO: elaborate
 
 
 def test_process_evr_record_krill_schools():
     echoview_record_manager = EchoviewRecordManager()
-    echoview_record_manager.process_evr_record(
-        evr_record=krill_schools_example, filename="test.evr"
+    output = echoview_record_manager.process_evr_record_full_geometry(
+        evr_record=krill_schools_example, file_name="test.evr"
     )
+    assert output is None
 
 
 def test_process_evr_record_ah_school_1():
     echoview_record_manager = EchoviewRecordManager()
-    echoview_record_manager.process_evr_record(
-        evr_record=ah_school_example1, filename="test.evr"
+    output = echoview_record_manager.process_evr_record_full_geometry(
+        evr_record=ah_school_example1, file_name="test.evr"
+    )
+    assert output.time_start == np.datetime64("2019-11-06 13:14:58.378000")
+    assert output.time_end == np.datetime64("2019-11-06 13:14:59.379000")
+    assert output.depth_min == 25.3
+    assert output.depth_max == 30.29
+    assert output.altitude == 70.28
+    assert output.latitude == 44.13652
+    assert output.longitude == -67.0766
+    assert output.distance_from_coastline == 51279
+    assert output.local_time == "2019-11-06T09:14:58.378000-04:00"
+    assert output.month == 11
+    assert output.solar_altitude == 17.61
+    assert output.phase_of_day == "day"
+    assert output.classification == "AH_School"
+    assert output.filename == "test.evr"
+    assert output.region_id == 23
+    assert output.ship == "Henry_B._Bigelow"
+    assert output.cruise == "HB1906"
+    assert output.instrument == "EK60"
+    assert output.point_count == 5
+    assert (
+        output.geometry_hash
+        == "6b976f373a3e035a3d0df62984cbdacf9e9df81e36369352637c7ae5458924a2"
     )
+    assert len(output.geometry) == 148  # TODO: elaborate
 
 
 def test_process_evr_record_ah_school_2():
     echoview_record_manager = EchoviewRecordManager()
-    echoview_record_manager.process_evr_record(
-        evr_record=ah_school_example2, filename="test.evr"
+    output = echoview_record_manager.process_evr_record_full_geometry(
+        evr_record=ah_school_example2, file_name="test.evr"
+    )
+    assert output.time_start == np.datetime64("2019-11-06 13:17:30.571500")
+    assert output.time_end == np.datetime64("2019-11-06 13:17:33.574500")
+    assert output.depth_min == 31.83
+    assert output.depth_max == 35.86
+    assert output.altitude == 70.93
+    assert output.latitude == 44.1376
+    assert output.longitude == -67.06638
+    assert output.distance_from_coastline == 50464
+    assert output.local_time == "2019-11-06T09:17:30.571500-04:00"
+    assert output.month == 11
+    assert output.solar_altitude == 17.93
+    assert output.phase_of_day == "day"
+    assert output.classification == "AH_School"
+    assert output.filename == "test.evr"
+    assert output.region_id == 28
+    assert output.ship == "Henry_B._Bigelow"
+    assert output.cruise == "HB1906"
+    assert output.instrument == "EK60"
+    assert output.point_count == 16
+    assert (
+        output.geometry_hash
+        == "038c6e57dd95bf9c836ae8ef6145ae53a4fa64bd6f836050c8fa8f2601ba2a41"
     )
+    assert len(output.geometry) == 480  # TODO: elaborate

water_column_sonar_annotation/__init__.py

@@ -1,5 +1,5 @@
 from __future__ import absolute_import
 
-from . import astronomical, geospatial, record, shape
+from . import astronomical, geospatial, record
 
-__all__ = ["astronomical", "record", "geospatial", "shape"]
+__all__ = ["astronomical", "record", "geospatial"]

water_column_sonar_annotation/astronomical/astronomical_manager.py

@@ -47,7 +47,7 @@ class AstronomicalManager:
         iso_time: str,
         latitude: float,
         longitude: float,
-    ) -> int:
+    ) -> str:
         """
         Returns whether the time/gps references a Nautical Daylight time
         Going to need to verify the az is correctly computed
@@ -62,12 +62,12 @@ class AstronomicalManager:
             longitude=longitude,
         )
         if solar_azimuth < self.NAUTICAL_TWILIGHT_DEGREES:
-            return 4  # night
+            return "night"  # night
         if solar_azimuth >= 0.0:
-            return 2  # day
+            return "day"  # day
         if local_hour < 12:
-            return 1  # dawn
-        return 3  # dusk
+            return "dawn"  # dawn
+        return "dusk"  # dusk
 
     # def get_moon_phase(self):
     #     # TODO: add method for getting the moon phase

water_column_sonar_annotation/geospatial/geospatial_manager.py

@@ -58,30 +58,27 @@ class GeospatialManager:
         self,  # -30.410156 51.508742)
         latitude: float = 51.508742,  # 42.682435,
         longitude: float = -30.410156,  # -68.741455,
-        shapefile_path: str = data_path()["DATA_PATH"],
-    ) -> np.float32 | None:
+    ) -> int | None:
         """
         # Note this takes about 14 seconds each, very slow!!!
         """
         try:
             # requires the shape file too
-            geometry_one = gpd.read_file(f"{shapefile_path}/ne_10m_coastline.shp")
+            geometry_one = gpd.read_file(
+                f"{data_path()['DATA_PATH']}/ne_10m_coastline.shp"
+            )
             geometry_one = geometry_one.set_crs(self.crs)
             geometry_two = Point([longitude, latitude])
             gdf_p = gpd.GeoDataFrame(geometry=[geometry_two], crs=self.crs)
             gdf_l = geometry_one
             gdf_p = gdf_p.to_crs(gdf_p.estimate_utm_crs())
-            # print(gdf_p.to_string())
             gdf_l = gdf_l.to_crs(gdf_p.crs)
-            # TODO: index 1399 has inf values, investigate
-            # RuntimeWarning: invalid value encountered in distance
-            #   return lib.distance(a, b, **kwargs)
             all_distances = [
                 gdf_p.geometry.distance(gdf_l.get_geometry(0)[i])[0]
                 for i in range(len(gdf_l.get_geometry(0)))
                 if gdf_l.get_geometry(0)[i].is_valid
             ]
-            return np.round(np.min(all_distances), 0)
+            return int(np.min(all_distances))
         except Exception as e:
             print(f"Could not process the distance: {e}")
 
@@ -102,8 +99,8 @@ class GeospatialManager:
         local_time = utc.astimezone(to_zone)
         return local_time.isoformat()  # [:19]
 
+    @staticmethod
     def get_local_hour_of_day(
-        self,
         iso_time: str = "2026-01-26T20:35:00Z",
         latitude: float = 51.508742,
         longitude: float = -30.410156,

water_column_sonar_annotation/record/echoview_record_manager.py

@@ -1,27 +1,50 @@
 import hashlib
 import itertools
-from os import listdir
-from os.path import isfile, join
+import os
+import zipfile
 from pathlib import Path
 
-import numpy as np
 import pandas as pd
+import pooch
 
 from water_column_sonar_annotation.astronomical import AstronomicalManager
 from water_column_sonar_annotation.cruise import CruiseManager
 from water_column_sonar_annotation.geospatial import GeospatialManager
-from water_column_sonar_annotation.record.graph_record_manager import (
-    GraphRecordManager,
+from water_column_sonar_annotation.record.parquet_record_manager import (
+    ParquetRecordManager,
 )
 
-# from water_column_sonar_annotation.record import EchofishRecordManager
-# from water_column_sonar_annotation.record import GRecordManager
-
 """
 Documentation for echoview record files in EVR format:
 https://support.echoview.com/WebHelp/Reference/File_Formats/Export_File_Formats/2D_Region_definition_file_format.htm
 """
 
+HB201906_EVR = pooch.create(
+    path=pooch.os_cache("water-column-sonar-annotation"),
+    base_url="https://github.com/CI-CMG/water-column-sonar-annotation/releases/download/v26.1.0/",
+    retry_if_failed=1,
+    registry={
+        # "HB201906_BOTTOMS.zip": "sha256:20609581493ea3326c1084b6868e02aafbb6c0eae871d946f30b8b5f0e7ba059",
+        "HB201906_EVR.zip": "sha256:256778122e9c8b05884f5f2c5cf5cdad5502aa3dae61d417ec5e4278262d937a",
+    },
+)
+
+
+def fetch_raw_files():
+    # HB201906_EVR.fetch(fname="HB201906_BOTTOMS.zip", progressbar=True)
+    file_path = HB201906_EVR.fetch(fname="HB201906_EVR.zip", progressbar=True)
+    if not os.path.isdir(os.path.join(Path(file_path).parent, "HB201906_EVR")):
+        with zipfile.ZipFile(file_path, "r") as zip_ref:
+            zip_ref.extractall(os.path.join(Path(file_path).parent, "HB201906_EVR"))
+
+    return os.path.join(Path(file_path).parent, "HB201906_EVR")
+
+
+def data_path():
+    return {
+        "DATA_PATH": fetch_raw_files(),
+    }
+
 
 def chunks(lst, n):
     """Yield strings from n-sized chunks from lst."""
@@ -64,7 +87,6 @@ class EchoviewRecordManager:
             "AH_School",
         ]
         self.all_records_df = pd.DataFrame()  # columns=["filename", "start_time"])
-        #
         self.astronomical_manager = AstronomicalManager()
         self.cruise_manager = CruiseManager()
         self.geospatial_manager = GeospatialManager()
@@ -98,9 +120,6 @@ class EchoviewRecordManager:
     # evr_region_name = # String
     """
 
-    # TODO:
-    #  [2] write df to parquet and tag as github resource
-
     @staticmethod
     def process_datetime_string(
         date_string: str,
@@ -117,13 +136,13 @@ class EchoviewRecordManager:
         depth: float,
     ) -> tuple:
         dt = self.process_datetime_string(date_string, time_string)
-        # print(dt.value)  # is epoch time in nanoseconds
-        return dt, dt.value, np.round(depth, 2)
+        # print(dt.isoformat())  # is epoch time in nanoseconds
+        return dt.value, round(depth, 2)
 
-    def process_evr_record(
+    def process_evr_record_full_geometry(
         self,
         evr_record: str,
-        filename: str,
+        file_name: str,
     ):
         try:
             #########################################################
@@ -224,20 +243,23 @@ class EchoviewRecordManager:
             # TODO: If the data has krill, skip creating a record of it
             if evr_region_classification == "krill_schools":
                 print("Krill, skipping!!!")
-                return
+                return None
             #
             # Data for first point – See Data formats below. These data are used to bound the region when importing into Echoview
             evr_points = [x for x in record_lines[-2].split(" ") if x][:-1]
             # print(f"EVR points: {evr_points}")  # TODO: strip last entry
             #
             evr_point_chunks = list(itertools.batched(evr_points, 3))
+            processed_points = []
             for evr_point_chunk in evr_point_chunks:
                 processed_point = self.process_vertice(
                     date_string=evr_point_chunk[0],
                     time_string=evr_point_chunk[1],
                     depth=float(evr_point_chunk[2]),
                 )
-                print(processed_point)
+                processed_points.append(processed_point)
+            #
+            geometry = processed_points
             #
             if len(evr_points) != evr_point_count * 3:
                 raise Exception("EVR point count does not match expected.")
@@ -285,55 +307,41 @@ class EchoviewRecordManager:
                 end_time=evr_right_x_value_of_bounding_rectangle.isoformat(),
                 bbox_max=evr_bottom_y_value_of_bounding_rectangle,
             )
-            # #
-            # # print("%5.2f, %5.2f, {2}, {3}, {4]" % (latitude, longitude, local_time, solar_altitude, is_daytime, distance_from_coastline, evr_altitude))
-            # print(
-            #     f"{latitude}, {longitude}, {local_time}, {solar_altitude}, {is_daytime}, {distance_from_coastline}, {evr_altitude}"
-            # )
-            #
-            # TODO: need additional infor for provenance --> need to create a unique key for each
-            #   want a hash of some sort
-            #   add the region_id (which will recycle from file to file)
             #
             ### provenance ###
             geometry_string = record_lines[-2]  # inclusive of evr_region_type
-            # geometry_string = evr_record # TODO: should i hash the entire record or the geometry?
-            geometry_hash = (
-                f"{hashlib.sha256(geometry_string.encode('utf-8')).hexdigest()}"
-                # f"sha256:{hashlib.sha256(geometry_string.encode('utf-8')).hexdigest()}"
-            )
+            geometry_hash = hashlib.sha256(geometry_string.encode("utf-8")).hexdigest()
             #
-            # parquet_record_manager = ParquetRecordManager()
-            # print(parquet_record_manager)
-            graph_record_manager = GraphRecordManager(
-                classification=evr_region_classification,
-                point_count=evr_point_count,
-                time_start=evr_left_x_value_of_bounding_rectangle.isoformat(),
-                time_end=evr_right_x_value_of_bounding_rectangle.isoformat(),
-                depth_min=np.round(evr_top_y_value_of_bounding_rectangle, 2),
-                depth_max=np.round(evr_bottom_y_value_of_bounding_rectangle, 2),
-                month=evr_left_x_value_of_bounding_rectangle.month,  # TODO: UTC Month, maybe change to localtime
-                latitude=float(latitude),  # TODO: too many digits
-                longitude=float(longitude),
+            parquet_record_manager = ParquetRecordManager(
+                ###
+                time_start=evr_left_x_value_of_bounding_rectangle,
+                time_end=evr_right_x_value_of_bounding_rectangle,
+                depth_min=evr_top_y_value_of_bounding_rectangle,
+                depth_max=evr_bottom_y_value_of_bounding_rectangle,
+                altitude=evr_altitude,
+                latitude=latitude,
+                longitude=longitude,
+                distance_from_coastline=distance_from_coastline,
                 local_time=local_time,
+                month=evr_left_x_value_of_bounding_rectangle.month,
                 solar_altitude=solar_altitude,
                 phase_of_day=phase_of_day,
-                #
-                distance_from_coastline=distance_from_coastline,
-                altitude=evr_altitude,
-                # geometry="P(0, 1)",  # TODO: https://hvplot.holoviz.org/en/docs/latest/ref/api/manual/hvplot.hvPlot.polygons.html
-                #
-                filename=filename,  # how do i find in parquet
+                classification=evr_region_classification,
+                filename=file_name,
                 region_id=evr_region_id,
+                ship="Henry_B._Bigelow",
+                cruise="HB1906",
+                instrument="EK60",
+                point_count=evr_point_count,
                 geometry_hash=geometry_hash,
+                geometry=str(geometry),
             )
-            # print(graph_record_manager.to_json())
-            #
-            update_df = pd.DataFrame([graph_record_manager.to_dict()])
+            update_df = pd.DataFrame([parquet_record_manager.to_dict()])
             self.all_records_df = pd.concat(
                 [self.all_records_df, update_df],
                 ignore_index=True,
             )
+            return parquet_record_manager
         except Exception as process_evr_record_exception:
             print(f"Problem with process_evr_record: {process_evr_record_exception}")
         finally:
@@ -342,41 +350,51 @@ class EchoviewRecordManager:
     def process_evr_file(
         self,
         evr_file_path: str = None,
-        evr_filename: str = None,
+        evr_file_name: str = None,
     ):
         try:
-            print(f"Filename: {evr_filename}")
-            with open(evr_file_path + evr_filename, "r") as file:
+            print(f"Filename: {evr_file_name}")
+            with open(os.path.join(evr_file_path, evr_file_name), "r") as file:
                 lines = file.read()
 
             records = lines.split("\n\n")
             records = [i for i in records if i.startswith("13 ")]  # filter
             for evr_record in records:
-                self.process_evr_record(evr_record=evr_record, filename=evr_filename)
+                self.process_evr_record_full_geometry(
+                    evr_record=evr_record, file_name=evr_file_name
+                )
         except Exception as process_evr_file_exception:
             print(
-                f"Problem processing file {evr_filename}: {process_evr_file_exception}"
+                f"Problem processing file {evr_file_name}: {process_evr_file_exception}"
             )
 
-    def process_evr_directory(self, evr_directory_path="../../data/HB201906/"):
+    def process_evr_directory(
+        self,
+        evr_directory_path: str = data_path()["DATA_PATH"],
+    ):
         """Open evr directory and start to parse files"""
         try:
             all_evr_files = [
-                f
-                for f in listdir(evr_directory_path)
-                if isfile(join(evr_directory_path, f)) and Path(f).suffix == ".evr"
+                os.path.join(dp, f)
+                for dp, dn, filenames in os.walk(evr_directory_path)
+                for f in filenames
+                if (os.path.splitext(f)[1] == ".evr")
             ]
             all_evr_files.sort()
             print(f"Found {len(all_evr_files)} EVR files.")
-            for evr_file in all_evr_files[:1]:  # TODO: fix this
+            #
+            # TODO: only processing two files right now
+            #
+            for evr_file in all_evr_files[0]:
                 self.process_evr_file(
-                    evr_file_path=evr_directory_path, evr_filename=evr_file
+                    evr_file_path=os.path.dirname(evr_file),
+                    evr_file_name=os.path.basename(evr_file),
                 )
             # I don't have the lat/lon information to draw here... need to query the zarr store...
             print(self.all_records_df)
-            self.all_records_df.set_index(
-                keys="geometry_hash", drop=False, inplace=True
-            )
+            # self.all_records_df.set_index(
+            #     keys="geometry_hash", drop=False, inplace=True
+            # )
             #  sort by time
             self.all_records_df.sort_values(
                 by="time_start",
@@ -386,19 +404,22 @@ class EchoviewRecordManager:
                 ignore_index=False,
             )
             print("writing files")
+            # TODO: write files to tmp directory???
+            # for front-end visualization
             self.all_records_df.to_parquet(
-                path="graph_record.parquet",
+                path="parquet_record_full.parquet",
                 engine="pyarrow",
                 compression="snappy",
                 index=True,
-                partition_cols=None,
-            )
-            self.all_records_df.to_csv(
-                path_or_buf="graph_record.csv",
-                header=True,
-                index=True,
-                mode="w",
+                # partition_cols=None,
             )
+            # TODO: omit geometry and write to csv for upload to neo4j
+            # self.all_records_df.to_csv(
+            #     path_or_buf="parquet_record_full_geometry.csv",
+            #     header=True,
+            #     index=False,
+            #     mode="w",
+            # )
             print("done writing files")
             #
         except Exception as process_evr_directory_exception:
@@ -407,15 +428,13 @@ class EchoviewRecordManager:
             )
 
 
-if __name__ == "__main__":
-    try:
-        echoview_record_manager = EchoviewRecordManager()
-        echoview_record_manager.process_evr_directory(
-            evr_directory_path="../../data/HB201906/"
-        )
-        print("done processing everything")
-    except Exception as e:
-        print(e)
+# if __name__ == "__main__":
+#     try:
+#         echoview_record_manager = EchoviewRecordManager()
+#         echoview_record_manager.process_evr_directory()
+#         print("done processing everything")
+#     except Exception as e:
+#         print(e)
 
 
 # Example of polygon

water_column_sonar_annotation/record/graph_record_manager.py

@@ -5,6 +5,7 @@ Format for export and bulk ingest into neo4j
 """
 
 
+# TODO: remove
 class GraphRecordManager:
     def __init__(
         self,

water_column_sonar_annotation/record/parquet_record_manager.py

@@ -1,63 +1,62 @@
 from json import dumps
 
+
+# from pyspark.sql.functions import *
+
 """
 Format for export to parquet and bulk ingest into neo4j:
 """
-# TODO:
-#  [1] write the records to a pandas dataframe
-#  [2] write df to parquet and tag as github resource
 
 
 class ParquetRecordManager:
     def __init__(
         self,
-        classification,
-        point_count,
-        geometry,
+        ###
         time_start,
         time_end,
         depth_min,
         depth_max,
+        altitude,
+        latitude,
+        longitude,
+        distance_from_coastline,
+        local_time,
         month,
-        # altitude,
-        # latitude: float,
-        # longitude: float,
-        # local_time,
-        # distance_from_coastline,
-        # solar_altitude,
-        # is_daytime,
+        solar_altitude,
+        phase_of_day,
+        classification,
         filename,
         region_id,
-        geometry_hash,  # sha256 hash
-        ship: str = "Henry_B._Bigelow",
-        cruise: str = "HB1906",
-        instrument: str = "EK60",
+        ship,
+        cruise,
+        instrument,
+        point_count,
+        geometry_hash,
+        geometry,
+        ###
     ):
         print("__init__ called")
+        self.time_start = time_start
+        self.time_end = time_end
+        self.depth_min = round(depth_min, 2)
+        self.depth_max = round(depth_max, 2)
+        self.altitude = round(altitude, 2)
+        self.latitude = round(latitude, 5)
+        self.longitude = round(longitude, 5)
+        self.distance_from_coastline: int = int(distance_from_coastline)
+        self.local_time: str = local_time
+        self.month: int = int(month)
+        self.solar_altitude = round(solar_altitude, 2)
+        self.phase_of_day: str = phase_of_day
         self.classification: str = classification
-        self.point_count: int = point_count
-        # self.geometry: str = geometry
-        ### geospatial ###
-        self.time_start: str = time_start
-        self.time_end: str = time_end
-        self.depth_min: float = depth_min
-        self.depth_max: float = depth_max
-        self.month: int = month
-        # self.altitude: float = altitude
-        # self.latitude: float = latitude
-        # self.longitude: float = longitude
-        # self.local_time: str = local_time
-        # self.distance_from_coastline: float = distance_from_coastline
-        # ### astronomical ###
-        # self.solar_altitude: float = solar_altitude
-        # self.is_daytime: bool = is_daytime
-        ### provenance ###
         self.filename: str = filename
-        self.region_id: str = region_id
-        self.geometry_hash: str = geometry_hash
+        self.region_id: int = int(region_id)
         self.ship: str = ship
         self.cruise: str = cruise
         self.instrument: str = instrument
+        self.point_count: int = int(point_count)
+        self.geometry_hash: str = geometry_hash
+        self.geometry: str = str(geometry)
 
     # def __enter__(self):
     #     print("__enter__ called")
@@ -66,6 +65,60 @@ class ParquetRecordManager:
     # def __exit__(self, *a):
     #     print("__exit__ called")
 
+    # def save_test_data(self):
+    #     # test_data = "geometry_hash,classification,point_count,time_start,time_end,depth_min,depth_max,month,altitude,latitude,longitude,local_time,distance_from_coastline,solar_altitude,filename,region_id,ship,cruise,instrument,phase_of_day
+    #     # [e78ee8839c5bd4931b0a790dabe334d5f9200e80b9e4057e5e1a62f60a14e5cf,Unclassified regions,15,2019-09-25T14:02:06.601000,2019-09-25T14:02:57.165800,8.85,14.37,9,-2.88,41.5303955078125,-71.318603515625,2019-09-25T10:02:06.601000-04:00,250.0,35.02,d20190925_t135327-t233118_Zsc-DWBA-Schools_All-RegionDefs.evr,2,Henry_B._Bigelow,HB1906,EK60,2]
+    #     # [46909f534985668542b6437224f0a533a8960619d93247fca0477995e559d9c0,possible_herring,8,2019-09-25T17:49:38.647000,2019-09-25T17:49:57.674000,18.75,29.31,9,3.4,41.38581466674805,-71.3131332397461,2019-09-25T13:49:38.647000-04:00,8139.0,44.57,d20190925_t135327-t233118_Zsc-DWBA-Schools_All-RegionDefs.evr,3,Henry_B._Bigelow,HB1906,EK60,2]
+    #     # [20d22a2da4b120ba925abe0eb39aabfa29dc9b6990888e268d0ea8a3c76511bc,fish_school,30,2019-09-25T17:49:45.160500,2019-09-25T17:49:50.164500,20.28,26.3,9,6.83,41.38582992553711,-71.31282806396484,2019-09-25T13:49:45.160500-04:00,8146.0,44.57,d20190925_t135327-t233118_Zsc-DWBA-Schools_All-RegionDefs.evr,8,Henry_B._Bigelow,HB1906,EK60,2]
+    #     times_start = pd.to_datetime(
+    #         [  # dfp["time_start"] >= np.datetime64("2019-09-25T17:49:38.647000")
+    #             "2019-09-25T14:02:06.601000",
+    #             "2019-09-25T17:49:38.647000",
+    #             "2019-09-25T17:49:45.160500",
+    #         ]
+    #     )
+    #     times_end = pd.to_datetime(
+    #         [
+    #             "2019-09-25T14:02:57.165800",
+    #             "2019-09-25T17:49:57.674000",
+    #             "2019-09-25T17:49:50.164500",
+    #         ]
+    #     )
+    #     geometry_hashes = [
+    #         "e78ee8839c5bd4931b0a790dabe334d5f9200e80b9e4057e5e1a62f60a14e5cf",
+    #         "46909f534985668542b6437224f0a533a8960619d93247fca0477995e559d9c0",
+    #         "20d22a2da4b120ba925abe0eb39aabfa29dc9b6990888e268d0ea8a3c76511bc",
+    #     ]
+    #     df = pd.DataFrame(
+    #         data={
+    #             "time_start": times_start,
+    #             "time_end": times_end,
+    #             "geometry_hash": geometry_hashes,
+    #         },
+    #         # index=["geometry_hashes"],
+    #     )
+    #     # df.set_index("geometry_hash", drop=True, inplace=True)
+    #     df.to_parquet(
+    #         path="test.parquet",
+    #         engine="pyarrow",
+    #         compression="snappy",
+    #         index=True,
+    #         # partition_cols=df.columns,
+    #     )
+    #     print("done")
+    #     # df = pd.read_csv("Henry_B._Bigelow_HB1906_annotations.parquet")
+    #     #
+    #     ### now test reading ###
+    #     #
+    #     dfp = pq.read_table(source="test.parquet")
+    #     print(dfp.shape)
+    #     dfp_select = dfp.filter(
+    #         (dfp["time_start"] >= np.datetime64("2019-09-25T17:49:40"))
+    #         & (dfp["time_end"] <= np.datetime64("2019-09-25T17:49:51"))
+    #     )
+    #     print(dfp_select["geometry_hash"])
+    #     # df = pq.read_table(source="Henry_B._Bigelow_HB1906_annotations.parquet").to_pandas()
+
     def to_dict(
         self,
     ):
@@ -81,3 +134,22 @@ class ParquetRecordManager:
             return dumps(self.__dict__)
         except Exception as parquet_record_exception:
             print(f"Problem with parquet record: {parquet_record_exception}")
+
+
+# if __name__ == "__main__":
+#     try:
+#         parquet_record_manager = ParquetRecordManager()
+#         parquet_record_manager.save_test_data()
+#     except Exception as e:
+#         print(e)
+
+
+"""
+with pandas:
+    pyarrow.Table
+    time_start: timestamp[us]
+    time_end: timestamp[us]
+    geometry_hash: large_string
+with numpy datetime64 -> doesn't work
+'>=' not supported between instances of 'pyarrow.lib.ChunkedArray' and 'Timestamp'
+"""

water_column_sonar_annotation/shape/shape_manager.py

@@ -1,29 +1,29 @@
-class ShapeManager:
-    def __init__(
-        self,
-    ):
-        self.DECIMAL_PRECISION = 4
-
-    def point(
-        self,
-        date_string,
-        time_string,
-        depth_string,
-    ):  # -> returntype # TODO:
-        pass
-
-    def polygon(
-        self,
-        date_string,
-        time_string,
-        depth_string,
-    ):  # -> type # TODO:
-        pass
-
-    def bounding_box(
-        self,
-        date_string,
-        time_string,
-        depth_string,
-    ):  # -> returntype # TODO:
-        pass
+# class ShapeManager:
+#     def __init__(
+#         self,
+#     ):
+#         self.DECIMAL_PRECISION = 4
+#
+#     def point(
+#         self,
+#         date_string,
+#         time_string,
+#         depth_string,
+#     ):  # -> returntype # TODO:
+#         pass
+#
+#     def polygon(
+#         self,
+#         date_string,
+#         time_string,
+#         depth_string,
+#     ):  # -> type # TODO:
+#         pass
+#
+#     def bounding_box(
+#         self,
+#         date_string,
+#         time_string,
+#         depth_string,
+#     ):  # -> returntype # TODO:
+#         pass

{water_column_sonar_annotation-26.1.8.dist-info → water_column_sonar_annotation-26.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: water-column-sonar-annotation
-Version: 26.1.8
+Version: 26.2.0
 Summary: Processing Tool for Working with Water Column Sonar Annotations
 Author-email: Rudy Klucik <rudy.klucik@noaa.gov>
 Maintainer-email: Rudy Klucik <rudy.klucik@noaa.gov>
@@ -25,6 +25,7 @@ Requires-Dist: pooch
 Requires-Dist: pvlib
 Requires-Dist: pyarrow
 Requires-Dist: pyogrio
+Requires-Dist: pyspark
 Requires-Dist: python-dotenv
 Requires-Dist: s3fs
 Requires-Dist: scipy
@@ -40,7 +41,7 @@ Dynamic: license-file
 Tool for converting EVR files to annotated regions of interest in parquet format
 
 ![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/CI-CMG/water-column-sonar-annotation/test_action.yaml)
-![PyPI - Implementation](https://img.shields.io/pypi/v/water-column-sonar-annotation) ![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/CI-CMG/water-column-sonar-annotation) ![GitHub repo size](https://img.shields.io/github/repo-size/CI-CMG/water-column-sonar-annotation)
+![PyPI - Version](https://img.shields.io/pypi/v/water-column-sonar-annotation) ![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/CI-CMG/water-column-sonar-annotation) ![GitHub repo size](https://img.shields.io/github/repo-size/CI-CMG/water-column-sonar-annotation)
 
 # Setting up the Python Environment
 
@@ -82,7 +83,7 @@ TODO
 Step 1 --> increment the semantic version in the zarr_manager.py "metadata" & the "pyproject.toml"
 
 ```commandline
-git tag -a v26.1.0 -m "Releasing v26.1.0"
+git tag -a v26.1.8 -m "Releasing v26.1.8"
 git push origin --tags
 gh release create v26.1.0
 ```

{water_column_sonar_annotation-26.1.8.dist-info → water_column_sonar_annotation-26.2.0.dist-info}/RECORD

@@ -1,27 +1,27 @@
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/conftest.py,sha256=vAypoNVgTu3Uj1JK_X63aM8c9WXZF5lpIr2oyXwHjCc,2099
+tests/conftest.py,sha256=qlztU9v4bk4zkUkUY55Oz4YUAxKptyQBK5Jfycgj2zA,2214
 tests/astronomical/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/astronomical/test_astronomical_manager.py,sha256=AMjwCq07zCfq6-UVZuPuMI-WfWbTOHuE5CFzQvV_WMs,5069
+tests/astronomical/test_astronomical_manager.py,sha256=BNVj_xlem-qXIfvOttaxN_X-b7m64kFYEhoi4_HN3-s,5127
 tests/cruise/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/cruise/test_cruise_manager.py,sha256=vvvw1DmCYeu1eL5RZWArXRqMYdiVZ-jrMBuxzxT67-0,2326
+tests/cruise/test_cruise_manager.py,sha256=ulQ8Sog4Lz8ETFI7SXvBpaSoXyEeD_EZJnFs5hnFMHo,2289
 tests/geospatial/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/geospatial/test_geospatial_manager.py,sha256=FH7EKTLc9IuaxuSu4a1ELF1Eag0PtLR3B2SmAsntyuo,2652
-tests/record/test_echoview_record_manager.py,sha256=sypDHtwig48ObnKYpB2RYboTwsal1uln-IyCVwfL3Hc,9992
-water_column_sonar_annotation/__init__.py,sha256=-PIqLf8FrVlRrJjCU15axf6lPIpZCK47nV6YVPwLO1o,155
+tests/geospatial/test_geospatial_manager.py,sha256=zsEy4sbUdsrRkAo95nD7UZ9QWNUS9V-w2E0LU50MP9I,2501
+tests/record/test_echoview_record_manager.py,sha256=qVkiCGLIdY7YPN8NztKiqtyFnEBfTCb3sJlUkE71LJk,15372
+water_column_sonar_annotation/__init__.py,sha256=mLrO0242C3iksRuXJBDXrwQ5mz2zyzJQ0fWWVkz21sk,139
 water_column_sonar_annotation/astronomical/__init__.py,sha256=iWJIwLDD0uK9ZGBH1EkKFKXmAdtD-mYAbrWlibXAJFU,94
-water_column_sonar_annotation/astronomical/astronomical_manager.py,sha256=pEpaa3Bjg9R1oqvlqEfMF5IY-oGEp9BtPaqaq_Mag4g,3060
+water_column_sonar_annotation/astronomical/astronomical_manager.py,sha256=igzisj3_n05kVAmd1nBj5Q73jTpjJXdDyEydaJNj7WA,3080
 water_column_sonar_annotation/cruise/__init__.py,sha256=G2lZmW1UaX2AmznB7qEFH4j6mNiNQxLsQmTeRFTenOM,76
 water_column_sonar_annotation/cruise/cruise_manager.py,sha256=Y-6eeHobHor9ZY33nSyk_iTz-cGzVgoWXgwPkNI2JMM,3546
 water_column_sonar_annotation/geospatial/__init__.py,sha256=wy7fP2g5vic7L3bHcpFzlMsW811ca2WfReTCeOzeRKk,88
-water_column_sonar_annotation/geospatial/geospatial_manager.py,sha256=KKYJ0YtQRfdW5Y3AbJ5Z5HFOkvHHB-zls1GUKXt-DAY,5212
+water_column_sonar_annotation/geospatial/geospatial_manager.py,sha256=yBtsMY0cQ2Sw27xS5FmJIfUgAN5jjN4H1Q3C7LnNVj4,4967
 water_column_sonar_annotation/record/__init__.py,sha256=2OKbUE6xbLSY6LFSiEgqV9hTT6piOKzWHZiKXKaGqmw,261
-water_column_sonar_annotation/record/echoview_record_manager.py,sha256=V7wwE6Dw2buVESGv4yB02RbR0tEkppxsX9SArKMITKo,20800
-water_column_sonar_annotation/record/graph_record_manager.py,sha256=4PociGWsXeRmvMcmDqWhs86uZP6eolhjKLqRQ3VN40M,2348
-water_column_sonar_annotation/record/parquet_record_manager.py,sha256=Q1pCDKfgKg4aQG2BPPqNK1rQEb1ZMXiAaw54KPM6-iU,2398
+water_column_sonar_annotation/record/echoview_record_manager.py,sha256=YE1NqWJNVJ-1d3xOlElsRizpqkfCDlrJF-HwHv7Vhkk,20992
+water_column_sonar_annotation/record/graph_record_manager.py,sha256=owqcpCEmwt4gCltEtVWzRHHDE0RUwb1MNT8UB5vzcXc,2363
+water_column_sonar_annotation/record/parquet_record_manager.py,sha256=Rmdq3fge8iWfXd9nX3teHiulOkSGKRuAIMY8YFejZnI,5880
 water_column_sonar_annotation/shape/__init__.py,sha256=Ssg9_cz1zkU42X-oy9FmnfcFtkl2ic5eCHRryG2hZoU,75
-water_column_sonar_annotation/shape/shape_manager.py,sha256=9P3tjgBqL1gktWyHcaUfh-eXZDv9M0rAy1g6Qu2oSJA,514
-water_column_sonar_annotation-26.1.8.dist-info/licenses/LICENSE,sha256=lz4IpJ5_adG3S0ali-WaIpQFVTnEAOucMDQPECUVEYw,1110
-water_column_sonar_annotation-26.1.8.dist-info/METADATA,sha256=0GtvS2MZU_61u_H0owPK2FLmTGK93FNYEaApbT0e9lA,2731
-water_column_sonar_annotation-26.1.8.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-water_column_sonar_annotation-26.1.8.dist-info/top_level.txt,sha256=WmW_0S58c1A0pgWNXbozKC-ahrBAfhiDSGv68kzC-VE,36
-water_column_sonar_annotation-26.1.8.dist-info/RECORD,,
+water_column_sonar_annotation/shape/shape_manager.py,sha256=h7nsknPpcGiHS8l4KiXBVPmpQVix4FjdArkc2U7Tg4s,569
+water_column_sonar_annotation-26.2.0.dist-info/licenses/LICENSE,sha256=lz4IpJ5_adG3S0ali-WaIpQFVTnEAOucMDQPECUVEYw,1110
+water_column_sonar_annotation-26.2.0.dist-info/METADATA,sha256=FzuhwUAAqE1HwY6BrR8YY031K-k0pXsutqknaN227g0,2747
+water_column_sonar_annotation-26.2.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+water_column_sonar_annotation-26.2.0.dist-info/top_level.txt,sha256=WmW_0S58c1A0pgWNXbozKC-ahrBAfhiDSGv68kzC-VE,36
+water_column_sonar_annotation-26.2.0.dist-info/RECORD,,