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 cc73ea7b1911c7298b2f6da74ea42caca0e95ef8..497b95d4f99ef6198f982ce5f83d579e0f04ce40 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 b76a1c8586fc93c6ffe79531bb666aeb461358b1..1c2e8bbd100cb0b7edf81c3e5b807c7e762bb642 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);