Merge branch 'disagg' into 'main'

Update to new Response

See merge request !15

example/src/app/app.component.ts

@@ -13,7 +13,7 @@ import * as deagg from '../assets/deagg.json';
 export class AppComponent implements AfterViewInit {
   title = 'Disaggregation';
 
-  data = deagg.response.pop() as any as nshmpHaz.disaggService.DisaggResponseData;
+  data = deagg.response as nshmpHaz.disaggService.DisaggResponseData;
 
   @ViewChild('example')
   el: ElementRef<HTMLElement>;

package-lock.json

@@ -9,7 +9,7 @@
       "version": "0.0.1",
       "license": "ISC",
       "dependencies": {
-        "@ghsc/nshmp-utils": "^4.0.1",
+        "@ghsc/nshmp-utils": "^4.0.3",
         "d3": "^3.5.17"
       },
       "devDependencies": {
@@ -121,9 +121,9 @@
       }
     },
     "node_modules/@ghsc/nshmp-utils": {
-      "version": "4.0.1",
-      "resolved": "https://code.usgs.gov/api/v4/projects/1414/packages/npm/@ghsc/nshmp-utils/-/@ghsc/nshmp-utils-4.0.1.tgz",
-      "integrity": "sha1-yObd029c9M3GhSlnGvVaDWfQJgo=",
+      "version": "4.0.3",
+      "resolved": "https://code.usgs.gov/api/v4/projects/1414/packages/npm/@ghsc/nshmp-utils/-/@ghsc/nshmp-utils-4.0.3.tgz",
+      "integrity": "sha1-jnoLpvst5DJVjmwkG8ReMtoOb/c=",
       "dependencies": {
         "@mapbox/geojson-extent": "^1.0.0",
         "change-case": "^4.1.2",
@@ -2108,9 +2108,9 @@
       }
     },
     "@ghsc/nshmp-utils": {
-      "version": "4.0.1",
-      "resolved": "https://code.usgs.gov/api/v4/projects/1414/packages/npm/@ghsc/nshmp-utils/-/@ghsc/nshmp-utils-4.0.1.tgz",
-      "integrity": "sha1-yObd029c9M3GhSlnGvVaDWfQJgo=",
+      "version": "4.0.3",
+      "resolved": "https://code.usgs.gov/api/v4/projects/1414/packages/npm/@ghsc/nshmp-utils/-/@ghsc/nshmp-utils-4.0.3.tgz",
+      "integrity": "sha1-jnoLpvst5DJVjmwkG8ReMtoOb/c=",
       "requires": {
         "@mapbox/geojson-extent": "^1.0.0",
         "change-case": "^4.1.2",

package.json

@@ -30,7 +30,7 @@
     "typescript": "^4.0.2"
   },
   "dependencies": {
-    "@ghsc/nshmp-utils": "^4.0.1",
+    "@ghsc/nshmp-utils": "^4.0.3",
     "d3": "^3.5.17"
   },
   "husky": {

src/disagg/DisaggResponse.js

@@ -8,13 +8,12 @@ var Disaggregation = require('./Disaggregation'),
 // Default values to be used by constructor
 var _DEFAULTS = {
   metadata: {
-    imt: { value: 'Unknown' },
     rlabel: 'Distance',
     mlabel: 'Magnitude',
     εlabel: 'Contribution',
     εbins: [],
   },
-  data: [],
+  disaggs: [],
 };
 
 var _DEAGG_ID = 0;
@@ -36,29 +35,34 @@ var DisaggResponse = function (params) {
    *
    */
   _initialize = function (params) {
-    var attributes, deaggs, metadata;
+    var attributes, metadata, imt;
 
-    params = Util.extend({}, _DEFAULTS, { id: 'deagg-response-' + _DEAGG_ID++ }, params);
+    params = Util.extend({}, _DEFAULTS, { id: 'disagg-response-' + _DEAGG_ID++ }, params);
 
     metadata = params.metadata;
-    deaggs = params.data.map(function (deagg) {
-      return Disaggregation(
-        Util.extend(
-          {
-            metadata: metadata,
-          },
-          deagg
-        )
-      );
+    var disaggs = [];
+    params.disaggs.forEach(function (disagg) {
+      imt = disagg.imt;
+      disagg.data.forEach(function (data) {
+        var disagg = Disaggregation(
+          Util.extend(
+            {
+              metadata,
+            },
+            data
+          )
+        );
+        disaggs.push(disagg);
+      });
     });
 
     attributes = {
-      imt: metadata.imt.value,
+      imt: imt.value,
       rlabel: metadata.rlabel,
       mlabel: metadata.mlabel,
       εlabel: metadata.εlabel,
       εbins: metadata.εbins,
-      disaggregations: Collection(deaggs),
+      disaggregations: Collection(disaggs),
     };
 
     // Should not have listeners yet, but silent anyway to short-circuit check
@@ -66,10 +70,10 @@ var DisaggResponse = function (params) {
   };
 
   _this.destroy = Util.compose(function () {
-    var deaggs;
+    var disaggs;
 
-    deaggs = _this.get('disaggregations');
-    deaggs.destroy();
+    disaggs = _this.get('disaggregations');
+    disaggs.destroy();
 
     _initialize = null;
     _this = null;