From bd67d08386c4017c6068f4f0311fb46ecc62cce4 Mon Sep 17 00:00:00 2001
From: bclayton-usgs <bclayton@usgs.gov>
Date: Tue, 2 Jun 2020 15:20:45 -0600
Subject: [PATCH] update location
---
.../usgs/earthquake/nshmp/aws/HazardResultSliceLambda.java | 4 ++--
.../java/gov/usgs/earthquake/nshmp/site/CybershakeSite.java | 2 +-
.../java/gov/usgs/earthquake/nshmp/site/NshmpPolygon.java | 2 +-
src/main/java/gov/usgs/earthquake/nshmp/site/NshmpSite.java | 2 +-
.../java/gov/usgs/earthquake/nshmp/site/NshmpSiteFiles.java | 4 ++--
src/main/java/gov/usgs/earthquake/nshmp/site/NuregSite.java | 2 +-
.../earthquake/nshmp/www/services/DeaggEpsilonService.java | 4 ++--
.../usgs/earthquake/nshmp/www/services/HazardService.java | 6 +++---
.../gov/usgs/earthquake/nshmp/www/services/RateService.java | 6 +++---
.../java/gov/usgs/earthquake/nshmp/site/NshmpSiteTests.java | 2 +-
10 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/aws/HazardResultSliceLambda.java b/src/main/java/gov/usgs/earthquake/nshmp/aws/HazardResultSliceLambda.java
index 813b12165..5ba9a19fc 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/aws/HazardResultSliceLambda.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/aws/HazardResultSliceLambda.java
@@ -43,7 +43,7 @@ import gov.usgs.earthquake.nshmp.www.services.ServletUtil;
/**
* AWS Lambda function to read in a curves file from AWS S3 and create slices at
* return periods interest. <br>
- *
+ *
* The results are written to S3 as map.csv bucket.
*/
@SuppressWarnings("unused")
@@ -174,7 +174,7 @@ public class HazardResultSliceLambda implements RequestStreamHandler {
}
return Site.builder()
- .location(lat, lon)
+ .location(lon, lat)
.name(name)
.build();
}
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/site/CybershakeSite.java b/src/main/java/gov/usgs/earthquake/nshmp/site/CybershakeSite.java
index da0d03e04..1cd89db28 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/site/CybershakeSite.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/site/CybershakeSite.java
@@ -118,7 +118,7 @@ public enum CybershakeSite implements NamedLocation {
double z1p0,
double z2p5) {
- this.loc = Location.create(lat, lon);
+ this.loc = Location.create(lon, lat);
this.run = run;
this.willsVs30 = willsVs30;
this.cvmVs30 = cvmVs30;
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpPolygon.java b/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpPolygon.java
index 4c15b89fc..ccc634578 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpPolygon.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpPolygon.java
@@ -55,7 +55,7 @@ public enum NshmpPolygon {
private static LocationList createPolygon(double[][] coords) {
LocationList.Builder locs = LocationList.builder();
for (double[] coord : coords) {
- locs.add(coord[1], coord[0]);
+ locs.add(coord[0], coord[1]);
}
return locs.build();
}
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpSite.java b/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpSite.java
index 7221fa82a..27041e5f2 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpSite.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpSite.java
@@ -324,7 +324,7 @@ public enum NshmpSite implements NamedLocation {
private final String label;
private NshmpSite(double lon, double lat) {
- this.location = Location.create(lat, lon);
+ this.location = Location.create(lon, lat);
this.state = UsRegion.valueOf(name().substring(name().lastIndexOf('_') + 1));
this.label = createLabel();
}
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpSiteFiles.java b/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpSiteFiles.java
index 2947000ac..796c767d1 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpSiteFiles.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpSiteFiles.java
@@ -439,8 +439,8 @@ final class NshmpSiteFiles {
@Override
public Location location() {
return Location.create(
- Maths.round(input.location().latitude, 1),
- Maths.round(input.location().longitude, 1));
+ Maths.round(input.location().longitude, 1),
+ Maths.round(input.location().latitude, 1));
}
@Override
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/site/NuregSite.java b/src/main/java/gov/usgs/earthquake/nshmp/site/NuregSite.java
index b645547a9..0aba72dce 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/site/NuregSite.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/site/NuregSite.java
@@ -26,7 +26,7 @@ public enum NuregSite implements NamedLocation {
private final UsRegion state;
private NuregSite(double lon, double lat) {
- this.loc = Location.create(lat, lon);
+ this.loc = Location.create(lon, lat);
this.state = UsRegion.valueOf(name().substring(name().lastIndexOf('_') + 1));
}
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/services/DeaggEpsilonService.java b/src/main/java/gov/usgs/earthquake/nshmp/www/services/DeaggEpsilonService.java
index 9722ce118..7ac915038 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/services/DeaggEpsilonService.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/services/DeaggEpsilonService.java
@@ -68,7 +68,7 @@ public final class DeaggEpsilonService {
/**
* Handler for {@link DeaggEpsilonController#doGetDeaggEpsilon}. Returns the
* usage or the deagg result.
- *
+ *
* @param query The query
* @param urlHelper The URL helper
*/
@@ -180,7 +180,7 @@ public final class DeaggEpsilonService {
@Override
public Site apply(CalcConfig config) {
return Site.builder()
- .location(Location.create(data.latitude, data.longitude))
+ .location(Location.create(data.longitude, data.latitude))
.basinDataProvider(data.basin ? basinUrl : null)
.vs30(data.vs30.value())
.build();
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/services/HazardService.java b/src/main/java/gov/usgs/earthquake/nshmp/www/services/HazardService.java
index 8b36bc0bd..9df7324c9 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/services/HazardService.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/services/HazardService.java
@@ -54,7 +54,7 @@ public final class HazardService {
/**
* Handler for {@link HazardController#doGetUsage}. Returns the usage for the
* hazard service.
- *
+ *
* @param urlHelper The URL helper
*/
public static HttpResponse<String> handleDoGetUsage(UrlHelper urlHelper) {
@@ -71,7 +71,7 @@ public final class HazardService {
/**
* Handler for {@link HazardController#doGetHazard}. Returns the usage or the
* hazard result.
- *
+ *
* @param query The query
* @param urlHelper The URL helper
*/
@@ -128,7 +128,7 @@ public final class HazardService {
public Site apply(CalcConfig config) {
return Site.builder()
.basinDataProvider(config.siteData.basinDataProvider)
- .location(Location.create(data.latitude, data.longitude))
+ .location(Location.create(data.longitude, data.latitude))
.vs30(data.vs30.value())
.build();
}
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/services/RateService.java b/src/main/java/gov/usgs/earthquake/nshmp/www/services/RateService.java
index ada84547e..272f69bdb 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/services/RateService.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/services/RateService.java
@@ -52,7 +52,7 @@ public final class RateService {
/**
* Handler for {@link RateController#doGetUsageRate} and
* {@link RateController#doGetUsageProbability}.
- *
+ *
* @param service The service
* @param urlHelper The url helper
*/
@@ -70,7 +70,7 @@ public final class RateService {
* Handler for {@link RateController#doGetProbability},
* {@link RateController#doGetProbabilitySlash},
* {@link RateController#doGetRate}, and {@link RateController#doGetRateSlash}
- *
+ *
* @param service The service
* @param query The query
* @param urlHelper The url helper
@@ -114,7 +114,7 @@ public final class RateService {
private static EqRate calc(Service service, RequestData data)
throws InterruptedException, ExecutionException {
- var location = Location.create(data.latitude, data.longitude);
+ var location = Location.create(data.longitude, data.latitude);
var site = Site.builder().location(location).build();
var futureRates = new ArrayList<ListenableFuture<EqRate>>();
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/site/NshmpSiteTests.java b/src/test/java/gov/usgs/earthquake/nshmp/site/NshmpSiteTests.java
index f6c09d266..6d64067a3 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/site/NshmpSiteTests.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/site/NshmpSiteTests.java
@@ -68,7 +68,7 @@ public class NshmpSiteTests {
public final void methodsTest() {
NshmpSite s = WASHINGTON_DC;
assertEquals(s.state(), UsRegion.DC);
- assertEquals(s.location(), Location.create(38.90, -77.05));
+ assertEquals(s.location(), Location.create(-77.05, 38.90));
assertEquals(s.toString(), "Washington DC");
s = MCGRATH_AK;
--
GitLab