From 536661a1e46e4da0c799ea978aeca46ca33ea05c Mon Sep 17 00:00:00 2001
From: Jason Altekruse <jaltekruse@usgs.gov>
Date: Fri, 14 May 2021 14:34:32 -0600
Subject: [PATCH] update nshmp-lib version to 0.4.0 to get fix for
anti-clockwise extents. fixed coordinates, and names, in NshmpPolygon.
updated resolutions in map files to match what is run.
---
etc/nshm/map-conus.geojson | 4 +-
etc/nshm/map-hawaii.geojson | 128 +++++++++---------
etc/nshm/map-la-basin.geojson | 2 +-
etc/nshm/map-puget.geojson | 2 +-
etc/nshm/map-sf-bay.geojson | 2 +-
etc/nshm/map-wasatch.geojson | 2 +-
gradle.properties | 2 +-
.../earthquake/nshmp/site/NshmpPolygon.java | 30 ++--
.../usgs/earthquake/nshmp/site/NshmpSite.java | 2 +-
.../earthquake/nshmp/site/NshmpSiteFiles.java | 10 +-
10 files changed, 94 insertions(+), 90 deletions(-)
diff --git a/etc/nshm/map-conus.geojson b/etc/nshm/map-conus.geojson
index 910036f73..c8cd66680 100644
--- a/etc/nshm/map-conus.geojson
+++ b/etc/nshm/map-conus.geojson
@@ -9,8 +9,8 @@
"coordinates": [
[
[-125.0, 24.4],
- [ -65.0, 24.4],
- [ -65.0, 50.0],
+ [-65.0, 24.4],
+ [-65.0, 50.0],
[-125.0, 50.0],
[-125.0, 24.4]
]
diff --git a/etc/nshm/map-hawaii.geojson b/etc/nshm/map-hawaii.geojson
index 458741589..1dbeb0dd5 100644
--- a/etc/nshm/map-hawaii.geojson
+++ b/etc/nshm/map-hawaii.geojson
@@ -6,13 +6,15 @@
"id": "Extents",
"geometry": {
"type": "Polygon",
- "coordinates": [[
+ "coordinates": [
+ [
[-160.5, 18.6],
[-154.3, 18.6],
[-154.3, 22.5],
[-160.5, 22.5],
[-160.5, 18.6]
- ]]
+ ]
+ ]
},
"properties": {
"fill": "#AA0078",
@@ -24,66 +26,68 @@
"type": "Feature",
"geometry": {
"type": "Polygon",
- "coordinates": [[
- [-160.39,21.74],
- [-160.07,21.65],
- [-159.81,21.90],
- [-159.49,21.75],
- [-159.25,21.82],
- [-158.39,21.49],
- [-158.19,21.22],
- [-157.69,21.14],
- [-157.41,21.03],
- [-157.12,20.71],
- [-156.81,20.46],
- [-156.60,20.41],
- [-156.23,20.47],
- [-156.05,20.25],
- [-156.03,20.03],
- [-156.14,19.84],
- [-156.16,19.67],
- [-156.09,19.48],
- [-156.08,19.29],
- [-156.08,19.06],
- [-155.96,18.89],
- [-155.81,18.80],
- [-155.57,18.72],
- [-155.36,18.69],
- [-155.18,18.69],
- [-155.00,18.78],
- [-154.90,18.92],
- [-154.78,19.05],
- [-154.58,19.15],
- [-154.47,19.26],
- [-154.43,19.42],
- [-154.48,19.60],
- [-154.72,19.76],
- [-154.87,19.93],
- [-155.03,20.14],
- [-155.34,20.34],
- [-155.56,20.46],
- [-155.71,20.61],
- [-155.74,20.78],
- [-155.82,20.95],
- [-156.02,21.07],
- [-156.29,21.18],
- [-156.56,21.30],
- [-156.84,21.41],
- [-157.21,21.44],
- [-157.46,21.50],
- [-157.63,21.69],
- [-157.86,21.85],
- [-158.16,21.84],
- [-158.35,21.71],
- [-159.13,21.96],
- [-159.15,22.19],
- [-159.32,22.35],
- [-159.63,22.39],
- [-159.88,22.23],
- [-160.15,22.11],
- [-160.34,21.99],
- [-160.39,21.74]
- ]]
+ "coordinates": [
+ [
+ [-160.39, 21.74],
+ [-160.07, 21.65],
+ [-159.81, 21.9],
+ [-159.49, 21.75],
+ [-159.25, 21.82],
+ [-158.39, 21.49],
+ [-158.19, 21.22],
+ [-157.69, 21.14],
+ [-157.41, 21.03],
+ [-157.12, 20.71],
+ [-156.81, 20.46],
+ [-156.6, 20.41],
+ [-156.23, 20.47],
+ [-156.05, 20.25],
+ [-156.03, 20.03],
+ [-156.14, 19.84],
+ [-156.16, 19.67],
+ [-156.09, 19.48],
+ [-156.08, 19.29],
+ [-156.08, 19.06],
+ [-155.96, 18.89],
+ [-155.81, 18.8],
+ [-155.57, 18.72],
+ [-155.36, 18.69],
+ [-155.18, 18.69],
+ [-155.0, 18.78],
+ [-154.9, 18.92],
+ [-154.78, 19.05],
+ [-154.58, 19.15],
+ [-154.47, 19.26],
+ [-154.43, 19.42],
+ [-154.48, 19.6],
+ [-154.72, 19.76],
+ [-154.87, 19.93],
+ [-155.03, 20.14],
+ [-155.34, 20.34],
+ [-155.56, 20.46],
+ [-155.71, 20.61],
+ [-155.74, 20.78],
+ [-155.82, 20.95],
+ [-156.02, 21.07],
+ [-156.29, 21.18],
+ [-156.56, 21.3],
+ [-156.84, 21.41],
+ [-157.21, 21.44],
+ [-157.46, 21.5],
+ [-157.63, 21.69],
+ [-157.86, 21.85],
+ [-158.16, 21.84],
+ [-158.35, 21.71],
+ [-159.13, 21.96],
+ [-159.15, 22.19],
+ [-159.32, 22.35],
+ [-159.63, 22.39],
+ [-159.88, 22.23],
+ [-160.15, 22.11],
+ [-160.34, 21.99],
+ [-160.39, 21.74]
+ ]
+ ]
},
"properties": {
"spacing": 0.02,
diff --git a/etc/nshm/map-la-basin.geojson b/etc/nshm/map-la-basin.geojson
index 7f8ae430f..17eb78b22 100644
--- a/etc/nshm/map-la-basin.geojson
+++ b/etc/nshm/map-la-basin.geojson
@@ -16,7 +16,7 @@
]
},
"properties": {
- "spacing": 0.05,
+ "spacing": 0.01,
"title": "Los Angeles Basin – WGCEP 2007"
}
}
diff --git a/etc/nshm/map-puget.geojson b/etc/nshm/map-puget.geojson
index 1b3160d3e..098d56be1 100644
--- a/etc/nshm/map-puget.geojson
+++ b/etc/nshm/map-puget.geojson
@@ -16,7 +16,7 @@
]
},
"properties": {
- "spacing": 0.05,
+ "spacing": 0.01,
"title": "Puget Lowland"
}
}
diff --git a/etc/nshm/map-sf-bay.geojson b/etc/nshm/map-sf-bay.geojson
index 151b7b0c1..17d1add9b 100644
--- a/etc/nshm/map-sf-bay.geojson
+++ b/etc/nshm/map-sf-bay.geojson
@@ -16,7 +16,7 @@
]
},
"properties": {
- "spacing": 0.05,
+ "spacing": 0.01,
"title": "San Francisco Bay Area – WGCEP 2002"
}
}
diff --git a/etc/nshm/map-wasatch.geojson b/etc/nshm/map-wasatch.geojson
index 3cb020b86..b843fa1ae 100644
--- a/etc/nshm/map-wasatch.geojson
+++ b/etc/nshm/map-wasatch.geojson
@@ -16,7 +16,7 @@
]
},
"properties": {
- "spacing": 0.05,
+ "spacing": 0.01,
"title": "Wasatch Front – WGUEP 2013"
}
}
diff --git a/gradle.properties b/gradle.properties
index 9265297c8..2bdc6c507 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,7 +8,7 @@ junitVersion = 5.5.2
micronautVersion = 2.4.1
mnPluginVersion = 1.4.2
nodeVersion = 3.0.1
-nshmpLibVersion = 0.3.2
+nshmpLibVersion = 0.4.0
nshmpWsUtilsVersion = 0.1.2
shadowVersion = 5.2.0
spotbugsVersion = 4.2.4
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 9699ecaf0..1efe4627c 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpPolygon.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpPolygon.java
@@ -9,15 +9,15 @@ import gov.usgs.earthquake.nshmp.geo.LocationList;
*/
public enum NshmpPolygon {
- CEUS_CLIP(Data.CEUS_CLIP, "Central & Eastern US Map Extents"),
- WUS_CLIP(Data.WUS_CLIP, "Western US Map Extents"),
- CONUS_CLIP(Data.CONUS_CLIP, "NSHMP Conterminus US Map Extents"),
- ALASKA_CLIP(Data.ALASKA_CLIP, "Alaska Map Extents"),
- HAWAII_CLIP(Data.HAWAII_CLIP, "Hawaii Map Extents"),
+ CEUS_CLIP(Data.CEUS_CLIP, "NSHMP Central & Eastern US Map Extents"),
+ WUS_CLIP(Data.WUS_CLIP, "NSHMP Western US Map Extents"),
+ CONUS_CLIP(Data.CONUS_CLIP, "NSHMP Conterminous US Map Extents"),
+ ALASKA_CLIP(Data.ALASKA_CLIP, "NSHMP Alaska Map Extents"),
+ HAWAII_CLIP(Data.HAWAII_CLIP, "NSHMP Hawaii Map Extents"),
- ALASKA(Data.ALASKA, "Alaska"),
- HAWAII(Data.HAWAII, "Hawaii"),
- CONTERMINOUS_US(Data.CONTERMINOUS, "Conterminous US"),
+ ALASKA(Data.ALASKA, "NSHMP Alaska"),
+ HAWAII(Data.HAWAII, "NSHMP Hawaii"),
+ CONTERMINOUS_US(Data.CONTERMINOUS, "NSHMP Conterminous US"),
LA_BASIN(Data.WG_07_LA, "Los Angeles Basin – WGCEP 2007"),
SF_BAY(Data.WG_02_SF, "San Francisco Bay Area – WGCEP 2002"),
@@ -63,17 +63,17 @@ public enum NshmpPolygon {
private static class Data {
private static final double[][] CONUS_CLIP = {
- { -125.0, 24.6 },
+ { -125.0, 24.4 },
{ -65.0, 50.0 }
};
private static final double[][] CEUS_CLIP = {
- { -115.0, 24.6 },
+ { -115.0, 24.4 },
{ -65.0, 50.0 }
};
private static final double[][] WUS_CLIP = {
- { -125.0, 24.6 },
+ { -125.0, 24.4 },
{ -100.0, 50.0 }
};
@@ -111,8 +111,8 @@ public enum NshmpPolygon {
};
private static final double[][] HAWAII_CLIP = {
- { -161.0, 18.0 },
- { -154.0, 23.0 }
+ { -160.5, 18.6 },
+ { -154.3, 22.5 }
};
private static final double[][] HAWAII = {
@@ -154,7 +154,7 @@ public enum NshmpPolygon {
{ -155.34, 20.34 },
{ -155.56, 20.46 },
{ -155.71, 20.61 },
- { -155.76, 20.78 },
+ { -155.74, 20.78 },
{ -155.82, 20.95 },
{ -156.02, 21.07 },
{ -156.29, 21.18 },
@@ -172,7 +172,7 @@ public enum NshmpPolygon {
{ -159.63, 22.39 },
{ -159.88, 22.23 },
{ -160.15, 22.11 },
- { -160.35, 21.99 },
+ { -160.34, 21.99 },
{ -160.39, 21.74 }
};
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 2455bd64b..f8754e839 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpSite.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpSite.java
@@ -369,7 +369,7 @@ public enum NshmpSite implements NamedLocation {
}
/**
- * The set of sites used to test the COnterminus US NSHM.
+ * The set of sites used to test the Conterminous US NSHM.
*/
public static EnumSet<NshmpSite> conus() {
var coords = NshmpPolygon.CONUS_CLIP.coordinates();
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 dbcfac7a3..1ebf01c01 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpSiteFiles.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpSiteFiles.java
@@ -115,35 +115,35 @@ final class NshmpSiteFiles {
EXPORT_DIR.resolve("map-hawaii.geojson"),
HAWAII.toString(),
HAWAII.coordinates(),
- 0.1,
+ 0.02,
HAWAII_CLIP.coordinates().bounds().toList());
writePolyJson(
EXPORT_DIR.resolve("map-la-basin.geojson"),
LA_BASIN.toString(),
LA_BASIN.coordinates(),
- 0.05,
+ 0.01,
null);
writePolyJson(
EXPORT_DIR.resolve("map-sf-bay.geojson"),
SF_BAY.toString(),
SF_BAY.coordinates(),
- 0.05,
+ 0.01,
null);
writePolyJson(
EXPORT_DIR.resolve("map-puget.geojson"),
PUGET.toString(),
PUGET.coordinates(),
- 0.05,
+ 0.01,
null);
writePolyJson(
EXPORT_DIR.resolve("map-wasatch.geojson"),
WASATCH.toString(),
WASATCH.coordinates(),
- 0.05,
+ 0.01,
null);
writePolyJson(
--
GitLab