s3dgraphy 1.6.0.dev100__tar.gz → 1.6.0.dev102__tar.gz

{s3dgraphy-1.6.0.dev100/src/s3dgraphy.egg-info → s3dgraphy-1.6.0.dev102}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: s3dgraphy
-Version: 1.6.0.dev100
+Version: 1.6.0.dev102
 Summary: 3D Stratigraphic Graph Management Library for archaeological and heritage applications
 Author-email: Emanuel Demetrescu <emanuel.demetrescu@cnr.it>
 Maintainer-email: Emanuel Demetrescu <emanuel.demetrescu@cnr.it>

{s3dgraphy-1.6.0.dev100 → s3dgraphy-1.6.0.dev102}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "s3dgraphy"
-version = "1.6.0.dev100"
+version = "1.6.0.dev102"
 description = "3D Stratigraphic Graph Management Library for archaeological and heritage applications"
 readme = "README.md"
 requires-python = ">=3.9"

{s3dgraphy-1.6.0.dev100 → s3dgraphy-1.6.0.dev102}/src/s3dgraphy/JSON_config/s3Dgraphy_node_datamodel.json

@@ -1326,7 +1326,8 @@
         "shift_y": "Q9_is_expressed_in_terms_of",
         "shift_z": "Q9_is_expressed_in_terms_of",
         "rotation": "Q9_is_expressed_in_terms_of",
-        "rotation_reference": {"note": "1.6.25 (D2, decided by E.D. 4 Oct 2026): the north 'rotation' is measured from — always 'grid' (the grid north of the CRS epsg), written by GeoPositionNode and set on load when a document does not carry it (it is the definition, not a guess). Not projected to RDF: the anchor's frame is the CRS itself."}
+        "rotation_reference": {"note": "1.6.25 (D2, decided by E.D. 4 Oct 2026): the north 'rotation' is measured from — always 'grid' (the grid north of the CRS epsg), written by GeoPositionNode and set on load when a document does not carry it (it is the definition, not a guess). Not projected to RDF: the anchor's frame is the CRS itself."},
+        "datum_operation": {"note": "1.6 (MICRO-DATUM-DICHIARATO, 9 Nov 2026): OPTIONAL, 'EPSG:<code>' — the coordinate operation the dataset's coordinates were taken to WGS 84 with (Metashape writes EPSG:3844 data in ECEF with the TOWGS84 of EPSG:1645, Pulkovo 1942(58) to WGS 84 (1); PROJ's own choice for Romania is EPSG:15995 — 0.8 m apart at Templu Mare). A reader that brings true ECEF / WGS 84 data into the study's CRS uses the declared operation; absent = PROJ's best non-ballpark operation, as before. Declared, never guessed: an operation PROJ does not know is refused by name, never silently replaced. Written by api.declare_georeference (form checked by api.normalise_datum_operation). Not projected to RDF in this round."}
       }
     },
     "ResourceNode": {

{s3dgraphy-1.6.0.dev100 → s3dgraphy-1.6.0.dev102}/src/s3dgraphy/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "1.6.0.dev100"
+__version__ = "1.6.0.dev102"
 __datamodel_version__ = "1.5.5"  # s3Dgraphy connections datamodel version
 
 # s3Dgraphy/__init__.py

{s3dgraphy-1.6.0.dev100 → s3dgraphy-1.6.0.dev102}/src/s3dgraphy/api.py

@@ -2862,12 +2862,39 @@ def georeference_state(graph: Graph) -> str:
     return "declared"
 
 
+def normalise_datum_operation(value: Any) -> Optional[str]:
+    """MICRO-DATUM-DICHIARATO (9 Nov 2026) · the operation a dataset's
+    coordinates were taken to WGS 84 with, as ``"EPSG:<code>"``. ``None`` / ``""``
+    = not declared (PROJ's best operation is used); ``1645``, ``"epsg:1645"``,
+    ``"EPSG::1645"`` → ``"EPSG:1645"``; anything else is a ``ValueError``. Only the
+    form is checked here: whether PROJ knows the operation is the reader's
+    question (a bridge refuses an unknown one by name, never replaces it)."""
+    if value is None or (isinstance(value, str) and not value.strip()):
+        return None
+    if isinstance(value, bool):
+        raise ValueError(f"datum_operation: {value!r} is not an EPSG operation")
+    if isinstance(value, int):
+        code = value
+    else:
+        m = re.fullmatch(r"\s*(?:EPSG\s*:{1,2}\s*)?(\d+)\s*", str(value), re.IGNORECASE)
+        if not m:
+            raise ValueError(f"datum_operation: {value!r} is not «EPSG:<code>»")
+        code = int(m.group(1))
+    if code <= 0:
+        raise ValueError(f"datum_operation: {value!r} is not an EPSG operation")
+    return f"EPSG:{code}"
+
+
 def declare_georeference(graph: Graph, epsg: int, shift_x: float = 0.0,
                          shift_y: float = 0.0, shift_z: float = 0.0,
-                         rotation: Optional[float] = None) -> Dict[str, Any]:
+                         rotation: Optional[float] = None,
+                         datum_operation: Any = ...) -> Dict[str, Any]:
     """Say where the graph is: the CRS and the anchor of the scene-local frame,
     on its GeoPositionNode (created when missing). ``read_shift`` gives the four
-    values of a SHIFT.txt. Returns the anchor as written."""
+    values of a SHIFT.txt. ``datum_operation`` (``"EPSG:<code>"``, see
+    :func:`normalise_datum_operation`): the operation the dataset's coordinates
+    were taken to WGS 84 with; omitted = left as it is, ``None`` = removed.
+    Returns the anchor as written."""
     from .nodes.geo_position_node import GeoPositionNode
     node = _geo_node(graph)
     if node is None:
@@ -2880,6 +2907,12 @@ def declare_georeference(graph: Graph, epsg: int, shift_x: float = 0.0,
     if rotation is not None:
         node.data["rotation"] = float(rotation)
     node.data.setdefault("rotation", 0.0)
+    if datum_operation is not ...:
+        op = normalise_datum_operation(datum_operation)
+        if op is None:
+            node.data.pop("datum_operation", None)
+        else:
+            node.data["datum_operation"] = op
     return _geo_anchor(graph)
 
 
@@ -2894,7 +2927,7 @@ def _geo_anchor(graph: Graph) -> Dict[str, Any]:
     node = _geo_node(graph)
     if node is None:
         return {"epsg": None, "shift_x": 0.0, "shift_y": 0.0, "shift_z": 0.0,
-                "rotation": 0.0}
+                "rotation": 0.0, "datum_operation": None}
     data = dict(getattr(node, "data", {}) or {})
     epsg = data.get("epsg")
     return {
@@ -2905,6 +2938,8 @@ def _geo_anchor(graph: Graph) -> Dict[str, Any]:
         "shift_y": float(data.get("shift_y") or 0.0),
         "shift_z": float(data.get("shift_z") or 0.0),
         "rotation": float(data.get("rotation") or 0.0),
+        # MICRO-DATUM-DICHIARATO · None = not declared: PROJ's best operation
+        "datum_operation": data.get("datum_operation") or None,
     }
 
 

{s3dgraphy-1.6.0.dev100 → s3dgraphy-1.6.0.dev102}/src/s3dgraphy/nodes/geo_position_node.py

@@ -29,7 +29,18 @@ class GeoPositionNode(Node):
     Attributi:
         type (str): Tipo di nodo, impostato su "geo_position".
         data (dict): ``epsg``, ``shift_x``, ``shift_y``, ``shift_z``, ``rotation``,
-            ``rotation_reference`` (``"grid"``: D2).
+            ``rotation_reference`` (``"grid"``: D2); facoltativo
+            ``datum_operation``.
+
+    **L'operazione di datum è dichiarata, non indovinata** (MICRO-DATUM-
+    DICHIARATO, 9 nov 2026). ``data.datum_operation`` = ``"EPSG:<codice>"``:
+    l'operazione con cui le coordinate del dataset sono state portate in
+    WGS 84 (Metashape per EPSG:3844 usa il TOWGS84 di EPSG:1645; PROJ, per la
+    Romania, sceglie EPSG:15995 — 0,8 m di differenza a Templu Mare). Chi
+    porta un dato vero in ECEF nel CRS dello studio usa quella; assente = la
+    migliore operazione di PROJ, come prima. Si scrive con
+    :func:`s3dgraphy.api.declare_georeference` (forma controllata da
+    ``normalise_datum_operation``).
     """
     node_type = "geo_position"
     def __init__(self, node_id, epsg=None, shift_x=0.0, shift_y=0.0, shift_z=0.0,

{s3dgraphy-1.6.0.dev100 → s3dgraphy-1.6.0.dev102/src/s3dgraphy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: s3dgraphy
-Version: 1.6.0.dev100
+Version: 1.6.0.dev102
 Summary: 3D Stratigraphic Graph Management Library for archaeological and heritage applications
 Author-email: Emanuel Demetrescu <emanuel.demetrescu@cnr.it>
 Maintainer-email: Emanuel Demetrescu <emanuel.demetrescu@cnr.it>

{s3dgraphy-1.6.0.dev100 → s3dgraphy-1.6.0.dev102}/src/s3dgraphy.egg-info/SOURCES.txt

@@ -469,6 +469,7 @@ tests/test_crdt.py
 tests/test_cycle_message_is_cheap.py
 tests/test_datamodel_fingerprint.py
 tests/test_datamodel_i18n.py
+tests/test_datum_operation.py
 tests/test_detail.py
 tests/test_deterministic_ids.py
 tests/test_dev29_em_sourcelist.py

s3dgraphy-1.6.0.dev102/tests/test_datum_operation.py

@@ -0,0 +1,57 @@
+"""MICRO-DATUM-DICHIARATO (9 Nov 2026) · the GeoPositionNode may declare the
+operation its dataset's coordinates were taken to WGS 84 with:
+``data.datum_operation = "EPSG:<code>"``. Absent = PROJ's best, as before."""
+
+import json
+
+import pytest
+
+from s3dgraphy import api
+from s3dgraphy.graph import Graph
+from s3dgraphy.importer.emjson_importer import parse_emjson
+from s3dgraphy.exporter.emjson_exporter import build_emjson
+
+
+@pytest.mark.parametrize("given, want", [
+    ("EPSG:1645", "EPSG:1645"), ("epsg:1645", "EPSG:1645"), ("EPSG::15995", "EPSG:15995"),
+    (" EPSG: 1645 ", "EPSG:1645"), (1645, "EPSG:1645"), ("1645", "EPSG:1645"),
+    (None, None), ("", None), ("  ", None),
+])
+def test_the_form_of_a_declared_operation(given, want):
+    assert api.normalise_datum_operation(given) == want
+
+
+@pytest.mark.parametrize("bad", ["ESRI:1645", "EPSG:", "EPSG:16x5", "Pulkovo", 0, -3, True, "EPSG:0"])
+def test_a_malformed_operation_is_refused(bad):
+    with pytest.raises(ValueError):
+        api.normalise_datum_operation(bad)
+
+
+def test_declared_on_the_node_and_read_in_the_anchor():
+    g = Graph("dd")
+    a = api.declare_georeference(g, 3844, 327372, 448682, 0)
+    assert a["datum_operation"] is None                   # not declared: PROJ's best
+    a = api.declare_georeference(g, 3844, 327372, 448682, 0, datum_operation="epsg:1645")
+    assert a["datum_operation"] == "EPSG:1645"
+    geo = next(n for n in g.nodes if n.node_type == "geo_position")
+    assert geo.data["datum_operation"] == "EPSG:1645"
+    # omitted = left as it is; None = removed
+    assert api.declare_georeference(g, 3844, 327372, 448682, 0)["datum_operation"] == "EPSG:1645"
+    assert api.declare_georeference(g, 3844, 327372, 448682, 0, datum_operation=None)["datum_operation"] is None
+    assert "datum_operation" not in geo.data
+    with pytest.raises(ValueError):
+        api.declare_georeference(g, 3844, datum_operation="TOWGS84")
+
+
+def test_the_field_travels_in_the_em_json():
+    g = Graph("dd2")
+    api.declare_georeference(g, 3844, 327372, 448682, 0, datum_operation="EPSG:1645")
+    back, _w = parse_emjson(json.loads(json.dumps(build_emjson(g))))
+    geo = next(n for n in back.nodes if n.node_type == "geo_position")
+    assert geo.data["datum_operation"] == "EPSG:1645"
+
+
+def test_the_datamodel_documents_it():
+    import importlib.resources as R
+    dm = json.loads((R.files("s3dgraphy") / "JSON_config" / "s3Dgraphy_node_datamodel.json").read_text())
+    assert "datum_operation" in dm["reference_nodes"]["GeoPositionNode"]["properties"]