Skip to content
Snippets Groups Projects

Update for CONUS V3 model runs

Merged Powers, Peter M. requested to merge ghsc/users/pmpowers/nshmp-haz:increment-lib into main
1 file
+ 4
5
Compare changes
  • Side-by-side
  • Inline
@@ -15,7 +15,6 @@ import gov.usgs.earthquake.nshmp.www.hazard.DisaggService.RequestIml;
@@ -15,7 +15,6 @@ import gov.usgs.earthquake.nshmp.www.hazard.DisaggService.RequestIml;
import gov.usgs.earthquake.nshmp.www.hazard.DisaggService.RequestRp;
import gov.usgs.earthquake.nshmp.www.hazard.DisaggService.RequestRp;
import gov.usgs.earthquake.nshmp.www.hazard.DisaggService.Response;
import gov.usgs.earthquake.nshmp.www.hazard.DisaggService.Response;
import gov.usgs.earthquake.nshmp.www.hazard.HazardService.Metadata;
import gov.usgs.earthquake.nshmp.www.hazard.HazardService.Metadata;
import io.micronaut.core.annotation.Nullable;
import io.micronaut.core.annotation.Nullable;
import io.micronaut.http.HttpRequest;
import io.micronaut.http.HttpRequest;
import io.micronaut.http.HttpResponse;
import io.micronaut.http.HttpResponse;
@@ -102,10 +101,10 @@ public class DisaggController {
@@ -102,10 +101,10 @@ public class DisaggController {
@PathVariable double latitude,
@PathVariable double latitude,
@Schema(
@Schema(
minimum = "150",
minimum = "150",
maximum = "3000") @PathVariable double vs30,
maximum = "1500") @PathVariable double vs30,
@Schema(
@Schema(
minimum = "150",
minimum = "50",
maximum = "3000") @PathVariable double returnPeriod,
maximum = "10000") @PathVariable double returnPeriod,
@QueryValue @Nullable Set<Imt> imt,
@QueryValue @Nullable Set<Imt> imt,
@QueryValue @Nullable Set<DisaggDataType> out) {
@QueryValue @Nullable Set<DisaggDataType> out) {
try {
try {
@@ -149,7 +148,7 @@ public class DisaggController {
@@ -149,7 +148,7 @@ public class DisaggController {
minimum = "150",
minimum = "150",
maximum = "3000") @PathVariable double vs30,
maximum = "3000") @PathVariable double vs30,
@Schema(
@Schema(
example = "{\"PGA\": 0, \"SA0P2\": 0, \"SA1P0\": 0, \"SA2P0\": 0}") @QueryValue @Nullable Map<Imt, Double> imls,
example = "{\"PGA\": 0.1, \"SA0P2\": 0.2, \"SA1P0\": 0.05, \"SA2P0\": 0.01}") @QueryValue @Nullable Map<Imt, Double> imls,
@QueryValue @Nullable Set<DisaggDataType> out) {
@QueryValue @Nullable Set<DisaggDataType> out) {
try {
try {
Map<Imt, Double> imtImlMap = http.getParameters().asMap(Imt.class, Double.class);
Map<Imt, Double> imtImlMap = http.getParameters().asMap(Imt.class, Double.class);
Loading