irie 0.0.47__py3-none-any.whl → 0.0.49__py3-none-any.whl

irie/apps/inventory/views.py

@@ -583,6 +583,9 @@ class AssetMap:
         top_markers = []
         for b in assets:
             lat, lon = b.coordinates
+            if lat is None or lon is None:
+                print(b)
+                continue
             popup = folium.Popup(
                         folium.Html(
                             '<a style="display: inline;" target="_blank" href="/inventory/{calid}/">{label}</a>'.format(

irie/apps/prediction/runners/opensees/utilities.py

@@ -8,7 +8,6 @@ import json
 import fnmatch
 import numpy as np
 
-from matplotlib import pyplot as plt
 from math import pi
 from collections import defaultdict
 import quakeio
@@ -239,6 +238,7 @@ def getPeak(file, other=None):
     return peakVals, timePeakVals, maxPeakCol
 
 def husid(accRH, plothusid, dt, lb=0.05, ub=0.95):
+    from matplotlib import pyplot as plt
     ai = np.tril(np.ones(len(accRH)))@accRH**2
     husid = ai/ai[-1]
     ilb = next(x for x, val in enumerate(husid) if val > lb)

irie/init/calid.py

@@ -41,7 +41,7 @@ CESMD = {
 
     "35-0054":   ("CE58677",                  None, "San Mateo Bridge"),
 #   "35-0054":   ("CE58799",                  None, "San Mateo Bridge Trestle"),
-    "53-3032":   ("CE14709",                  None, "Long Beach - Schuyler Heim Bridge"),
+#   "53-3032":   ("CE14709",                  None, "Long Beach - Schuyler Heim Bridge"),
     "51-0104":   ("CE25749",                  None, "Santa Barbara - San Roque Canyon Bridge"),
     "44-0298":   ("CE47646",                  None, "Big Sur - New Hwy 1/Pfeiffer Cnyn Bridge"),
     "44-0060":   ("CE47729",                  None, "Big Sur - Hwy 1/Pfeiffer Canyon Bridge [Demolished]"),
@@ -50,7 +50,7 @@ CESMD = {
     "27-0013":   ("CE68778",                  None, "Novato - Hwy37/Petaluma River Bridge"),
     "17-0058L":  ("CE76741",                  None, "Truckee - I80/Truckee River Bridge"),
     "06-0210":   ("CE88638",                  None, "Shasta Lake - I5/Antlers Bridge"),
-    "54-0474F":  ("CE12666",                  None, "North Palm Springs - I10/Hwy 62 Bridge"),
+#   "54-0474F":  ("CE12666",                  None, "North Palm Springs - I10/Hwy 62 Bridge"),
     "53-1185":   ("CE14690",                  None, "Los Angeles - I405/San Gabriel River Br"),
     "50-0402R":  ("CE34715",                  None, "Mojave - Hwy 14/Railroad Bridge"),
     "33-0347S":  ("CE58656",                  None, "Oakland - Hwy 580/13 Interchange Bridge"),

irie/init/management/commands/init_cesmd.py

@@ -1,10 +1,11 @@
 import irie
 import numpy as np
 from irie.apps.inventory.models  import Asset
-from irie.init.calid   import CALID, CESMD
+from irie.init.calid   import CESMD_LONG_LAT, CESMD
 from pathlib import Path
 from django.core.management.base import BaseCommand
 import json
+from collections import defaultdict
 
 DATA = Path(irie.__file__).parents[0]/"init"/"data"
 
@@ -13,6 +14,15 @@ with open(DATA/"cgs_data.json") as f:
 with open(DATA/"nbi_data_cesmd.json") as f:
     NBI_DATA = json.loads(f.read())
 
+
+def nbi_reshape(raw):
+    data = defaultdict(dict)
+    for row in raw["Results"]["NBIData"]["NBIDataList"]:
+        data[row["TABLE_NAME"]][row["EXPANDED_FIELD_ALIAS"]] = row["FIELD_VALUE"]
+
+    return dict(data)
+
+
 class Command(BaseCommand):
     def handle(self, *args, **kwargs):
         # with open(DATA/"cgs-stations.json") as f:
@@ -31,8 +41,9 @@ class Command(BaseCommand):
                 asset.cesmd = cesmd 
                 asset.calid = calid
                 asset.cgs_data = CGS_DATA.get(cesmd, {})
-                asset.nbi_data = NBI_DATA.get(calid.replace("-", " "), {})
-                
+                if calid.replace("-", " ") in NBI_DATA:
+                    asset.nbi_data = nbi_reshape(NBI_DATA.get(calid.replace("-", " "), [{}])[-1])
+
                 asset.save()
                 print(asset)
                 count += 1

{irie-0.0.47.dist-info → irie-0.0.49.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: irie
-Version: 0.0.47
+Version: 0.0.49
 Summary: An infrastructure resilience engine
 Author-email: "Claudio M. Perez" <50180406+claudioperez@users.noreply.github.com>
 Project-URL: Repository, https://github.com/STAIRLab
@@ -32,6 +32,7 @@ Requires-Dist: opensees
 Requires-Dist: quakeio
 Requires-Dist: mdof
 Requires-Dist: veux
+Requires-Dist: xara
 Requires-Dist: bottle
 Requires-Dist: openbim
 Requires-Dist: folium

{irie-0.0.47.dist-info → irie-0.0.49.dist-info}/RECORD

@@ -65,7 +65,7 @@ irie/apps/inventory/models.py,sha256=ie7XhFDujpoyIinmX-YfScVx28SkkRhFadU0iNLC9HI
 irie/apps/inventory/sitemaps.py,sha256=Nha1MTsIH_ad7JyoxwonPytp7MNuEhDNszkEUOmlN0o,826
 irie/apps/inventory/tables.py,sha256=vZdPOcbN1ibuWXqLwbBUoQw9iavwa1GJ5fd83k8bu7Y,27874
 irie/apps/inventory/urls.py,sha256=u2LNLB4K4fDq3yPYtREKf3i7_yHRzrTP3cb22G8Brvk,1578
-irie/apps/inventory/views.py,sha256=cjL2v4_7q2S7OczeNdh_g7pVxXdkKgaqj60oQaOEED8,21422
+irie/apps/inventory/views.py,sha256=H9H16E8HODOadg809QuzNPV-vzeW2ZfrE45jhISa46s,21518
 irie/apps/inventory/archive/CESMD.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 irie/apps/inventory/archive/calid.py,sha256=3L8MbPIGOE3kzDnqeyY055pRBiF2O2l0cmpuDbTsdTg,3014
 irie/apps/inventory/migrations/0001_initial.py,sha256=PwTHv4Q3gqWFha--8Zp9kUOh-cYalB14jXj7RVJUVnw,1786
@@ -111,7 +111,7 @@ irie/apps/prediction/runners/hazus.py,sha256=sWQDDmwN82wKSHW9EGx46JOOPo_IN2CTK7R
 irie/apps/prediction/runners/ssid.py,sha256=Y36FMPVzjNMXknQO6LegTBFUF2X-l7TXyddY4Z8SDmA,18701
 irie/apps/prediction/runners/opensees/__init__.py,sha256=QlInYqEKc1oYBnw6TeF4dS3VnOxmQeLptF9EKr-blfM,21177
 irie/apps/prediction/runners/opensees/metrics.py,sha256=HU1V0RYQDXrhTcHqwpnU2KOSl4UPNo9S6QP3sz2VcUY,6428
-irie/apps/prediction/runners/opensees/utilities.py,sha256=aPBANs6NR-EPrYsekBLx-IWvx4GbNypMtkHy3PPM6aM,9028
+irie/apps/prediction/runners/opensees/utilities.py,sha256=1cajnV6gWkJ5obYixfbHZKwxi1ECpR0sBWquAAGhseE,9032
 irie/apps/prediction/runners/opensees/xmlutils.py,sha256=Q3i5L0Dp_5nRsKRGMr-m_bS03Mxa36Ujb-RvwAmResc,7510
 irie/apps/prediction/runners/opensees/zipped.py,sha256=ou2BnxY4WzAzVp3cL9XJUeSJqdijRs-rbcagOsX_Ed0,942
 irie/apps/prediction/runners/opensees/schemas/__init__.py,sha256=AMX2Z5F_ltcB6ny1U41aDXIbAmS7wprjcA35j511XBU,1033
@@ -465,7 +465,7 @@ irie/fhwa/fields/nbi002.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 irie/init/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 irie/init/__main__.py,sha256=waUELqnhqZirROMIb5wMzD4mK5fgrUvWRsXoTXhjtxY,807
 irie/init/bridges.py,sha256=OBBKnLx2lmMKDfeR0C8CBSbnpnzO0lfokBypD2nEFcM,74198
-irie/init/calid.py,sha256=-861tihqB-u2ZfXWqAW6RzgSmR1UvcSX4Y_ZzfJVWMw,10883
+irie/init/calid.py,sha256=JsZRnR_GBNgYkKotVPyju6EcCo9eTFyjQGNweHz1xq4,10883
 irie/init/getBridgeData.py,sha256=PU4OcdXCR0D-CCBX_T3PjyYL0QJKYyz2I4AMhaYKaZk,12650
 irie/init/getCGSData.py,sha256=iZG3Ab1Y_rhiliKCPNy0MZrKBsfEe6ShgSFz2ttvTUU,2916
 irie/init/getCGSevents.py,sha256=4dBkFFJQrUs6gfl1Nj-_R2UOZj0B_T017a6tC7fUHOw,421
@@ -482,15 +482,15 @@ irie/init/data/nbi_definitions.json,sha256=NS3yNP1i1E_JXfGW_I_xOoNRsfeljDA5BZ_1h
 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=z-QczBwa7altFy8oLgKtF2_ogHwWOGGFiMJYLkol-zU,5709
-irie/init/management/commands/init_cesmd.py,sha256=CuttXboaYoIHAlWnsfE-h6cdCQqoO0iVGI11F91i-uo,1355
+irie/init/management/commands/init_cesmd.py,sha256=vWRJDxNv4T4yVSU2ikC3GM-HL9O1TkQvUvWWGatbcyk,1679
 irie/init/management/commands/init_corridors.py,sha256=EzLk0HUiFxlco-2u0rypewOc9mAo_raqXC2_UCG8a_w,1241
 irie/init/management/commands/init_predictors.py,sha256=edCf7d36cwl4YitXLtvOfsPee-BiPF55_Gr73OvTPcU,2368
 irie/init/management/commands/make_asset.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 irie/pull/nbi.py,sha256=KpBjJ9GEU72Qk1t4bGN9cg0QBeVJ8k9XcI3Y1oSgIR0,11478
 irie/rest/__main__.py,sha256=6Nf_-Rr9zGmMyp_wqCFDO7ls9QPnPd9UyUgN17rIGYw,3680
 irie/usgs/__main__.py,sha256=HiSvPn5IW5IqRiCk1qRRq5dCy3-7iISw7v1P_w2rLrk,5049
-irie-0.0.47.dist-info/METADATA,sha256=UY4aOzGLBIxZib3YMGJmtUSiMQbiZzMNoYlWIFaPPuY,3207
-irie-0.0.47.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-irie-0.0.47.dist-info/entry_points.txt,sha256=A_3h9wPBGfxGQ78_MGa-nO6Z0foxOYeAnIE47jxEztg,44
-irie-0.0.47.dist-info/top_level.txt,sha256=zVCxi5E2nkISZPzKq8VEhWe_dGuPcefLYV1tYqQdwlY,5
-irie-0.0.47.dist-info/RECORD,,
+irie-0.0.49.dist-info/METADATA,sha256=6ZscywZ1s8hwRpSf8tdLhXs358Lv2zjPd6e-ckLNfgk,3227
+irie-0.0.49.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+irie-0.0.49.dist-info/entry_points.txt,sha256=A_3h9wPBGfxGQ78_MGa-nO6Z0foxOYeAnIE47jxEztg,44
+irie-0.0.49.dist-info/top_level.txt,sha256=zVCxi5E2nkISZPzKq8VEhWe_dGuPcefLYV1tYqQdwlY,5
+irie-0.0.49.dist-info/RECORD,,