irie 0.0.59__py3-none-any.whl → 0.0.60__py3-none-any.whl

irie/apps/static/assets/js/brace.js

@@ -545,27 +545,27 @@ function debounce(func, wait, immediate) {
   };
 };
 
-// initialization of Toasts
-document.addEventListener("DOMContentLoaded", function() {
-  var toastElList = [].slice.call(document.querySelectorAll(".toast"));
+// // initialization of Toasts
+// document.addEventListener("DOMContentLoaded", function() {
+//   var toastElList = [].slice.call(document.querySelectorAll(".toast"));
 
-  var toastList = toastElList.map(function(toastEl) {
-    return new bootstrap.Toast(toastEl);
-  });
+//   var toastList = toastElList.map(function(toastEl) {
+//     return new bootstrap.Toast(toastEl);
+//   });
 
-  var toastButtonList = [].slice.call(document.querySelectorAll(".toast-btn"));
+//   var toastButtonList = [].slice.call(document.querySelectorAll(".toast-btn"));
 
-  toastButtonList.map(function(toastButtonEl) {
-    toastButtonEl.addEventListener("click", function() {
-      var toastToTrigger = document.getElementById(toastButtonEl.dataset.target);
+//   toastButtonList.map(function(toastButtonEl) {
+//     toastButtonEl.addEventListener("click", function() {
+//       var toastToTrigger = document.getElementById(toastButtonEl.dataset.target);
 
-      if (toastToTrigger) {
-        var toast = bootstrap.Toast.getInstance(toastToTrigger);
-        toast.show();
-      }
-    });
-  });
-});
+//       if (toastToTrigger) {
+//         var toast = bootstrap.Toast.getInstance(toastToTrigger);
+//         toast.show();
+//       }
+//     });
+//   });
+// });
 
 // Tabs navigation
 
@@ -582,7 +582,7 @@ function initNavs() {
     moving_div.appendChild(tab);
     item.appendChild(moving_div);
 
-    var list_length = item.getElementsByTagName("li").length;
+    // var list_length = item.getElementsByTagName("li").length;
 
     moving_div.style.padding = '0px';
     moving_div.style.width = item.querySelector('li:nth-child(1)').offsetWidth + 'px';
@@ -767,6 +767,62 @@ window.onload = function() {
   }
 };
 
+
+class IrieMainNav {
+  #iconNavbarSidenav;
+  #iconSidenav;
+  #sidenav;
+  #body;
+  #className = 'g-sidenav-pinned';
+
+  constructor() {
+    this.#iconNavbarSidenav = document.getElementById('iconNavbarSidenav');
+    this.#iconSidenav = document.getElementById('iconSidenav');
+    this.#sidenav = document.getElementById('sidenav-main');
+    this.#body = document.getElementsByTagName('body')[0];
+
+    if (this.#iconNavbarSidenav) {
+      this.#iconNavbarSidenav.addEventListener("click", () => this.toggleSidenav());
+    }
+
+    if (this.#iconSidenav) {
+      this.#iconSidenav.addEventListener("click", () => this.toggleSidenav());
+    }
+  }
+
+  toggleSidenav() {
+    if (this.#body.classList.contains(this.#className)) {
+      this.#body.classList.remove(this.#className);
+      setTimeout(() => {
+        this.#sidenav.classList.remove('bg-white');
+      }, 100);
+      this.#sidenav.classList.remove('bg-transparent');
+    } else {
+      this.#body.classList.add(this.#className);
+      this.#sidenav.classList.add('bg-white');
+      this.#sidenav.classList.remove('bg-transparent');
+      // this.#iconSidenav.classList.remove('d-none');
+      // this.navbarMinimize();
+    }
+  }
+
+  navbarMinimize() {
+    const el = this.#iconNavbarSidenav;
+    let sidenavShow = document.getElementsByClassName('g-sidenav-show')[0];
+
+    if (!el.getAttribute("checked")) {
+      sidenavShow.classList.remove('g-sidenav-pinned');
+      sidenavShow.classList.add('g-sidenav-hidden');
+      el.setAttribute("checked", "true");
+    } else {
+      sidenavShow.classList.remove('g-sidenav-hidden');
+      sidenavShow.classList.add('g-sidenav-pinned');
+      el.removeAttribute("checked");
+    }
+  }
+}
+
+
 // Toggle Sidenav
 const iconNavbarSidenav = document.getElementById('iconNavbarSidenav');
 const iconSidenav = document.getElementById('iconSidenav');
@@ -774,29 +830,30 @@ const sidenav = document.getElementById('sidenav-main');
 let body = document.getElementsByTagName('body')[0];
 let className = 'g-sidenav-pinned';
 
-if (iconNavbarSidenav) {
-  iconNavbarSidenav.addEventListener("click", toggleSidenav);
-}
-
-if (iconSidenav) {
-  iconSidenav.addEventListener("click", toggleSidenav);
-}
-
-function toggleSidenav() {
-  if (body.classList.contains(className)) {
-    body.classList.remove(className);
-    setTimeout(function() {
-      sidenav.classList.remove('bg-white');
-    }, 100);
-    sidenav.classList.remove('bg-transparent');
-
-  } else {
-    body.classList.add(className);
-    sidenav.classList.add('bg-white');
-    sidenav.classList.remove('bg-transparent');
-    iconSidenav.classList.remove('d-none');
-  }
-}
+const irieMainNav = new IrieMainNav();
+// if (iconNavbarSidenav) {
+//   iconNavbarSidenav.addEventListener("click", toggleSidenav);
+// }
+
+// if (iconSidenav) {
+//   iconSidenav.addEventListener("click", toggleSidenav);
+// }
+
+// function toggleSidenav() {
+//   if (body.classList.contains(className)) {
+//     body.classList.remove(className);
+//     setTimeout(function() {
+//       sidenav.classList.remove('bg-white');
+//     }, 100);
+//     sidenav.classList.remove('bg-transparent');
+
+//   } else {
+//     body.classList.add(className);
+//     sidenav.classList.add('bg-white');
+//     sidenav.classList.remove('bg-transparent');
+//     iconSidenav.classList.remove('d-none');
+//   }
+// }
 
 // Resize navbar color depends on configurator active type of sidenav
 
@@ -811,6 +868,7 @@ if (sidenav) {
         sidenav.classList.remove('bg-white');
       } else {
         sidenav.classList.add('bg-white');
+        sidenav.classList.remove('bg-transparent');
       }
     } else {
       sidenav.classList.add('bg-white');
@@ -821,7 +879,7 @@ if (sidenav) {
 
 // Deactivate sidenav type buttons on resize and small screens
 window.addEventListener("resize", sidenavTypeOnResize);
-window.addEventListener("load", sidenavTypeOnResize);
+window.addEventListener("load",   sidenavTypeOnResize);
 
 function sidenavTypeOnResize() {
   let elements = document.querySelectorAll('[onclick="sidebarType(this)"]');
@@ -833,6 +891,7 @@ function sidenavTypeOnResize() {
     elements.forEach(function(el) {
       el.classList.remove('disabled');
     });
+    // irieMainNav.navbarMinimize();
   }
 }
 

irie/apps/templates/includes/footer.html

@@ -1,4 +1,4 @@
-<footer class="bg-white rounded shadow p-5 mb-2 mt-2 py-3">
+<footer class="bg-white  shadow p-5 mb-2 mt-2 py-3">
   <div class="row">
     <div class="col-10 col-md-8 col-xl-8 mb-0 mb-md-0">
         <p class="mb-0 text-left">

irie/apps/templates/inventory/asset-event-summary.html

@@ -44,6 +44,13 @@
        class="btn btn-sm btn-outline-primary d-inline-flex align-items-center">
       Asset Profile
     </a>
+    <form method="POST" action="#">
+      {% csrf_token %}
+      <button type="submit" class="btn btn-sm btn-outline-primary d-inline-flex align-items-center">
+        <svg class="icon icon-xxs" 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 8v4m0 4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path></svg>
+        Evaluate
+      </button>
+    </form>
   </div>
 </div>
 

irie/apps/templates/inventory/asset-on-map.html

@@ -1,29 +1,29 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <title>Test Maps</title>
-    <meta property="og:description" content="Use a custom style layer with babylon.js to add a 3D model to the map." />
-    <meta charset='utf-8'>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel='stylesheet' href='https://unpkg.com/maplibre-gl@5.2.0/dist/maplibre-gl.css' />
-    <script src='https://unpkg.com/maplibre-gl@5.2.0/dist/maplibre-gl.js'></script>
-    <style>
-        body { margin: 0; padding: 0; }
-        html, body, #map { height: 100%; }
-    </style>
-    {% if viewer == "three" %}
-    <script type="importmap">
-    {
-      "imports": {
-        "three": "https://cdn.jsdelivr.net/npm/three@0.169.0/build/three.module.js",
-        "three/addons/": "https://cdn.jsdelivr.net/npm/three@0.169.0/examples/jsm/"
-      }
+  <title>Asset Map</title>
+  <meta property="og:description" content="Use a custom style layer with babylon.js to add a 3D model to the map." />
+  <meta charset='utf-8'>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel='stylesheet' href='https://unpkg.com/maplibre-gl@5.2.0/dist/maplibre-gl.css' />
+  <script src='https://unpkg.com/maplibre-gl@5.2.0/dist/maplibre-gl.js'></script>
+  <style>
+      body { margin: 0; padding: 0; }
+      html, body, #map { height: 100%; margin: 0}
+  </style>
+  {% if viewer == "three" %}
+  <script type="importmap">
+  {
+    "imports": {
+      "three": "https://cdn.jsdelivr.net/npm/three@0.169.0/build/three.module.js",
+      "three/addons/": "https://cdn.jsdelivr.net/npm/three@0.169.0/examples/jsm/"
     }
-    </script>
-    {% else %}
-    <script src="https://unpkg.com/babylonjs@5.42.2/babylon.js"></script>
-    <script src="https://unpkg.com/babylonjs-loaders@5.42.2/babylonjs.loaders.min.js"></script>
-    {% endif %}
+  }
+  </script>
+  {% else %}
+  <script src="https://unpkg.com/babylonjs@5.42.2/babylon.js"></script>
+  <script src="https://unpkg.com/babylonjs-loaders@5.42.2/babylonjs.loaders.min.js"></script>
+  {% endif %}
 </head>
 <body>
     <div id="map" data-location="{{ location }}"

irie/apps/templates/inventory/asset-on-map.js

@@ -16,7 +16,7 @@ function createAssetLayerThreeJS(options) {
     const modelTransform = {
         translateX: modelCoord.x,
         translateY: modelCoord.y, //-25*modelScale,
-        translateZ: modelCoord.z+100*modelScale, // 35
+        translateZ: modelCoord.z+35*modelScale, // 100*modelScale, // 35
         rotateX: modelRotate[0],
         rotateY: modelRotate[1],
         rotateZ: modelRotate[2],
@@ -267,122 +267,124 @@ function calculateDistanceMercatorToMeters(from, to) {
     return {dEastMeter, dNorthMeter};
 }
 
-const div = document.querySelector('#map');
-const modelOrigin = JSON.parse(div.dataset.location); // [-124.1014, 40.50303];
-var modelSource = undefined;
-if (div.dataset.renderSource)
-    modelSource = div.dataset.renderSource;
-else
-    modelSource = div.dataset.renderInline;
-
-const unitToMeter = 1/3.2808;
-
-const MAPTILER_KEY = 'get_your_own_OpIi9ZULNHzrESv6T2vL';
-const mapid = 'winter'; // 'dataviz'; // 'basic-v2'; // 'aquarelle';
-const map = (window.map = new maplibregl.Map({
-    container: 'map',
-    style: `https://api.maptiler.com/maps/${mapid}/style.json?key=${MAPTILER_KEY}`,
-    zoom: 18,
-    center: modelOrigin,
-    zoom: 18,
-    maxZoom: 30,
-    maxPitch: 85,
-    pitch: 77,
-    // create the gl context with MSAA antialiasing, so custom layers are antialiased
-    canvasContextAttributes: {antialias: true}
-}));
-
-// Make interaction the same as THREE OrbitControls
-map.dragPan.disable();
-map.dragRotate.enable({ pitchWithRotate: true });
-map.scrollZoom.enable({ around: 'pointer' });
-map.dragPan.enable({
-  deceleration: 2000,   // px/s²
-  linearity:   0.3,     // lower = snappier stop
-  maxSpeed:    2000
-});
-map.scrollZoom.setWheelZoomRate(1/600);  // slower mouse‐wheel zoom
-map.keyboard.enable();                   // arrow keys to pan/zoom
-map.touchZoomRotate.enable();            // two-finger pinch & rotate
-
-
-//
-// Add Buildings
-//
+document.addEventListener('DOMContentLoaded', () => {
+    const div = document.querySelector('#map');
+    const modelOrigin = JSON.parse(div.dataset.location); // [-124.1014, 40.50303];
+    var modelSource = undefined;
+    if (div.dataset.renderSource)
+        modelSource = div.dataset.renderSource;
+    else
+        modelSource = div.dataset.renderInline;
+
+    const unitToMeter = 1/3.2808;
+
+    const MAPTILER_KEY = 'get_your_own_OpIi9ZULNHzrESv6T2vL';
+    const mapid = 'winter'; // 'dataviz'; // 'basic-v2'; // 'aquarelle';
+    const map = (window.map = new maplibregl.Map({
+        container: 'map',
+        style: `https://api.maptiler.com/maps/${mapid}/style.json?key=${MAPTILER_KEY}`,
+        zoom: 18,
+        center: modelOrigin,
+        zoom: 18,
+        maxZoom: 30,
+        maxPitch: 85,
+        pitch: 77,
+        // create the gl context with MSAA antialiasing, so custom layers are antialiased
+        canvasContextAttributes: {antialias: true}
+    }));
 
-// The 'building' layer in the streets vector source contains building-height
-// data from OpenStreetMap.
-map.on('load', () => {
-    // Insert the layer beneath any symbol layer.
-    const layers = map.getStyle().layers;
-
-    let labelLayerId;
-    for (let i = 0; i < layers.length; i++) {
-        if (layers[i].type === 'symbol' && layers[i].layout['text-field']) {
-            labelLayerId = layers[i].id;
-            break;
+    // Make interaction the same as THREE OrbitControls
+    map.dragPan.disable();
+    map.dragRotate.enable({ pitchWithRotate: true });
+    map.scrollZoom.enable({ around: 'pointer' });
+    map.dragPan.enable({
+    deceleration: 2000,   // px/s²
+    linearity:   0.3,     // lower = snappier stop
+    maxSpeed:    2000
+    });
+    map.scrollZoom.setWheelZoomRate(1/600);  // slower mouse‐wheel zoom
+    map.keyboard.enable();                   // arrow keys to pan/zoom
+    map.touchZoomRotate.enable();            // two-finger pinch & rotate
+
+
+    //
+    // Add Buildings
+    //
+
+    // The 'building' layer in the streets vector source contains building-height
+    // data from OpenStreetMap.
+    map.on('load', () => {
+        // Insert the layer beneath any symbol layer.
+        const layers = map.getStyle().layers;
+
+        let labelLayerId;
+        for (let i = 0; i < layers.length; i++) {
+            if (layers[i].type === 'symbol' && layers[i].layout['text-field']) {
+                labelLayerId = layers[i].id;
+                break;
+            }
         }
-    }
 
-    map.addSource('openmaptiles', {
-        url: `https://api.maptiler.com/tiles/v3/tiles.json?key=${MAPTILER_KEY}`,
-        type: 'vector',
+        map.addSource('openmaptiles', {
+            url: `https://api.maptiler.com/tiles/v3/tiles.json?key=${MAPTILER_KEY}`,
+            type: 'vector',
+        });
+
+        map.addLayer(
+            {
+                'id': '3d-buildings',
+                'source': 'openmaptiles',
+                'source-layer': 'building',
+                'type': 'fill-extrusion',
+                'minzoom': 15,
+                'filter': ['!=', ['get', 'hide_3d'], true],
+                'paint': {
+                    'fill-extrusion-color': [
+                        'interpolate',
+                        ['linear'],
+                        ['get', 'render_height'], 0, 'lightgray', 200, 'royalblue', 400, 'lightblue'
+                    ],
+                    'fill-extrusion-height': [
+                        'interpolate',
+                        ['linear'],
+                        ['zoom'],
+                        15,
+                        0,
+                        16,
+                        ['get', 'render_height']
+                    ],
+                    'fill-extrusion-base': ['case',
+                        ['>=', ['get', 'zoom'], 16],
+                        ['get', 'render_min_height'], 0
+                    ]
+                }
+            },
+            labelLayerId
+        );
     });
 
-    map.addLayer(
-        {
-            'id': '3d-buildings',
-            'source': 'openmaptiles',
-            'source-layer': 'building',
-            'type': 'fill-extrusion',
-            'minzoom': 15,
-            'filter': ['!=', ['get', 'hide_3d'], true],
-            'paint': {
-                'fill-extrusion-color': [
-                    'interpolate',
-                    ['linear'],
-                    ['get', 'render_height'], 0, 'lightgray', 200, 'royalblue', 400, 'lightblue'
-                ],
-                'fill-extrusion-height': [
-                    'interpolate',
-                    ['linear'],
-                    ['zoom'],
-                    15,
-                    0,
-                    16,
-                    ['get', 'render_height']
-                ],
-                'fill-extrusion-base': ['case',
-                    ['>=', ['get', 'zoom'], 16],
-                    ['get', 'render_min_height'], 0
-                ]
-            }
-        },
-        labelLayerId
-    );
-});
 
-
-//
-// Add Asset
-//
-const worldAltitude = 0;
-// +x east, +y up, +z north
-const modelRotate = [Math.PI / 2, 0, 0];
-// Maplibre.js default coordinate system (no rotations)
-// +x east, -y north, +z up
-// const modelRotate = [0, 0, 0];
-
-map.on('style.load', () => {
-{% if viewer == "three" %}
-    map.addLayer(createAssetLayerThreeJS({
-{% else %}
-    map.addLayer(createAssetLayerBabylon({
-{% endif %}
-        map,
-        modelSource,
-        modelOrigin,
-        modelRotate,
-        unitToMeter
-    }));
+    //
+    // Add Asset
+    //
+    const worldAltitude = 0;
+    // +x east, +y up, +z north
+    const modelRotate = [Math.PI / 2, 0, 0];
+    // Maplibre.js default coordinate system (no rotations)
+    // +x east, -y north, +z up
+    // const modelRotate = [0, 0, 0];
+
+    map.on('style.load', () => {
+    {% if viewer == "three" %}
+        map.addLayer(createAssetLayerThreeJS({
+    {% else %}
+        map.addLayer(createAssetLayerBabylon({
+    {% endif %}
+            map,
+            modelSource,
+            modelOrigin,
+            modelRotate,
+            unitToMeter
+        }));
+    });
 });

irie/apps/templates/inventory/create-datum.html

@@ -11,33 +11,33 @@
     </fieldset>
 
     <fieldset>
-        <legend>New Datum</legend>
-        <div id="formset-container" class="container">
-            <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">Angle x</span>
-                        <input id="input-datum-angle-x" 
-                                type="number" 
-                                step="any" 
-                                name="angle x" 
-                                value="{{ form.dx.value|default_if_none:'' }}"
-                                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">Angle y</span>
-                        <input id="input-datum-angle-y" 
-                                type="number" 
-                                step="any" 
-                                name="angle y"
-                                value="{{ form.dy.value|default_if_none:'' }}" 
-                                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>
-        <button id="add-datum" class="btn btn-sm button btn-outline-primary mb-3">Add Datum</button>
+      <legend>New Datum</legend>
+      <div id="formset-container" class="container">
+          <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">Angle x</span>
+                      <input id="input-datum-angle-x" 
+                              type="number" 
+                              step="any" 
+                              name="angle x" 
+                              value="{{ form.dx.value|default_if_none:'' }}"
+                              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">Angle y</span>
+                      <input id="input-datum-angle-y" 
+                              type="number" 
+                              step="any" 
+                              name="angle y"
+                              value="{{ form.dy.value|default_if_none:'' }}" 
+                              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>
+      <button id="add-datum" class="btn btn-sm button btn-outline-primary mb-3">Add Datum</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">Save</button>

irie/apps/templates/layouts/base.html

@@ -42,13 +42,13 @@
 
 <link type="text/css" href="{{ ASSETS_ROOT }}/vendor/sweetalert2/dist/sweetalert2.min.css" rel="stylesheet">
 <link type="text/css" href="{{ ASSETS_ROOT }}/vendor/notyf/notyf.min.css" rel="stylesheet">
-<!-- <link type="text/css" href="{{ ASSETS_ROOT }}/css/brace.min.css" media="screen" rel="stylesheet"> -->
-<link type="text/css" href="{{ ASSETS_ROOT }}/css/brace.css" media="screen" rel="stylesheet">
+<link type="text/css" href="{{ ASSETS_ROOT }}/css/brace.min.css" media="screen" rel="stylesheet">
+<!-- <link type="text/css" href="{{ ASSETS_ROOT }}/css/brace.css" media="screen" rel="stylesheet"> -->
 
 {% block stylesheets %}{% endblock stylesheets %}
 </head>
 
-<body class="g-sidenav-show">
+<body class="g-sidenav-show g-sidenav-pinned">
 
   {% include 'includes/sidebar.html' %}