diff --git a/src/main/java/gov/usgs/earthquake/nshmp/netcdf/reader/NetcdfUtils.java b/src/main/java/gov/usgs/earthquake/nshmp/netcdf/reader/NetcdfUtils.java index e80215ddba0fdc62d7d4c99e0db323e8a63f0b31..503b8f742abd39a27d27d9f30e4d2144909b0541 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/netcdf/reader/NetcdfUtils.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/netcdf/reader/NetcdfUtils.java @@ -32,20 +32,20 @@ public class NetcdfUtils { var builder = LocationList.builder(); for (var lat : latitudes) { - builder.add(lat, longitudes[0]); + builder.add(longitudes[0], lat); } // omit duplicate points at corners for (var i = 1; i < longitudes.length; i++) { - builder.add(latitudes[latitudes.length - 1], longitudes[i]); + builder.add(longitudes[i], latitudes[latitudes.length - 1]); } for (var i = latitudes.length - 2; i >= 0; i--) { - builder.add(latitudes[i], longitudes[longitudes.length - 1]); + builder.add(longitudes[longitudes.length - 1], latitudes[i]); } for (var i = longitudes.length - 2; i >= 0; i--) { - builder.add(latitudes[0], longitudes[i]); + builder.add(longitudes[i], latitudes[0]); } return builder.build(); 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 c5b7d81e82a772583652b2f62cd5b6a49726c8cf..1f07aafe4570bd9a08ea166a0e15aae4260bf401 100644 --- a/src/test/java/gov/usgs/earthquake/nshmp/netcdf/NshmNetcdfReaderTests.java +++ b/src/test/java/gov/usgs/earthquake/nshmp/netcdf/NshmNetcdfReaderTests.java @@ -48,10 +48,10 @@ public class NshmNetcdfReaderTests { public static final double[] EXPECTED_LATITUDES = new double[] { 39.15, 39.2, 39.25, 39.3 }; static final LocationList BOUNDING_LOCATIONS = LocationList.builder() - .add(EXPECTED_LATITUDES[1], EXPECTED_LONGITUDES[1]) - .add(EXPECTED_LATITUDES[2], EXPECTED_LONGITUDES[1]) - .add(EXPECTED_LATITUDES[2], EXPECTED_LONGITUDES[2]) - .add(EXPECTED_LATITUDES[1], EXPECTED_LONGITUDES[2]) + .add(EXPECTED_LONGITUDES[1], EXPECTED_LATITUDES[1]) + .add(EXPECTED_LONGITUDES[1], EXPECTED_LATITUDES[2]) + .add(EXPECTED_LONGITUDES[2], EXPECTED_LATITUDES[2]) + .add(EXPECTED_LONGITUDES[2], EXPECTED_LATITUDES[1]) .build(); static final LocationList LOCATIONS = LocationList.builder() diff --git a/src/test/java/gov/usgs/earthquake/nshmp/netcdf/reader/NetcdfUtilsTests.java b/src/test/java/gov/usgs/earthquake/nshmp/netcdf/reader/NetcdfUtilsTests.java index 9e0f818a5856aac68584779c430ed4d6dbb57100..1a21d02b6829e6390993b71edd647f257633f0d0 100644 --- a/src/test/java/gov/usgs/earthquake/nshmp/netcdf/reader/NetcdfUtilsTests.java +++ b/src/test/java/gov/usgs/earthquake/nshmp/netcdf/reader/NetcdfUtilsTests.java @@ -45,11 +45,11 @@ class NetcdfUtilsTests { static { BORDER_LOCATIONS = LocationList.builder() - .add(BORDER_LATITUDES[0], BORDER_LONGITUDES[0]) - .add(BORDER_LATITUDES[1], BORDER_LONGITUDES[0]) - .add(BORDER_LATITUDES[1], BORDER_LONGITUDES[1]) - .add(BORDER_LATITUDES[0], BORDER_LONGITUDES[1]) - .add(BORDER_LATITUDES[0], BORDER_LONGITUDES[0]) + .add(BORDER_LONGITUDES[0], BORDER_LATITUDES[0]) + .add(BORDER_LONGITUDES[0], BORDER_LATITUDES[1]) + .add(BORDER_LONGITUDES[1], BORDER_LATITUDES[1]) + .add(BORDER_LONGITUDES[1], BORDER_LATITUDES[0]) + .add(BORDER_LONGITUDES[0], BORDER_LATITUDES[0]) .build(); var siteClasses = List.of(SiteClass.B, SiteClass.C, SiteClass.D);