bugfix for crs

Author: valentin-gauthier-geosiris

energyml-utils/example/attic/crs_info_from_epc.py

@@ -19,7 +19,7 @@
 import logging
 import sys
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any, List, Optional
 
 
 # Run $env:PYTHONPATH="src" if it fails to be executed from the project root.
@@ -76,15 +76,23 @@ def _resolve_crs_from_grid(grid_obj: Any, epc: Epc) -> Optional[Any]:
     """
     Walk from a representation object to its CRS document.
 
-    Tries the common path ``local_crs`` (or nested in ``grid2d_patch.geometry``
-    for v2.0.1 ``Grid2DRepresentation``). Returns the resolved CRS object or
-    ``None``.
+    The CRS DOR is always present in ``LocalCrs`` — the difference between
+    RESQML versions is the depth of the path:
+
+    * **v2.2** : ``Geometry.LocalCrs``  (``PointGeometry`` sits directly on the object)
+    * **v2.0.1**: ``Grid2dPatch.Geometry.LocalCrs``  (geometry is inside a patch sub-object)
+
+    ``get_object_attribute_rgx`` resolves dot-delimited paths at exactly the
+    depth specified, so we try the shallower v2.2 path first, then fall back
+    to the deeper v2.0.1 path.
+
+    Returns the resolved CRS object or ``None``.
     """
-    # Direct attribute (v2.0.1 and many v2.2 envelopes)
-    dor = get_object_attribute_rgx(grid_obj, "[Ll]ocal[_]?[Cc]rs")
+    # v2.2: Geometry.LocalCrs (PointGeometry directly on the object)
+    dor = get_object_attribute_rgx(grid_obj, "[Gg]eometry.[Ll]ocal[_]?[Cc]rs")
 
     if dor is None:
-        # Nested path used by Grid2DRepresentation v2.0.1
+        # v2.0.1: Grid2dPatch.Geometry.LocalCrs (geometry wrapped in a patch)
         dor = get_object_attribute_rgx(
             grid_obj,
             "[Gg]rid2[Dd][Pp]atch.[Gg]eometry.[Ll]ocal[_]?[Cc]rs",
@@ -101,6 +109,31 @@ def _resolve_crs_from_grid(grid_obj: Any, epc: Epc) -> Optional[Any]:
     return candidates[0] if candidates else None
 
 
+def resolve_crs_from_triangulated_set(triangulated_obj: Any, epc: Epc) -> List[Optional[Any]]:
+    """
+    Walk from a TriangulatedSetRepresentation to its CRS document.
+
+    Each patch of a TriangulatedSetRepresentation may reference a CRS via its
+    ``local_crs`` attribute.  This function tries to resolve the first patch's CRS.
+    """
+    dor = get_object_attribute_rgx(triangulated_obj, "triangle_patch.\d+.geometry.local_crs")
+    # print(f"  Found DOR for TriangulatedSetRepresentation patch CRS: {dor}")
+    if dor is None:
+        return []
+    
+    if isinstance(dor, list):
+        candidates = []
+        for d in dor:
+            uuid = get_obj_uuid(d)
+            if uuid:
+                obj_candidates = epc.get_object_by_uuid(uuid)
+                print(f"  Found DOR for TriangulatedSetRepresentation patch CRS: {d} → candidates: {len(obj_candidates)}")
+                candidates.append(obj_candidates[0] if obj_candidates else None)
+        return candidates
+
+    return None
+
+
 # ===========================================================================
 # RESQML v2.0.1  —  testingPackageCpp.epc
 # ===========================================================================
@@ -124,7 +157,9 @@ def _resolve_crs_from_grid(grid_obj: Any, epc: Epc) -> Optional[Any]:
 check("z_offset", 15.0, info.z_offset, approx=True)
 check("projected_uom (raw from xsdata enum)", "M", info.projected_uom)
 check("vertical_uom  (raw from xsdata enum)", "M", info.vertical_uom)
-check("z_increasing_downward", False, info.z_increasing_downward)
+# ZIncreasingDownward=true in the file; VerticalUnknownCrs sub-object carries
+# no direction field, so the sentinel correctly preserves the top-level value.
+check("z_increasing_downward", True, info.z_increasing_downward)
 check("areal_rotation_value", 0.0, info.areal_rotation_value, approx=True)
 check("projected_epsg_code", None, info.projected_epsg_code)
 check("vertical_epsg_code", None, info.vertical_epsg_code)
@@ -141,9 +176,9 @@ def _resolve_crs_from_grid(grid_obj: Any, epc: Epc) -> Optional[Any]:
 check("projected_epsg_code", 23031, info.projected_epsg_code)
 check("projected_uom", "M", info.projected_uom)
 check("vertical_uom", "M", info.vertical_uom)
-# This particular depth CRS has z_increasing_downward=False in the file
-# (the VerticalCrs it references has no direction set or direction=up)
-check("z_increasing_downward", False, info.z_increasing_downward)
+# ZIncreasingDownward=true in the raw file; the linked VerticalUnknownCrs
+# carries no direction field, so the sentinel correctly preserves the value.
+check("z_increasing_downward", True, info.z_increasing_downward)
 check("x_offset", 0.0, info.x_offset, approx=True)
 check("y_offset", 0.0, info.y_offset, approx=True)
 check("z_offset", 0.0, info.z_offset, approx=True)
@@ -215,14 +250,17 @@ def _resolve_crs_from_grid(grid_obj: Any, epc: Epc) -> Optional[Any]:
     info = extract_crs_info(resolved_crs, workspace=epc20)
     check("  projected_epsg_code", 23031, info.projected_epsg_code)
     check("  projected_uom", "M", info.projected_uom)
-    check("  z_increasing_downward", False, info.z_increasing_downward)
+    # Same LocalDepth3DCrs — ZIncreasingDownward=true in the raw file.
+    check("  z_increasing_downward", True, info.z_increasing_downward)
 
 # Grid 4e56b0e4 → also LocalDepth3DCrs (same uuid)
 grid_depth2 = epc20.get_object_by_uuid("4e56b0e4-2cd1-4efa-97dd-95f72bcf9f80")[0]
 resolved_crs = _resolve_crs_from_grid(grid_depth2, epc20)
 check("Grid 4e56b0e4 resolved CRS uuid", "0ae56ef3-fc79-405b-8deb-6942e0f2e77c",
       getattr(resolved_crs, "uuid", None))
 
+
+
 # ===========================================================================
 # RESQML v2.2 / EML v2.3  —  testingPackageCpp22.epc
 # ===========================================================================
@@ -321,21 +359,19 @@ def _resolve_crs_from_grid(grid_obj: Any, epc: Epc) -> Optional[Any]:
 check("z_increasing_downward", True, info.z_increasing_downward)
 
 # ── Grid2D v2.2 — CRS note ────────────────────────────────────────────────
-section("v2.2 · Grid2DRepresentation  — CRS resolution note")
+section("v2.2 · Grid2DRepresentation  — CRS resolution")
 print("""
-  In RESQML v2.2, Grid2DRepresentation does not embed a local_crs DOR
-  in its geometry patch the same way v2.0.1 does.  Instead the CRS is
-  referenced via the containing LocalEngineeringCompoundCrs or through
-  the representation's own schema-level CRS association.
-
-  The canonical way to obtain CRS info from a v2.2 representation is to:
-    1. Retrieve all LocalEngineeringCompoundCrs objects from the EPC.
-    2. Match the one that logically covers your representation (by
-       consulting interpretation / framework associations).
-  or use the helper ``get_crs_obj(repr_obj, workspace=epc)`` which walks
-  the object hierarchy.
-
-  Direct example — iterate all compound CRS objects and extract info:
+  In RESQML v2.2, Grid2DRepresentation DOES embed a LocalCrs DOR, but at
+  a shallower path than v2.0.1:
+
+    v2.2  : Geometry.LocalCrs  (PointGeometry sits directly on the object)
+    v2.0.1: Grid2dPatch.Geometry.LocalCrs  (geometry is wrapped in a patch sub-object)
+
+  Both paths are resolved by trying the shallower v2.2 path first with
+  ``get_object_attribute_rgx``, then falling back to the deeper v2.0.1 path.
+  No indirect lookup through framework associations is needed.
+
+  All LocalEngineeringCompoundCrs objects in this EPC:
 """)
 
 for obj in epc22.energyml_objects:
@@ -346,6 +382,51 @@ def _resolve_crs_from_grid(grid_obj: Any, epc: Epc) -> Optional[Any]:
         print(f"    vertical_uom={info.vertical_uom}  z_down={info.z_increasing_downward}")
         print(f"    offsets: x={info.x_offset}  y={info.y_offset}  z={info.z_offset}")
 
+# ── Grid2DRepresentation v2.2 → CRS via Geometry.LocalCrs ─────────────────
+
+section("v2.2 · Grid2DRepresentation (uuid 4e56b0e4) → CRS via Geometry.LocalCrs")
+
+grid22 = epc22.get_object_by_uuid("4e56b0e4-2cd1-4efa-97dd-95f72bcf9f80")
+if grid22:
+    grid22 = grid22[0]
+    resolved_crs22 = _resolve_crs_from_grid(grid22, epc22)
+    check("resolved CRS type", "LocalEngineeringCompoundCrs",
+          type(resolved_crs22).__name__ if resolved_crs22 else None)
+    check("resolved CRS uuid", "6a18c177-93be-41ac-9084-f84bbb31f46d",
+          getattr(resolved_crs22, "uuid", None))
+    if resolved_crs22:
+        info = extract_crs_info(resolved_crs22, workspace=epc22)
+        check("  projected_epsg_code", 23031, info.projected_epsg_code)
+        check("  projected_uom", "M", info.projected_uom)
+        check("  vertical_uom", "M", info.vertical_uom)
+        check("  z_increasing_downward", True, info.z_increasing_downward)
+        check("  x_offset", 0.0, info.x_offset, approx=True)
+        check("  y_offset", 0.0, info.y_offset, approx=True)
+        check("  z_offset", 0.0, info.z_offset, approx=True)
+else:
+    print("  [SKIP] Grid 4e56b0e4 not found in testingPackageCpp22.epc")
+
+
+# TriangulatedSetRepresentation 1a4112fa → LocalEngineeringCompoundCrs (6a18c177)
+triangulated_set = epc22.get_object_by_uuid("1a4112fa-c4ef-4c8d-aed0-47d9273bebc5")[0]
+resolved_crs_list = resolve_crs_from_triangulated_set(triangulated_set, epc22)
+check("TriangulatedSetRepresentation resolved CRS uuid", 5,
+      len(resolved_crs_list))
+
+for i, resolved_crs in enumerate(resolved_crs_list):
+    check(f"{i})  patch {i} resolved CRS type", "LocalEngineeringCompoundCrs",
+          type(resolved_crs).__name__ if resolved_crs else None)
+    if resolved_crs:
+        info = extract_crs_info(resolved_crs, workspace=epc22)
+        check("        projected_epsg_code (resolved)", 23031, info.projected_epsg_code)
+        check("        projected_uom", "M", info.projected_uom)
+        check("        vertical_uom", "M", info.vertical_uom)
+        check("        z_increasing_downward", True, info.z_increasing_downward)
+        check("        x_offset", 0.0, info.x_offset, approx=True)
+        check("        y_offset", 0.0, info.y_offset, approx=True)
+        check("        z_offset", 0.0, info.z_offset, approx=True)
+        check("        azimuth_reference", "grid north", info.azimuth_reference)
+
 # ===========================================================================
 # Convenience helpers (delegates in helper.py)
 # ===========================================================================
@@ -361,7 +442,8 @@ def _resolve_crs_from_grid(grid_obj: Any, epc: Epc) -> Optional[Any]:
 )
 
 depth_crs = epc20.get_object_by_uuid("0ae56ef3-fc79-405b-8deb-6942e0f2e77c")[0]
-check("is_z_reversed(LocalDepth3DCrs)", False, is_z_reversed(depth_crs))
+# ZIncreasingDownward=true in the raw file → is_z_reversed returns True.
+check("is_z_reversed(LocalDepth3DCrs)", True, is_z_reversed(depth_crs))
 check("get_projected_epsg_code", 23031, get_projected_epsg_code(depth_crs))
 check("get_projected_uom", "M", get_projected_uom(depth_crs))
 

energyml-utils/example/attic/dump_crs_objects.py

@@ -0,0 +1,95 @@
+"""
+Dump the raw JSON for every CRS (and Grid2D) object referenced by
+``crs_info_from_epc.py``, so you can cross-check the expected values
+in the integration script against what is actually stored in the EPC files.
+
+Run from the workspace root::
+
+    poetry run python example/attic/dump_crs_objects.py
+"""
+from __future__ import annotations
+
+import json
+import logging
+import sys
+from pathlib import Path
+
+sys.path.insert(0, str(Path(__file__).parent.parent.parent / "src"))
+
+from energyml.utils.epc import Epc
+from energyml.utils.serialization import serialize_json
+
+logging.basicConfig(level=logging.ERROR)
+
+_ROOT = Path(__file__).parent.parent.parent
+EPC20_PATH = str(_ROOT / "rc" / "epc" / "testingPackageCpp.epc")
+EPC22_PATH = str(_ROOT / "rc" / "epc" / "testingPackageCpp22.epc")
+
+# ---------------------------------------------------------------------------
+# Objects to dump
+# (epc_key, uuid, label)
+# ---------------------------------------------------------------------------
+OBJECTS_EPC20 = [
+    ("dbd637d5-4528-4145-908b-5f7136824f6d", "LocalTime3DCrs"),
+    ("0ae56ef3-fc79-405b-8deb-6942e0f2e77c", "LocalDepth3DCrs"),
+    ("95330cec-164c-4165-9fb9-c56477ae7f8a", "LocalEngineeringCompoundCrs (v2.0.1 EPC)"),
+    ("811f8e68-c0e4-5f90-b9cf-03f7e3d53ca4", "LocalEngineering2DCrs (v2.0.1 EPC)"),
+    ("1f6cf904-336c-5202-a13d-7c9b142cd406", "VerticalCrs (v2.0.1 EPC)"),
+    ("030a82f6-10a7-4ecf-af03-54749e098624", "Grid2DRepresentation → LocalTime3DCrs"),
+    ("aa5b90f1-2eab-4fa6-8720-69dd4fd51a4d", "Grid2DRepresentation → LocalDepth3DCrs"),
+    ("4e56b0e4-2cd1-4efa-97dd-95f72bcf9f80", "Grid2DRepresentation (v2.0.1)"),
+]
+
+OBJECTS_EPC22 = [
+    ("997796f5-da9d-5175-9fb7-e592957b73fb", "LocalEngineering2DCrs (no EPSG)"),
+    ("671ffdeb-f25c-513a-a4a2-1774d3ac20c6", "LocalEngineering2DCrs (EPSG 23031)"),
+    ("f0e9f421-b902-4392-87d8-6495c02f2fbe", "LocalEngineeringCompoundCrs (no EPSG)"),
+    ("6a18c177-93be-41ac-9084-f84bbb31f46d", "LocalEngineeringCompoundCrs (EPSG 23031)"),
+    ("65cd199f-156b-5112-ad3e-b4f54a2aa77b", "VerticalCrs-A  — Direction=down → z_down=True"),
+    ("355174db-6226-57ae-a5a6-92f33825fed4", "VerticalCrs-B  — Direction=down → z_down=True"),
+    ("4e56b0e4-2cd1-4efa-97dd-95f72bcf9f80", "Grid2DRepresentation (v2.2)"),
+    ("1a4112fa-c4ef-4c8d-aed0-47d9273bebc5", "TriangulatedSetRepresentation (v2.2)"),
+]
+
+# ---------------------------------------------------------------------------
+
+def _sep(title: str) -> None:
+    print(f"\n{'═' * 70}")
+    print(f"  {title}")
+    print(f"{'═' * 70}")
+
+
+def _dump(epc: Epc, uuid: str, label: str) -> None:
+    print(f"\n── {label}  [{uuid}]")
+    candidates = epc.get_object_by_uuid(uuid)
+    if not candidates:
+        print("  *** NOT FOUND ***")
+        return
+    obj = candidates[0]
+    print(f"  type : {type(obj).__module__}.{type(obj).__name__}")
+    try:
+        raw = json.loads(serialize_json(obj))
+        # Pretty-print, indented 4 spaces relative to the bullet
+        text = json.dumps(raw, indent=2, ensure_ascii=False)
+        for line in text.splitlines():
+            print(f"    {line}")
+    except Exception as exc:
+        print(f"  *** serialization error: {exc} ***")
+
+
+def main() -> None:
+    _sep(f"EPC 2.0.1 — {EPC20_PATH}")
+    epc20 = Epc.read_file(EPC20_PATH)
+    print(f"  Loaded {len(epc20.energyml_objects)} objects.")
+    for uuid, label in OBJECTS_EPC20:
+        _dump(epc20, uuid, label)
+
+    _sep(f"EPC 2.2 — {EPC22_PATH}")
+    epc22 = Epc.read_file(EPC22_PATH)
+    print(f"  Loaded {len(epc22.energyml_objects)} objects.")
+    for uuid, label in OBJECTS_EPC22:
+        _dump(epc22, uuid, label)
+
+
+if __name__ == "__main__":
+    main()

energyml-utils/example/attic/main_test_3D.py

@@ -44,12 +44,12 @@ def export_all_representation(epc_path: str, output_dir: str, regex_type_filter:
                         mesh_list=mesh_list,
                         out=f,
                     )
-                    export_stl_path = path.with_suffix(".stl")
-                    with export_stl_path.open("wb") as stl_f:
-                        export_stl(
-                            mesh_list=mesh_list,
-                            out=stl_f,
-                        )
+                    # export_stl_path = path.with_suffix(".stl")
+                    # with export_stl_path.open("wb") as stl_f:
+                    #     export_stl(
+                    #         mesh_list=mesh_list,
+                    #         out=stl_f,
+                    #     )
                     export_vtk_path = path.with_suffix(".vtk")
                     with export_vtk_path.open("wb") as vtk_f:
                         export_vtk(
@@ -103,18 +103,18 @@ def export_all_representation_in_memory(epc_path: str, output_dir: str, regex_ty
                         mesh_list=mesh_list,
                         out=f,
                     )
-                    export_stl_path = path.with_suffix(".stl")
-                    with export_stl_path.open("wb") as stl_f:
-                        export_stl(
-                            mesh_list=mesh_list,
-                            out=stl_f,
-                        )
-                    export_vtk_path = path.with_suffix(".vtk")
-                    with export_vtk_path.open("wb") as vtk_f:
-                        export_vtk(
-                            mesh_list=mesh_list,
-                            out=vtk_f,
-                        )
+                    # export_stl_path = path.with_suffix(".stl")
+                    # with export_stl_path.open("wb") as stl_f:
+                    #     export_stl(
+                    #         mesh_list=mesh_list,
+                    #         out=stl_f,
+                    #     )
+                    # export_vtk_path = path.with_suffix(".vtk")
+                    # with export_vtk_path.open("wb") as vtk_f:
+                    #     export_vtk(
+                    #         mesh_list=mesh_list,
+                    #         out=vtk_f,
+                    #     )
 
                 logging.info(f"  ✓ Exported to {path.name}")
             except NotSupportedError:
@@ -135,11 +135,12 @@ def export_all_representation_in_memory(epc_path: str, output_dir: str, regex_ty
     import logging
 
     logging.basicConfig(level=logging.DEBUG)
-    epc_file = "rc/epc/testingPackageCpp.epc"
+    epc_file = "rc/epc/testingPackageCpp22.epc"
+    # epc_file = "rc/epc/testingPackageCpp.epc"
     # epc_file = "rc/epc/output-val.epc"
     # epc_file = "rc/epc/Volve_Horizons_and_Faults_Depth_originEQN.epc"
     output_directory = Path("exported_meshes") / Path(epc_file).name.replace(".epc", "_3D_export")
     # export_all_representation(epc_file, output_directory)
     # export_all_representation(epc_file, output_directory, regex_type_filter="Wellbore")
-    export_all_representation(epc_file, str(output_directory), regex_type_filter="")
-    # export_all_representation_in_memory(epc_file, str(output_directory), regex_type_filter="")
+    # export_all_representation(epc_file, str(output_directory), regex_type_filter="")
+    export_all_representation_in_memory(epc_file, str(output_directory), regex_type_filter="")

energyml-utils/rc/epc/testingPackageCpp.epc

@@ -6,4 +6,4 @@
 Contains functions to help the read of specific entities like Grid2DRepresentation, TriangulatedSetRepresentation etc.
 It also contains functions to export data into OFF/OBJ format.
 """
-from .crs import CrsInfo, extract_crs_info  # noqa: F401
+from .crs import CrsInfo, extract_crs_info, apply_from_crs_info, apply_axis_order_swap  # noqa: F401