From 80695a0088c0f1d564adb5d861880b8de044ae53 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 3 Feb 2021 11:16:57 -0700
Subject: [PATCH 1/3] add new parameter class
---
.../usgs/earthquake/nshmp/www/meta/Parameter.java | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 src/main/java/gov/usgs/earthquake/nshmp/www/meta/Parameter.java
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/meta/Parameter.java b/src/main/java/gov/usgs/earthquake/nshmp/www/meta/Parameter.java
new file mode 100644
index 000000000..7b32b1825
--- /dev/null
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/meta/Parameter.java
@@ -0,0 +1,13 @@
+package gov.usgs.earthquake.nshmp.www.meta;
+
+@SuppressWarnings("unused")
+public class Parameter {
+
+ private final String display;
+ private final String value;
+
+ public Parameter(String display, String value) {
+ this.display = display;
+ this.value = value;
+ }
+}
--
GitLab
From 3f5548e28fa131a7260da86b18656786af59cb0d Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 3 Feb 2021 11:17:29 -0700
Subject: [PATCH 2/3] add display, value to imt
---
.../nshmp/www/services/HazardService.java | 32 +++++++------------
1 file changed, 12 insertions(+), 20 deletions(-)
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/services/HazardService.java b/src/main/java/gov/usgs/earthquake/nshmp/www/services/HazardService.java
index 0a7d816d4..33c62435d 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/services/HazardService.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/services/HazardService.java
@@ -31,6 +31,7 @@ import gov.usgs.earthquake.nshmp.model.SourceType;
import gov.usgs.earthquake.nshmp.www.HazardController;
import gov.usgs.earthquake.nshmp.www.meta.DoubleParameter;
import gov.usgs.earthquake.nshmp.www.meta.Metadata;
+import gov.usgs.earthquake.nshmp.www.meta.Parameter;
import gov.usgs.earthquake.nshmp.www.services.ServicesUtil.ServiceQueryData;
import gov.usgs.earthquake.nshmp.www.services.ServicesUtil.ServiceRequestData;
import gov.usgs.earthquake.nshmp.www.services.SourceServices.SourceModel;
@@ -216,20 +217,12 @@ public final class HazardService {
}
private static final class ResponseMetadata {
- // final SourceModel model;
- // final double latitude;
- // final double longitude;
- // final double vs30;
- final String imt;
final String xlabel = "Ground Motion (g)";
final String ylabel = "Annual Frequency of Exceedence";
+ final Object server;
- ResponseMetadata(Imt imt) {
- // model = new SourceModel(ServletUtil.model());
- // latitude = data.latitude;
- // longitude = data.longitude;
- // vs30 = data.vs30;
- this.imt = imtShortLabel(imt);
+ ResponseMetadata(Object server) {
+ this.server = server;
}
}
@@ -253,21 +246,21 @@ public final class HazardService {
}
private static final class ResponseData {
- final Object server;
+ final ResponseMetadata metadata;
final List<HazardResponse> hazards;
- ResponseData(Object server, List<HazardResponse> hazards) {
- this.server = server;
+ ResponseData(ResponseMetadata metadata, List<HazardResponse> hazards) {
+ this.metadata = metadata;
this.hazards = hazards;
}
}
private static final class HazardResponse {
- final ResponseMetadata metadata;
+ final Parameter imt;
final List<Curve> data;
- HazardResponse(ResponseMetadata metadata, List<Curve> data) {
- this.metadata = metadata;
+ HazardResponse(Imt imt, List<Curve> data) {
+ this.imt = new Parameter(imtShortLabel(imt), imt.name());
this.data = data;
}
}
@@ -343,7 +336,6 @@ public final class HazardService {
var hazards = new ArrayList<HazardResponse>();
for (Imt imt : totalMap.keySet()) {
- var responseData = new ResponseMetadata(imt);
var curves = new ArrayList<Curve>();
// total curve
@@ -355,11 +347,11 @@ public final class HazardService {
curves.add(new Curve(type.toString(), typeMap.get(type)));
}
- hazards.add(new HazardResponse(responseData, List.copyOf(curves)));
+ hazards.add(new HazardResponse(imt, List.copyOf(curves)));
}
Object server = Metadata.serverData(ServletUtil.THREAD_COUNT, timer);
- var response = new ResponseData(server, List.copyOf(hazards));
+ var response = new ResponseData(new ResponseMetadata(server), List.copyOf(hazards));
return new Response<>(Status.SUCCESS, NAME, request, response, urlHelper);
}
--
GitLab
From 52ff6a0eb7076020a4403a9f8208ca0dafff2d8e Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 3 Feb 2021 13:13:28 -0700
Subject: [PATCH 3/3] cleanup
---
.../java/gov/usgs/earthquake/nshmp/www/meta/Parameter.java | 1 -
.../usgs/earthquake/nshmp/www/services/HazardService.java | 6 +++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/meta/Parameter.java b/src/main/java/gov/usgs/earthquake/nshmp/www/meta/Parameter.java
index 7b32b1825..c6463c3ba 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/meta/Parameter.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/meta/Parameter.java
@@ -1,6 +1,5 @@
package gov.usgs.earthquake.nshmp.www.meta;
-@SuppressWarnings("unused")
public class Parameter {
private final String display;
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/services/HazardService.java b/src/main/java/gov/usgs/earthquake/nshmp/www/services/HazardService.java
index 33c62435d..46baebefd 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/services/HazardService.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/services/HazardService.java
@@ -247,11 +247,11 @@ public final class HazardService {
private static final class ResponseData {
final ResponseMetadata metadata;
- final List<HazardResponse> hazards;
+ final List<HazardResponse> hazardCurves;
- ResponseData(ResponseMetadata metadata, List<HazardResponse> hazards) {
+ ResponseData(ResponseMetadata metadata, List<HazardResponse> hazardCurves) {
this.metadata = metadata;
- this.hazards = hazards;
+ this.hazardCurves = hazardCurves;
}
}
--
GitLab