Merge remote-tracking branch 'origin/master' into level1gui

Author: ptormene

openquake/calculators/export/__init__.py

@@ -27,7 +27,7 @@
     'mag_dst_eps_sig': "Deterministic Earthquake Scenarios",
     'job': 'job.zip',
     'asset_risk': 'Exposure + Risk',
-    'assetcol': 'Exposure',
+    'exposure': 'Exposure',
     'gmf_data': 'Ground Motion Fields',
     'damages-rlzs': 'Asset Risk Distributions',
     'damages-stats': 'Asset Risk Statistics',

openquake/calculators/export/risk.py

@@ -753,7 +753,6 @@ def export_vulnerability_xml(dstore):
     return dic
 
 
-@export.add(('assetcol', 'csv'))
 def export_assetcol_csv(ekey, dstore):
     assetcol = dstore['assetcol']
     writer = writers.CsvWriter(fmt=writers.FIVEDIGITS)
@@ -778,7 +777,7 @@ def export_exposure(ekey, dstore):
     """
     :param dstore: datastore object
     """
-    [assetcol_csv] = export(('assetcol', 'csv'), dstore)
+    [assetcol_csv] = export_assetcol_csv(('assetcol', 'csv'), dstore)
     tagnames = dstore['assetcol/tagcol'].tagnames
     cost_types = dstore.getitem('exposure')  # cost_type, area_type, unit
     N = node.Node

openquake/calculators/tests/scenario_risk_test.py

@@ -232,7 +232,7 @@ def test_case_9(self):
         self.run_calc(case_9.__file__, 'job.ini')
         [fname] = export(('aggrisk', 'csv'), self.calc.datastore)
         self.assertEqualFiles('expected/aggrisk.csv', fname)
-        [fname] = export(('assetcol', 'csv'), self.calc.datastore)
+        [_, fname] = export(('exposure', 'zip'), self.calc.datastore)
         self.assertEqualFiles('expected/assetcol.csv', fname)
 
     def test_case_10(self):
@@ -248,7 +248,7 @@ def test_case_11(self):
         [fname] = out[('avg_losses-rlzs', 'csv')]
         self.assertEqualFiles(
             'expected/avg_losses-rlz-000_443.csv', fname)
-        [fname] = export(('assetcol', 'csv'), self.calc.datastore)
+        [_, fname] = export(('exposure', 'zip'), self.calc.datastore)
         self.assertEqualFiles('expected/assetcol.csv', fname)
 
     def test_case_12(self):

openquake/server/static/js/engine.js

@@ -659,6 +659,7 @@ function capitalizeFirstLetter(val) {
                     );
                 } else if (asce_version === 'ASCE7-22') {
                     const items = [
+                        {value: 260, text: 'Unknown (default: class D)' },
                         {value: 1500, text: 'A: Vs30 >= 1500 m/s'},
                         {value: 1080, text: 'B: 914 m/s <= Vs30 < 1500 m/s' },
                         {value: 760, text: 'BC: 640 m/s <= Vs30 < 914 m/s' },
@@ -667,7 +668,6 @@ function capitalizeFirstLetter(val) {
                         {value: 260, text: 'D: 213 m/s <= Vs30 >= 305 m/s' },
                         {value: 185, text: 'DE: 152 m/s <= Vs30 >= 213 m/s' },
                         {value: 150, text: 'E: vs30 m/s < 152 m/s' },
-                        {value: 260, text: 'Unknown (default: class D)' },
                         {value: 'custom', text: 'Custom'},
                     ];
                     items.forEach(item => {