From 8b7fbe0e16f51a637353781270555e5737b3fb58 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 5 Oct 2022 10:39:45 -0600
Subject: [PATCH 1/4] add name
---
package-lock.json | 1 +
1 file changed, 1 insertion(+)
diff --git a/package-lock.json b/package-lock.json
index fd03b78e3..dc72624ba 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,6 +5,7 @@
"requires": true,
"packages": {
"": {
+ "name": "nshmp-haz",
"version": "2.0.0",
"devDependencies": {
"markdownlint-cli": "^0.31.1",
--
GitLab
From ee453f69531fe556bcb51f9b9e81b0ce2cf6e7c4 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 5 Oct 2022 10:39:57 -0600
Subject: [PATCH 2/4] update nshmp-lib dep
---
gradle.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gradle.properties b/gradle.properties
index 935b741dd..207012f70 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,7 +11,7 @@ micronautVersion = 3.2.3
micronautRxVersion = 2.1.1
nodePluginVersion = 3.0.1
nodeVersion = 16.3.0
-nshmpLibVersion = 1.2.2
+nshmpLibVersion = 1.2.1
nshmpWsUtilsVersion = 0.3.11
openApiVersion = 4.0.0
shadowVersion = 7.1.2
--
GitLab
From eed671baba6a5ab9777254a650061cc4fa4df417 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 5 Oct 2022 10:40:10 -0600
Subject: [PATCH 3/4] add map and sites
---
.../gov/usgs/earthquake/nshmp/www/source/SourceService.java | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceService.java b/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceService.java
index 6cedce847..dff841186 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceService.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceService.java
@@ -10,6 +10,7 @@ import java.util.stream.DoubleStream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import gov.usgs.earthquake.nshmp.geo.json.FeatureCollection;
import gov.usgs.earthquake.nshmp.gmm.Gmm;
import gov.usgs.earthquake.nshmp.gmm.NehrpSiteClass;
import gov.usgs.earthquake.nshmp.model.HazardModel;
@@ -73,6 +74,8 @@ public class SourceService {
final Map<NehrpSiteClass, Double> siteClasses;
final List<Parameter> imts;
final List<Double> bounds;
+ final FeatureCollection map;
+ final FeatureCollection sites;
public SourceModel(HazardModel model) {
name = model.name();
@@ -86,6 +89,8 @@ public class SourceService {
.map(imt -> new Parameter(ServletUtil.imtShortLabel(imt), imt.name()))
.collect(toList());
bounds = DoubleStream.of(model.bounds().toArray()).boxed().collect(toList());
+ map = model.map().orElseThrow();
+ sites = model.sites().orElseThrow();
}
public String getName() {
--
GitLab
From 9b320df0b507cd7b2567f45dde2a4fc2e60f7edd Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 6 Oct 2022 16:04:58 -0600
Subject: [PATCH 4/4] update lib
---
gradle.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gradle.properties b/gradle.properties
index 207012f70..935b741dd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,7 +11,7 @@ micronautVersion = 3.2.3
micronautRxVersion = 2.1.1
nodePluginVersion = 3.0.1
nodeVersion = 16.3.0
-nshmpLibVersion = 1.2.1
+nshmpLibVersion = 1.2.2
nshmpWsUtilsVersion = 0.3.11
openApiVersion = 4.0.0
shadowVersion = 7.1.2
--
GitLab