test

src/main/java/gov/usgs/earthquake/nshmp/www/hazard/HazardController.java

@@ -111,7 +111,7 @@ public class HazardController {
       content = @Content(
           schema = @Schema(implementation = HazardResponse.class)))
   @Get(
-      uri = "/{longitude}/{latitude}/{vs30}{?truncate,maxdir,imt,sourceType,tectonicSetting}",
+      uri = "/{longitude}/{latitude}/{vs30}{?truncate,maxdir,imt}",
       produces = MediaType.APPLICATION_JSON)
   public HttpResponse<String> doGetHazard(
       HttpRequest<?> http,
@@ -124,16 +124,14 @@ public class HazardController {
           defaultValue = "false") @Nullable Boolean truncate,
       @QueryValue(
           defaultValue = "false") @Nullable Boolean maxdir,
-      @QueryValue @Nullable Set<Imt> imt,
-      @QueryValue @Nullable SourceType sourceType,
-      @QueryValue @Nullable TectonicSetting tectonicSetting) {
+      @QueryValue @Nullable Set<Imt> imt) {
     try {
       Logger log = Logger.getAnonymousLogger();
       log.info("Hazard call");
       log.info("Thread count: " + ServletUtil.THREAD_COUNT);
       Set<Imt> imts = HazardService.readImts(http);
       HazardService.Request request = new HazardService.Request(
-          http, longitude, latitude, vs30, imts, truncate, maxdir, sourceType, tectonicSetting);
+          http, longitude, latitude, vs30, imts, truncate, maxdir);
       return HazardService.getHazard(request);
     } catch (Exception e) {
       return ServletUtil.error(

src/main/java/gov/usgs/earthquake/nshmp/www/hazard/HazardService.java

@@ -124,15 +124,15 @@ public final class HazardService {
         .imts(request.imts)
         .build();
 
-    if (request.sourceType != null) {
-      config.hazard.sourceTypes.clear();
-      // config.hazard.sourceTypes.addAll(
-      // Stream.of(SourceType.values())
-      // .filter(sourceType -> sourceType != request.sourceType)
-      // .collect(Collectors.toSet())
-      // );
-      config.hazard.sourceTypes.add(request.sourceType);
-    }
+    // if (request.sourceType != null) {
+    //   config.hazard.sourceTypes.clear();
+    //   // config.hazard.sourceTypes.addAll(
+    //   // Stream.of(SourceType.values())
+    //   // .filter(sourceType -> sourceType != request.sourceType)
+    //   // .collect(Collectors.toSet())
+    //   // );
+    //   config.hazard.sourceTypes.add(request.sourceType);
+    // }
 
     // if (request.tectonicSetting != null) {
     // config.hazard.tectonicSettings.clear();
@@ -243,8 +243,6 @@ public final class HazardService {
     final boolean truncate;
     final boolean maxdir;
     final Set<Imt> imts;
-    final SourceType sourceType;
-    final TectonicSetting tectonicSetting;
 
     public Request(
         HttpRequest<?> http,
@@ -253,14 +251,10 @@ public final class HazardService {
         double vs30,
         Set<Imt> imts,
         boolean truncate,
-        boolean maxdir,
-        SourceType sourceType,
-        TectonicSetting tectonicSetting) {
+        boolean maxdir) {
       super(http, longitude, latitude, vs30);
       this.truncate = truncate;
       this.maxdir = maxdir;
-      this.sourceType = sourceType;
-      this.tectonicSetting = tectonicSetting;
       this.imts = imts.isEmpty()
           ? Gmm.supportedImts(ServletUtil.model().gmms())
           : imts;