ras-commander 0.46.0__tar.gz → 0.47.0__tar.gz

{ras_commander-0.46.0/ras_commander.egg-info → ras_commander-0.47.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ras-commander
-Version: 0.46.0
+Version: 0.47.0
 Summary: A Python library for automating HEC-RAS operations
 Home-page: https://github.com/billk-FM/ras-commander
 Author: William M. Katzenmeyer
@@ -61,7 +61,7 @@ Create a virtual environment with conda or venv (ask ChatGPT if you need help)
 
 In your virtual environment, install ras-commander using pip:
 ```
-pip install h5py numpy pandas requests tqdm scipy
+pip install h5py numpy pandas requests tqdm scipy rtree pyproj shapely xarray rasterio
 pip install --upgrade ras-commander
 ```
 

{ras_commander-0.46.0 → ras_commander-0.47.0}/README.md

@@ -50,7 +50,7 @@ Create a virtual environment with conda or venv (ask ChatGPT if you need help)
 
 In your virtual environment, install ras-commander using pip:
 ```
-pip install h5py numpy pandas requests tqdm scipy
+pip install h5py numpy pandas requests tqdm scipy rtree pyproj shapely xarray rasterio
 pip install --upgrade ras-commander
 ```
 

{ras_commander-0.46.0 → ras_commander-0.47.0}/ras_commander/HdfBndry.py

@@ -70,9 +70,9 @@ class HdfBndry:
                 return gpd.GeoDataFrame(
                     {
                         "bc_line_id": bc_line_ids,
-                        "name": names,
+                        "Name": names,
                         "mesh_name": mesh_names,
-                        "type": types,
+                        "Type": types,
                         "geometry": geoms,
                     },
                     geometry="geometry",
@@ -110,7 +110,7 @@ class HdfBndry:
                 )
                 geoms = HdfBndry._get_polylines(hdf_file, breaklines_path)
                 return gpd.GeoDataFrame(
-                    {"bl_id": bl_line_ids, "name": names, "geometry": geoms},
+                    {"bl_id": bl_line_ids, "Name": names, "geometry": geoms},
                     geometry="geometry",
                     crs=HdfUtils.projection(hdf_file),
                 )
@@ -158,7 +158,7 @@ class HdfBndry:
                             )
                         )
                 return gpd.GeoDataFrame(
-                    {"rr_id": rr_ids, "name": names, "geometry": geoms},
+                    {"rr_id": rr_ids, "Name": names, "geometry": geoms},
                     geometry="geometry",
                     crs=HdfUtils.projection(hdf_file),
                 )
@@ -242,9 +242,9 @@ class HdfBndry:
                 return gpd.GeoDataFrame(
                     {
                         "refln_id": refline_ids,
-                        "refln_name": names,
-                        "mesh_name": mesh_names,
-                        "type": types,
+                        "Name": names,
+                        "mesh-name": mesh_names,
+                        "Type": types,
                         "geometry": geoms,
                     },
                     geometry="geometry",
@@ -286,9 +286,9 @@ class HdfBndry:
                 return gpd.GeoDataFrame(
                     {
                         "refpt_id": range(attributes.shape[0]),
-                        "refpt_name": names,
+                        "Name": names,
                         "mesh_name": mesh_names,
-                        "cell_id": cell_id,
+                        "Cell Index": cell_id,
                         "geometry": list(map(Point, points)),
                     },
                     geometry="geometry",

{ras_commander-0.46.0 → ras_commander-0.47.0}/ras_commander/HdfMesh.py

@@ -64,7 +64,7 @@ class HdfMesh:
                     return list()
                 return list(
                     [
-                        HdfUtils.convert_ras_hdf_string(n)
+                        HdfUtils.convert_ras_hdf_string(n.decode('utf-8'))  # Decode as UTF-8
                         for n in hdf_file["Geometry/2D Flow Areas/Attributes"][()]["Name"]
                     ]
                 )
@@ -174,12 +174,11 @@ class HdfMesh:
         except Exception as e:
             logger.error(f"Error reading mesh cell polygons from {hdf_path}: {str(e)}")
             return GeoDataFrame()
-
     @staticmethod
     @standardize_input(file_type='plan_hdf')
     def mesh_cell_points(hdf_path: Path) -> GeoDataFrame:
         """
-        Return 2D flow mesh cell points.
+        Return 2D flow mesh cell center points.
 
         Parameters
         ----------
@@ -189,29 +188,29 @@ class HdfMesh:
         Returns
         -------
         GeoDataFrame
-            A GeoDataFrame containing the 2D flow mesh cell points.
+            A GeoDataFrame containing the 2D flow mesh cell center points.
         """
         try:
             with h5py.File(hdf_path, 'r') as hdf_file:
                 mesh_area_names = HdfMesh.mesh_area_names(hdf_path)
                 if not mesh_area_names:
                     return GeoDataFrame()
+                
                 pnt_dict = {"mesh_name": [], "cell_id": [], "geometry": []}
-                for i, mesh_name in enumerate(mesh_area_names):
-                    starting_row, count = hdf_file["Geometry/2D Flow Areas/Cell Info"][()][i]
-                    cell_pnt_coords = hdf_file["Geometry/2D Flow Areas/Cell Points"][()][
-                        starting_row : starting_row + count
-                    ]
-                    pnt_dict["mesh_name"] += [mesh_name] * cell_pnt_coords.shape[0]
-                    pnt_dict["cell_id"] += range(count)
+                for mesh_name in mesh_area_names:
+                    cell_center_coords = hdf_file[f"Geometry/2D Flow Areas/{mesh_name}/Cells Center Coordinate"][()]
+                    cell_count = len(cell_center_coords)
+                    
+                    pnt_dict["mesh_name"] += [mesh_name] * cell_count
+                    pnt_dict["cell_id"] += range(cell_count)
                     pnt_dict["geometry"] += list(
                         np.vectorize(lambda coords: Point(coords), signature="(n)->()")(
-                            cell_pnt_coords
+                            cell_center_coords
                         )
                     )
                 return GeoDataFrame(pnt_dict, geometry="geometry", crs=HdfUtils.projection(hdf_path))
         except Exception as e:
-            self.logger.error(f"Error reading mesh cell points from {hdf_path}: {str(e)}")
+            logger.error(f"Error reading mesh cell points from {hdf_path}: {str(e)}")
             return GeoDataFrame()
 
     @staticmethod
@@ -293,7 +292,7 @@ class HdfMesh:
                         try:
                             value = d2_flow_area[name][()]
                             if isinstance(value, bytes):
-                                value = value.decode('utf-8')
+                                value = value.decode('utf-8')  # Decode as UTF-8
                             result[name] = value
                         except Exception as e:
                             logger.warning(f"Error converting attribute '{name}': {str(e)}")
@@ -340,10 +339,10 @@ class HdfMesh:
                         for z, area, wetted_perimeter, mannings_n in face_values:
                             face_data.append({
                                 'Face ID': face_id,
-                                'Z': z,
-                                'Area': area,
-                                'Wetted Perimeter': wetted_perimeter,
-                                "Manning's n": mannings_n
+                                'Z': z.decode('utf-8'),  # Decode as UTF-8
+                                'Area': area.decode('utf-8'),  # Decode as UTF-8
+                                'Wetted Perimeter': wetted_perimeter.decode('utf-8'),  # Decode as UTF-8
+                                "Manning's n": mannings_n.decode('utf-8')  # Decode as UTF-8
                             })
                     
                     result[mesh_name] = pd.DataFrame(face_data)
@@ -352,4 +351,4 @@ class HdfMesh:
 
         except Exception as e:
             logger.error(f"Error extracting face property tables from {hdf_path}: {str(e)}")
-            return {}
+            return {}

{ras_commander-0.46.0 → ras_commander-0.47.0}/ras_commander/RasPrj.py

@@ -107,7 +107,7 @@ class RasPrj:
         # Add Geom_File to plan_df
         self.plan_df['Geom_File'] = self.plan_df.apply(lambda row: self._get_geom_file_for_plan(row['plan_number']), axis=1)
 
-    @log_call
+    
     def _get_geom_file_for_plan(self, plan_number):
         """
         Get the geometry file path for a given plan number.
@@ -133,7 +133,7 @@ class RasPrj:
             logger.error(f"Error reading plan file for geometry: {e}")
         return None
 
-    @log_call
+
     def _parse_plan_file(self, plan_file_path):
         """
         Parse a plan file and extract critical information.
@@ -193,9 +193,6 @@ class RasPrj:
         
         return plan_info
     
-
-    
-    @log_call
     def _get_prj_entries(self, entry_type):
         """
         Extract entries of a specific type from the HEC-RAS project file.
@@ -242,7 +239,6 @@ class RasPrj:
 
         return pd.DataFrame(entries)
 
-    @log_call
     def _parse_unsteady_file(self, unsteady_file_path):
         """
         Parse an unsteady flow file and extract critical information.
@@ -617,7 +613,6 @@ class RasPrj:
         
         return merged_df
 
-    @log_call
     def _parse_boundary_condition(self, block: str, unsteady_number: str, bc_number: int) -> Tuple[Dict, str]:
         lines = block.split('\n')
         bc_info = {

{ras_commander-0.46.0 → ras_commander-0.47.0/ras_commander.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ras-commander
-Version: 0.46.0
+Version: 0.47.0
 Summary: A Python library for automating HEC-RAS operations
 Home-page: https://github.com/billk-FM/ras-commander
 Author: William M. Katzenmeyer
@@ -61,7 +61,7 @@ Create a virtual environment with conda or venv (ask ChatGPT if you need help)
 
 In your virtual environment, install ras-commander using pip:
 ```
-pip install h5py numpy pandas requests tqdm scipy
+pip install h5py numpy pandas requests tqdm scipy rtree pyproj shapely xarray rasterio
 pip install --upgrade ras-commander
 ```
 

{ras_commander-0.46.0 → ras_commander-0.47.0}/setup.py

@@ -14,7 +14,7 @@ class CustomBuildPy(build_py):
 
 setup(
     name="ras-commander",
-    version="0.46.0",
+    version="0.47.0",
     packages=["ras_commander"],
     include_package_data=True,
     python_requires='>=3.10',