From 0e6285ecac48c65d4de7e217a1c29d125f597cd3 Mon Sep 17 00:00:00 2001
From: bclayton-usgs <bclayton@usgs.gov>
Date: Wed, 3 Jun 2020 07:26:29 -0600
Subject: [PATCH] update location
---
.../earthquake/nshmp/netcdf/reader/NetcdfUtils.java | 8 ++++----
.../earthquake/nshmp/netcdf/NshmNetcdfReaderTests.java | 8 ++++----
.../nshmp/netcdf/reader/NetcdfUtilsTests.java | 10 +++++-----
3 files changed, 13 insertions(+), 13 deletions(-)
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 e80215d..503b8f7 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 c5b7d81..1f07aaf 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 9e0f818..1a21d02 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);
--
GitLab