From 0573110f843e2c67db971540eefc0b590b4ee104 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 21 Jul 2022 09:32:02 -0600
Subject: [PATCH] switch to netcdf data files
---
.../www/NetcdfServiceGroundMotions.java | 22 +++++++++----------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/src/aashto/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/NetcdfServiceGroundMotions.java b/src/aashto/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/NetcdfServiceGroundMotions.java
index e5ddcae..78ae196 100644
--- a/src/aashto/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/NetcdfServiceGroundMotions.java
+++ b/src/aashto/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/NetcdfServiceGroundMotions.java
@@ -5,6 +5,7 @@ import java.util.stream.Collectors;
import gov.usgs.earthquake.nshmp.data.XySequence;
import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.netcdf.NetcdfDataFilesGroundMotions;
import gov.usgs.earthquake.nshmp.netcdf.NetcdfGroundMotions;
import gov.usgs.earthquake.nshmp.netcdf.NetcdfVersion;
import gov.usgs.earthquake.nshmp.netcdf.data.StaticData;
@@ -32,8 +33,8 @@ public class NetcdfServiceGroundMotions extends NetcdfService<Query> {
static final String X_LABEL = "Period (s)";
static final String Y_LABEL = "Spectral Acceleration (g)";
- public NetcdfServiceGroundMotions(NetcdfGroundMotions netcdf) {
- super(netcdf);
+ public NetcdfServiceGroundMotions(NetcdfDataFilesGroundMotions netcdfDataFiles) {
+ super(netcdfDataFiles);
}
@Override
@@ -51,17 +52,16 @@ public class NetcdfServiceGroundMotions extends NetcdfService<Query> {
@Override
String getServiceName() {
- return getSourceModel().name;
+ return String.format("AASHTO-%d Web Services", netcdfDataFiles().aashtoYear());
}
- @Override
- SourceModel getSourceModel() {
- return new SourceModel(netcdf());
+ NetcdfGroundMotions netcdf(Location location) {
+ return netcdfDataFiles().netcdf(location);
}
@Override
- NetcdfGroundMotions netcdf() {
- return (NetcdfGroundMotions) netcdf;
+ NetcdfDataFilesGroundMotions netcdfDataFiles() {
+ return (NetcdfDataFilesGroundMotions) netcdfDataFiles;
}
@Override
@@ -82,14 +82,13 @@ public class NetcdfServiceGroundMotions extends NetcdfService<Query> {
}
}
- @Override
ResponseBody<RequestDataSiteClass, ResponseData<ServiceResponseMetadata>> processCurvesSiteClass(
RequestDataSiteClass request,
String url) {
WsUtils.checkValue(Key.LATITUDE, request.latitude);
WsUtils.checkValue(Key.LONGITUDE, request.longitude);
WsUtils.checkValue(Key.SITE_CLASS, request.siteClass);
- var curves = netcdf().staticData(request.site, request.siteClass);
+ var curves = netcdf(request.site).staticData(request.site, request.siteClass);
var responseData = toResponseData(request, curves);
return ResponseBody.<RequestDataSiteClass, ResponseData<ServiceResponseMetadata>> success()
@@ -101,13 +100,12 @@ public class NetcdfServiceGroundMotions extends NetcdfService<Query> {
.build();
}
- @Override
ResponseBody<RequestData, List<ResponseData<ServiceResponseMetadata>>> processCurves(
RequestData request,
String url) {
WsUtils.checkValue(Key.LATITUDE, request.latitude);
WsUtils.checkValue(Key.LONGITUDE, request.longitude);
- var curves = netcdf().staticData(request.site);
+ var curves = netcdf(request.site).staticData(request.site);
var responseData = toList(request, curves);
return ResponseBody.<RequestData, List<ResponseData<ServiceResponseMetadata>>> success()
--
GitLab