diff --git a/gradle.properties b/gradle.properties index 8217be6b5d6b68cf3dbe2719c1a934b99a4af221..26eadda4faa63fe2f2a0c4464f1d1d555462890b 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.4.9 +nshmpLibVersion = 1.4.13 nshmpUtilsJavaVersion = 0.4.0 shadowVersion = 7.1.2 spotbugsVersion = 4.7.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 01f5cd494fa47c23398228414ff12db76c66456d..4d6df1a70ab8fd6f689a4026b4a016a8b8c73207 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 @@ -44,6 +44,7 @@ import gov.usgs.earthquake.nshmp.gmm.GmmInput; import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints; import gov.usgs.earthquake.nshmp.gmm.GmmInput.Field; import gov.usgs.earthquake.nshmp.gmm.Imt; +import gov.usgs.earthquake.nshmp.model.TectonicSetting; import gov.usgs.earthquake.nshmp.www.ResponseBody; import gov.usgs.earthquake.nshmp.www.ResponseMetadata; import gov.usgs.earthquake.nshmp.www.WsUtils; @@ -387,12 +388,14 @@ class ServiceUtil { final String id; final String label; + final Gmm.Type type; final ArrayList<String> supportedImts; final Constraints constraints; Value(Gmm gmm) { this.id = gmm.name(); this.label = gmm.toString(); + this.type = gmm.type(); this.supportedImts = supportedImts(gmm.supportedImts()); this.constraints = gmm.constraints(); } @@ -435,11 +438,21 @@ class ServiceUtil { final String id; final String label; final List<Gmm> data; + final String type; Value(Gmm.Group group) { this.id = group.name(); this.label = group.toString(); this.data = group.gmms(); + + if (group.toString().contains("Active Volcanic (HI)")) { + this.type = TectonicSetting.VOLCANIC.name(); + } else { + this.type = group.gmms().stream() + .map(gmm -> gmm.type().name()) + .findFirst() + .orElseThrow(); + } } } }