irie 0.0.41__py3-none-any.whl → 0.0.42__py3-none-any.whl

irie/apps/inventory/filters.py

@@ -37,7 +37,7 @@ class AssetFilter(django_filters.FilterSet):
     def filter_year(self, queryset, name, value):
         ids = {
             asset.id for asset in queryset if (
-                asset.nbi_data and int(asset.nbi_data["NBI_BRIDGE"]["Year Built"] or 0) <= int(value) #.year
+                asset.nbi_data and int(asset.nbi_data["NBI_BRIDGE"].get("Year Built",0) or 0) <= int(value) #.year
             )
         }
         return queryset.filter(id__in=ids)

irie/apps/prediction/runners/hazus.py

@@ -31,7 +31,6 @@ REFERENCES
 import math
 import json
 from scipy.stats import norm
-from irie.apps.events.models import EventRecord
 from irie.apps.prediction.runners import Runner, RunID
 from irie.apps.prediction.models import PredictorModel
 
@@ -181,30 +180,30 @@ def _bridge_info(nbi: dict) -> dict:
     """
     try:
         nbi_bridge = nbi.get("NBI_BRIDGE", {})
-        nbi_superstructure = nbi.get("NBI_SUPERSTRUCTURE_DECK", {})
+        nbi_supers = nbi.get("NBI_SUPERSTRUCTURE_DECK", {})
 
-        # Parse "Skew Angle"
-        skew_angle_str = nbi_bridge.get("Skew Angle", "0")
-        if "99" in skew_angle_str:  # Handle undefined skew
+        # 34: "Skew Angle"
+        skew_angle_str = nbi_bridge.get("Skew Angle", "99")
+        if "99" in skew_angle_str:
             skew_angle = 0
         else:
             skew_angle = float(skew_angle_str.split(" - ")[0])
 
         return {
             "state_code":      StateCodes.California,
-            "year_built":      int(nbi_bridge.get("Year Built", 0)),
-            "skew_angle":      skew_angle,
+            "year_built":      int(nbi_bridge.get("Year Built", 0)),                                      # 27
+            "skew_angle":      skew_angle,                                                                # 34
             "service_type":    int(
-                nbi_bridge.get("Type of Service on Bridge Code", "0 - Unknown").split(" - ")[0]
-                + nbi_bridge.get("Type Of Service Under Bridge Code", "0 - Unknown").split(" - ")[0]
+                nbi_bridge.get("Type of Service on Bridge Code", "0 - Unknown").split(" - ")[0]           # 42A
+                + nbi_bridge.get("Type Of Service Under Bridge Code", "0 - Unknown").split(" - ")[0]      # 42B
             ),
-            "material_flag":   int(nbi_superstructure.get("Main Span Material", "0 - Unknown").split(" - ")[0]),
-            "geometry_flag":   int(nbi_superstructure.get("Main Span Design", "0 - Unknown").split(" - ")[0]),
-            "span_count":      int(nbi_superstructure.get("Number of Spans in Main Unit", 0)),
-            "approach_spans":  int(nbi_superstructure.get("Number of Approach Spans", 0)),
-            "max_span_length": float(nbi_bridge.get("Length of Maximum Span", 0.0)),
-            "total_length":    float(nbi_bridge.get("Structure Length", 0.0)),
-            "deck_width":      float(nbi_bridge.get("Deck Width - Out to Out", 0.0)),
+            "material_flag":   int(nbi_supers.get("Main Span Material", "0 - Unknown").split(" - ")[0]),  # 43A
+            "geometry_flag":   int(nbi_supers.get("Main Span Design", "0 - Unknown").split(" - ")[0]),    # 43B
+            "span_count":      int(nbi_supers.get("Number of Spans in Main Unit", 0)),                    # 45
+            "approach_spans":  int(nbi_supers.get("Number of Approach Spans", 0)),                        # 46
+            "max_span_length": float(nbi_bridge.get("Length of Maximum Span", 0.0)),                      # 48
+            "total_length":    float(nbi_bridge.get("Structure Length", 0.0)),                            # 49
+            "deck_width":      float(nbi_bridge.get("Deck Width - Out to Out", 0.0)),                     # 52
         }
     except ValueError as e:
         raise ValueError(f"Error processing NBI data: {e}")
@@ -214,12 +213,20 @@ def _bridge_info(nbi: dict) -> dict:
 
 def _hazus_curve(type: int, properties: dict, sa_03s: float, sa_10s: float, soil_type: str) -> dict:
     """
-    Compute fragility probabilities for the four damage states and optionally generate fragility curves.
+    Compute fragility probabilities for the four damage states
 
     See page 7-14 of [1]
-    Args:
+    See reference [3] for details
+    See Section 7.1.6.2 of [1] for example
+
+    Parameters
     - type (int): Bridge classification (integer from 1 to 28).
-    - properties (dict): Dictionary containing bridge-specific properties.
+    - properties (dict): Dictionary containing NBI data:
+        - span_count (N), 
+        - skew_angle (α), 
+        - deck_width (W), 
+        - max_span_length (Lmax), # 48
+        - total_length (L),       # 49
     - pga (float): Peak Ground Acceleration (g).
     - sa_03s (float): Spectral Acceleration at 0.3 seconds (g).
     - sa_10s (float): Spectral Acceleration at 1.0 seconds (g).
@@ -227,6 +234,10 @@ def _hazus_curve(type: int, properties: dict, sa_03s: float, sa_10s: float, soil
 
     Returns:
     - dict: Fragility probabilities for Slight, Moderate, Extensive, and Complete damage states.
+
+    Note
+    The skew angle is defined as the angle between the centerline of a 
+    pier and a line normal to the roadway centerline.
     """
     # Validate inputs
     required_keys = {"span_count", "skew_angle"}
@@ -242,6 +253,9 @@ def _hazus_curve(type: int, properties: dict, sa_03s: float, sa_10s: float, soil
     skew_angle = properties["skew_angle"]
 
     # Step 2: Get soil-amplified shaking parameters
+    # Evaluate the soil-amplified shaking at the bridge site. That is, get the peak ground acceleration
+    # (PGA), spectral accelerations (Sa at 0.3 seconds and Sa at 1.0 second) and the permanent ground
+    # deformation (in inches).
     modified_values = modify_ground_motion(soil_type, None, sa_03s, sa_10s)
     modified_sa_03s = modified_values['sa_03s']
     modified_sa_10s = modified_values['sa_10s']

irie/apps/static/assets/css/brace.css

@@ -23442,7 +23442,6 @@ svg.text-dark .color-background {
   padding-left: 0.75rem;
   padding-right: 0.75rem;
   font-weight: 500;
-  color: #ffffff;
   font-size: 0.75rem;
 }
 .navbar-vertical .navbar-nav .nav-link > i {