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

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

@@ -0,0 +1,452 @@
+<!-- 
+===----------------------------------------------------------------------===#
+
+         STAIRLab -- STructural Artificial Intelligence Laboratory
+
+===----------------------------------------------------------------------===#
+
+Chrystal Chern, Spring 2025
+
+-->
+{% extends "layouts/base.html" %}
+
+{% block stylesheets %}
+<style>
+input[type="number"] {
+    -moz-appearance: textfield; /* Firefox */
+    appearance: textfield; /* Standard */
+}
+input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+    -webkit-appearance: none;
+    margin: 0;
+}
+</style>
+<script type="importmap">
+    {
+      "imports": {
+        "three": "https://cdn.jsdelivr.net/npm/three@0.172.0/build/three.module.js",
+        "three/addons/": "https://cdn.jsdelivr.net/npm/three@0.172.0/examples/jsm/"
+      }
+    }
+</script>
+{% endblock stylesheets %}
+
+{% block title %} Add Sensor Group to {{ asset.calid }} {% endblock %} 
+
+{% block content %}
+<h1>Add Sensor Group to <code>{{ asset.calid }}</code></h1>
+
+<div class="py-4 align-right">
+    <a role="button" class="button btn btn-outline-primary"
+    href="{% url 'asset_profile' calid=asset.calid %}" class="me-1">Back to Structure</a>
+    <a role="button" class="button btn btn-outline-primary"
+    href="{% url 'asset_sensors' calid=asset.calid %}" class="me-1">Back to Sensors</a>
+</div>
+
+
+<div class="container">
+    <div class="row align-right">
+        
+<!-- Left Side: Sensor Form -->
+<div class="col-md-6" >
+<form method="post">
+    {% csrf_token %}
+
+    <fieldset class="mb-4">
+        <legend>Sensor Group</legend>
+        {{ group_form.as_p }}
+        <div id="datum-info" class="mb-4 p-2 border rounded bg-light" style="display: none;">
+            <strong>Datum Location (x;y;z):</strong> <span id="datum-location">_, _, _</span> <br>
+            <strong>Datum Orientation (dx;dy;dz):</strong> <span id="datum-orientation">_, _, _</span>
+        </div>
+    </fieldset>
+
+    <fieldset>
+        <legend>Sensors</legend>
+        {{ formset.management_form }}
+        <div id="formset-container" class="container">
+                {% for form in formset %}
+                    <div class="sensor-form mb-4">
+                        <div class="row mb-3">
+                            <div class="input-group">
+                                <span class="input-group-text col-md-2 text-dark border-dark">{{ form.name.label }}</span>
+                                <input id="{{form.name.html_name}}" type="text" name="{{form.name.html_name}}" class="form-control col-md-4 text-dark border-dark" required></input>
+                            </div>
+                        </div>
+                        <div class="row"><div class="col-md-12 d-flex align-items-center mb-3">
+                            <div class="input-group">
+                                <span class="input-group-text col-md-4 text-gray">{{ form.x.label }}</span>
+                                <input id="{{form.x.html_name}}" type="number" step="any" name="{{form.x.html_name}}" class="form-control col-md-8 text-gray" required></input>
+                            </div>
+                            <div class="input-group">
+                                <span class="input-group-text col-md-4 text-gray">{{ form.y.label }}</span>
+                                <input id="{{form.y.html_name}}" type="number" step="any" name="{{form.y.html_name}}" class="form-control col-md-8 text-gray" required></input>
+                            </div>
+                            <div class="input-group">
+                                <span class="input-group-text col-md-4 text-gray">{{ form.z.label }}</span>
+                                <input id="{{form.z.html_name}}" type="number" step="any" name="{{form.z.html_name}}" class="form-control col-md-8 text-gray" required></input>
+                            </div>
+                        </div></div>
+                        <div class="row"><div class="col-md-12 d-flex align-items-center mb-3">
+                            <div class="input-group">
+                                <span class="input-group-text col-md-5 text-gray">{{ form.dx.label }}</span>
+                                <input id="{{form.dx.html_name}}" type="number" step="any" name="{{form.dx.html_name}}" class="form-control col-md-8 text-gray" required></input>
+                            </div>
+                            <div class="input-group">
+                                <span class="input-group-text col-md-5 text-gray">{{ form.dy.label }}</span>
+                                <input id="{{form.dy.html_name}}" type="number" step="any" name="{{form.dy.html_name}}" class="form-control col-md-8 text-gray" required></input>
+                            </div>
+                            <div class="input-group">
+                                <span class="input-group-text col-md-5 text-gray">{{ form.dz.label }}</span>
+                                <input id="{{form.dz.html_name}}" type="number" step="any" name="{{form.dz.html_name}}" class="form-control col-md-8 text-gray" required></input>
+                            </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-primary mb-3">Add Sensor</button>
+    </fieldset>
+    
+    <button type="button" id="plot-btn" class="btn btn-info btn-sm mb-3">Plot</button>
+
+    <button type="submit" class="btn btn-sm button btn-success mb-3">Submit</button>
+</form>
+</div>
+<!-- Right Side: Asset Geometry -->
+<div class="col-md-6">
+    <h4>Geometry</h4>
+{%if false %}
+    {% if asset.cesmd %}
+    <div id="sensors" class="card bg-white-100 border-1 rounded-0 shadow mb-3">
+        <div class="card-body text-center p-2">
+            <img src="{{ ASSETS_ROOT }}/inventory/ll{{ asset.cesmd|slice:"2:" }}.svg" class="img-fluid">
+        </div>
+        <div class="card-footer text-center">
+            <span class="small">
+                Source: <a rel="nofollow noreferrer" href="https://www.strongmotioncenter.org/cgi-bin/CESMD/stationhtml.pl?stationID={{asset.cesmd}}&network=CGS">CGS</a>
+            </span>
+        </div>
+    </div>
+    {% endif %}
+
+    <div id="rendering" class="card bg-white-100 border-1 rounded-0 shadow">
+        <div class="card-body text-center">
+            <model-viewer 
+                id="irie-viewer"
+                alt="3D Model" 
+                {% if asset.rendering %}
+                src="{{ asset.rendering }}" 
+                {% else %}
+                src="{{ ASSETS_ROOT }}/inventory/empty.glb" 
+                {% endif %}
+                camera-controls
+                interaction-prompt="none"
+                camera-orbit="0deg 75deg 2m" 
+                field-of-view="30deg"
+                style="width: 100%; height: 300px; background-color: #f0f0f0;">
+            </model-viewer>
+        </div>
+        <div class="card-footer text-center">
+            Powered by <a href="https://veux.io/">veux</a>
+        </div>
+    </div>
+{% else %}
+    {% if asset.cesmd %}
+    <div id="sensors" class="card bg-white-100 border-1 rounded-0 shadow mb-3">
+        <div class="card-body text-center p-2">
+            <img src="{{ ASSETS_ROOT }}/inventory/ll{{ asset.cesmd|slice:"2:" }}.svg" class="img-fluid">
+        </div>
+        <div class="card-footer text-center">
+            <span class="small">
+                Source: <a rel="nofollow noreferrer" href="https://www.strongmotioncenter.org/cgi-bin/CESMD/stationhtml.pl?stationID={{asset.cesmd}}&network=CGS">CGS</a>
+            </span>
+        </div>
+    </div>
+    {% endif %}
+
+    <div id="rendering" class="card bg-white-100 border-1 rounded-0 shadow">
+        <div class="card-body text-center" style="background-color: #f0f0f0;">
+            <!-- Our Three.js container -->
+            <div id="threejs-container"
+                 style="width: 100%; height: 300px; background-color: #f0f0f0; margin: 0 auto;">
+            </div>
+        </div>
+        <div class="card-footer text-center">
+            Powered by <a href="https://veux.io/">veux</a>
+        </div>
+    </div>
+{% endif %}
+</div>
+
+    </div>
+</div>
+<!-- 
+<div id="plot-container" style="display: none;">
+    <h3>3D Sensor Plot</h3>
+    <div id="sensor-plot"></div>
+</div> -->
+{%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>
+<script>
+    document.addEventListener("DOMContentLoaded", function () {
+        const datumSelect = document.getElementById("id_datum");
+        const datumInfoDiv = document.getElementById("datum-info");
+        const locationSpan = document.getElementById("datum-location");
+        const orientationSpan = document.getElementById("datum-orientation");
+    
+        // Store datum data from Django
+        const datums = {{ datums|safe }};
+    
+        datumSelect.addEventListener("change", function () {
+            const selectedDatumId = this.value;
+            const selectedDatum = datums.find(d => d.id == selectedDatumId);
+    
+            if (selectedDatum) {
+                locationSpan.textContent = `${selectedDatum.locate_x}; ${selectedDatum.locate_y}; ${selectedDatum.locate_z}`;
+                orientationSpan.textContent = `${selectedDatum.orient_x}; ${selectedDatum.orient_y}; ${selectedDatum.orient_z}`;
+                datumInfoDiv.style.display = "block";  // Show info box
+            } else {
+                datumInfoDiv.style.display = "none";  // Hide if no datum selected
+            }
+        });
+    });
+</script>
+<script type="module">
+
+import * as THREE from 'three';
+import { OrbitControls } from 'three/addons/controls/OrbitControls.js';
+import { GLTFLoader } from 'three/addons/loaders/GLTFLoader.js';
+
+function createArrow(origin, direction, length, color, headLength, headWidth, shaftRadius) {
+    const dir = direction.clone().normalize();
+
+    const shaftLength = length - headLength;
+
+    const arrowGroup = new THREE.Group();
+
+    const shaftGeometry = new THREE.CylinderGeometry(shaftRadius, shaftRadius, shaftLength, 16);
+    const shaftMaterial = new THREE.MeshStandardMaterial({ color: color });
+    const shaftMesh = new THREE.Mesh(shaftGeometry, shaftMaterial);
+
+    // CylinderGeometry is oriented along the Y-axis.
+    // Rotate it so it aligns with the group's local +Y (arrow "up").
+    // Then rotate the entire group to match `dir`.
+    shaftMesh.position.y = shaftLength / 2;  // move it so its base starts at y=0
+    arrowGroup.add(shaftMesh);
+
+    const headGeometry = new THREE.ConeGeometry(shaftRadius * 2, headLength, 16);
+    const headMaterial = new THREE.MeshStandardMaterial({ color: color });
+    const headMesh = new THREE.Mesh(headGeometry, headMaterial);
+
+    headMesh.position.y = shaftLength + headLength / 2;
+    arrowGroup.add(headMesh);
+
+    arrowGroup.position.copy(origin);
+
+    // 5) Rotate the entire group so that +Y in local space points along `dir`
+    const up = new THREE.Vector3(0, 1, 0);
+    const quaternion = new THREE.Quaternion().setFromUnitVectors(up, dir);
+    arrowGroup.quaternion.copy(quaternion);
+
+    return arrowGroup;
+}
+
+document.addEventListener('DOMContentLoaded', () => {
+    const container = document.getElementById('threejs-container');
+    // Fallback or real path
+    const modelPath = `{{ asset.rendering|default_if_none:"" }}`;
+
+    // 1) SETUP SCENE
+    const scene = new THREE.Scene();
+    scene.background = new THREE.Color(0xf0f0f0);
+
+    // 2) SETUP RENDERER
+    const renderer = new THREE.WebGLRenderer({ antialias: true });
+    renderer.setPixelRatio(window.devicePixelRatio);
+    renderer.setSize(container.clientWidth, container.clientHeight);
+    // renderer.outputEncoding = THREE.sRGBEncoding; 
+    container.appendChild(renderer.domElement);
+
+    // 3) SETUP CAMERA
+    const camera = new THREE.PerspectiveCamera(
+        30,                                // fov
+        container.clientWidth / container.clientHeight,  // aspect
+        0.1,                               // near
+        1000                               // far
+    );
+    // Position: "0deg 75deg 2m" => we can interpret as an angle from horizontal
+    // Place the camera a bit above and away from the origin.
+    camera.position.set(0, 2, 2);
+    camera.lookAt(0, 0, 0);
+
+    // 4) ORBIT CONTROLS
+    const controls = new OrbitControls(camera, renderer.domElement);
+    controls.enableDamping = true;
+    controls.dampingFactor = 0.05;
+    controls.target.set(0, 0, 0);
+
+    // 5) LIGHTING (basic environment)
+    const ambientLight = new THREE.HemisphereLight(0xffffff, 0x444444, 1.2);
+    scene.add(ambientLight);
+
+    const globalLight = new THREE.AmbientLight(0xffffff, 0.4);
+    scene.add(globalLight);
+
+    const directionalLight = new THREE.DirectionalLight(0xffffff, 0.5);
+    directionalLight.position.set(5, 10, 7.5);
+    scene.add(directionalLight);
+
+    // 6) LOAD THE GLB MODEL (if asset.rendering is not empty)
+    if (modelPath) {
+        const loader = new GLTFLoader();
+        loader.load(modelPath, (gltf) => {
+            const model = gltf.scene;
+            scene.add(model);
+
+            // Compute bounding box
+            const box = new THREE.Box3().setFromObject(model);
+            const size = box.getSize(new THREE.Vector3()).length();
+            const center = box.getCenter(new THREE.Vector3());
+
+            // Adjust camera clipping
+            camera.near = size / 100;
+            camera.far  = size * 100;
+            camera.updateProjectionMatrix();
+
+            // Move camera so the model is nicely framed
+            camera.position.copy(center);
+            // Move the camera out some distance (play with the multiplier)
+            camera.position.x += size;  
+            camera.position.y += size;  
+            camera.position.z += size;  
+            camera.lookAt(center);
+
+
+            controls.target.copy(center);
+            controls.update();
+        },
+        undefined,
+        (error) => {
+            console.error('Error loading GLB:', error);
+        });
+    } else {
+        const axesHelper = new THREE.AxesHelper(1);
+        scene.add(axesHelper);
+    }
+
+    // 7) HANDLE WINDOW RESIZE
+    window.addEventListener('resize', onWindowResize, false);
+    function onWindowResize() {
+        camera.aspect = container.clientWidth / container.clientHeight;
+        camera.updateProjectionMatrix();
+        renderer.setSize(container.clientWidth, container.clientHeight);
+    }
+
+    // 8) ANIMATE LOOP
+    function animate() {
+        requestAnimationFrame(animate);
+        controls.update();
+        renderer.render(scene, camera);
+    }
+    animate();
+
+    const arrowObjects = [];
+
+    //
+    // Plot Button
+    //
+    const plotButton = document.getElementById('plot-btn');
+    plotButton.addEventListener('click', function () {
+        arrowObjects.forEach(arrow => {
+                scene.remove(arrow);
+        });
+        arrowObjects.length = 0;
+
+        // Grab sensor forms
+        const sensorForms = document.querySelectorAll('.sensor-form');
+        sensorForms.forEach((form) => {
+            const x = parseFloat(form.querySelector("input[name*='x']").value) || 0;
+            const y = parseFloat(form.querySelector("input[name*='y']").value) || 0;
+            const z = parseFloat(form.querySelector("input[name*='z']").value) || 0;
+            const dx = parseFloat(form.querySelector("input[name*='dx']").value) || 0;
+            const dy = parseFloat(form.querySelector("input[name*='dy']").value) || 0;
+            const dz = parseFloat(form.querySelector("input[name*='dz']").value) || 0;
+
+            // Create a direction vector from dx,dy,dz
+            const direction = new THREE.Vector3(dx, dy, dz);
+            const length = direction.length() || 0.1; // arrow length
+            direction.normalize();
+
+            const origin = new THREE.Vector3(x, y, z);
+            const color = 0xff0000;
+            const arrow = createArrow(
+                                        origin,
+                                        direction, 
+                                        length,
+                                        color,
+                                        0.3*length, // head length 
+                                        0.2*length, // head width
+                                        0.1*length  // shaft radius
+                                    );
+
+            scene.add(arrow);
+            arrowObjects.push(arrow);
+        });
+    });
+});
+</script>
+{% endblock javascripts %}

irie/apps/templates/layouts/base-fullscreen.html

@@ -1,13 +1,14 @@
 <!DOCTYPE html>
 <html lang="en">
 <head> 
-      <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>{% block title %}{% endblock %} | BRACE2</title>
 
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
   <meta name="title" content="BRACE2 - Sign up page">
   <meta name="author" content="PEER">
   <meta name="description" content="BRACE2 is a platform for structural health monitoring.">
+  <link rel="canonical" href="https://structures.live{{ request.path }}">
 
   <!-- Open Graph / Facebook -->
   <meta property="og:type" content="website">
@@ -44,12 +45,10 @@
 
 </head>
 <body>
-
     {% block content %}{% endblock content %}
 
     {% include 'includes/scripts.html' %}
 
-    {% block javascripts %}{% endblock javascripts %}  
-
+    {% block javascripts %}{% endblock javascripts %}
 </body>
 </html>

irie/apps/templates/site/index.html

@@ -219,7 +219,7 @@ td.left-text{vertical-align:middle}
             <div class="col-lg-5 order-lg-2 mb-5 mb-lg-0">
               <h2 class="h1">Digital Twins</h2>
               <p class="mb-4">The <em>IRiE</em> engine is used to realize high-fidelity digital twins that are backed by 
-              state-of-the-art analysis platforms like <a href="https://pypi.org/project/opensees">OpenSees</a> for nonlinear finite element analysis and <em><a href="https://chrystalchern.github.io/mdof">mdof</a></em> for system identification.</p>
+              state-of-the-art analysis platforms like <a href="https://pypi.org/project/sees">OpenSees</a> for nonlinear finite element analysis and <em><a href="https://chrystalchern.github.io/mdof">mdof</a></em> for system identification.</p>
             </div>
             <div class="col-lg-4 order-lg-1 card shadow"><img src="{{ ASSETS_ROOT }}/img/twin.png"
                  alt="Digital twins"></div>
@@ -258,7 +258,7 @@ td.left-text{vertical-align:middle}
                   <a href="https://stairlab.berkeley.edu/software/opensees/">
                   <img class="first-column-layout"
                        src="{{ ASSETS_ROOT }}/content_images/brace/opensees.jpg" alt="opensees"></a></td>
-                <td class=full-center-text><a href="https://pypi.org/project/opensees" >sees</a></td>
+                <td class=full-center-text><a href="https://pypi.org/project/sees" >sees</a></td>
                 <td class=left-text>Direct and idiomatic bindings to <a href="https://github.com/claudioperez/OpenSeesRT" >
                   <samp>OpenSeesRT</samp></a> kernel for finite element analysis.</td>
               </tr>

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.37.dist-info}/METADATA

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