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 338f0664003be437eeac47f3a64062bd9e95bd8d..cdf0c9d4a0c5e189a4692fb525cd8a34614c79cf 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 003f2c3d07204b05218f97cabd7b769fd0f802ef..72102fcfc77967f151592d3ec6da11738cd273fb 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 157504f786b00aeb5e8cb960ffbf7d332651b691..c5b7d81e82a772583652b2f62cd5b6a49726c8cf 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 };