Fix loader for damages_rlzs, getting damage states and reading values…

… as loss_type-dmg_state
gem · Nov 25, 2024 · 07126fb · 07126fb
1 parent 965071b
commit 07126fb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/svir/dialogs/load_damages_rlzs_as_layer_dialog.py b/svir/dialogs/load_damages_rlzs_as_layer_dialog.py
@@ -29,7 +29,7 @@
 from svir.dialogs.load_output_as_layer_dialog import LoadOutputAsLayerDialog
 from svir.utilities.utils import (WaitCursorManager,
                                   log_msg,
-                                  get_loss_types,
+                                  get_attrs,
                                   )
 from svir.tasks.extract_npz_task import ExtractNpzTask
 
@@ -77,11 +77,12 @@ def finalize_init(self, extracted_npz):
         self.npz_file = extracted_npz
 
         # NOTE: still running this synchronously, because it's small stuff
-        with WaitCursorManager('Loading loss types...',
+        with WaitCursorManager('Loading loss types and damage states...',
                                self.iface.messageBar()):
-            self.loss_types = get_loss_types(
-                self.session, self.hostname, self.calc_id,
-                self.iface.messageBar())
+            attrs = get_attrs(self.session, self.hostname, self.calc_id,
+                              self.iface.messageBar())
+            self.loss_types = attrs['loss_types']
+            self.dmg_states = ['no_damage'] + attrs['limit_states']
 
         self.populate_out_dep_widgets()
 
@@ -122,6 +123,7 @@ def on_rlz_or_stat_changed(self):
     def populate_out_dep_widgets(self):
         self.populate_rlz_or_stat_cbx()
         self.populate_loss_type_cbx(self.loss_types)
+        self.populate_dmg_state_cbx()
         self.show_num_sites()
 
     def populate_taxonomy_cbx(self, taxonomies):
@@ -130,11 +132,6 @@ def populate_taxonomy_cbx(self, taxonomies):
         self.taxonomy_cbx.addItems(taxonomies)
         self.taxonomy_cbx.setEnabled(True)
 
-    def on_loss_type_changed(self):
-        loss_type = self.loss_type_cbx.currentText()
-        self.dmg_states = self.dataset[loss_type].dtype.names
-        self.populate_dmg_state_cbx()
-
     def populate_dmg_state_cbx(self):
         self.dmg_state_cbx.clear()
         self.dmg_state_cbx.setEnabled(True)
@@ -258,7 +255,7 @@ def group_by_site(self, npz, rlz_or_stat, loss_type, dmg_state,
         dmg_by_site = collections.defaultdict(float)  # lon, lat -> dmg
         for rec in npz[rlz_or_stat]:
             if taxonomy == 'All' or taxonomy.encode('utf8') == rec['taxonomy']:
-                value = rec[loss_type][dmg_state]
+                value = rec[f'{loss_type}-{dmg_state}']
                 dmg_by_site[rec['lon'], rec['lat']] += value
         data = numpy.zeros(
             len(dmg_by_site),

diff --git a/svir/utilities/utils.py b/svir/utilities/utils.py
@@ -1179,6 +1179,11 @@ def get_loss_types(session, hostname, calc_id, message_bar):
     return loss_types
 
 
+def get_attrs(session, hostname, calc_id, message_bar):
+    return extract_npz(session, hostname, calc_id, 'composite_risk_model.attrs',
+                       message_bar=message_bar)
+
+
 def write_metadata_to_layer(
         drive_engine_dlg, output_type, layer, user_params=None,
         disagg_params=None):