From 659676355e383fa202137da460d760938dcebf7f Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Tue, 26 Jan 2021 07:09:37 -0700
Subject: [PATCH] hazard mods for services
---
src/main/java/gov/usgs/earthquake/nshmp/calc/Hazard.java | 1 +
.../java/gov/usgs/earthquake/nshmp/internal/www/WsUtils.java | 4 +---
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/calc/Hazard.java b/src/main/java/gov/usgs/earthquake/nshmp/calc/Hazard.java
index cc73ea7b..497b95d4 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/calc/Hazard.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/calc/Hazard.java
@@ -119,6 +119,7 @@ public final class Hazard {
* model. If only 1 {@code Hazard} is supplied, method returns that
* supplied.
*/
+ @Deprecated
public static Hazard merge(Hazard... hazards) {
checkArgument(hazards.length > 0);
if (hazards.length == 1) {
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/internal/www/WsUtils.java b/src/main/java/gov/usgs/earthquake/nshmp/internal/www/WsUtils.java
index b76a1c85..1c2e8bbd 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/internal/www/WsUtils.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/internal/www/WsUtils.java
@@ -12,7 +12,6 @@ import com.google.gson.JsonPrimitive;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
-import gov.usgs.earthquake.nshmp.calc.Vs30;
import gov.usgs.earthquake.nshmp.gmm.GmmInput;
import gov.usgs.earthquake.nshmp.gmm.GmmInput.Field;
import gov.usgs.earthquake.nshmp.internal.www.meta.ParamType;
@@ -89,12 +88,11 @@ public class WsUtils {
@Override
public JsonElement serialize(E src, Type type, JsonSerializationContext context) {
- String value = (src instanceof Vs30) ? src.name().substring(3) : src.name();
int displayOrder = src.ordinal();
JsonObject jObj = new JsonObject();
jObj.addProperty("id", src.ordinal());
- jObj.addProperty("value", value);
+ jObj.addProperty("value", src.name());
jObj.addProperty("display", src.toString());
jObj.addProperty("displayorder", displayOrder);
--
GitLab