irie 0.0.35__py3-none-any.whl → 0.0.36__py3-none-any.whl

irie/apps/context_processors.py

@@ -3,3 +3,11 @@ from django.conf import settings
 
 def cfg_assets_root(request):
     return {"ASSETS_ROOT": settings.ASSETS_ROOT}
+
+def irie_apps(request):      
+    return {
+        'irie_apps': settings.IRIE_APPS,
+        'irie_app_name': request.resolver_match.app_name,
+        'namespace': request.resolver_match.namespace,
+        'irie_url_name': request.resolver_match.url_name
+    }

irie/apps/inventory/admin.py

@@ -4,7 +4,10 @@
 #
 #===----------------------------------------------------------------------===#
 from django.contrib import admin
-from .models import Asset, Corridor
+from .models import Asset, Corridor, SensorGroup, Sensor, Datum
 
 admin.site.register(Corridor)
 admin.site.register(Asset)
+admin.site.register(SensorGroup)
+admin.site.register(Sensor)
+admin.site.register(Datum)

irie/apps/inventory/forms.py

@@ -4,9 +4,32 @@
 #
 #===----------------------------------------------------------------------===#
 from django import forms
-from irie.apps.inventory.models import Asset
+from django.forms import formset_factory
+from irie.apps.inventory.models import Asset, SensorGroup, Sensor
 
 class AssetForm(forms.ModelForm):
     class Meta:
         model = Asset
         fields = '__all__'
+
+class SensorGroupForm(forms.ModelForm):
+    class Meta:
+        model = SensorGroup
+        fields = ['name', 'datum']
+
+class SensorForm(forms.ModelForm):
+    class Meta:
+        model = Sensor
+        fields = ['x', 'y', 'z', 'dx', 'dy', 'dz']
+        labels = {
+            'x': 'x',
+            'y': 'y',
+            'z': 'z',
+            'dx': 'dx',
+            'dy': 'dy',
+            'dz': 'dz',
+        }
+
+
+# Create a formset for multiple sensors
+SensorFormSet = formset_factory(SensorForm, extra=3)  # Default to 3 empty sensor forms

irie/apps/inventory/migrations/0004_datum_sensorgroup_sensor.py

@@ -0,0 +1,43 @@
+# Generated by Django 5.1.2 on 2025-02-24 00:30
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('irie_apps_inventory', '0003_asset_notes'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Datum',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=100)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='SensorGroup',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=100)),
+                ('asset', models.ForeignKey(on_delete=django.db.models.deletion.RESTRICT, to='irie_apps_inventory.asset')),
+                ('datum', models.ForeignKey(on_delete=django.db.models.deletion.RESTRICT, to='irie_apps_inventory.datum')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Sensor',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('x', models.FloatField()),
+                ('y', models.FloatField()),
+                ('z', models.FloatField()),
+                ('dx', models.FloatField()),
+                ('dy', models.FloatField()),
+                ('dz', models.FloatField()),
+                ('group', models.ForeignKey(on_delete=django.db.models.deletion.RESTRICT, to='irie_apps_inventory.sensorgroup')),
+            ],
+        ),
+    ]

irie/apps/inventory/models.py

@@ -22,23 +22,6 @@ class Corridor(models.Model):
         return f"{self.name} ({self.assets.count()})"
 
 
-class _Sensor: # (models.Model):
-    class Status:
-        active: bool
-
-    status = None
-
-class Station: # (models.Model):
-    sensors = None
-    assets  = None
-    network = None
-    events  = None
-
-class Vulnerability: # (models.Model):
-    type    = None
-    asset   = None
-    notes   = models.CharField(max_length=1024, blank=True, null=True)
-
 class Asset(models.Model):
     id = models.BigAutoField(primary_key=True)
     cesmd = models.CharField(max_length=7, blank=True, null=True)
@@ -112,3 +95,43 @@ class Asset(models.Model):
     class Meta:
         ordering = ["-id"]
 
+
+class Vulnerability: # (models.Model):
+    type    = None
+    asset   = None
+    notes   = models.CharField(max_length=1024, blank=True, null=True)
+
+
+class Datum(models.Model):
+    name  = models.CharField(max_length=100)
+    def __str__(self):
+        return f"{self.name}"
+
+class SensorGroup(models.Model):
+    """
+    """
+    name    = models.CharField(max_length=100)
+#   sensors; access with .sensor_set.all()
+    asset   = models.ForeignKey(Asset, on_delete=models.RESTRICT)
+    datum   = models.ForeignKey(Datum, on_delete=models.RESTRICT)
+#   network = models.CharField(max_length=100)
+#   events  = None
+    def __str__(self):
+        return f"{self.name} - {self.datum}"
+
+class Sensor(models.Model):
+    # class Status:
+    #     active: bool
+
+    x    = models.FloatField()
+    y    = models.FloatField()
+    z    = models.FloatField()
+
+    dx   = models.FloatField()
+    dy   = models.FloatField()
+    dz   = models.FloatField()
+
+    group  = models.ForeignKey(SensorGroup, related_name="sensors", on_delete=models.RESTRICT)
+
+    def __str__(self):
+        return f"Sensor {self.id} ({self.group.name})"

irie/apps/inventory/urls.py

@@ -23,6 +23,8 @@ urlpatterns = [
         "^evaluations/(?P<event>[0-9 A-Z-]*)/(?P<cesmd>[0-9 A-Z-]*)/.*", views.asset_event_summary, 
                                                                           name="asset_event_summary"
     ),
-    re_path("^inventory/(?P<calid>[0-9 A-Z-]*)/evaluations/$", views.asset_evals,   name="asset_evals"),
-    re_path("^inventory/(?P<calid>[0-9 A-Z-]*)/$",             views.asset_profile, name="asset_profile"),
+    re_path("^inventory/(?P<calid>[0-9 A-Z-]*)/evaluations/$",  views.asset_evals,   name="asset_evals"),
+    re_path("^inventory/(?P<calid>[0-9 A-Z-]*)/$",              views.asset_profile, name="asset_profile"),
+    re_path("^inventory/(?P<calid>[0-9 A-Z-]*)/sensors/$",      views.asset_sensors, name="asset_sensors"),
+    re_path("^inventory/(?P<calid>[0-9 A-Z-]*)/sensor_upload",  views.sensor_upload, name="sensor_upload"),
 ]

irie/apps/inventory/views.py

@@ -17,10 +17,13 @@ from django.core.paginator import Paginator
 from django.template import loader
 from django.http import HttpResponse
 from django.contrib.auth.decorators import login_required
+from django.shortcuts import render, redirect, get_object_or_404
+from django.forms import formset_factory
 
 from irie.apps.events.models import EventRecord
 from irie.apps.site.view_utils import raise404
-from irie.apps.inventory.models import Asset
+from irie.apps.inventory.models import Asset, SensorGroup, Sensor
+from irie.apps.inventory.forms import SensorGroupForm, SensorForm, SensorFormSet
 from .filters import AssetFilter
 # Predictors
 from irie.apps.prediction.runners.hazus import hazus_fragility
@@ -339,6 +342,49 @@ def _make_tables(asset):
     return tables
 
 
+@login_required(login_url="/login/")
+def asset_sensors(request, calid):
+    asset = Asset.objects.get(calid=calid)
+    context = {
+        "asset": asset,
+        "groups": SensorGroup.objects.filter(asset=asset)
+    }
+    html_template = loader.get_template("inventory/asset-sensors.html")
+    return HttpResponse(html_template.render(context, request))
+
+@login_required(login_url="/login/")
+def sensor_upload(request, calid):
+    asset = get_object_or_404(Asset, calid=calid)  # Fetch the asset using calid
+    SensorFormSet = formset_factory(SensorForm, extra=1, can_delete=False)  
+
+    if request.method == "POST":
+        group_form = SensorGroupForm(request.POST)
+        formset = SensorFormSet(request.POST)
+
+        if group_form.is_valid() and formset.is_valid():
+            sensor_group = group_form.save(commit=False)
+            sensor_group.asset = asset  # Assign the asset
+            sensor_group.save()
+
+            for form in formset:
+                if form.cleaned_data and not form.cleaned_data.get('DELETE', False):
+                    sensor = form.save(commit=False)
+                    sensor.group = sensor_group
+                    sensor.save()
+
+            return redirect('asset_sensors', calid=calid)  # Redirect after successful submission
+
+    else:
+        group_form = SensorGroupForm()
+        formset = SensorFormSet()
+
+    return render(request, "inventory/sensor-upload.html", {
+        "group_form": group_form, 
+        "formset": formset,
+        "asset": asset  # Pass asset to template if needed
+    })
+
+
 def _filter_asset_table(request):
     # Copy the GET parameters and remove the 'page' parameter
     page_query = request.GET.copy()

irie/apps/templates/includes/sidebar.html

@@ -65,7 +65,7 @@
               <li class="nav-item {% if 'events' in segment %} active {% endif %}">
                 <span
                   class="nav-link  collapsed  d-flex justify-content-between align-items-center"
-                  data-bs-toggle="collapse" data-bs-target="#submenu-app">
+                  data-bs-toggle="collapse" data-bs-target="#submenu-events">
                   <span>
                     <span class="sidebar-icon">
                       <svg class="icon icon-xs me-2" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5 4a3 3 0 00-3 3v6a3 3 0 003 3h10a3 3 0 003-3V7a3 3 0 00-3-3H5zm-1 9v-1h5v2H5a1 1 0 01-1-1zm7 1h4a1 1 0 001-1v-1h-5v2zm0-4h5V8h-5v2zM9 8H4v2h5V8z" clip-rule="evenodd"></path></svg>
@@ -78,7 +78,7 @@
                   </span>
                 </span>
                 <div class="multi-level collapse {% if 'events' in segment %} show {% endif %}"
-                  role="list" id="submenu-app" aria-expanded="false">
+                  role="list" id="submenu-events" aria-expanded="false">
                   <ul class="flex-column nav">
                     <li class="nav-item {% if 'cgs' in segment %} active {% endif %}">
                       <a class="nav-link" href="{% url 'event_table' %}">
@@ -99,15 +99,34 @@
                 </a>
               </li>
 
-              <li class="nav-item {% if 'networks' in segment %} active {% endif %}">
-                <a href="{% url 'networks' %}" class="nav-link">
-                  <span class="sidebar-icon">
-                    <svg class="icon icon-xs me-2" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M2 10a8 8 0 018-8v8h8a8 8 0 11-16 0z"></path><path d="M12 2.252A8.014 8.014 0 0117.748 8H12V2.252z"></path></svg>
-                  </span> 
-                  <span class="sidebar-text">Networks</span>
-                </a>
+              <li class="nav-item {% if 'applications' in segment %} active {% endif %}">
+                <span
+                  class="nav-link  collapsed  d-flex justify-content-between align-items-center"
+                  data-bs-toggle="collapse" data-bs-target="#submenu-apps">
+                  <span>
+                    <span class="sidebar-icon">
+                      <svg class="icon icon-xs me-2" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5 4a3 3 0 00-3 3v6a3 3 0 003 3h10a3 3 0 003-3V7a3 3 0 00-3-3H5zm-1 9v-1h5v2H5a1 1 0 01-1-1zm7 1h4a1 1 0 001-1v-1h-5v2zm0-4h5V8h-5v2zM9 8H4v2h5V8z" clip-rule="evenodd"></path></svg>
+                    </span> 
+                    <span title="Listing of processed events" 
+                          class="sidebar-text">Applications</span>
+                  </span>
+                  <span class="link-arrow">
+                    <svg class="icon icon-sm" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clip-rule="evenodd"></path></svg>
+                  </span>
+                </span>
+                <div class="multi-level collapse {% if app.url in irie_url_name %} show {% endif %}"
+                  role="list" id="submenu-apps" aria-expanded="false">
+                  <ul class="flex-column nav">
+                    {% for app in irie_apps %}
+                    <li class="nav-item {% if app.url in irie_url_name %} active {% endif %}">
+                      <a class="nav-link" href="{% url app.url %}">
+                        <span class="sidebar-text">{{ app.name }}</span>
+                      </a>
+                    </li>
+                    {% endfor %}
+                  </ul>
+                </div>
               </li>
-
               <li role="separator" class="dropdown-divider mt-4 mb-3 border-gray-700"></li>
               
 

irie/apps/templates/inventory/asset-profile.html

@@ -135,6 +135,14 @@
               xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 6v6m0 0v6m0-6h6m-6 0H6"></path></svg>
               Predictors
         </a>
+        <a role="button" 
+           href="{% url 'asset_sensors' calid=asset.calid %}"
+           class="btn btn-sm btn-outline-primary d-inline-flex align-items-center">
+          <svg class="icon icon-xs me-2" fill="none" 
+              stroke="currentColor" viewBox="0 0 24 24" 
+              xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 6v6m0 0v6m0-6h6m-6 0H6"></path></svg>
+              Sensors
+        </a>
       </div>
     </div>
     {% if True %}

irie/apps/templates/inventory/asset-sensors.html

@@ -0,0 +1,50 @@
+<!-- 
+===----------------------------------------------------------------------===#
+
+         STAIRLab -- STructural Artificial Intelligence Laboratory
+
+===----------------------------------------------------------------------===#
+
+Claudio Perez, Summer 2023 
+Chrystal Chern, Spring 2025
+
+-->
+
+{% extends "layouts/base.html" %}
+{% block title %} {{ asset.calid }} Sensors {% endblock %} 
+
+{% block content %}
+<h1><code>{{ asset.calid }}</code> Sensors</h1>
+  <div class="py-4 align-right">
+    <a role="button" class="button btn btn-outline-white btn-gray-600 text-white"
+    href="{% url 'asset_profile' calid=asset.calid %}" class="me-1">Back to Structure</a>
+    <a role="button" class="button btn btn-outline-white btn-gray-600 text-white"
+    href="{% url 'sensor_upload' calid=asset.calid %}" class="me-1">Add SensorGroup</a>
+  </div>
+
+
+<div class="col-10">
+    {% for group in groups %}
+    <div class="card">
+        <div class="card-header">
+            {{group.name}}
+        </div>
+        <div class="card-body">
+          <table>
+            {% for sensor in group.sensors.all %}
+            <tr>
+                <td>{{ sensor }} </td><td>{{sensor.x}}</td><td>{{sensor.y}}</td><td>{{sensor.z}}</td>
+            </tr>
+            {% endfor %}
+          </table>
+        </div>
+    </div>
+    {% endfor %}
+</div>
+
+{% endblock %}
+
+{% block javascripts %}
+
+{% endblock %}
+

irie/apps/templates/inventory/sensor-upload.html

@@ -0,0 +1,119 @@
+<!-- 
+===----------------------------------------------------------------------===#
+
+         STAIRLab -- STructural Artificial Intelligence Laboratory
+
+===----------------------------------------------------------------------===#
+
+Chrystal Chern, Spring 2025
+
+-->
+{% extends "layouts/base.html" %}
+{% block title %} Add Sensor Group to {{ asset.calid }} {% endblock %} 
+
+{% block content %}
+
+<h1>Add Sensor Group to <code>{{ asset.calid }}</code></h1>
+
+<form method="post">
+    {% csrf_token %}
+
+    <fieldset>
+        <legend>Sensor Group</legend>
+        {{ group_form.as_p }}
+    </fieldset>
+
+    <fieldset>
+        <legend>Sensors</legend>
+        {{ formset.management_form }}
+        <div id="formset-container" class="container">
+                {% for form in formset %}
+                    <div class="sensor-form">
+                        <div class="row"><div class="col-md-6 d-flex align-items-center mb-3">
+                            <div class="input-group">
+                                <span class="input-group-text col-md-2">{{ form.x.label }}</span>
+                                <input id="{{form.x.html_name}}" type="number" name="{{form.x.html_name}}" class="form-control col-md-4"></input>
+                            </div>
+                            <div class="input-group">
+                                <span class="input-group-text col-md-2">{{ form.y.label }}</span>
+                                <input id="{{form.y.html_name}}" type="number" name="{{form.y.html_name}}" class="form-control col-md-4"></input>
+                            </div>
+                            <div class="input-group">
+                                <span class="input-group-text col-md-2">{{ form.z.label }}</span>
+                                <input id="{{form.z.html_name}}" type="number" name="{{form.z.html_name}}" class="form-control col-md-4"></input>
+                            </div>
+                        </div></div>
+                        <div class="row"><div class="col-md-4 d-flex align-items-center mb-3">
+                            <div class="form-group">
+                                {{ form.dx.label }}: {{ form.dx }}
+                            </div>
+                            <div class="form-group">
+                                {{ form.dy.label }}: {{ form.dy }}
+                            </div>
+                            <div class="form-group">
+                                {{ form.dz.label }}: {{ form.dz }}
+                            </div>
+                        </div></div>
+                        
+                        <button class="remove-form btn btn-danger btn-sm ml-2">Remove</button>
+                    </div>
+                {% endfor %}
+        </div>
+
+        <button id="add-form" class="btn btn-sm button btn-outline-white btn-gray-600 text-white">Add Sensor</button>
+    </fieldset>
+
+    <button type="submit" class="btn btn-sm button btn-success btn-outline-white ">Submit</button>
+</form>
+{%endblock content %}
+{% block javascripts %}
+
+<script>
+document.addEventListener("DOMContentLoaded", () => {
+    const formsetContainer = document.getElementById("formset-container");
+    const addButton = document.getElementById("add-form");
+    const totalForms = document.getElementById("id_form-TOTAL_FORMS");
+
+    function updateRemoveButtons() {
+        let forms = document.querySelectorAll(".sensor-form");
+
+        forms.forEach((form, index) => {
+            let removeButton = form.querySelector(".remove-form");
+            if (forms.length > 1)
+                removeButton.style.display = "inline-block";
+            else 
+                removeButton.style.display =  "none";
+        });
+    }
+
+    addButton.addEventListener("click", (e) => {
+        e.preventDefault();
+        let formNum = parseInt(totalForms.value);
+        let newForm = document.querySelector(".sensor-form").cloneNode(true);
+        
+        // Update form attributes
+        newForm.innerHTML = newForm.innerHTML.replace(/form-(\d+)-/g, `form-${formNum}-`);
+        formsetContainer.appendChild(newForm);
+
+        // Increment the management form count
+        totalForms.value = formNum + 1;
+
+        updateRemoveButtons();
+    });
+
+    formsetContainer.addEventListener("click", (e) => {
+        if (e.target.classList.contains("remove-form")) {
+            e.preventDefault();
+            if (document.querySelectorAll(".sensor-form").length > 1) {
+                e.target.closest(".sensor-form").remove();
+                totalForms.value = document.querySelectorAll(".sensor-form").length;
+                updateRemoveButtons();
+            }
+        }
+    });
+
+    // Ensure the correct remove button state on load
+    updateRemoveButtons();
+});
+</script>
+{% endblock javascripts %}

irie/core/settings.py

@@ -100,6 +100,7 @@ TEMPLATES = [
                 "django.contrib.auth.context_processors.auth",
                 "django.contrib.messages.context_processors.messages",
                 "apps.context_processors.cfg_assets_root",
+                "irie.apps.context_processors.irie_apps",
             ],
         },
     },

irie/init/data/nbi_definitions.json

@@ -0,0 +1 @@
+{"1": "State Name", "2": "Highway Agency District", "3": "County Name", "4": "Place Code", "5A": "Record Type", "5B": "Route Signing Prefix Code", "5C": "Designated Level of Service Code", "5D": "Route Number", "5E": "Directional Suffix Code", "6A": "Features Intersected", "7": "Facility Carried By Structure", "8": "Structure Number", "9": "Location", "10": "Inventory Route - Minimum Vertical Clearance", "11": "Mile Point", "12": "Base Highway Network", "13A": "LRS Inventory Route", "13B": "Subroute Number", "16": "Latitude", "17": "Longitude", "19": "Bypass or Detour Length", "20": "Toll Status", "21": "Maintenance Responsibility", "22": "Owner Agency", "26": "Functional Class Of Inventory Route", "27": "Year Built", "28A": "Lanes On the Structure", "28B": "Lanes Under the Structure", "29": "Average Daily Traffic", "30": "Year of Average Daily Traffic", "31": "Design Load Descriptor", "32": "Approach Roadway Width", "33": "Bridge Median Code", "34": "Skew Angle", "35": "Structure Flared", "36A": "Bridge Railings", "36B": "Transitions", "36C": "Approach Guardrail", "36D": "Bridge Guardrail Ends", "37": "Historical Significance Code", "38": "Navigation Control Code", "39": "Navigation Vertical Clearance", "40": "Navigation Horizontal Clearance", "41": "Structure Operational Status Code", "42A": "Type of Service on Bridge Code", "42B": "Type Of Service Under Bridge Code", "43A": "Main Span Material", "43B": "Main Span Design", "44A": "Approach Spans Material", "44B": "Approach Spans Design", "45": "Number of Spans in Main Unit", "46": "Number of Approach Spans", "47": "Inventory Route Total Horizontal Clearance", "48": "Length of Maximum Span", "49": "Structure Length", "50A": "Left Curb/Sidewalk Width", "50B": "Right Curb/Sidewalk Width", "51": "Bridge Roadway Width Curb to Curb", "52": "Deck Width - Out to Out", "53": "Minimum Vertical Clearance Over Bridge Roadway", "54A": "Minimum Vertical Underclearance Reference Feature", "54B": "Minimum Vertical Underclearance", "55A": "Minimum Lateral Underclearance Reference Feature", "55B": "Minimum Lateral Underclearance on Right", "56": "Minimum Lateral Underclearance on Left", "58": "Deck Condition Rating", "59": "Superstructure Condition Rating", "60": "Substructure Condition Rating", "61": "Channel and Channel Protection Condition Rating", "62": "Culverts Condition Rating", "63": "Operating Rating Method Code", "64": "Operating Rating", "65": "Inventory Rating Method Code", "66": "Inventory Rating", "67": "Structural Evaluation Appraisal", "68": "Deck Geometry Appraisal", "69": "Underclearance Appraisal Vertical and Horizontal", "70": "Bridge Posting Code", "71": "Waterway Adequacy Appraisal", "72": "Approach Alignment Appraisal", "75A": "Type of Work Proposed", "75B": "Work Done By", "76": "Length of Structure Improvement", "90": "Inspection Date", "91": "Designated Inspection Frequency", "92A": "Fracture Critical Details", "92B": "Underwater Inspection", "92C": "Other Special Inspection", "93A": "Fracture Critical Detail Date", "93B": "Underwater Inspection Date", "93C": "Other Special Inspection Date", "94": "Bridge Improvement Cost", "95": "Roadway Improvement Cost", "96": "Total Project Cost", "97": "Year of Improvement Cost Estimate", "98A": "Neighboring State Name", "98B": "Neighboring State Percent Responsibility", "99": "Border Bridge Structure Number", "100": "STRAHNET Highway Designation", "101": "Parallel Structure Designation Code", "102": "Direction of Traffic Code", "103": "Temporary Structure Designation Code", "104": "Inventory Route NHS Code", "105": "Federal Lands Highways Code", "106": "Year Reconstructed", "107": "Deck Structure Type Code", "108A": "Wearing Surface Type Code", "108B": "Membrane Type Code", "108C": "Deck Protection Code", "109": "Average Daily Truck Traffic (Percent ADT)", "110": "Designated National Truck Network Code", "111": "Pier Abutment Protection Code", "112": "NBIS Minimum Bridge Length", "113": "Scour Critical Bridge Value", "114": "Future Average Daily Traffic", "115": "Year of Future Average Daily Traffic", "116": "Minimum Vertical Clearance - Lift Bridge", "Computed": "Average Daily Truck Traffic (Volume)", "CAT29": "Deck Area", "CAT10": "Bridge Condition", "CAT23": "Condition Code", "null": "City (InfoBridge Place Code-Name)"}

irie/init/getNBIData.py

@@ -12,6 +12,18 @@
 #
 # Claudio M. Perez
 #
+# TODO:
+#
+# - Add option for "SELECTED_TAB": "NBETab", 
+#
+# - Perhaps add something like:
+#     --filter-calid calids.txt
+#   This will be useful for testing, eg, (chrystal's first version)
+#     python getNBIData.py yearly.json --filter-calid <(echo "33 0214L")
+#   
+#   or
+#     python getNBIData.py | python getNBIData.py /dev/stdin <(echo "33 0214L")
+#
 import sys
 import json
 import requests

irie/init/management/commands/init_assets.py

@@ -98,10 +98,14 @@ def load_assets(NBI_DATA):
 
 # 1. Collect routes of interest
     ROUTES = set()
-    for bridge in BRIDGES.values():
-        if "calid" not in bridge:
+    for calid in CESMD: #BRIDGES.values():
+        # if "calid" not in bridge:
+        try:
+            calid = Asset.objects.get(calid=calid).calid 
+        except:
             continue
-        calid = bridge["calid"].split(" ")[0].replace("-", " ")
+                
+        calid = calid.split(" ")[0].replace("-", " ")
         nbi = get_nbi(calid, missing_ok=True)
         if nbi is not None:
             ROUTES.add(get_route(nbi))
@@ -112,7 +116,7 @@ def load_assets(NBI_DATA):
     for item in NBI_DATA:
         calid  = item.replace(" ", "-")
         nbi    = get_nbi(item)
-        config = find_bridge(BRIDGES, calid)
+        config = None # find_bridge(BRIDGES, calid)
         try:
             if skip(nbi, ROUTES) or item == "33 0726L":
                 continue
@@ -143,9 +147,9 @@ def load_assets(NBI_DATA):
 
             count += 1
 
-        if config:
-            asset.bridge_sensors = json.dumps(config["accelerometers"]["bridge_channels"])
-            asset.ground_sensors = json.dumps(config["accelerometers"]["ground_channels"])
+        # if config:
+        #     asset.bridge_sensors = json.dumps(config["accelerometers"]["bridge_channels"])
+        #     asset.ground_sensors = json.dumps(config["accelerometers"]["ground_channels"])
 
         asset.save()
 

irie/init/management/commands/init_cesmd.py

@@ -13,18 +13,21 @@ with open(DATA/"cgs_data.json") as f:
 
 class Command(BaseCommand):
     def handle(self, *args, **kwargs):
-        with open(DATA/"cgs-stations.json") as f:
-            stations = json.load(f)
+        # with open(DATA/"cgs-stations.json") as f:
+        #     stations = json.load(f)
 
         count = 0
         try:
-            for asset in Asset.objects.all():
-                if asset.calid not in CESMD:
-                    continue 
+            for calid, (cesmd, route, name) in CESMD.items():
+                try:
+                    asset = Asset.objects.get(calid=calid)
+                except Asset.DoesNotExist:
+                    asset = Asset()
+                    asset.is_complete = False
 
-                cesmd = CESMD[asset.calid][0]
-                asset.cesmd = CESMD[asset.calid][0]
-                asset.name  = CESMD[asset.calid][2]
+                asset.name = name 
+                asset.cesmd = cesmd 
+                asset.calid = calid
                 asset.cgs_data = CGS_DATA.get(cesmd, {})
                 asset.save()
                 print(asset)

{irie-0.0.35.dist-info → irie-0.0.36.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: irie
-Version: 0.0.35
+Version: 0.0.36
 Summary: An infrastructure resilience engine
 Author-email: "Claudio M. Perez" <50180406+claudioperez@users.noreply.github.com>
 Project-URL: Repository, https://github.com/STAIRLab

{irie-0.0.35.dist-info → irie-0.0.36.dist-info}/RECORD

@@ -2,7 +2,7 @@ irie/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 irie/__main__.py,sha256=JTbP1tFc8z2e_wXuurYT9MBe3pLt9UwY_HHnuEZvI2c,501
 irie/apps/__init__.py,sha256=0HD7vRzfFqSPsnJF15Hts06RR-MBlJcUMHaipYEkYYk,229
 irie/apps/config.py,sha256=VJW1NKjouIMBejJDbMYqmIUzZsnORQk02tuYO7bxo4s,399
-irie/apps/context_processors.py,sha256=kdMNU9-yK7rd8QWH5KxiKyQufFEmMLfZMRl7G8p7XHk,114
+irie/apps/context_processors.py,sha256=iBloyvMODcI86mQFnW0OS_rDEMSy8zNW3f_O1OQzQ2o,375
 irie/apps/sitemaps.py,sha256=yYjh_IXH2wBcIaSBG9-3BA8H_ijgkP0BWEFJAPpIoWc,572
 irie/apps/admin_dash/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 irie/apps/admin_dash/admin.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -57,22 +57,23 @@ irie/apps/events/migrations/0003_hazardevent.py,sha256=TEaMSJz16BpDXeMXo4jwD6LAL
 irie/apps/events/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 irie/apps/inventory/CESMD.py,sha256=cLtuBhSK14M1VwirCs-oeSOoB4CFFYcTnh38egQqPYg,2549
 irie/apps/inventory/__init__.py,sha256=wkkNngGxgYcCM745-rlvP6ynrI0b0QN3aWmLWDsR8zU,230
-irie/apps/inventory/admin.py,sha256=bwSoY9qzF8VYbVilaKqz8w90QGpDifNo55BVC4JQm8Q,357
+irie/apps/inventory/admin.py,sha256=e_W8ls_ARLLf8rn3oJd-YkPdTGMIrcN-mRrxk2BcY3c,472
 irie/apps/inventory/apps.py,sha256=bZ6qYIwPMG4_4IeLfg9N4WuZAEgEVj84oOswV-7_MAI,424
 irie/apps/inventory/calid.py,sha256=3L8MbPIGOE3kzDnqeyY055pRBiF2O2l0cmpuDbTsdTg,3014
 irie/apps/inventory/fields.py,sha256=J3nTImPsuCeiOWBizSL4tnuKs36sPfXALNTKEZY-wVg,79
 irie/apps/inventory/filters.py,sha256=8ge94J5OlGhLRIo6EtBYVe2c9QxW7YCBLxJzfoFHzSg,2185
-irie/apps/inventory/forms.py,sha256=8KaegZRIJlCEpHbdNLWEETfa4x3oGYSE_YTfwUEgyYs,400
-irie/apps/inventory/models.py,sha256=u7VKuEjezP4Rs4mUfwAKqf__o4fKmU8PS-wWL0DIdbU,3872
+irie/apps/inventory/forms.py,sha256=0caWKxq7cU_z7XM2jZLqsGNDL01IlltWvFCCi9a0Wzc,1005
+irie/apps/inventory/models.py,sha256=WQaRQR4S9Qca00nHH8a-ZsYHEd7uupBUgNIe0H3ss2c,4638
 irie/apps/inventory/sitemaps.py,sha256=Nha1MTsIH_ad7JyoxwonPytp7MNuEhDNszkEUOmlN0o,826
 irie/apps/inventory/tables.py,sha256=vZdPOcbN1ibuWXqLwbBUoQw9iavwa1GJ5fd83k8bu7Y,27874
 irie/apps/inventory/traffic.py,sha256=B3PHqn2Pm4AEdUZ_tuA16fuFruo2rm5waMBwLQyF-9g,4490337
-irie/apps/inventory/urls.py,sha256=rTZjVsyFAZ17xudUuEjKi8Zw5r830mC5p9GYZD8QXmk,1258
-irie/apps/inventory/views.py,sha256=njC6YUjAGqdgfQKq_CAcgwfw7g8pHS6iq0DDJqjhxis,17371
+irie/apps/inventory/urls.py,sha256=bH63Y2jk-DzDDTiFdCDb5YLXFvq3sRyJrMAz0z_niKs,1476
+irie/apps/inventory/views.py,sha256=vlNzf_vClNekT6n4SPjpmNSMxMrTPAPTeltGY8JJjgw,19178
 irie/apps/inventory/archive/arcGIS.py,sha256=vcfsy1be4edOXD1Z3rkUnq9QmCTol7dypdF816Q3B_w,34893
 irie/apps/inventory/migrations/0001_initial.py,sha256=PwTHv4Q3gqWFha--8Zp9kUOh-cYalB14jXj7RVJUVnw,1786
 irie/apps/inventory/migrations/0002_alter_asset_bridge_sensors_and_more.py,sha256=rPzWHkjg-ZCorVA_gv6MVb5F6LTLHcwlPwhBR1PxVr0,842
 irie/apps/inventory/migrations/0003_asset_notes.py,sha256=N3p8PdRlwlED7z5gPAVVcDVsAjSLx-e0D4bx5eEwGlQ,436
+irie/apps/inventory/migrations/0004_datum_sensorgroup_sensor.py,sha256=Jk_GdHN33ymWM6As1K95WC5JPdMg4bLNdWunVw6vEm4,1712
 irie/apps/inventory/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 irie/apps/inventory/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 irie/apps/inventory/templatetags/get.py,sha256=ZVjFYv1uhjhcOQ8I5ukz7DuR6TXnbYuijPWKkgxacOM,134
@@ -388,16 +389,18 @@ irie/apps/templates/includes/navigation.html,sha256=iUblmqRGBT0GRCsvOUKy6a1O1buq
 irie/apps/templates/includes/paginate.js,sha256=dAaL4uFQzEIbm61c_USEHlQLFkKc2ndJdR3bGzELtNc,3991
 irie/apps/templates/includes/scripts.html,sha256=1Up6xJJSTpdLTJp0tDAa3JubevvSlicOE4_j1vEOkek,1190
 irie/apps/templates/includes/settings-box.html,sha256=_YubYOyAJ8IldTgVlXP2wLLXpKpInp8hJ88FN6i6rmw,2488
-irie/apps/templates/includes/sidebar.html,sha256=ZrKOfVokpCQ0CjW6ckbSEjp6CKqevzw8GYE1a1I1DuE,11025
+irie/apps/templates/includes/sidebar.html,sha256=m2TahYwFnysqcLkK4ANYZhUf8xGVId_tiJFBKrQD4Cw,12386
 irie/apps/templates/inventory/asset-evals.html,sha256=KzbdJJ7ildMpfO4IQDuXqGBcPzUTlYpJ_Y3Wg4payVc,2700
 irie/apps/templates/inventory/asset-event-summary.html,sha256=r_Zl74thZlhUZiJYStycAhLFrq5DJ_YXJnmNG4yUHj0,50935
-irie/apps/templates/inventory/asset-profile.html,sha256=6NJATNOqbSy3fqWtznnbRo5EROkMWmsTvVS-ReJfoDY,13622
+irie/apps/templates/inventory/asset-profile.html,sha256=_4xm-1OojZkSVtYSzYjAnD9Glvgcnpwpq4zCR0f0DGM,14104
+irie/apps/templates/inventory/asset-sensors.html,sha256=ydAp4kPOiCitjd0wrUNjekcsvMS9bbW0VH-2BxGtxxo,1382
 irie/apps/templates/inventory/asset-table.html,sha256=Ak_N_QDUgWzyffBBidJ8H0wLR3zX3wNHQm6MnZYbruQ,12589
 irie/apps/templates/inventory/bridge-dashboard.html,sha256=67zrDlih3LOi9xFVwPVZZkgRT3DO-lE_qRL7q8Uz9GY,45472
 irie/apps/templates/inventory/bridge.html,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 irie/apps/templates/inventory/dashboard.html,sha256=_qhFiPP6xN-UzZj5NuM5e9NxsgDHJkQ89oXN1cBwhj0,7505
 irie/apps/templates/inventory/preamble.tex,sha256=TmRhIWg2-Pxj_e2OBctANRZPwU8RWMT3EZJFSa3R8HY,3547
 irie/apps/templates/inventory/report.tex,sha256=A1XKpwknlBrAZjFzzxVIDwypjXteqzoCQiuo1tQANfw,45228
+irie/apps/templates/inventory/sensor-upload.html,sha256=v-FOU9nyQUx5OgRCluaoYV1rmo9T0dMZscFSxH6hBKw,4769
 irie/apps/templates/layouts/base-fullscreen.html,sha256=rDKXBySGTF65SUYc7YkrdbVqFFT_6a9HEvUcOQCetTg,2513
 irie/apps/templates/layouts/base.html,sha256=phiHZX_CjuOhmkJgqyMAGTPdwm0qqrJCKZZwKLGTtQY,2387
 irie/apps/templates/layouts/json-form.html,sha256=cT6Pd2168Z3p8RODS7SulUC79LnuzSs0EVLVxkGOXAo,1333
@@ -438,7 +441,7 @@ irie/apps/templates/site/transactions.html,sha256=-heynHR8PTt_C4P3IWmYG_VE1aGH68
 irie/apps/templates/site/unused-dashboard-cards.html,sha256=DDNWrnIf4o0wj06WYH8YitTfemzARRcVafZ2iNFdJZM,14715
 irie/core/__init__.py,sha256=wkkNngGxgYcCM745-rlvP6ynrI0b0QN3aWmLWDsR8zU,230
 irie/core/asgi.py,sha256=3lVQKFRA4bznM2mWu5Cv24a5H9pfb6YU07q-I_TN0DM,395
-irie/core/settings.py,sha256=Lifr6YHB2SIvW162jjyNFP5rAW0B-oG7xjUubeLW4DM,6516
+irie/core/settings.py,sha256=NQioOh_sdXa-_KsxsZaut5cDBh58kqR3laaUT_B11fE,6574
 irie/core/urls.py,sha256=5_35Rh6LtnE_5TrHgsIZtVJeWpNXWwvqRfawYEWZCeE,1968
 irie/core/wsgi.py,sha256=8dxK789vOoRWm0IatEhNqMgZhov9TlspjM6hOUbjg24,395
 irie/init/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -447,22 +450,23 @@ irie/init/bridges.py,sha256=OBBKnLx2lmMKDfeR0C8CBSbnpnzO0lfokBypD2nEFcM,74198
 irie/init/calid.py,sha256=Nmmv5e4rX-6_Uoo7FGRdU23p1NHKOWzPgUGoIulJMGk,8267
 irie/init/getCGSData.py,sha256=iZG3Ab1Y_rhiliKCPNy0MZrKBsfEe6ShgSFz2ttvTUU,2916
 irie/init/getCGSevents.py,sha256=4dBkFFJQrUs6gfl1Nj-_R2UOZj0B_T017a6tC7fUHOw,421
-irie/init/getNBIData.py,sha256=xEzM4nCfaRo5QoB90QCezxbOdpKd54UbeFNaymvDhZU,7923
+irie/init/getNBIData.py,sha256=WuconVGj-DyiOCFHWCYSt7PEVsVzFf_3XHjzWKuUWjg,8292
 irie/init/hayward.zip,sha256=WECOnYLP_3EeKHQzdxm17MHTncF2QdgXI28Vm6Iopt0,124675
 irie/init/data/cgs-stations.json,sha256=h-KKF-u31j_OQnQZQlmFzDjqgi0AcsPNzohn7bCNq0Q,105563
 irie/init/data/cgs_data.json,sha256=l2lADALMXVLKY6jn-rvEZjYWcZjGHLk22ZudocdR81Q,27752
 irie/init/data/nbi_codes-california.json,sha256=UPFbBzxY2NshREecsP4evCA8vdvXFRvG4rYT4_KHmQs,2398694
 irie/init/data/nbi_data-california.json,sha256=nyslZbMf30WrtdyqCpMvxd-NNxNzFHtZX_TDWRZFob0,8534365
+irie/init/data/nbi_definitions.json,sha256=NS3yNP1i1E_JXfGW_I_xOoNRsfeljDA5BZ_1h0Cu_1I,4301
 irie/init/data/nbi/04.tar,sha256=ubRgxWBshe0cNKxftbEVyFeh1HcUmFarVL2BBHo9Tyk,1884160
 irie/init/data/networks/soga_corridors.json,sha256=AQOUaKGNWkQxQKLfqphE9Qb_-NRmjN9IwK59SGjutxE,45496
-irie/init/management/commands/init_assets.py,sha256=CdLb9qT0iIzrlmxfYVI80WMLNo0F7sxDJRobSkvwYtk,5778
-irie/init/management/commands/init_cesmd.py,sha256=4TLtlRRmafaz-cxYXI2b2OQFBMQA6n_7gjk5C-ToqXA,1075
+irie/init/management/commands/init_assets.py,sha256=CGbB7eLlctfusbHal3v1LOs1y02ugJITrqhK7qE4XSs,5894
+irie/init/management/commands/init_cesmd.py,sha256=IPuKYtrQEDb8C-TyUKpjbdjlLUrUkATW5dmtqEd7SVQ,1183
 irie/init/management/commands/init_corridors.py,sha256=EzLk0HUiFxlco-2u0rypewOc9mAo_raqXC2_UCG8a_w,1241
 irie/init/management/commands/init_predictors.py,sha256=jdD7rd8l2qxuUuR5GOYuHXp-ZQkAK477TefksBMdlOw,2362
 irie/rest/__main__.py,sha256=6Nf_-Rr9zGmMyp_wqCFDO7ls9QPnPd9UyUgN17rIGYw,3680
 irie/usgs/__main__.py,sha256=HiSvPn5IW5IqRiCk1qRRq5dCy3-7iISw7v1P_w2rLrk,5049
-irie-0.0.35.dist-info/METADATA,sha256=aYmygBZop8txtpscNBprjszIJoWn3WWUwJaDK_DGoMw,3207
-irie-0.0.35.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-irie-0.0.35.dist-info/entry_points.txt,sha256=A_3h9wPBGfxGQ78_MGa-nO6Z0foxOYeAnIE47jxEztg,44
-irie-0.0.35.dist-info/top_level.txt,sha256=zVCxi5E2nkISZPzKq8VEhWe_dGuPcefLYV1tYqQdwlY,5
-irie-0.0.35.dist-info/RECORD,,
+irie-0.0.36.dist-info/METADATA,sha256=prWBuMtqwIbh_eTlkxOyMcr30NG93g29Dc-Bf0K0TvQ,3207
+irie-0.0.36.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+irie-0.0.36.dist-info/entry_points.txt,sha256=A_3h9wPBGfxGQ78_MGa-nO6Z0foxOYeAnIE47jxEztg,44
+irie-0.0.36.dist-info/top_level.txt,sha256=zVCxi5E2nkISZPzKq8VEhWe_dGuPcefLYV1tYqQdwlY,5
+irie-0.0.36.dist-info/RECORD,,