compass-lib 0.0.4__tar.gz → 0.0.7__tar.gz

{compass_lib-0.0.4 → compass_lib-0.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: compass_lib
-Version: 0.0.4
+Version: 0.0.7
 Summary: Compass Parser Library.
 Keywords: cave,survey,karst
 Author-email: Jonathan Dekhtiar <jonathan@dekhtiar.com>
@@ -21,23 +21,22 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
 License-File: LICENSE
 Requires-Dist: geojson>=3.2,<4
-Requires-Dist: numpy>=1.26,<3
-Requires-Dist: scipy>=1.12,<2
-Requires-Dist: orjson>=3.10,<3.12
-Requires-Dist: pydantic>=2.12,<2.13
-Requires-Dist: pydantic-extra-types>=2.11,<3.0
+Requires-Dist: numpy>=2.4.4,<3
+Requires-Dist: scipy>=1.17.1,<2
+Requires-Dist: orjson>=3.11.8,<3.12
+Requires-Dist: pydantic>=2.13.1,<2.14
+Requires-Dist: pydantic-extra-types>=2.11.1,<3.0
 Requires-Dist: pyIGRF14==1.0.4
-Requires-Dist: pyproj>=3.7.1,<3.8
-Requires-Dist: shapely>=2.0,<3
+Requires-Dist: pyproj>=3.7.2,<3.8
+Requires-Dist: shapely>=2.1.2,<3
 Requires-Dist: utm>=0.8.1,<0.9
-Requires-Dist: cryptography>=44.0.0,<47.0.0 ; extra == "test"
-Requires-Dist: python-dotenv>=1.0.0,<2.0.0 ; extra == "test"
-Requires-Dist: deepdiff>=7.0,<9.0 ; extra == "test"
-Requires-Dist: pytest>=8.0.0,<10.0.0 ; extra == "test"
-Requires-Dist: pytest-cov>=5.0.0,<8.0.0 ; extra == "test"
-Requires-Dist: pytest-dotenv>=0.5.0,<1.0.0 ; extra == "test"
-Requires-Dist: pytest-env>=1.1.3,<2.0.0 ; extra == "test"
-Requires-Dist: pytest-runner>=6.0.0,<7.0.0 ; extra == "test"
+Requires-Dist: cryptography>=46.0.7,<47.0.0 ; extra == "test"
+Requires-Dist: python-dotenv>=1.2.2,<2.0.0 ; extra == "test"
+Requires-Dist: deepdiff>=7.0,<10.0 ; extra == "test"
+Requires-Dist: pytest>=9.0.3,<10.0.0 ; extra == "test"
+Requires-Dist: pytest-cov>=7.1.0,<8.0.0 ; extra == "test"
+Requires-Dist: pytest-env>=1.6.0,<2.0.0 ; extra == "test"
+Requires-Dist: pytest-runner>=6.0.1,<7.0.0 ; extra == "test"
 Requires-Dist: pytest-ordering>=0.6,<1.0.0 ; extra == "test"
 Requires-Dist: parameterized>=0.9.0,<0.10 ; extra == "test"
 Project-URL: Bug Reports, https://github.com/OpenSpeleo/pytool_compass_lib/issues

{compass_lib-0.0.4 → compass_lib-0.0.7}/compass_lib/__init__.py

@@ -21,7 +21,7 @@ Usage:
     directives = read_mak_file(Path("project.MAK"))
 """
 
-__version__ = "0.0.4"
+__version__ = "0.0.7"
 
 # Constants
 from compass_lib.constants import COMPASS_ENCODING

{compass_lib-0.0.4 → compass_lib-0.0.7}/compass_lib/geojson.py

@@ -33,10 +33,10 @@ from __future__ import annotations
 import datetime
 import logging
 import math
+import uuid
 from collections import deque
 from dataclasses import dataclass
 from dataclasses import field
-from dataclasses import replace
 from typing import TYPE_CHECKING
 from typing import Any
 
@@ -54,6 +54,7 @@ from shapely.ops import unary_union
 from compass_lib.constants import FEET_TO_METERS
 from compass_lib.constants import GEOJSON_COORDINATE_PRECISION
 from compass_lib.constants import JSON_ENCODING
+from compass_lib.constants import METERS_TO_FEET
 from compass_lib.enums import Datum
 from compass_lib.geo_utils import GeoLocation
 from compass_lib.geo_utils import get_declination
@@ -153,7 +154,7 @@ class MisclosureLeg:
     the position computed by the arriving (typically longer) path; the
     ``existing`` is the position already set by the first path to
     reach the station.  The longest path is considered the "true"
-    segment; closure error is ghost − existing.
+    segment; closure error is ghost - existing.
     """
 
     existing: Station  # Station already computed by another anchor's BFS
@@ -212,7 +213,6 @@ def length_to_meters(length_ft: float) -> float:
 _transformer_cache: dict[str, Transformer] = {}
 
 
-
 def _get_transformer(zone: int, northern: bool, datum: Datum) -> Transformer:
     """Get or create a cached transformer from UTM to WGS84.
 
@@ -488,9 +488,7 @@ def _compute_file_scopes(project: CompassMakFile) -> dict[str, int]:
     for fd in project.file_directives:
         # Explicit linking = at least one link station WITHOUT coordinates.
         # Link stations with coordinates are just anchors (fixed points).
-        has_explicit_linking = any(
-            ls.location is None for ls in fd.link_stations
-        )
+        has_explicit_linking = any(ls.location is None for ls in fd.link_stations)
         if has_explicit_linking:
             current_scope += 1
         file_scopes[fd.file] = current_scope
@@ -559,12 +557,8 @@ def build_station_graph(
 
                 all_shots.append((shot, file_dir.file, survey_name, survey))
 
-                from_name = _scope_name(
-                    shot.from_station_name, scope_id, link_names
-                )
-                to_name = _scope_name(
-                    shot.to_station_name, scope_id, link_names
-                )
+                from_name = _scope_name(shot.from_station_name, scope_id, link_names)
+                to_name = _scope_name(shot.to_station_name, scope_id, link_names)
 
                 # Skip self-loops (from == to).  These are data errors
                 # that create impossible solver constraints.
@@ -587,12 +581,18 @@ def build_station_graph(
                 # Pre-scoped names are stored in the tuple so BFS
                 # does not need to re-scope per shot.
                 adjacency[from_name].append(
-                    (shot, file_dir.file, survey_name, survey, False,
-                     from_name, to_name)
+                    (
+                        shot,
+                        file_dir.file,
+                        survey_name,
+                        survey,
+                        False,
+                        from_name,
+                        to_name,
+                    )
                 )
                 adjacency[to_name].append(
-                    (shot, file_dir.file, survey_name, survey, True,
-                     from_name, to_name)
+                    (shot, file_dir.file, survey_name, survey, True, from_name, to_name)
                 )
 
     return adjacency, all_shots
@@ -803,9 +803,7 @@ def propagate_coordinates(
         primary_station.origin = primary_name
         result.stations = {primary_name: primary_station}
         result.anchors = {primary_name}
-        _secondary_anchors = {
-            k: v for k, v in anchors.items() if k != primary_name
-        }
+        _secondary_anchors = {k: v for k, v in anchors.items() if k != primary_name}
     else:
         # Multi-origin BFS: seed from all anchors
         result.stations = dict(anchors)
@@ -854,8 +852,15 @@ def propagate_coordinates(
         if not current_station:
             continue
 
-        for (shot, file_name, survey_name, survey, is_reverse,
-             from_name, to_name) in adjacency.get(current_name, []):
+        for (
+            shot,
+            file_name,
+            survey_name,
+            survey,
+            is_reverse,
+            from_name,
+            to_name,
+        ) in adjacency.get(current_name, []):
             # Multi-origin: forward only.  Single-origin: both.
             if is_reverse and not detect_same_origin_loops:
                 continue
@@ -912,7 +917,10 @@ def propagate_coordinates(
             # the frontsight; for reverse edges it uses the backsight
             # (or frontsight + 180° when no backsight is available).
             shot_delta = compute_shot_delta(
-                shot, is_reverse, declination, convergence,
+                shot,
+                is_reverse,
+                declination,
+                convergence,
             )
             de, dn, dz = shot_delta
 
@@ -933,8 +941,7 @@ def propagate_coordinates(
                 new_station.survey = survey_name
                 new_station.origin = current_station.origin
                 new_station.path_distance = (
-                    current_station.path_distance
-                    + length_to_meters(shot.length or 0.0)
+                    current_station.path_distance + length_to_meters(shot.length or 0.0)
                 )
                 result.stations[target_name] = new_station
 
@@ -1106,8 +1113,7 @@ def propagate_coordinates(
                         ),
                     )
                     logger.info(
-                        "Closure at anchor '%s': %.3f m "
-                        "(path distance: %.1f m)",
+                        "Closure at anchor '%s': %.3f m (path distance: %.1f m)",
                         sec_known.name,
                         gap,
                         bfs_station.path_distance,
@@ -1152,8 +1158,15 @@ def propagate_coordinates(
                 if not current_station:
                     continue
 
-                for (shot, file_name, survey_name, survey, is_reverse,
-                     from_name, to_name) in adjacency.get(current_name, []):
+                for (
+                    shot,
+                    file_name,
+                    survey_name,
+                    survey,
+                    is_reverse,
+                    from_name,
+                    to_name,
+                ) in adjacency.get(current_name, []):
                     # Same traversal rules as main BFS
                     target_name = from_name if is_reverse else to_name
 
@@ -1175,18 +1188,24 @@ def propagate_coordinates(
                             result.datum or Datum.WGS_1984,
                         )
                         declination = calculate_survey_declination(
-                            station_wgs84, survey.header.date,
+                            station_wgs84,
+                            survey.header.date,
                         )
                         survey_declinations[survey_key] = declination
                         logger.debug(
                             "Survey %s declination: %.2f° (date: %s)",
-                            survey_key, declination, survey.header.date,
+                            survey_key,
+                            declination,
+                            survey.header.date,
                         )
                     else:
                         declination = survey_declinations[survey_key]
 
                     shot_delta = compute_shot_delta(
-                        shot, is_reverse, declination, convergence,
+                        shot,
+                        is_reverse,
+                        declination,
+                        convergence,
                     )
                     de, dn, dz = shot_delta
 
@@ -1287,8 +1306,15 @@ def propagate_coordinates(
         # reverse edges to orphaned stations.
         fallback_queue: deque[str] = deque()
         for name in list(visited_stations):
-            for (shot, file_name, survey_name, survey, is_reverse,
-                 _from_scoped, _to_scoped) in adjacency.get(name, []):
+            for (
+                _,
+                _,
+                _,
+                _,
+                is_reverse,
+                _from_scoped,
+                _,
+            ) in adjacency.get(name, []):
                 if not is_reverse:
                     continue
                 if _from_scoped in orphaned:
@@ -1301,18 +1327,21 @@ def propagate_coordinates(
             if not current_station:
                 continue
 
-            for (shot, file_name, survey_name, survey, is_reverse,
-                 from_name, to_name) in adjacency.get(current_name, []):
-
+            for (
+                shot,
+                file_name,
+                survey_name,
+                survey,
+                is_reverse,
+                from_name,
+                to_name,
+            ) in adjacency.get(current_name, []):
                 shot_key = (min(from_name, to_name), max(from_name, to_name))
                 if shot_key in visited_shots:
                     continue
 
                 # Determine target and direction.
-                if is_reverse:
-                    target_name = from_name
-                else:
-                    target_name = to_name
+                target_name = from_name if is_reverse else to_name
 
                 if target_name in result.stations:
                     continue  # Already computed
@@ -1332,14 +1361,18 @@ def propagate_coordinates(
                         result.datum or Datum.WGS_1984,
                     )
                     declination = calculate_survey_declination(
-                        station_wgs84, survey.header.date,
+                        station_wgs84,
+                        survey.header.date,
                     )
                     survey_declinations[survey_key] = declination
                 else:
                     declination = survey_declinations[survey_key]
 
                 forward_delta = compute_shot_delta(
-                    shot, False, declination, convergence,
+                    shot,
+                    is_reverse=False,
+                    declination=declination,
+                    convergence=convergence,
                 )
                 de, dn, dz = forward_delta
 
@@ -1368,8 +1401,7 @@ def propagate_coordinates(
                 new_station.survey = survey_name
                 new_station.origin = current_station.origin
                 new_station.path_distance = (
-                    current_station.path_distance
-                    + length_to_meters(shot.length or 0.0)
+                    current_station.path_distance + length_to_meters(shot.length or 0.0)
                 )
                 result.stations[target_name] = new_station
                 visited_stations.add(target_name)
@@ -1434,7 +1466,9 @@ def compute_survey_coordinates(
     adjacency, _ = build_station_graph(project)
     anchors = find_anchor_stations(project)
     result = propagate_coordinates(
-        project, anchors, adjacency,
+        project,
+        anchors,
+        adjacency,
         detect_same_origin_loops=(solver is not None),
     )
 
@@ -1526,7 +1560,12 @@ def station_to_feature(
         GeoJSON Feature with Point geometry
     """
     lon, lat = _cached_utm_to_wgs84(
-        station.easting, station.northing, zone, northern, datum, wgs84_cache,
+        station.easting,
+        station.northing,
+        zone,
+        northern,
+        datum,
+        wgs84_cache,
     )
 
     properties: dict[str, Any] = {
@@ -1568,16 +1607,22 @@ def anchor_to_feature(
         GeoJSON Feature with Point geometry and type "anchor"
     """
     lon, lat = _cached_utm_to_wgs84(
-        station.easting, station.northing, zone, northern, datum, wgs84_cache,
+        station.easting,
+        station.northing,
+        zone,
+        northern,
+        datum,
+        wgs84_cache,
     )
 
+    depth_ft = round(station.elevation * METERS_TO_FEET, 2)
+
     return Feature(
         geometry=Point((lon, lat, round(station.elevation, 2))),
         properties={
-            "type": "anchor",
-            "name": station.name,
-            "file": station.file,
-            "elevation_m": round(station.elevation, 2),
+            "id": station.name,
+            "depth": abs(depth_ft),
+            "name": station.survey,
         },
     )
 
@@ -1602,29 +1647,24 @@ def leg_to_feature(
         GeoJSON Feature with LineString geometry
     """
     from_lon, from_lat = _cached_utm_to_wgs84(
-        leg.from_station.easting, leg.from_station.northing,
-        zone, northern, datum, wgs84_cache,
+        leg.from_station.easting,
+        leg.from_station.northing,
+        zone,
+        northern,
+        datum,
+        wgs84_cache,
     )
     to_lon, to_lat = _cached_utm_to_wgs84(
-        leg.to_station.easting, leg.to_station.northing,
-        zone, northern, datum, wgs84_cache,
+        leg.to_station.easting,
+        leg.to_station.northing,
+        zone,
+        northern,
+        datum,
+        wgs84_cache,
     )
 
-    properties: dict[str, Any] = {
-        "type": "leg",
-        "from": leg.from_station.name,
-        "to": leg.to_station.name,
-        "distance_ft": leg.distance,
-        "distance_m": round(length_to_meters(leg.distance), 2)
-        if leg.distance
-        else None,
-        "azimuth": leg.azimuth,
-        "inclination": leg.inclination,
-        "file": leg.file,
-        "survey": leg.survey,
-    }
-    if leg.from_station.origin:
-        properties["origin"] = leg.from_station.origin
+    depth_m = leg.to_station.elevation
+    depth_ft = round(depth_m * METERS_TO_FEET, 2)
 
     return Feature(
         geometry=LineString(
@@ -1633,7 +1673,11 @@ def leg_to_feature(
                 (to_lon, to_lat, round(leg.to_station.elevation, 2)),
             ]
         ),
-        properties=properties,
+        properties={
+            "id": str(uuid.uuid5(uuid.NAMESPACE_OID, leg.to_station.name)),
+            "depth": abs(depth_ft),  # Compass depth is < 0
+            "name": leg.survey,
+        },
     )
 
 
@@ -1793,16 +1837,36 @@ def passage_to_feature(
 
     try:
         from_left = _cached_utm_to_wgs84(
-            from_left_e, from_left_n, zone, northern, datum, wgs84_cache,
+            from_left_e,
+            from_left_n,
+            zone,
+            northern,
+            datum,
+            wgs84_cache,
         )
         from_right = _cached_utm_to_wgs84(
-            from_right_e, from_right_n, zone, northern, datum, wgs84_cache,
+            from_right_e,
+            from_right_n,
+            zone,
+            northern,
+            datum,
+            wgs84_cache,
         )
         to_left = _cached_utm_to_wgs84(
-            to_left_e, to_left_n, zone, northern, datum, wgs84_cache,
+            to_left_e,
+            to_left_n,
+            zone,
+            northern,
+            datum,
+            wgs84_cache,
         )
         to_right = _cached_utm_to_wgs84(
-            to_right_e, to_right_n, zone, northern, datum, wgs84_cache,
+            to_right_e,
+            to_right_n,
+            zone,
+            northern,
+            datum,
+            wgs84_cache,
         )
     except InvalidCoordinateError:
         return None
@@ -1891,7 +1955,6 @@ def survey_to_geojson(
     # Add station points
     if include_stations:
         for name, station in survey.stations.items():
-
             try:
                 feat = station_to_feature(station, zone, northern, datum, wgs84_cache)
                 if color_by_origin:
@@ -1949,12 +2012,18 @@ def survey_to_geojson(
         for misc in survey.misclosures:
             try:
                 ex_lon, ex_lat = utm_to_wgs84(
-                    misc.existing.easting, misc.existing.northing,
-                    zone, northern, datum,
+                    misc.existing.easting,
+                    misc.existing.northing,
+                    zone,
+                    northern,
+                    datum,
                 )
                 gh_lon, gh_lat = utm_to_wgs84(
-                    misc.ghost.easting, misc.ghost.northing,
-                    zone, northern, datum,
+                    misc.ghost.easting,
+                    misc.ghost.northing,
+                    zone,
+                    northern,
+                    datum,
                 )
 
                 gap_dist = (
@@ -1991,10 +2060,12 @@ def survey_to_geojson(
                     props["closing_segment_distance_m"] = round(closing_dist, 2)
 
                 line_feat = Feature(
-                    geometry=LineString([
-                        (gh_lon, gh_lat, round(misc.ghost.elevation, 2)),
-                        (ex_lon, ex_lat, round(misc.existing.elevation, 2)),
-                    ]),
+                    geometry=LineString(
+                        [
+                            (gh_lon, gh_lat, round(misc.ghost.elevation, 2)),
+                            (ex_lon, ex_lat, round(misc.existing.elevation, 2)),
+                        ]
+                    ),
                     properties=props,
                 )
                 features.append(line_feat)
@@ -2011,7 +2082,12 @@ def survey_to_geojson(
             if leg.excluded_from_plotting:
                 continue
             passage = passage_to_feature(
-                leg, zone, northern, datum, station_lrud, wgs84_cache,
+                leg,
+                zone,
+                northern,
+                datum,
+                station_lrud,
+                wgs84_cache,
             )
             if not passage:
                 continue

{compass_lib-0.0.4 → compass_lib-0.0.7}/compass_lib/project/parser.py

@@ -18,6 +18,7 @@ from compass_lib.enums import FormatIdentifier
 from compass_lib.errors import CompassParseException
 from compass_lib.errors import SourceLocation
 from compass_lib.project.models import CompassMakFile
+from compass_lib.project.models import CompassProjectDirective
 
 
 class CompassProjectParser:
@@ -133,7 +134,7 @@ class CompassProjectParser:
     # Legacy model-returning methods (thin wrappers for backwards compat)
     # -------------------------------------------------------------------------
 
-    def parse_file(self, path: Path) -> list["CompassProjectDirective"]:  # noqa: F821
+    def parse_file(self, path: Path) -> list[CompassProjectDirective]:
         """Parse a project file.
 
         DEPRECATED: Use parse_file_to_dict() for new code.
@@ -156,7 +157,7 @@ class CompassProjectParser:
         self,
         data: str,
         source: str = "<string>",
-    ) -> list["CompassProjectDirective"]:  # noqa: F821
+    ) -> list[CompassProjectDirective]:
         """Parse project data from a string.
 
         DEPRECATED: Use parse_string_to_dict() for new code.

{compass_lib-0.0.4 → compass_lib-0.0.7}/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["flit_core >=3.11,<4"]
+requires = ["flit_core >=3.12.0,<4"]
 build-backend = "flit_core.buildapi"
 
 [tool.uv]
@@ -7,14 +7,12 @@ package = true
 
 [dependency-groups]
 dev = [
-    "check-manifest",
-    "pre-commit>=4.1,<4.6",
-    "ruff>=0.14,<0.16",
+    "prek>=0.3.9,<0.4",
+    "ruff>=0.15.10,<0.16",
     "flit>=3.12,<4",
-    "wheel>=0.45",
     # File encryption/decryption
-    "python-dotenv>=1.0.0,<2.0.0",
-    "cryptography>=44.0.0,<47.0.0",
+    "python-dotenv>=1.2.2,<2.0.0",
+    "cryptography>=46.0.7,<47.0.0",
 ]
 
 [project]
@@ -55,14 +53,14 @@ classifiers = [
 ]
 dependencies = [
     "geojson>=3.2,<4",
-    "numpy>=1.26,<3",
-    "scipy>=1.12,<2",
-    "orjson>=3.10,<3.12",
-    "pydantic>=2.12,<2.13",
-    "pydantic-extra-types>=2.11,<3.0",
+    "numpy>=2.4.4,<3",
+    "scipy>=1.17.1,<2",
+    "orjson>=3.11.8,<3.12",
+    "pydantic>=2.13.1,<2.14",
+    "pydantic-extra-types>=2.11.1,<3.0",
     "pyIGRF14==1.0.4",
-    "pyproj>=3.7.1,<3.8",
-    "shapely>=2.0,<3",
+    "pyproj>=3.7.2,<3.8",
+    "shapely>=2.1.2,<3",
     "utm>=0.8.1,<0.9",
 ]
 dynamic = ["description", "version"]
@@ -70,15 +68,14 @@ dynamic = ["description", "version"]
 [project.optional-dependencies]
 test = [
     # File encryption/decryption
-    "cryptography>=44.0.0,<47.0.0",
-    "python-dotenv>=1.0.0,<2.0.0",
+    "cryptography>=46.0.7,<47.0.0",
+    "python-dotenv>=1.2.2,<2.0.0",
     # Testing
-    "deepdiff>=7.0,<9.0",
-    "pytest>=8.0.0,<10.0.0",
-    "pytest-cov>=5.0.0,<8.0.0",
-    "pytest-dotenv>=0.5.0,<1.0.0",
-    "pytest-env>=1.1.3,<2.0.0",
-    "pytest-runner>=6.0.0,<7.0.0",
+    "deepdiff>=7.0,<10.0",
+    "pytest>=9.0.3,<10.0.0",
+    "pytest-cov>=7.1.0,<8.0.0",
+    "pytest-env>=1.6.0,<2.0.0",
+    "pytest-runner>=6.0.1,<7.0.0",
     "pytest-ordering>=0.6,<1.0.0",
     "parameterized>=0.9.0,<0.10",
 ]
@@ -97,17 +94,12 @@ convert = "compass_lib.commands.convert:convert"
 geojson = "compass_lib.commands.geojson:geojson"
 
 [tool.pytest.ini_options]
-env_files = [".env"]
 testpaths = ["tests/"]
 addopts = "-vvv --cov=compass_lib --cov-report=term-missing"
 # addopts = "-vvv --cov=compass_lib --cov-report=term-missing --capture=no"
 
-# # This is configuration specific to the `setuptools` build backend.
-# # If you are using a different build backend, you will need to change this.
-# [tool.setuptools]
-# # If there are data files included in your packages that need to be
-# # installed, specify them here.
-# package-data = {"sample" = ["*.dat"]}
+[tool.pytest_env]
+env_files = [".env"]
 
 [tool.isort]
 profile = "black"