diff --git a/etc/nshm/map-alaska.geojson b/etc/nshm/map-alaska.geojson
index 07514b1b448012331cccd93e98e8a6c35405e916..c37ff256d6af4a8a500b24a83f252148eff84846 100644
--- a/etc/nshm/map-alaska.geojson
+++ b/etc/nshm/map-alaska.geojson
@@ -9,9 +9,9 @@
"coordinates": [
[
[-200.0, 48.0],
- [-200.0, 72.0],
- [-125.0, 72.0],
[-125.0, 48.0],
+ [-125.0, 72.0],
+ [-200.0, 72.0],
[-200.0, 48.0]
]
]
@@ -19,7 +19,7 @@
"properties": {
"fill": "#AA0078",
"stroke": "#AA0078",
- "title": "Alaska Map Extents"
+ "title": "NSHMP Alaska Map Extents"
}
},
{
@@ -58,7 +58,7 @@
},
"properties": {
"spacing": 0.1,
- "title": "Alaska"
+ "title": "NSHMP Alaska"
}
}
]
diff --git a/etc/nshm/map-ceus.geojson b/etc/nshm/map-ceus.geojson
index 5bf312f1f27570471d9b39f6c4c36d9365363d8d..7f557a558ea0d9f1efcbe0f912df6f0b8d556644 100644
--- a/etc/nshm/map-ceus.geojson
+++ b/etc/nshm/map-ceus.geojson
@@ -8,11 +8,11 @@
"type": "Polygon",
"coordinates": [
[
- [-115.0, 24.6],
- [-115.0, 50.0],
+ [-115.0, 24.4],
+ [-65.0, 24.4],
[-65.0, 50.0],
- [-65.0, 24.6],
- [-115.0, 24.6]
+ [-115.0, 50.0],
+ [-115.0, 24.4]
]
]
},
diff --git a/etc/nshm/map-conus.geojson b/etc/nshm/map-conus.geojson
index ee9d2c7172353beb5fad838126718fe6a3d179f7..c8cd666808addc6e44996b946cebfc6aa0d0e872 100644
--- a/etc/nshm/map-conus.geojson
+++ b/etc/nshm/map-conus.geojson
@@ -8,18 +8,18 @@
"type": "Polygon",
"coordinates": [
[
- [-125.0, 24.6],
- [-125.0, 50.0],
+ [-125.0, 24.4],
+ [-65.0, 24.4],
[-65.0, 50.0],
- [-65.0, 24.6],
- [-125.0, 24.6]
+ [-125.0, 50.0],
+ [-125.0, 24.4]
]
]
},
"properties": {
"fill": "#AA0078",
"stroke": "#AA0078",
- "title": "Conterminous US Map Extents"
+ "title": "NSHMP Conterminous US Map Extents"
}
},
{
@@ -109,7 +109,7 @@
},
"properties": {
"spacing": 0.1,
- "title": "Conterminous US"
+ "title": "NSHMP Conterminous US"
}
}
]
diff --git a/etc/nshm/map-hawaii.geojson b/etc/nshm/map-hawaii.geojson
index bca64085e05cc1d220b8f4989a686b5dae1b64bf..1dbeb0dd5f1f19a171337e3d8ed0c34658891704 100644
--- a/etc/nshm/map-hawaii.geojson
+++ b/etc/nshm/map-hawaii.geojson
@@ -8,18 +8,18 @@
"type": "Polygon",
"coordinates": [
[
- [-161.0, 18.0],
- [-161.0, 23.0],
- [-154.0, 23.0],
- [-154.0, 18.0],
- [-161.0, 18.0]
+ [-160.5, 18.6],
+ [-154.3, 18.6],
+ [-154.3, 22.5],
+ [-160.5, 22.5],
+ [-160.5, 18.6]
]
]
},
"properties": {
"fill": "#AA0078",
"stroke": "#AA0078",
- "title": "Hawaii Map Extents"
+ "title": "NSHMP Hawaii Map Extents"
}
},
{
@@ -66,7 +66,7 @@
[-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],
@@ -84,14 +84,14 @@
[-159.63, 22.39],
[-159.88, 22.23],
[-160.15, 22.11],
- [-160.35, 21.99],
+ [-160.34, 21.99],
[-160.39, 21.74]
]
]
},
"properties": {
- "spacing": 0.1,
- "title": "Hawaii"
+ "spacing": 0.02,
+ "title": "NSHMP Hawaii"
}
}
]
diff --git a/etc/nshm/map-la-basin.geojson b/etc/nshm/map-la-basin.geojson
index 7f8ae430ffe8af1a11326cd6987bd68764e6b666..17eb78b2268aa7c12ce128fe8e5cbb66510863d4 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 1b3160d3e0d896a3977af429e9e190e2c74bdd7e..098d56be1bc58198003a41e8818f97c469ca6172 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 151b7b0c16edeb1b4ac0cd0384a37b14239df411..17d1add9b58ffc55682adaac09ad7269e972ab97 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 3cb020b86af009e8f243718a1a7da043a8f03e4a..b843fa1aefe2b813f270a7e8c761335abfb1de6d 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/etc/nshm/map-wus.geojson b/etc/nshm/map-wus.geojson
index 7000b7292692fa40c0c4cb72a15ac795dd9abcb8..a5d4598b727cb11b26b2b8c8240ab9519b67351d 100644
--- a/etc/nshm/map-wus.geojson
+++ b/etc/nshm/map-wus.geojson
@@ -8,11 +8,11 @@
"type": "Polygon",
"coordinates": [
[
- [-125.0, 24.6],
- [-125.0, 50.0],
+ [-125.0, 24.4],
+ [-100.0, 24.4],
[-100.0, 50.0],
- [-100.0, 24.6],
- [-125.0, 24.6]
+ [-125.0, 50.0],
+ [-125.0, 24.4]
]
]
},
diff --git a/gradle.properties b/gradle.properties
index 9265297c8b96533a16a6e2c67956221f07159ec5..927cd9a8175a5fe7ba83f8f0793dfdda09ff96e3 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.3
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 9699ecaf03a92b0273da3528b82b5e70fc955e96..1efe4627c2caf1341414d53e3a907fb2a1e867ae 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 2455bd64b52c8ea1e98ba93b84f4cb0b1d1b3f0d..f8754e83931d8719cb5729a027a7899c69ca75fb 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 dbcfac7a3c118bab9c27404b2725d149bc48f5cc..5d1022116e4f4160f5cb1f90c541cce3b5695338 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpSiteFiles.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpSiteFiles.java
@@ -91,17 +91,17 @@ final class NshmpSiteFiles {
Path ceusOut = EXPORT_DIR.resolve("map-ceus.geojson");
LocationList ceusBounds = CEUS_CLIP.coordinates().bounds().toList();
- writePolyJson(ceusOut, "NSHMP Central & Eastern US", usCoords, 0.1, ceusBounds);
+ writePolyJson(ceusOut, "NSHMP Central & Eastern US", usCoords, 0.05, ceusBounds);
Path wusOut = EXPORT_DIR.resolve("map-wus.geojson");
LocationList wusBounds = WUS_CLIP.coordinates().bounds().toList();
- writePolyJson(wusOut, "NSHMP Western US", usCoords, 0.1, wusBounds);
+ writePolyJson(wusOut, "NSHMP Western US", usCoords, 0.05, wusBounds);
writePolyJson(
EXPORT_DIR.resolve("map-conus.geojson"),
CONTERMINOUS_US.toString(),
CONTERMINOUS_US.coordinates(),
- 0.1,
+ 0.05,
CONUS_CLIP.coordinates().bounds().toList());
writePolyJson(
@@ -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(