diff --git a/example/src/app/app.component.ts b/example/src/app/app.component.ts index 2f007885c1d63c89425749884f9a3daaa3154b85..1df618757f5c1eac3c00470f4e180d7890269037 100644 --- a/example/src/app/app.component.ts +++ b/example/src/app/app.component.ts @@ -1,7 +1,7 @@ import { Component, ViewChild, ElementRef, OnInit, AfterViewInit } from '@angular/core'; import { DisaggResponse, Disaggregation, DisaggGraphView } from '@nshmp/disagg-d3/src/disagg'; import { Collection } from '@nshmp/disagg-d3/src/mvc'; -import { DeaggResponseData } from '@ghsc/nshmp-utils/nshmp'; +import { DeaggResponseData } from '@ghsc/nshmp-utils/nshmp-haz'; import * as deagg from '../assets/deagg.json'; diff --git a/example/src/app/app.service.ts b/example/src/app/app.service.ts index 9aacbfdab4ae855bae7d0af5f375aeec4ef35c70..6a2b129db2836102622cf7dc51d965251014e6bf 100644 --- a/example/src/app/app.service.ts +++ b/example/src/app/app.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { map } from 'rxjs/operators'; -import { DeaggUsage, DeaggResponse } from '@ghsc/nshmp-utils/nshmp'; +import { DeaggResponse } from '@ghsc/nshmp-utils/nshmp-haz'; import { throwError, Observable } from 'rxjs'; @Injectable({ diff --git a/package-lock.json b/package-lock.json index f25c2765d2a4ec680c37739a0dba6d560d64f37b..087e21ac5427b1df28337f50df3c604cc91566f3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,9 +31,9 @@ } }, "@ghsc/nshmp-utils": { - "version": "2.0.1", - "resolved": "https://code.usgs.gov/api/v4/projects/1414/packages/npm/@ghsc/nshmp-utils/-/@ghsc/nshmp-utils-2.0.1.tgz", - "integrity": "sha1-xapLYFECuFrkYMxnmPG4U0LnB1M=", + "version": "2.3.0", + "resolved": "https://code.usgs.gov/api/v4/projects/1414/packages/npm/@ghsc/nshmp-utils/-/@ghsc/nshmp-utils-2.3.0.tgz", + "integrity": "sha1-nrTl9FZV/wnMG64oCqMyHdKH+ng=", "requires": { "@mapbox/geojson-extent": "^0.3.2", "d3-format": "^1.4.4", @@ -101,9 +101,9 @@ "integrity": "sha1-ioP5M1x4YO/6Lu7KJUMyqgru2PI=" }, "@mapbox/tiny-sdf": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@mapbox/tiny-sdf/-/tiny-sdf-1.1.1.tgz", - "integrity": "sha512-Ihn1nZcGIswJ5XGbgFAvVumOgWpvIjBX9jiRlIl46uQG9vJOF51ViBYHF95rEZupuyQbEmhLaDPLQlU7fUTsBg==" + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@mapbox/tiny-sdf/-/tiny-sdf-1.2.2.tgz", + "integrity": "sha512-GeJdumh5Do1JvnE2QbbLixZmJg6CzOfpzcAuS+qZadWK1Gj+yY/mj7IOVlgXCBg/yDqDmitGwSius+rrTpm8RA==" }, "@mapbox/unitbezier": { "version": "0.0.0", @@ -571,9 +571,9 @@ } }, "ieee754": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", - "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" }, "ignore": { "version": "5.1.8", @@ -667,9 +667,9 @@ } }, "mapbox-gl": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-1.12.0.tgz", - "integrity": "sha512-B3URR4qY9R/Bx+DKqP8qmGCai8IOZYMSZF7ZSvcCZaYTaOYhQQi8ErTEDZtFMOR0ZPj7HFWOkkhl5SqvDfpJpA==", + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-1.13.0.tgz", + "integrity": "sha512-g8zlzuJxYJqbOPXT19/UBYpVrcefBQ06F/Cbj0fyEfFnFesDcU3cFTxd75/FZ6Upx2ZEjCsD61CHxrcxZidVpA==", "requires": { "@mapbox/geojson-rewind": "^0.5.0", "@mapbox/geojson-types": "^1.0.2", @@ -898,9 +898,9 @@ } }, "plotly.js-dist": { - "version": "1.55.2", - "resolved": "https://registry.npmjs.org/plotly.js-dist/-/plotly.js-dist-1.55.2.tgz", - "integrity": "sha512-1QBBIPnh/G+8w9h/6pr7DQGm3t/XZptskUxJQsqTJJ1uth4xsDj2ltkmzujI5cG4lZadurJnfrJbFof+LHiyHg==" + "version": "1.58.4", + "resolved": "https://registry.npmjs.org/plotly.js-dist/-/plotly.js-dist-1.58.4.tgz", + "integrity": "sha512-oXCTRJFN8FBsHZSQPYoM3LuJQchPUrf6sOXFC0EFdvcr5lmJmLcAsW74jDy9PkRpm3PB+A+2oY1hsUMmk2eZbw==" }, "potpack": { "version": "1.0.1", @@ -980,9 +980,9 @@ } }, "protocol-buffers-schema": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.4.0.tgz", - "integrity": "sha512-G/2kcamPF2S49W5yaMGdIpkG6+5wZF0fzBteLKgEHjbNzqjZQ85aAs1iJGto31EJaSTkNvHs5IXuHSaTLWBAiA==" + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.5.1.tgz", + "integrity": "sha512-YVCvdhxWNDP8/nJDyXLuM+UFsuPk4+1PB7WGPVDzm3HTHbzFLxQYeW2iZpS4mmnXrQJGBzt230t/BbEb7PrQaw==" }, "pump": { "version": "3.0.0", @@ -1108,9 +1108,9 @@ "dev": true }, "supercluster": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supercluster/-/supercluster-7.1.0.tgz", - "integrity": "sha512-LDasImUAFMhTqhK+cUXfy9C2KTUqJ3gucLjmNLNFmKWOnDUBxLFLH9oKuXOTCLveecmxh8fbk8kgh6Q0gsfe2w==", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/supercluster/-/supercluster-7.1.2.tgz", + "integrity": "sha512-bGA0pk3DYMjLTY1h+rbh0imi/I8k/Lg0rzdBGfyQs0Xkiix7jK2GUmH1qSD8+jq6U0Vu382QHr3+rbbiHqdKJA==", "requires": { "kdbush": "^3.0.0" } diff --git a/package.json b/package.json index 6da0e8828156c7ef9d95e5cfec974e218f94efa5..caa744f4a9c0be6100ed21d5e3d75632f2f661c9 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "typescript": "^4.0.2" }, "dependencies": { - "@ghsc/nshmp-utils": "^2.0.1", + "@ghsc/nshmp-utils": "^2.3.0", "d3": "^3.5.17" }, "husky": { diff --git a/types/disagg/DisaggResponse.d.ts b/types/disagg/DisaggResponse.d.ts index 9a81cd402e370cf7e7a1b41944d053f57b85bfd1..e76b1d129855ce70747c50891441eaed89354963 100644 --- a/types/disagg/DisaggResponse.d.ts +++ b/types/disagg/DisaggResponse.d.ts @@ -1,4 +1,4 @@ -import { DeaggResponseData } from '@ghsc/nshmp-utils/nshmp'; +import { DeaggResponseData } from '@ghsc/nshmp-utils/nshmp-haz'; import { Model } from '../mvc/Model'; /** diff --git a/types/disagg/Disaggregation.d.ts b/types/disagg/Disaggregation.d.ts index bc13c62dd88a4b1afbf933b77fcf3e335c1f36d9..e56c38a7a9355962e1fdcec72a457abc8a36bebc 100644 --- a/types/disagg/Disaggregation.d.ts +++ b/types/disagg/Disaggregation.d.ts @@ -1,4 +1,4 @@ -import { DeaggResponseData } from '@ghsc/nshmp-utils/nshmp'; +import { DeaggResponseData } from '@ghsc/nshmp-utils/nshmp-haz'; import { Model } from '../mvc/Model'; import { DisaggParameters } from './DisaggParameters';