diff --git a/gradle.properties b/gradle.properties
index 107cec099ff646bbdb646fcab6853da0f2580557..c8e2cb9d9ee6f7e8c17a8ce1bedd97187499ba33 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,7 @@ micronautRxVersion = 2.1.1
nodePluginVersion = 3.0.1
nodeVersion = 16.3.0
nshmFaultSectionsTag = v0.1
-nshmpLibVersion = 1.2.5
+nshmpLibVersion = 1.2.6
nshmpWsUtilsVersion = 0.3.11
shadowVersion = 7.1.2
spotbugsVersion = 4.7.0
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/gmm/GmmController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/gmm/GmmController.java
index a6a5d5ccfa2fa113da1a606a1a066642a171a740..bea64c3f8044c5e40c9f0a90fe05bf6fccd4e306 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/gmm/GmmController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/gmm/GmmController.java
@@ -41,7 +41,7 @@ class GmmController {
JAVADOC_URL + "/gmm/GmmInput.Builder.html#withDefaults()";
private static final String GMM_INPUT_PARAMS =
- "<pre>[Mw, rJB, rRup, rX, dip, width, zTor, rake, vs30, vsInf, z1p0, z2p5, zSed]</pre>";
+ "<pre>[Mw, rJB, rRup, rX, dip, width, zTor, rake, vs30, z1p0, z2p5, zSed]</pre>";
private static final String SPECTRA_QUERY_1 = "/gmm/spectra?gmm=ASK_14";
private static final String SPECTRA_QUERY_2 =
@@ -99,7 +99,6 @@ class GmmController {
* ([-180, 1080])
* @param vs30 The average shear-wave velocity down to 30 meters, in
* kilometers per second ([150, 3000])
- * @param vsInf Whether Vs30 was measured or inferred
* @param z1p0 Depth to a shear-wave velocity of 1.0 kilometers per second, in
* kilometers ([0, 5])
* @param z2p5 Depth to a shear-wave velocity of 2.5 kilometers per second, in
@@ -158,8 +157,6 @@ class GmmController {
defaultValue = "760",
minimum = "150",
maximum = "3000") @QueryValue @Nullable Double vs30,
- @Schema(
- defaultValue = "true") @QueryValue @Nullable Boolean vsInf,
@Schema(
defaultValue = "",
minimum = "0",
@@ -216,7 +213,6 @@ class GmmController {
* ([-180, 1080])
* @param vs30 The average shear-wave velocity down to 30 meters, in
* kilometers per second ([150, 3000])
- * @param vsInf Whether Vs30 was measured or inferred
* @param z1p0 Depth to a shear-wave velocity of 1.0 kilometers per second, in
* kilometers ([0, 5])
* @param z2p5 Depth to a shear-wave velocity of 2.5 kilometers per second, in
@@ -290,7 +286,6 @@ class GmmController {
defaultValue = "760",
minimum = "150",
maximum = "3000") @QueryValue @Nullable Double vs30,
- @Schema(defaultValue = "true") @QueryValue @Nullable Boolean vsInf,
@Schema(
defaultValue = "",
minimum = "0",
@@ -342,7 +337,6 @@ class GmmController {
* ([-180, 1080])
* @param vs30 The average shear-wave velocity down to 30 meters, in
* kilometers per second ([150, 3000])
- * @param vsInf Whether Vs30 was measured or inferred
* @param z1p0 Depth to a shear-wave velocity of 1.0 kilometers per second, in
* kilometers ([0, 5])
* @param z2p5 Depth to a shear-wave velocity of 2.5 kilometers per second, in
@@ -403,7 +397,6 @@ class GmmController {
defaultValue = "760",
minimum = "150",
maximum = "3000") @QueryValue @Nullable Double vs30,
- @Schema(defaultValue = "true") @QueryValue @Nullable Boolean vsInf,
@Schema(
defaultValue = "",
minimum = "0",
@@ -456,7 +449,6 @@ class GmmController {
* ([-180, 1080])
* @param vs30 The average shear-wave velocity down to 30 meters, in
* kilometers per second ([150, 3000])
- * @param vsInf Whether Vs30 was measured or inferred
* @param z1p0 Depth to a shear-wave velocity of 1.0 kilometers per second, in
* kilometers ([0, 5])
* @param z2p5 Depth to a shear-wave velocity of 2.5 kilometers per second, in
@@ -527,7 +519,6 @@ class GmmController {
defaultValue = "760",
minimum = "150",
maximum = "3000") @QueryValue @Nullable Double vs30,
- @Schema(defaultValue = "true") @QueryValue @Nullable Boolean vsInf,
@Schema(
defaultValue = "",
minimum = "0",
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/gmm/ServiceUtil.java b/src/main/java/gov/usgs/earthquake/nshmp/www/gmm/ServiceUtil.java
index 6f01ae290dc49c76d381582721588a831228dbd0..3b7e614ea1b46edc302a1c083355ca851095bdf8 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/gmm/ServiceUtil.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/gmm/ServiceUtil.java
@@ -7,7 +7,6 @@ import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RJB;
import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RRUP;
import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RX;
import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VS30;
-import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VSINF;
import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.WIDTH;
import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.Z1P0;
import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.Z2P5;
@@ -16,7 +15,6 @@ import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.ZSED;
import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.ZTOR;
import static gov.usgs.earthquake.nshmp.gmm.Imt.AI;
import static gov.usgs.earthquake.nshmp.gmm.Imt.PGV;
-import static io.micronaut.core.type.Argument.BOOLEAN;
import static io.micronaut.core.type.Argument.DOUBLE;
import static java.util.stream.Collectors.toCollection;
@@ -111,7 +109,6 @@ class ServiceUtil {
params.getFirst(ZHYP.id, DOUBLE).ifPresent(b::zHyp);
params.getFirst(RAKE.id, DOUBLE).ifPresent(b::rake);
params.getFirst(VS30.id, DOUBLE).ifPresent(b::vs30);
- params.getFirst(VSINF.id, BOOLEAN).ifPresent(b::vsInf);
params.getFirst(Z1P0.id, DOUBLE).ifPresent(b::z1p0);
params.getFirst(Z2P5.id, DOUBLE).ifPresent(b::z2p5);
params.getFirst(ZSED.id, DOUBLE).ifPresent(b::zSed);
@@ -175,9 +172,8 @@ class ServiceUtil {
Field field,
Optional<?> constraint) {
- return (field == VSINF)
- ? new BooleanParam(field)
- : new NumberParam(field, (Range<Double>) constraint.orElseThrow());
+ // if (field == VSINF) return new BooleanParam(field);
+ return new NumberParam(field, (Range<Double>) constraint.orElseThrow());
}
/*
@@ -351,8 +347,12 @@ class ServiceUtil {
}
@SuppressWarnings("unused")
+ @Deprecated
private static final class BooleanParam implements Param {
+ // used to support vsInf
+ // will likely be used for other flags in future (e.g. vertical GM)
+
final String label;
final String info;
final boolean value;