ras-commander 0.72.0__py3-none-any.whl → 0.74.0__py3-none-any.whl

ras_commander/RasPlan.py

@@ -579,12 +579,12 @@ class RasPlan:
 
     @staticmethod
     @log_call
-    def get_geom_path(geom_number: str, ras_object=None) -> Optional[str]:
+    def get_geom_path(geom_number: Union[str, int], ras_object=None) -> Optional[str]:
         """
         Return the full path for a given geometry number.
 
         Args:
-        geom_number (str): The geometry number to search for.
+        geom_number (Union[str, int]): The geometry number to search for.
         ras_object (RasPrj, optional): Specific RAS object to use. If None, uses the global ras instance.
 
         Returns:
@@ -601,17 +601,51 @@ class RasPlan:
         ... else:
         ...     print("Geometry file not found.")
         """
-        ras_obj = ras_object or ras
-        ras_obj.check_initialized()
-        
-        # Use updated geom dataframe
-        ras_obj.geom_df = ras_obj.get_prj_entries('Geom')
+        logger = get_logger(__name__)
         
-        geom_path = ras_obj.geom_df[ras_obj.geom_df['geom_number'] == geom_number]
-        if not geom_path.empty:
-            full_path = geom_path['full_path'].iloc[0]
-            return full_path
-        else:
+        if geom_number is None:
+            logger.warning("Provided geometry number is None")
+            return None
+            
+        try:
+            ras_obj = ras_object or ras
+            ras_obj.check_initialized()
+            
+            # Ensure geom_number is a string with proper formatting
+            if isinstance(geom_number, int):
+                geom_number = f"{geom_number:02d}"
+            elif isinstance(geom_number, str):
+                # Strip any leading zeros and reformat
+                stripped = geom_number.lstrip('0')
+                if not stripped:  # Handle case where input was '0' or '00'
+                    geom_number = '00'
+                else:
+                    geom_number = f"{int(stripped):02d}"
+            else:
+                # Handle unexpected types
+                logger.warning(f"Unexpected type for geom_number: {type(geom_number)}")
+                return None
+            
+            # Use updated geom dataframe
+            ras_obj.geom_df = ras_obj.get_prj_entries('Geom')
+            
+            # Find the geometry file path
+            geom_path = ras_obj.geom_df[ras_obj.geom_df['geom_number'] == geom_number]
+            if not geom_path.empty:
+                if 'full_path' in geom_path.columns and pd.notna(geom_path['full_path'].iloc[0]):
+                    full_path = geom_path['full_path'].iloc[0]
+                    logger.info(f"Found geometry path: {full_path}")
+                    return full_path
+                else:
+                    # Fallback to constructing path
+                    constructed_path = str(ras_obj.project_folder / f"{ras_obj.project_name}.g{geom_number}")
+                    logger.info(f"Constructed geometry path: {constructed_path}")
+                    return constructed_path
+            else:
+                logger.warning(f"No geometry file found with number: {geom_number}")
+                return None
+        except Exception as e:
+            logger.error(f"Error in get_geom_path: {str(e)}")
             return None
 
     # Clone Functions to copy unsteady, flow, and geometry files from templates

ras_commander/__init__.py

@@ -10,7 +10,7 @@ try:
     __version__ = version("ras-commander")
 except PackageNotFoundError:
     # package is not installed
-    __version__ = "0.72.0"
+    __version__ = "0.74.0"
 
 # Set up logging
 setup_logging()
@@ -23,6 +23,7 @@ from .RasUnsteady import RasUnsteady
 from .RasUtils import RasUtils
 from .RasExamples import RasExamples
 from .RasCmdr import RasCmdr
+from .RasMap import RasMap
 from .HdfFluvialPluvial import HdfFluvialPluvial
 
 # HDF handling
@@ -49,7 +50,7 @@ __all__ = [
     # Core functionality
     'RasPrj', 'init_ras_project', 'get_ras_exe', 'ras',
     'RasPlan', 'RasGeo', 'RasUnsteady', 'RasUtils',
-    'RasExamples', 'RasCmdr', 'HdfFluvialPluvial',
+    'RasExamples', 'RasCmdr', 'RasMap', 'HdfFluvialPluvial',
     
     # HDF handling
     'HdfBase', 'HdfBndry', 'HdfMesh', 'HdfPlan',

{ras_commander-0.72.0.dist-info → ras_commander-0.74.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ras-commander
-Version: 0.72.0
+Version: 0.74.0
 Summary: A Python library for automating HEC-RAS 6.x operations
 Home-page: https://github.com/gpt-cmdr/ras-commander
 Author: William M. Katzenmeyer, P.E., C.F.M.
@@ -85,6 +85,25 @@ HDF Data Access & Analysis
 - Pipe network and pump station analysis
 - Fluvial-pluvial boundary calculations
 - Infiltration and precipitation data handling
+- Infiltration and soil data handling
+- Land cover and terrain data integration
+- Weighted parameter calculations for hydrologic modeling
+
+RASMapper Data Integration
+- RASMapper configuration parsing (.rasmap files)
+- Terrain, soil, and land cover HDF paths
+- Profile line paths
+
+Manning's n Coefficient Management
+- Base Manning's n table extraction and modification
+- Regional overrides for spatially-varied roughness
+- Direct editing of geometry file Manning values
+
+Infiltration & Soil Analysis
+- Soil statistics calculation and analysis
+- Infiltration parameter management and scaling
+- Weighted average parameter calculation
+- Raster-based soil data processing
 
 RAS ASCII File Operations
 - Plan file creation and modification
@@ -266,6 +285,7 @@ This is useful for comparing different river systems, running scenario analyses
 - `RasGeo`: Handles operations related to geometry files
 - `RasUnsteady`: Manages unsteady flow file operations
 - `RasUtils`: Contains utility functions for file operations and data management
+- `RasMap`: Parses and manages RASMapper configuration data
 - `RasExamples`: Manages and loads HEC-RAS example projects
 
 #### HDF Data Access Classes
@@ -280,7 +300,6 @@ This is useful for comparing different river systems, running scenario analyses
 - `HdfPipe`: Pipe network analysis tools
 - `HdfPump`: Pump station analysis capabilities
 - `HdfFluvialPluvial`: Fluvial-pluvial boundary analysis
-- `RasMapper`: RASMapper Functions
 - `HdfPlot` & `HdfResultsPlot`: Specialized plotting utilities
 
 ### Project Organization Diagram

{ras_commander-0.72.0.dist-info → ras_commander-0.74.0.dist-info}/RECORD

@@ -1,14 +1,14 @@
-ras_commander/Decorators.py,sha256=EOYi20fyV6JgArpHO3lQEVAU6LPHbpa3wGlmIYS40K0,10115
+ras_commander/Decorators.py,sha256=mhfM6A8jJTZ9b0srybB3u4DIaDnwweVQqYHERLR62Ck,14527
 ras_commander/HdfBase.py,sha256=Jws6Y8JFkharuiM6Br5ivp6MS64X2fL6y87FOpe3FQw,14219
 ras_commander/HdfBndry.py,sha256=FBNFoTz4sXVB-MOsbHJBP8P0dMqJUfBROloKTaxmzCo,16377
 ras_commander/HdfFluvialPluvial.py,sha256=dlqoFX5i7uSA2BvuRNrV-Fg-z2JaeUxY86_fbZAdGqI,25933
-ras_commander/HdfInfiltration.py,sha256=Dm6WbOg0VWDuVrzflaIEzd9JM5gU_PrgKUgpF4s8tOY,27280
+ras_commander/HdfInfiltration.py,sha256=HiifhbzgUs4kdtJkKfhxo1IsE-FBp5XspKkrJnnCDuc,66171
 ras_commander/HdfMesh.py,sha256=zI_4AqxDxb2_31G9RUmWibyld6KDMGhDpI3F8qwzVAw,19139
 ras_commander/HdfPipe.py,sha256=m-yvPL2GIP23NKt2tcwzOlS7khvgcDPGAshlTPMUAeI,32154
-ras_commander/HdfPlan.py,sha256=_KIWMoMpAftUp2wc2PQ9psl78IvW0disN0yKt7sNfqU,11807
+ras_commander/HdfPlan.py,sha256=WINI3lp865cE99QXztgvKKIhVUTOqu4X41ZPBfhYJGU,12145
 ras_commander/HdfPlot.py,sha256=7MNI5T9qIz-Ava1RdlnB6O9oJElE5BEB29QVF5Y2Xuc,3401
 ras_commander/HdfPump.py,sha256=Vc2ff16kRISR7jwtnaAqxI0p-gfBSuZKzR3rQbBLQoE,12951
-ras_commander/HdfResultsMesh.py,sha256=kjk5zXowgfscayiyKmSFdTDXa8-kPUI4SYKJ2okw3F0,31738
+ras_commander/HdfResultsMesh.py,sha256=MKnSJxcWVDccHaRRGgAK0szm7B-VtrKBtgL1Uz0kAiw,44662
 ras_commander/HdfResultsPlan.py,sha256=L3IOdF6R3XiA7mbFAyLdczrZJQJogd8hhl7UYJWT5fY,16246
 ras_commander/HdfResultsPlot.py,sha256=ylzfT78CfgoDO0XAlRwlgMNRzvNQYBMn9eyXyBfjv_w,7660
 ras_commander/HdfResultsXsec.py,sha256=-P7nXnbjOLAeUnrdSC_lJQSfzrlWKmDF9Z5gEjmxbJY,13031
@@ -18,15 +18,15 @@ ras_commander/HdfXsec.py,sha256=flREnFFrIZu4SSKGRQeX9w3SS49q0UWPJnq4zO7DbUM,2734
 ras_commander/LoggingConfig.py,sha256=gWe5K5XTmMQpSczsTysAqpC9my24i_IyM8dvD85fxYg,2704
 ras_commander/RasCmdr.py,sha256=37GnchoQ0fIAkPnssnCr1mRUXY8gm-hIMTmuHZlnYP8,34591
 ras_commander/RasExamples.py,sha256=6IZ96LcAsk5LYFehdD0zDW5wyZWxQa6OQu2N9upxWXA,17536
-ras_commander/RasGeo.py,sha256=hHurT_jsAfWu0Nto7cTPTgT1H6TZB7JD_v-tdzr8r_A,21742
+ras_commander/RasGeo.py,sha256=CQ1VjJ4uWWyXC9KsoVStbhlRf_5AiDm8yWvtDM3l4ac,21675
 ras_commander/RasMap.py,sha256=4cVzaaQure-CXdXB1BY29iE20S00eldUqoL96PvJPbw,10635
-ras_commander/RasPlan.py,sha256=7cgwsKjD40ZSj9uOnsHd-OfmBJFxkS2xFhWmlHQflak,62179
+ras_commander/RasPlan.py,sha256=GhAeUSvWRuBcYcOtBCo-qZGUefEWOlhw4ASJQHTGWzU,63872
 ras_commander/RasPrj.py,sha256=ivAHB3vexH6GQi-Aa4kqAabRwdthllMkTp8xphh5Ldc,57655
 ras_commander/RasUnsteady.py,sha256=TO08CT2GC4G5rcXO_Wbia2t4PhiWRu9-nC9F0IW7Gyo,37187
 ras_commander/RasUtils.py,sha256=0fm4IIs0LH1dgDj3pGd66mR82DhWLEkRKUvIo2M_5X0,35886
-ras_commander/__init__.py,sha256=JclW9xzKI5BVqPu2lxrp6uAcyoDiBaZPxmhCc23ISds,2001
-ras_commander-0.72.0.dist-info/licenses/LICENSE,sha256=_pbd6qHnlsz1iQ-ozDW_49r86BZT6CRwO2iBtw0iN6M,457
-ras_commander-0.72.0.dist-info/METADATA,sha256=0R0x1oIIkBVnDXXHSh5DIoX5S8xrefdOvZgryQQz0zQ,26654
-ras_commander-0.72.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-ras_commander-0.72.0.dist-info/top_level.txt,sha256=i76S7eKLFC8doKcXDl3aiOr9RwT06G8adI6YuKbQDaA,14
-ras_commander-0.72.0.dist-info/RECORD,,
+ras_commander/__init__.py,sha256=K6g6-GMFHnDKhLYvht8voqlGfY3N86UNS6ZQKvne3Mc,2039
+ras_commander-0.74.0.dist-info/licenses/LICENSE,sha256=_pbd6qHnlsz1iQ-ozDW_49r86BZT6CRwO2iBtw0iN6M,457
+ras_commander-0.74.0.dist-info/METADATA,sha256=qoAaqX8Z5ZCA88r1KAhcvatAh1WyAX75H0FK8HmC-8Y,27365
+ras_commander-0.74.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+ras_commander-0.74.0.dist-info/top_level.txt,sha256=i76S7eKLFC8doKcXDl3aiOr9RwT06G8adI6YuKbQDaA,14
+ras_commander-0.74.0.dist-info/RECORD,,