From 3dd9ceeb405014399fa2e886592ee25881e644e3 Mon Sep 17 00:00:00 2001
From: bclayton-usgs <bclayton@usgs.gov>
Date: Tue, 2 Jun 2020 14:09:41 -0600
Subject: [PATCH] fix location
---
.../nshmp/netcdf/reader/BoundingHazardsReader.java | 4 ++--
.../gov/usgs/earthquake/nshmp/netcdf/www/NetcdfService.java | 6 +++---
.../usgs/earthquake/nshmp/netcdf/NshmNetcdfReaderTests.java | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/netcdf/reader/BoundingHazardsReader.java b/src/main/java/gov/usgs/earthquake/nshmp/netcdf/reader/BoundingHazardsReader.java
index 338f066..cdf0c9d 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/netcdf/reader/BoundingHazardsReader.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/netcdf/reader/BoundingHazardsReader.java
@@ -18,7 +18,7 @@ import ucar.nc2.dataset.NetcdfDataset;
/**
* Container for gridded hazard curves at four closest grid points to target
- *
+ *
* @author U.S. Geological Survey
*/
public class BoundingHazardsReader {
@@ -202,7 +202,7 @@ public class BoundingHazardsReader {
final int[] origin;
BoundingLocation(double longitude, double latitude, int longitudeIndex, int latitudeIndex) {
- location = Location.create(latitude, longitude);
+ location = Location.create(longitude, latitude);
origin = new int[] { 0, 0, latitudeIndex, longitudeIndex, 0 };
}
}
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/NetcdfService.java b/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/NetcdfService.java
index 003f2c3..72102fc 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/NetcdfService.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/NetcdfService.java
@@ -31,9 +31,9 @@ import io.micronaut.http.HttpResponse;
/**
* Service handler for {@code NetcdfController}.
- *
+ *
* @see NetcdfController
- *
+ *
* @author U.S. Geological Survey
*/
public class NetcdfService {
@@ -254,7 +254,7 @@ public class NetcdfService {
Location site;
RequestData(double longitude, double latitude) {
- site = Location.create(latitude, longitude);
+ site = Location.create(longitude, latitude);
}
}
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/netcdf/NshmNetcdfReaderTests.java b/src/test/java/gov/usgs/earthquake/nshmp/netcdf/NshmNetcdfReaderTests.java
index 157504f..c5b7d81 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/netcdf/NshmNetcdfReaderTests.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/netcdf/NshmNetcdfReaderTests.java
@@ -41,7 +41,7 @@ public class NshmNetcdfReaderTests {
public static final double IML_TOL = 1e-6;
static final double HAZ_TOL = 1e-8;
- static final Location TARGET_LOCATION = Location.create(39.213, -105.234);
+ static final Location TARGET_LOCATION = Location.create(-105.234, 39.213);
public static final double[] EXPECTED_LONGITUDES =
new double[] { -105.3, -105.25, -105.2, -105.15 };
--
GitLab