rashdf 0.2.0__tar.gz → 0.2.2__tar.gz

{rashdf-0.2.0 → rashdf-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rashdf
-Version: 0.2.0
+Version: 0.2.2
 Summary: Read data from HEC-RAS HDF files.
 Project-URL: repository, https://github.com/fema-ffrd/rashdf
 Classifier: Development Status :: 4 - Beta
@@ -20,16 +20,26 @@ Provides-Extra: dev
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: ruff; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
+Provides-Extra: docs
+Requires-Dist: sphinx; extra == "docs"
+Requires-Dist: numpydoc; extra == "docs"
+Requires-Dist: sphinx_rtd_theme; extra == "docs"
 
 # rashdf
 [![CI](https://github.com/fema-ffrd/rashdf/actions/workflows/continuous-integration.yml/badge.svg?branch=main)](https://github.com/fema-ffrd/rashdf/actions/workflows/continuous-integration.yml)
 [![Release](https://github.com/fema-ffrd/rashdf/actions/workflows/release.yml/badge.svg)](https://github.com/fema-ffrd/rashdf/actions/workflows/release.yml)
 [![PyPI version](https://badge.fury.io/py/rashdf.svg)](https://badge.fury.io/py/rashdf)
+[![codecov](https://codecov.io/gh/fema-ffrd/rashdf/graph/badge.svg?token=CTIIONEHV1)](https://codecov.io/gh/fema-ffrd/rashdf)
+[![Documentation Status](https://readthedocs.org/projects/rashdf/badge/?version=latest)](https://rashdf.readthedocs.io/en/latest/?badge=latest)
 
 Read data from [HEC-RAS](https://www.hec.usace.army.mil/software/hec-ras/) [HDF](https://github.com/HDFGroup/hdf5) files.
 
 *Pronunciation: `raz·aitch·dee·eff`*
 
+## Documentation
+[rashdf on ReadTheDocs](http://rashdf.readthedocs.io/)
+
 ## Install
 ```bash
 $ pip install rashdf
@@ -120,9 +130,6 @@ Example: write structures GeoJSON to `stdout`:
 $ rashdf structures Potomac.p01.hdf
 ```
 
-## Documentation
-Coming soon.
-
 ## Developer Setup
 Create a virtual environment in the project directory:
 ```

{rashdf-0.2.0 → rashdf-0.2.2}/README.md

@@ -2,11 +2,16 @@
 [![CI](https://github.com/fema-ffrd/rashdf/actions/workflows/continuous-integration.yml/badge.svg?branch=main)](https://github.com/fema-ffrd/rashdf/actions/workflows/continuous-integration.yml)
 [![Release](https://github.com/fema-ffrd/rashdf/actions/workflows/release.yml/badge.svg)](https://github.com/fema-ffrd/rashdf/actions/workflows/release.yml)
 [![PyPI version](https://badge.fury.io/py/rashdf.svg)](https://badge.fury.io/py/rashdf)
+[![codecov](https://codecov.io/gh/fema-ffrd/rashdf/graph/badge.svg?token=CTIIONEHV1)](https://codecov.io/gh/fema-ffrd/rashdf)
+[![Documentation Status](https://readthedocs.org/projects/rashdf/badge/?version=latest)](https://rashdf.readthedocs.io/en/latest/?badge=latest)
 
 Read data from [HEC-RAS](https://www.hec.usace.army.mil/software/hec-ras/) [HDF](https://github.com/HDFGroup/hdf5) files.
 
 *Pronunciation: `raz·aitch·dee·eff`*
 
+## Documentation
+[rashdf on ReadTheDocs](http://rashdf.readthedocs.io/)
+
 ## Install
 ```bash
 $ pip install rashdf
@@ -97,9 +102,6 @@ Example: write structures GeoJSON to `stdout`:
 $ rashdf structures Potomac.p01.hdf
 ```
 
-## Documentation
-Coming soon.
-
 ## Developer Setup
 Create a virtual environment in the project directory:
 ```

{rashdf-0.2.0 → rashdf-0.2.2}/pyproject.toml

@@ -12,11 +12,12 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
 ]
-version = "0.2.0"
+version = "0.2.2"
 dependencies = ["h5py", "geopandas", "pyarrow"]
 
 [project.optional-dependencies]
-dev = ["pre-commit", "ruff", "pytest"]
+dev = ["pre-commit", "ruff", "pytest", "pytest-cov"]
+docs = ["sphinx", "numpydoc", "sphinx_rtd_theme"]
 
 [project.urls]
 repository = "https://github.com/fema-ffrd/rashdf"
@@ -28,10 +29,12 @@ rashdf = "cli:main"
 pythonpath = "src"
 testpaths = "tests"
 
-# TODO: linting for docstrings.
-# https://github.com/fema-ffrd/rashdf/issues/15
-# [tool.ruff.lint]
-# select = ["D"]
+[tool.ruff.lint]
+select = ["D"]
 
-# [tool.ruff.lint.pydocstyle]
-# convention = "numpy"
+[tool.ruff.lint.pydocstyle]
+convention = "numpy"
+
+[tool.ruff.lint.per-file-ignores]
+"tests/**" = ["D"]
+"docs/**" = ["D"]

{rashdf-0.2.0 → rashdf-0.2.2}/src/cli.py

@@ -1,3 +1,5 @@
+"""rashdf CLI."""
+
 from rashdf import RasGeomHdf
 from rashdf.utils import df_datetimes_to_str
 
@@ -60,6 +62,7 @@ def fiona_supported_drivers() -> List[str]:
 
 
 def parse_args(args: str) -> argparse.Namespace:
+    """Parse command-line arguments."""
     parser = argparse.ArgumentParser(description="Extract data from HEC-RAS HDF files.")
     parser.add_argument(
         "--fiona-drivers",
@@ -100,6 +103,7 @@ def parse_args(args: str) -> argparse.Namespace:
 
 
 def export(args: argparse.Namespace) -> Optional[str]:
+    """Act on parsed arguments to extract data from HEC-RAS HDF files."""
     if args.fiona_drivers:
         for driver in fiona_supported_drivers():
             print(driver)
@@ -147,6 +151,7 @@ def export(args: argparse.Namespace) -> Optional[str]:
 
 
 def main():
+    """Entry point for the rashdf CLI."""
     args = parse_args(sys.argv[1:])
     export(args)
 

{rashdf-0.2.0 → rashdf-0.2.2}/src/rashdf/__init__.py

@@ -1,3 +1,5 @@
+"""rashdf package."""
+
 from .base import RasHdf
 from .geom import RasGeomHdf
 from .plan import RasPlanHdf

{rashdf-0.2.0 → rashdf-0.2.2}/src/rashdf/base.py

@@ -1,3 +1,5 @@
+"""Base class for reading HEC-RAS HDF files."""
+
 import h5py
 from .utils import hdf5_attrs_to_dict
 from typing import Dict
@@ -68,7 +70,7 @@ class RasHdf(h5py.File):
         return {}
 
     def get_root_attrs(self):
-        """Returns attributes at root level of HEC-RAS HDF file.
+        """Return attributes at root level of HEC-RAS HDF file.
 
         Returns
         -------

{rashdf-0.2.0 → rashdf-0.2.2}/src/rashdf/geom.py

@@ -1,3 +1,5 @@
+"""HEC-RAS Geometry HDF class."""
+
 from .base import RasHdf
 from .utils import (
     convert_ras_hdf_string,
@@ -16,27 +18,37 @@ from shapely import (
     LineString,
     MultiLineString,
     MultiPolygon,
-    polygonize,
+    polygonize_full,
 )
 
-from typing import List, Optional
+from typing import Dict, List, Optional
 
 
 class RasGeomHdf(RasHdf):
+    """HEC-RAS Geometry HDF class."""
+
     GEOM_PATH = "Geometry"
     GEOM_STRUCTURES_PATH = f"{GEOM_PATH}/Structures"
     FLOW_AREA_2D_PATH = f"{GEOM_PATH}/2D Flow Areas"
 
     def __init__(self, name: str, **kwargs):
+        """Open a HEC-RAS Geometry HDF file.
+
+        Parameters
+        ----------
+        name : str
+            The path to the RAS Geometry HDF file.
+        kwargs : dict
+            Additional keyword arguments to pass to h5py.File
+        """
         super().__init__(name, **kwargs)
 
     def projection(self) -> Optional[CRS]:
-        """Return the projection of the RAS geometry as a
-        pyproj.CRS object.
+        """Return the projection of the RAS geometry as a pyproj.CRS object.
 
         Returns
         -------
-        CRS
+        pyproj.CRS or None
             The projection of the RAS geometry.
         """
         proj_wkt = self.attrs.get("Projection")
@@ -47,12 +59,11 @@ class RasGeomHdf(RasHdf):
         return CRS.from_wkt(proj_wkt)
 
     def mesh_area_names(self) -> List[str]:
-        """Return a list of the 2D mesh area names of
-        the RAS geometry.
+        """Return a list of the 2D mesh area names of the RAS geometry.
 
         Returns
         -------
-        list
+        List[str]
             A list of the 2D mesh area names (str) within the RAS geometry if 2D areas exist.
         """
         if "/Geometry/2D Flow Areas" not in self:
@@ -128,13 +139,19 @@ class RasGeomHdf(RasHdf):
             cell_dict["cell_id"] += cell_ids
             cell_dict["geometry"] += list(
                 np.vectorize(
-                    lambda face_id_list: polygonize(
-                        np.ravel(
-                            mesh_faces[
-                                np.array(face_id_list.strip("[]").split()).astype(int)
-                            ]
+                    lambda face_id_list: (
+                        lambda geom_col: Polygon((geom_col[0] or geom_col[3]).geoms[0])
+                    )(
+                        polygonize_full(
+                            np.ravel(
+                                mesh_faces[
+                                    np.array(face_id_list.strip("[]").split()).astype(
+                                        int
+                                    )
+                                ]
+                            )
                         )
-                    ).geoms[0]
+                    )
                 )(face_id_lists)
             )
         return GeoDataFrame(cell_dict, geometry="geometry", crs=self.projection())
@@ -206,8 +223,8 @@ class RasGeomHdf(RasHdf):
                 face_dict["geometry"].append(LineString(coordinates))
         return GeoDataFrame(face_dict, geometry="geometry", crs=self.projection())
 
-    def get_geom_attrs(self):
-        """Returns base geometry attributes from a HEC-RAS HDF file.
+    def get_geom_attrs(self) -> Dict:
+        """Return base geometry attributes from a HEC-RAS HDF file.
 
         Returns
         -------
@@ -216,8 +233,8 @@ class RasGeomHdf(RasHdf):
         """
         return self.get_attrs(self.GEOM_PATH)
 
-    def get_geom_structures_attrs(self):
-        """Returns geometry structures attributes from a HEC-RAS HDF file.
+    def get_geom_structures_attrs(self) -> Dict:
+        """Return geometry structures attributes from a HEC-RAS HDF file.
 
         Returns
         -------
@@ -226,8 +243,8 @@ class RasGeomHdf(RasHdf):
         """
         return self.get_attrs(self.GEOM_STRUCTURES_PATH)
 
-    def get_geom_2d_flow_area_attrs(self):
-        """Returns geometry 2d flow area attributes from a HEC-RAS HDF file.
+    def get_geom_2d_flow_area_attrs(self) -> Dict:
+        """Return geometry 2d flow area attributes from a HEC-RAS HDF file.
 
         Returns
         -------
@@ -373,6 +390,11 @@ class RasGeomHdf(RasHdf):
     def structures(self, datetime_to_str: bool = False) -> GeoDataFrame:
         """Return the model structures.
 
+        Parameters
+        ----------
+        datetime_to_str : bool, optional
+            If True, convert datetime values to string format (default: False).
+
         Returns
         -------
         GeoDataFrame
@@ -419,50 +441,50 @@ class RasGeomHdf(RasHdf):
             )
         return struct_gdf
 
-    def connections(self) -> GeoDataFrame:
+    def connections(self) -> GeoDataFrame:  # noqa D102
         raise NotImplementedError
 
-    def ic_points(self) -> GeoDataFrame:
+    def ic_points(self) -> GeoDataFrame:  # noqa D102
         raise NotImplementedError
 
-    def reference_lines(self) -> GeoDataFrame:
+    def reference_lines(self) -> GeoDataFrame:  # noqa D102
         raise NotImplementedError
 
-    def reference_points(self) -> GeoDataFrame:
+    def reference_points(self) -> GeoDataFrame:  # noqa D102
         raise NotImplementedError
 
-    def pump_stations(self) -> GeoDataFrame:
+    def pump_stations(self) -> GeoDataFrame:  # noqa D102
         raise NotImplementedError
 
-    def mannings_calibration_regions(self) -> GeoDataFrame:
+    def mannings_calibration_regions(self) -> GeoDataFrame:  # noqa D102
         raise NotImplementedError
 
-    def classification_polygons(self) -> GeoDataFrame:
+    def classification_polygons(self) -> GeoDataFrame:  # noqa D102
         raise NotImplementedError
 
-    def terrain_modifications(self) -> GeoDataFrame:
+    def terrain_modifications(self) -> GeoDataFrame:  # noqa D102
         raise NotImplementedError
 
-    def cross_sections(self) -> GeoDataFrame:
+    def cross_sections(self) -> GeoDataFrame:  # noqa D102
         raise NotImplementedError
 
-    def river_reaches(self) -> GeoDataFrame:
+    def river_reaches(self) -> GeoDataFrame:  # noqa D102
         raise NotImplementedError
 
-    def flowpaths(self) -> GeoDataFrame:
+    def flowpaths(self) -> GeoDataFrame:  # noqa D102
         raise NotImplementedError
 
-    def bank_points(self) -> GeoDataFrame:
+    def bank_points(self) -> GeoDataFrame:  # noqa D102
         raise NotImplementedError
 
-    def bank_lines(self) -> GeoDataFrame:
+    def bank_lines(self) -> GeoDataFrame:  # noqa D102
         raise NotImplementedError
 
-    def ineffective_areas(self) -> GeoDataFrame:
+    def ineffective_areas(self) -> GeoDataFrame:  # noqa D102
         raise NotImplementedError
 
-    def ineffective_points(self) -> GeoDataFrame:
+    def ineffective_points(self) -> GeoDataFrame:  # noqa D102
         raise NotImplementedError
 
-    def blocked_obstructions(self) -> GeoDataFrame:
+    def blocked_obstructions(self) -> GeoDataFrame:  # noqa D102
         raise NotImplementedError

{rashdf-0.2.0 → rashdf-0.2.2}/src/rashdf/plan.py

@@ -1,9 +1,13 @@
+"""HEC-RAS Plan HDF class."""
+
 from .geom import RasGeomHdf
 from typing import Dict
 from geopandas import GeoDataFrame
 
 
 class RasPlanHdf(RasGeomHdf):
+    """HEC-RAS Plan HDF class."""
+
     PLAN_INFO_PATH = "Plan Data/Plan Information"
     PLAN_PARAMS_PATH = "Plan Data/Plan Parameters"
     PRECIP_PATH = "Event Conditions/Meteorology/Precipitation"
@@ -12,67 +16,76 @@ class RasPlanHdf(RasGeomHdf):
     VOLUME_ACCOUNTING_PATH = f"{RESULTS_UNSTEADY_PATH}/Volume Accounting"
 
     def __init__(self, name: str, **kwargs):
+        """Open a HEC-RAS Plan HDF file.
+
+        Parameters
+        ----------
+        name : str
+            The path to the RAS Plan HDF file.
+        kwargs : dict
+            Additional keyword arguments to pass to h5py.File
+        """
         super().__init__(name, **kwargs)
 
     def get_plan_info_attrs(self) -> Dict:
-        """Returns plan information attributes from a HEC-RAS HDF plan file.
+        """Return plan information attributes from a HEC-RAS HDF plan file.
 
         Returns
         -------
         dict
-            Dictionary filled with plan information attributes.
+            Dictionary of plan information attributes.
         """
         return self.get_attrs(self.PLAN_INFO_PATH)
 
     def get_plan_param_attrs(self) -> Dict:
-        """Returns plan parameter attributes from a HEC-RAS HDF plan file.
+        """Return plan parameter attributes from a HEC-RAS HDF plan file.
 
         Returns
         -------
         dict
-            Dictionary filled with plan parameter attributes.
+            Dictionary of plan parameter attributes.
         """
         return self.get_attrs(self.PLAN_PARAMS_PATH)
 
     def get_meteorology_precip_attrs(self) -> Dict:
-        """Returns precipitation attributes from a HEC-RAS HDF plan file.
+        """Return precipitation attributes from a HEC-RAS HDF plan file.
 
         Returns
         -------
         dict
-            Dictionary filled with precipitation attributes.
+            Dictionary of precipitation attributes.
         """
         return self.get_attrs(self.PRECIP_PATH)
 
     def get_results_unsteady_attrs(self) -> Dict:
-        """Returns unsteady attributes from a HEC-RAS HDF plan file.
+        """Return unsteady attributes from a HEC-RAS HDF plan file.
 
         Returns
         -------
         dict
-            Dictionary filled with unsteady attributes.
+            Dictionary of unsteady attributes.
         """
         return self.get_attrs(self.RESULTS_UNSTEADY_PATH)
 
     def get_results_unsteady_summary_attrs(self) -> Dict:
-        """Returns results unsteady summary attributes from a HEC-RAS HDF plan file.
+        """Return results unsteady summary attributes from a HEC-RAS HDF plan file.
 
         Returns
         -------
         dict
-            Dictionary filled with results summary attributes.
+            Dictionary of results summary attributes.
         """
         return self.get_attrs(self.RESULTS_UNSTEADY_SUMMARY_PATH)
 
     def get_results_volume_accounting_attrs(self) -> Dict:
-        """Returns volume accounting attributes from a HEC-RAS HDF plan file.
+        """Return volume accounting attributes from a HEC-RAS HDF plan file.
 
         Returns
         -------
         dict
-            Dictionary filled with volume accounting attributes.
+            Dictionary of volume accounting attributes.
         """
         return self.get_attrs(self.VOLUME_ACCOUNTING_PATH)
 
-    def enroachment_points(self) -> GeoDataFrame:
+    def enroachment_points(self) -> GeoDataFrame:  # noqa: D102
         raise NotImplementedError

{rashdf-0.2.0 → rashdf-0.2.2}/src/rashdf/utils.py

@@ -1,3 +1,5 @@
+"""Utility functions for reading HEC-RAS HDF data."""
+
 import h5py
 import numpy as np
 import pandas as pd
@@ -5,27 +7,40 @@ import pandas as pd
 from datetime import datetime, timedelta
 import re
 from typing import Any, List, Tuple, Union, Optional
+from shapely import LineString, Polygon, polygonize_full
 
 
 def parse_ras_datetime(datetime_str: str) -> datetime:
     """Parse a datetime string from a RAS file into a datetime object.
 
+    If the datetime has a time of 2400, then it is converted to midnight of the next day.
+
     Parameters
     ----------
-        datetime_str (str): The datetime string to be parsed. The string should be in the format "ddMMMyyyy HHmm".
+        datetime_str (str): The datetime string to be parsed. The string should be in the format "ddMMMyyyy HH:mm:ss".
 
     Returns
     -------
         datetime: A datetime object representing the parsed datetime.
     """
     format = "%d%b%Y %H:%M:%S"
-    return datetime.strptime(datetime_str, format)
+
+    if datetime_str.endswith("24:00:00"):
+        datetime_str = datetime_str.replace("24:00:00", "00:00:00")
+        parsed_dt = datetime.strptime(datetime_str, format)
+        parsed_dt += timedelta(days=1)
+    else:
+        parsed_dt = datetime.strptime(datetime_str, format)
+
+    return parsed_dt
 
 
 def parse_ras_simulation_window_datetime(datetime_str) -> datetime:
     """
     Parse a datetime string from a RAS simulation window into a datetime object.
 
+    If the datetime has a time of 2400, then it is converted to midnight of the next day.
+
     Parameters
     ----------
         datetime_str: The datetime string to be parsed.
@@ -35,7 +50,15 @@ def parse_ras_simulation_window_datetime(datetime_str) -> datetime:
         datetime: A datetime object representing the parsed datetime.
     """
     format = "%d%b%Y %H%M"
-    return datetime.strptime(datetime_str, format)
+
+    if datetime_str.endswith("2400"):
+        datetime_str = datetime_str.replace("2400", "0000")
+        parsed_dt = datetime.strptime(datetime_str, format)
+        parsed_dt += timedelta(days=1)
+    else:
+        parsed_dt = datetime.strptime(datetime_str, format)
+
+    return parsed_dt
 
 
 def parse_run_time_window(window: str) -> Tuple[datetime, datetime]:
@@ -183,13 +206,13 @@ def hdf5_attrs_to_dict(attrs: dict, prefix: str = None) -> dict:
     """
     Convert a dictionary of attributes from an HDF5 file into a Python dictionary.
 
-    Parameters:
+    Parameters
     ----------
         attrs (dict): The attributes to be converted.
         prefix (str, optional): An optional prefix to prepend to the keys.
 
-    Returns:
-    ----------
+    Returns
+    -------
         dict: A dictionary with the converted attributes.
     """
     results = {}
@@ -210,12 +233,12 @@ def get_first_hdf_group(parent_group: h5py.Group) -> Optional[h5py.Group]:
     This function iterates over the items in the parent group and returns the first item that is an instance of
      h5py.Group. If no such item is found, it returns None.
 
-    Parameters:
+    Parameters
     ----------
         parent_group (h5py.Group): The parent group to search in.
 
-    Returns:
-    ----------
+    Returns
+    -------
         Optional[h5py.Group]: The first HDF5 group in the parent group, or None if no group is found.
     """
     for _, item in parent_group.items():

{rashdf-0.2.0 → rashdf-0.2.2}/src/rashdf.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rashdf
-Version: 0.2.0
+Version: 0.2.2
 Summary: Read data from HEC-RAS HDF files.
 Project-URL: repository, https://github.com/fema-ffrd/rashdf
 Classifier: Development Status :: 4 - Beta
@@ -20,16 +20,26 @@ Provides-Extra: dev
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: ruff; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
+Provides-Extra: docs
+Requires-Dist: sphinx; extra == "docs"
+Requires-Dist: numpydoc; extra == "docs"
+Requires-Dist: sphinx_rtd_theme; extra == "docs"
 
 # rashdf
 [![CI](https://github.com/fema-ffrd/rashdf/actions/workflows/continuous-integration.yml/badge.svg?branch=main)](https://github.com/fema-ffrd/rashdf/actions/workflows/continuous-integration.yml)
 [![Release](https://github.com/fema-ffrd/rashdf/actions/workflows/release.yml/badge.svg)](https://github.com/fema-ffrd/rashdf/actions/workflows/release.yml)
 [![PyPI version](https://badge.fury.io/py/rashdf.svg)](https://badge.fury.io/py/rashdf)
+[![codecov](https://codecov.io/gh/fema-ffrd/rashdf/graph/badge.svg?token=CTIIONEHV1)](https://codecov.io/gh/fema-ffrd/rashdf)
+[![Documentation Status](https://readthedocs.org/projects/rashdf/badge/?version=latest)](https://rashdf.readthedocs.io/en/latest/?badge=latest)
 
 Read data from [HEC-RAS](https://www.hec.usace.army.mil/software/hec-ras/) [HDF](https://github.com/HDFGroup/hdf5) files.
 
 *Pronunciation: `raz·aitch·dee·eff`*
 
+## Documentation
+[rashdf on ReadTheDocs](http://rashdf.readthedocs.io/)
+
 ## Install
 ```bash
 $ pip install rashdf
@@ -120,9 +130,6 @@ Example: write structures GeoJSON to `stdout`:
 $ rashdf structures Potomac.p01.hdf
 ```
 
-## Documentation
-Coming soon.
-
 ## Developer Setup
 Create a virtual environment in the project directory:
 ```

{rashdf-0.2.0 → rashdf-0.2.2}/src/rashdf.egg-info/requires.txt

@@ -6,3 +6,9 @@ pyarrow
 pre-commit
 ruff
 pytest
+pytest-cov
+
+[docs]
+sphinx
+numpydoc
+sphinx_rtd_theme

{rashdf-0.2.0 → rashdf-0.2.2}/tests/test_geom.py

@@ -9,6 +9,7 @@ from . import _create_hdf_with_group_attrs
 
 TEST_DATA = Path("./tests/data")
 MUNCIE_G05 = TEST_DATA / "ras/Muncie.g05.hdf"
+COAL_G01 = TEST_DATA / "ras/Coal.g01.hdf"
 TEST_JSON = TEST_DATA / "json"
 
 TEST_ATTRS = {"test_attribute1": "test_str1", "test_attribute2": 500}
@@ -59,6 +60,24 @@ def test_mesh_cell_polygons():
         assert _gdf_matches_json(ghdf.mesh_cell_polygons(), mesh_cell_polygons_json)
 
 
+def test_mesh_cell_polygons_coal():
+    """Test with the mesh from the Coal River model.
+
+    The Jan 2024 Coal River model from the Kanawha FFRD pilot project
+    contains some topologically incorrect polygons in the 2D mesh;
+    some of the mesh cell faces overlap.
+
+    See: https://github.com/fema-ffrd/rashdf/issues/31
+    """
+    coal_bad_polygons_json = TEST_JSON / "coal-bad-mesh-cell-polygons.json"
+    with RasGeomHdf(COAL_G01) as geom_hdf:
+        gdf = geom_hdf.mesh_cell_polygons()
+        gdf_bad_polygons = gdf[gdf["cell_id"].isin([8561, 11791, 17529])].to_crs(
+            "EPSG:4326"
+        )  # reproject because the Kanawha FFRD pilot project uses a custom CRS
+        assert _gdf_matches_json(gdf_bad_polygons, coal_bad_polygons_json)
+
+
 def test_bc_lines():
     bc_lines_json = TEST_JSON / "bc_lines.json"
     with RasGeomHdf(MUNCIE_G05) as ghdf:

{rashdf-0.2.0 → rashdf-0.2.2}/tests/test_utils.py

@@ -15,13 +15,35 @@ def test_convert_ras_hdf_value():
     assert utils.convert_ras_hdf_value(b"15Mar2024 16:39:01") == datetime(
         2024, 3, 15, 16, 39, 1
     )
+    assert utils.convert_ras_hdf_value(b"15Mar2024 24:00:00") == datetime(
+        2024, 3, 16, 0, 0, 0
+    )
     assert utils.convert_ras_hdf_value(b"15Mar2024 16:39:01 to 16Mar2024 16:39:01") == [
         datetime(2024, 3, 15, 16, 39, 1),
         datetime(2024, 3, 16, 16, 39, 1),
     ]
+    assert utils.convert_ras_hdf_value(b"18Mar2024 24:00:00 to 19Mar2024 24:00:00") == [
+        datetime(2024, 3, 19, 0, 0, 0),
+        datetime(2024, 3, 20, 0, 0, 0),
+    ]
     assert utils.convert_ras_hdf_value(b"01:23:45") == timedelta(
         hours=1, minutes=23, seconds=45
     )
+    assert utils.convert_ras_hdf_value(b"15Mar2024 2400") == datetime(
+        2024, 3, 16, 0, 0, 0
+    )
+    assert utils.convert_ras_hdf_value(b"15Mar2024 2315") == datetime(
+        2024, 3, 15, 23, 15, 0
+    )
+
+    assert utils.convert_ras_hdf_value(b"15Mar2024 1639 to 16Mar2024 1639") == [
+        datetime(2024, 3, 15, 16, 39, 0),
+        datetime(2024, 3, 16, 16, 39, 0),
+    ]
+    assert utils.convert_ras_hdf_value(b"18Mar2024 2400 to 19Mar2024 2400") == [
+        datetime(2024, 3, 19, 0, 0, 0),
+        datetime(2024, 3, 20, 0, 0, 0),
+    ]
 
 
 def test_df_datetimes_to_str():