rashdf 0.8.0__py3-none-any.whl → 0.8.2__py3-none-any.whl

rashdf/geom.py

@@ -17,6 +17,8 @@ from shapely import (
 )
 
 from typing import Dict, List, Optional, Union
+from warnings import warn
+from pathlib import Path
 
 
 from .base import RasHdf
@@ -29,7 +31,7 @@ from .utils import (
 
 
 class RasGeomHdfError(Exception):
-    """HEC-RAS Plan HDF error class."""
+    """HEC-RAS Geometry HDF error class."""
 
     pass
 
@@ -43,6 +45,7 @@ class RasGeomHdf(RasHdf):
     BC_LINES_PATH = f"{GEOM_PATH}/Boundary Condition Lines"
     IC_POINTS_PATH = f"{GEOM_PATH}/IC Points"
     BREAKLINES_PATH = f"{GEOM_PATH}/2D Flow Area Break Lines"
+    REFINEMENT_REGIONS_PATH = f"{GEOM_PATH}/2D Flow Area Refinement Regions"
     REFERENCE_LINES_PATH = f"{GEOM_PATH}/Reference Lines"
     REFERENCE_POINTS_PATH = f"{GEOM_PATH}/Reference Points"
     CROSS_SECTIONS = f"{GEOM_PATH}/Cross Sections"
@@ -103,10 +106,15 @@ class RasGeomHdf(RasHdf):
         mesh_area_names = self.mesh_area_names()
         if not mesh_area_names:
             return GeoDataFrame()
-        mesh_area_polygons = [
-            Polygon(self[f"{self.FLOW_AREA_2D_PATH}/{n}/Perimeter"][()])
-            for n in mesh_area_names
-        ]
+
+        mesh_area_polygons = []
+        for n in mesh_area_names:
+            try:
+                mesh_area_polygons.append(
+                    Polygon(self[f"{self.FLOW_AREA_2D_PATH}/{n}/Perimeter"][()])
+                )
+            except KeyError as e:
+                raise RasGeomHdfError(f"Data for mesh '{n}' not found.") from e
         return GeoDataFrame(
             {"mesh_name": mesh_area_names, "geometry": mesh_area_polygons},
             geometry="geometry",
@@ -295,19 +303,28 @@ class RasGeomHdf(RasHdf):
         polyline_points = self[polyline_points_path][()]
 
         geoms = []
-        for pnt_start, pnt_cnt, part_start, part_cnt in polyline_info:
-            points = polyline_points[pnt_start : pnt_start + pnt_cnt]
-            if part_cnt == 1:
-                geoms.append(LineString(points))
-            else:
-                parts = polyline_parts[part_start : part_start + part_cnt]
-                geoms.append(
-                    MultiLineString(
-                        list(
-                            points[part_pnt_start : part_pnt_start + part_pnt_cnt]
-                            for part_pnt_start, part_pnt_cnt in parts
+        for i, (pnt_start, pnt_cnt, part_start, part_cnt) in enumerate(polyline_info):
+            try:
+                points = polyline_points[pnt_start : pnt_start + pnt_cnt]
+                if part_cnt == 1:
+                    geoms.append(LineString(points))
+                else:  # pragma: no cover | TODO: add test coverage for this
+                    parts = polyline_parts[part_start : part_start + part_cnt]
+                    geoms.append(
+                        MultiLineString(
+                            list(
+                                points[part_pnt_start : part_pnt_start + part_pnt_cnt]
+                                for part_pnt_start, part_pnt_cnt in parts
+                            )
                         )
                     )
+            except (
+                Exception
+            ) as e:  # pragma: no cover | TODO: add test coverage for this
+                geoms.append(None)
+                warn(
+                    f"Feature ID {i} within '{Path(path).name}' layer set to null due to invalid geometry. {e}",
+                    UserWarning,
                 )
         return geoms
 
@@ -370,25 +387,38 @@ class RasGeomHdf(RasHdf):
         GeoDataFrame
             A GeoDataFrame containing the 2D mesh area refinement regions if they exist.
         """
-        if "/Geometry/2D Flow Area Refinement Regions" not in self:
+        if self.REFINEMENT_REGIONS_PATH not in self:
             return GeoDataFrame()
-        rr_data = self["/Geometry/2D Flow Area Refinement Regions"]
+        rr_data = self[self.REFINEMENT_REGIONS_PATH]
         rr_ids = range(rr_data["Attributes"][()].shape[0])
         names = np.vectorize(convert_ras_hdf_string)(rr_data["Attributes"][()]["Name"])
         geoms = list()
-        for pnt_start, pnt_cnt, part_start, part_cnt in rr_data["Polygon Info"][()]:
-            points = rr_data["Polygon Points"][()][pnt_start : pnt_start + pnt_cnt]
-            if part_cnt == 1:
-                geoms.append(Polygon(points))
-            else:
-                parts = rr_data["Polygon Parts"][()][part_start : part_start + part_cnt]
-                geoms.append(
-                    MultiPolygon(
-                        list(
-                            points[part_pnt_start : part_pnt_start + part_pnt_cnt]
-                            for part_pnt_start, part_pnt_cnt in parts
+        for i, (pnt_start, pnt_cnt, part_start, part_cnt) in enumerate(
+            rr_data["Polygon Info"][()]
+        ):
+            try:
+                points = rr_data["Polygon Points"][()][pnt_start : pnt_start + pnt_cnt]
+                if part_cnt == 1:
+                    geoms.append(Polygon(points))
+                else:  # pragma: no cover | TODO: add test coverage for this
+                    parts = rr_data["Polygon Parts"][()][
+                        part_start : part_start + part_cnt
+                    ]
+                    geoms.append(
+                        MultiPolygon(
+                            list(
+                                points[part_pnt_start : part_pnt_start + part_pnt_cnt]
+                                for part_pnt_start, part_pnt_cnt in parts
+                            )
                         )
                     )
+            except (
+                Exception
+            ) as e:  # pragma: no cover | TODO: add test coverage for this
+                geoms.append(None)
+                warn(
+                    f"Feature ID {i} within '{Path(self.REFINEMENT_REGIONS_PATH).name}' layer set to null due to invalid geometry. {e}",
+                    UserWarning,
                 )
         return GeoDataFrame(
             {"rr_id": rr_ids, "name": names, "geometry": geoms},

{rashdf-0.8.0.dist-info → rashdf-0.8.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rashdf
-Version: 0.8.0
+Version: 0.8.2
 Summary: Read data from HEC-RAS HDF files.
 Project-URL: repository, https://github.com/fema-ffrd/rashdf
 Classifier: Development Status :: 4 - Beta
@@ -16,7 +16,7 @@ License-File: LICENSE
 Requires-Dist: h5py
 Requires-Dist: geopandas<2.0,>=1.0
 Requires-Dist: pyarrow
-Requires-Dist: xarray
+Requires-Dist: xarray<=2025.4.0
 Provides-Extra: dev
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: ruff; extra == "dev"

{rashdf-0.8.0.dist-info → rashdf-0.8.2.dist-info}/RECORD

@@ -1,12 +1,12 @@
 cli.py,sha256=HbyrdUVKfrmtU2T9ljKTPQ-ugomJqYbCA26ghGJDJh0,6588
 rashdf/__init__.py,sha256=XXFtJDgLPCimqAhfsFz_pTWYECJiRT0i-Kb1uflXmVU,156
 rashdf/base.py,sha256=cAQJX1aeBJKb3MJ06ltpbRTUaZX5NkuxpR1J4f7FyTU,2507
-rashdf/geom.py,sha256=XAs6HQQaLkFlic60xUO0R2MuTi71H6f3WoEfNBlaxYU,27146
+rashdf/geom.py,sha256=ODdqxcK152AcBAYCw-gcvsmGRxhch7wvzN11YuDzz6Q,28495
 rashdf/plan.py,sha256=d8YhpC6cV8rhh3qf1o12TbhUvo_4pMh75vIdDkcAvjE,63971
 rashdf/utils.py,sha256=Cba6sULF0m0jg6CQass4bPm2oxTd_avoe1pRQxq082c,10896
-rashdf-0.8.0.dist-info/licenses/LICENSE,sha256=L_0QaLpQVHPcglVjiaJPnOocwzP8uXevDRjUPr9DL1Y,1065
-rashdf-0.8.0.dist-info/METADATA,sha256=gw9owwT8skbZ7kupdYi8McfwMRXqk9PtXYWptJiTuQQ,6062
-rashdf-0.8.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rashdf-0.8.0.dist-info/entry_points.txt,sha256=LHHMR1lLy4wRyscMuW1RlYDXemtPgqQhNcILz0DtStY,36
-rashdf-0.8.0.dist-info/top_level.txt,sha256=SrmLb6FFTJtM_t6O1v0M0JePshiQJMHr0yYVkHL7ztk,11
-rashdf-0.8.0.dist-info/RECORD,,
+rashdf-0.8.2.dist-info/licenses/LICENSE,sha256=L_0QaLpQVHPcglVjiaJPnOocwzP8uXevDRjUPr9DL1Y,1065
+rashdf-0.8.2.dist-info/METADATA,sha256=wtCbEs_hvNJ9MfbAoLkmtulhTEv34tTlxP3r5BT7xrE,6072
+rashdf-0.8.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rashdf-0.8.2.dist-info/entry_points.txt,sha256=LHHMR1lLy4wRyscMuW1RlYDXemtPgqQhNcILz0DtStY,36
+rashdf-0.8.2.dist-info/top_level.txt,sha256=SrmLb6FFTJtM_t6O1v0M0JePshiQJMHr0yYVkHL7ztk,11
+rashdf-0.8.2.dist-info/RECORD,,