hydxlib 1.7.6.dev0__tar.gz → 1.7.7__tar.gz

{hydxlib-1.7.6.dev0 → hydxlib-1.7.7}/CHANGES.rst

@@ -1,7 +1,14 @@
 Changelog of hydxlib
 ===================================================
 
-1.7.6 (unreleased)
+1.7.7 (2026-06-09)
+------------------
+
+- Set weir cross-section shape to closed rectangle; set cross_section_height from OVS_VOH (mm to m) when present (nens/rana#4429).
+- Profiles without a shape now import with shape=NULL and width/height preserved; unknown shape logs a warning (nens/rana#4429).
+
+
+1.7.6 (2026-05-11)
 ------------------
 
 - Support discharge_capacity import

{hydxlib-1.7.6.dev0/hydxlib.egg-info → hydxlib-1.7.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hydxlib
-Version: 1.7.6.dev0
+Version: 1.7.7
 Summary: Importer and Exporter for GWSW
 Home-page: https://github.com/nens/hydxlib
 Author: Nelen & Schuurmans
@@ -104,7 +104,14 @@ install `pre-commit`::
 Changelog of hydxlib
 ===================================================
 
-1.7.6 (unreleased)
+1.7.7 (2026-06-09)
+------------------
+
+- Set weir cross-section shape to closed rectangle; set cross_section_height from OVS_VOH (mm to m) when present (nens/rana#4429).
+- Profiles without a shape now import with shape=NULL and width/height preserved; unknown shape logs a warning (nens/rana#4429).
+
+
+1.7.6 (2026-05-11)
 ------------------
 
 - Support discharge_capacity import

hydxlib-1.7.7/hydxlib/__init__.py

@@ -0,0 +1,3 @@
+# fmt: off
+__version__ = '1.7.7'
+# fmt: on

{hydxlib-1.7.6.dev0 → hydxlib-1.7.7}/hydxlib/exporter.py

@@ -434,7 +434,7 @@ def get_cross_section_fields(connection, cross_section_dict):
                     connection["cross_section_table"] = "\n".join(
                         [",".join(row) for row in zip(col1, col2)]
                     )
-        elif profile["shape"] is not None:
+        else:
             connection["cross_section_width"] = profile["width"]
             connection["cross_section_height"] = profile["height"]
     else:

{hydxlib-1.7.6.dev0 → hydxlib-1.7.7}/hydxlib/tests/test_threedi.py

@@ -180,6 +180,18 @@ def test_import_hydx(hydx):
         "sewerage": True,
         "cross_section_code": "weir_ovs83",
     }
+    # weir cross-section: always closed rectangle; height from OVS_VOH (mm -> m)
+    weir_cross_section_ovs83 = next(
+        cs for cs in threedi.cross_sections if cs["code"] == "weir_ovs83"
+    )
+    assert weir_cross_section_ovs83["shape"] == 0  # CLOSED_RECTANGLE
+    assert weir_cross_section_ovs83["height"] == pytest.approx(0.00025)  # 0.25 mm -> m
+
+    weir_cross_section_ovs82 = next(
+        cs for cs in threedi.cross_sections if cs["code"] == "weir_ovs82"
+    )
+    assert weir_cross_section_ovs82["shape"] == 0  # CLOSED_RECTANGLE
+    assert weir_cross_section_ovs82["height"] is None  # no OVS_VOH set
     assert threedi.orifices[1] == {
         "code": "drl97",
         "display_name": "2002-2002-1",
@@ -202,6 +214,23 @@ def get_profile(**kwargs):
     return x
 
 
+def test_get_cross_section_details_unknown_shape_keeps_width_height(caplog):
+    profiel = get_profile(
+        identificatieprofieldefinitie="PRO",
+        vormprofiel=None,
+        breedte_diameterprofiel="800",
+        hoogteprofiel="500",
+        materiaal="PVC",
+        tabulatedbreedte="",
+        tabulatedhoogte="",
+    )
+    actual = get_cross_section_details(profiel, "PRO", "profile")
+    assert actual["shape"] is None
+    assert actual["width"] == pytest.approx(0.8)
+    assert actual["height"] == pytest.approx(0.5)
+    assert any(r.levelname == "WARNING" for r in caplog.records)
+
+
 @pytest.mark.parametrize(
     "vrm,bre,hgt,expected",
     [

{hydxlib-1.7.6.dev0 → hydxlib-1.7.7}/hydxlib/threedi.py

@@ -209,20 +209,22 @@ def get_cross_section_details(hydx_profile, record_code, name_for_logging):
     else:
         width = hydx_profile.tabulatedbreedte
         height = hydx_profile.tabulatedhoogte
-        shape = CrossSectionShape.TABULATED_RECTANGLE.value
 
-    if not width:
-        logger.error(
-            "%s has an undefined %s.width: %s",
+    shape = SHAPE_MAPPING.get(hydx_profile.vormprofiel)
+    if shape is None:
+        # Unknown/missing shape: fall back to scalar mm fields for width/height
+        width = transform_unit_mm_to_m(hydx_profile.breedte_diameterprofiel)
+        height = transform_unit_mm_to_m(hydx_profile.hoogteprofiel)
+        logger.warning(
+            "%s has an unknown %s: %s",
             record_code,
             name_for_logging,
             hydx_profile.vormprofiel,
         )
 
-    shape = SHAPE_MAPPING.get(hydx_profile.vormprofiel)
-    if shape is None:
+    if not width:
         logger.error(
-            "%s has an unknown %s: %s",
+            "%s has an undefined %s.width: %s",
             record_code,
             name_for_logging,
             hydx_profile.vormprofiel,
@@ -497,11 +499,12 @@ class Threedi:
             hydx_connection, hydx_structure
         )
 
+        voh = hydx_structure.vrijeoverstorthoogte
         profile = {
             "code": f"weir_{hydx_connection.identificatieknooppuntofverbinding}",
-            "shape": CrossSectionShape.RECTANGLE.value,
+            "shape": CrossSectionShape.CLOSED_RECTANGLE.value,
             "width": hydx_structure.breedteoverstortdrempel,
-            "height": None,
+            "height": float(voh) * 1e-3 if voh else None,
         }
         self.cross_sections.append(profile)
 

{hydxlib-1.7.6.dev0 → hydxlib-1.7.7/hydxlib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hydxlib
-Version: 1.7.6.dev0
+Version: 1.7.7
 Summary: Importer and Exporter for GWSW
 Home-page: https://github.com/nens/hydxlib
 Author: Nelen & Schuurmans
@@ -104,7 +104,14 @@ install `pre-commit`::
 Changelog of hydxlib
 ===================================================
 
-1.7.6 (unreleased)
+1.7.7 (2026-06-09)
+------------------
+
+- Set weir cross-section shape to closed rectangle; set cross_section_height from OVS_VOH (mm to m) when present (nens/rana#4429).
+- Profiles without a shape now import with shape=NULL and width/height preserved; unknown shape logs a warning (nens/rana#4429).
+
+
+1.7.6 (2026-05-11)
 ------------------
 
 - Support discharge_capacity import

hydxlib-1.7.6.dev0/hydxlib/__init__.py

@@ -1,3 +0,0 @@
-# fmt: off
-__version__ = '1.7.6.dev0'
-# fmt: on