Skip to content
Snippets Groups Projects
Commit 7db87c97 authored by Powers, Peter M.'s avatar Powers, Peter M.
Browse files

service cleaning

parent 8ee5dae8
No related branches found
No related tags found
2 merge requests!644Production Release | nshmp-haz,!640Service updates
package gov.usgs.earthquake.nshmp.www.hazard; package gov.usgs.earthquake.nshmp.www.hazard;
import static com.google.common.base.Preconditions.checkState;
import static gov.usgs.earthquake.nshmp.calc.HazardExport.curvesBySource; import static gov.usgs.earthquake.nshmp.calc.HazardExport.curvesBySource;
import static gov.usgs.earthquake.nshmp.data.DoubleData.checkInRange; import static gov.usgs.earthquake.nshmp.data.DoubleData.checkInRange;
import static gov.usgs.earthquake.nshmp.geo.Coordinates.checkLatitude; import static gov.usgs.earthquake.nshmp.geo.Coordinates.checkLatitude;
...@@ -42,7 +41,6 @@ import gov.usgs.earthquake.nshmp.www.ServletUtil.Server; ...@@ -42,7 +41,6 @@ import gov.usgs.earthquake.nshmp.www.ServletUtil.Server;
import gov.usgs.earthquake.nshmp.www.meta.DoubleParameter; import gov.usgs.earthquake.nshmp.www.meta.DoubleParameter;
import gov.usgs.earthquake.nshmp.www.meta.Parameter; import gov.usgs.earthquake.nshmp.www.meta.Parameter;
import gov.usgs.earthquake.nshmp.www.source.SourceService.SourceModel; import gov.usgs.earthquake.nshmp.www.source.SourceService.SourceModel;
import io.micronaut.http.HttpRequest; import io.micronaut.http.HttpRequest;
import io.micronaut.http.HttpResponse; import io.micronaut.http.HttpResponse;
import jakarta.inject.Singleton; import jakarta.inject.Singleton;
...@@ -135,7 +133,6 @@ public final class HazardService { ...@@ -135,7 +133,6 @@ public final class HazardService {
Metadata(HazardModel model) { Metadata(HazardModel model) {
this.model = new SourceModel(model); this.model = new SourceModel(model);
// TODO should get min max from model (fix via swagger openapi injection)
longitude = new DoubleParameter( longitude = new DoubleParameter(
"Longitude", "Longitude",
"°", "°",
...@@ -294,12 +291,8 @@ public final class HazardService { ...@@ -294,12 +291,8 @@ public final class HazardService {
} }
Builder hazard(Hazard hazard) { Builder hazard(Hazard hazard) {
// necessary??
checkState(totalMap == null, "Hazard has already been added to this builder");
componentMaps = new EnumMap<>(Imt.class); componentMaps = new EnumMap<>(Imt.class);
totalMap = new EnumMap<>(Imt.class); totalMap = new EnumMap<>(Imt.class);
var typeTotalMaps = curvesBySource(hazard); var typeTotalMaps = curvesBySource(hazard);
for (var imt : hazard.curves().keySet()) { for (var imt : hazard.curves().keySet()) {
...@@ -320,7 +313,6 @@ public final class HazardService { ...@@ -320,7 +313,6 @@ public final class HazardService {
XySequence.addToMap(type, componentMap, typeTotalMap.get(type)); XySequence.addToMap(type, componentMap, typeTotalMap.get(type));
} }
} }
return this; return this;
} }
...@@ -440,7 +432,7 @@ public final class HazardService { ...@@ -440,7 +432,7 @@ public final class HazardService {
.collect(toCollection(() -> EnumSet.noneOf(Imt.class))); .collect(toCollection(() -> EnumSet.noneOf(Imt.class)));
} }
/* Read the 'imt' query values; can be comma-delimited. */ /* Read the 'out'put type query values; can be comma-delimited. */
static Set<DataType> readDataTypes(HttpRequest<?> http) { static Set<DataType> readDataTypes(HttpRequest<?> http) {
return http.getParameters().getAll("out").stream() return http.getParameters().getAll("out").stream()
.map(s -> s.split(",")) .map(s -> s.split(","))
......
...@@ -5,7 +5,6 @@ import gov.usgs.earthquake.nshmp.www.ResponseBody; ...@@ -5,7 +5,6 @@ import gov.usgs.earthquake.nshmp.www.ResponseBody;
import gov.usgs.earthquake.nshmp.www.ServletUtil; import gov.usgs.earthquake.nshmp.www.ServletUtil;
import gov.usgs.earthquake.nshmp.www.source.SourceLogicTreesService.Metadata; import gov.usgs.earthquake.nshmp.www.source.SourceLogicTreesService.Metadata;
import gov.usgs.earthquake.nshmp.www.source.SourceLogicTreesService.RequestData; import gov.usgs.earthquake.nshmp.www.source.SourceLogicTreesService.RequestData;
import io.micronaut.http.HttpRequest; import io.micronaut.http.HttpRequest;
import io.micronaut.http.HttpResponse; import io.micronaut.http.HttpResponse;
import io.micronaut.http.annotation.Controller; import io.micronaut.http.annotation.Controller;
...@@ -31,7 +30,7 @@ import jakarta.inject.Inject; ...@@ -31,7 +30,7 @@ import jakarta.inject.Inject;
* @author U.S. Geological Survey * @author U.S. Geological Survey
*/ */
@Tag( @Tag(
name = "Source Model Logic Tree", name = "Source Model Logic Trees",
description = "USGS NSHM source model logic tree service") description = "USGS NSHM source model logic tree service")
@Controller("/trees") @Controller("/trees")
public class SourceLogicTreesController { public class SourceLogicTreesController {
......
...@@ -17,7 +17,6 @@ import gov.usgs.earthquake.nshmp.www.ResponseBody; ...@@ -17,7 +17,6 @@ import gov.usgs.earthquake.nshmp.www.ResponseBody;
import gov.usgs.earthquake.nshmp.www.ResponseMetadata; import gov.usgs.earthquake.nshmp.www.ResponseMetadata;
import gov.usgs.earthquake.nshmp.www.ServletUtil; import gov.usgs.earthquake.nshmp.www.ServletUtil;
import gov.usgs.earthquake.nshmp.www.meta.Parameter; import gov.usgs.earthquake.nshmp.www.meta.Parameter;
import io.micronaut.http.HttpRequest; import io.micronaut.http.HttpRequest;
import io.micronaut.http.HttpResponse; import io.micronaut.http.HttpResponse;
import jakarta.inject.Singleton; import jakarta.inject.Singleton;
...@@ -72,6 +71,8 @@ public class SourceService { ...@@ -72,6 +71,8 @@ public class SourceService {
final Map<NehrpSiteClass, Double> siteClasses; final Map<NehrpSiteClass, Double> siteClasses;
final List<Parameter> imts; final List<Parameter> imts;
// final Bounds
public SourceModel(HazardModel model) { public SourceModel(HazardModel model) {
name = model.name(); name = model.name();
gmms = model.gmms(); gmms = model.gmms();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment