From 56425e113cd7dd9babc293e034f87e4234e1a39e Mon Sep 17 00:00:00 2001
From: Jason Altekruse <jaltekruse@usgs.gov>
Date: Tue, 12 Nov 2024 15:46:57 -0700
Subject: [PATCH] correct NRC enumset to only include CEUS sites (exclude
territories)
---
etc/nshm/sites-nrc.csv | 27 --
etc/nshm/sites-nrc.geojson | 297 ------------------
.../usgs/earthquake/nshmp/site/NshmpSite.java | 7 +-
3 files changed, 6 insertions(+), 325 deletions(-)
diff --git a/etc/nshm/sites-nrc.csv b/etc/nshm/sites-nrc.csv
index 1cac390a..05f96f45 100644
--- a/etc/nshm/sites-nrc.csv
+++ b/etc/nshm/sites-nrc.csv
@@ -16,14 +16,6 @@ Miami FL, -80.20, 25.75
Atlanta GA, -84.40, 33.75
Lincolnton GA, -82.50, 33.80
Savannah GA, -81.10, 32.10
-Anderson AFB (ATC) GU, 144.90, 13.60
-Central GU, 144.80, 13.50
-Dededo GU, 144.90, 13.50
-Northeast GU, 144.90, 13.60
-Santa Rita GU, 144.70, 13.40
-Southwest GU, 144.70, 13.30
-Yigo GU, 144.90, 13.50
-Yona GU, 144.80, 13.40
Des Moines IA, -93.60, 41.60
Central IL, -90.00, 40.00
Chicago IL, -87.65, 41.85
@@ -43,9 +35,6 @@ Minneapolis MN, -93.30, 45.00
Cape Girardeau MO, -89.50, 37.30
New Madrid MO, -89.55, 36.60
St Louis MO, -90.20, 38.60
-Saipan (central) MP, 145.70, 15.20
-Saipan MP, 145.80, 15.20
-Tinian MP, 145.60, 15.00
Jackson MS, -90.20, 32.30
Charlotte NC, -80.85, 35.25
Fargo ND, -96.80, 46.90
@@ -63,18 +52,6 @@ Elgin OK, -98.30, 34.80
Oklahoma City OK, -97.50, 35.50
Philadelphia PA, -75.15, 39.95
Pittsburg PA, -80.00, 40.45
-Arecibo PR, -66.72, 18.47
-Bayamon PR, -66.16, 18.40
-Caguas PR, -66.04, 18.24
-Culebra Barrio PR, -65.30, 18.30
-Fajardo PR, -65.65, 18.34
-Isabel II PR, -65.44, 18.15
-Mayaguez PR, -67.14, 18.20
-Ponce PR, -66.62, 18.00
-San Juan (ATC) PR, -66.10, 18.45
-San Juan PR, -66.12, 18.47
-Utuado PR, -66.70, 18.27
-Yabucoa PR, -65.88, 18.05
Providence RI, -71.40, 41.80
Charleston SC, -79.95, 32.80
Edgemont SD, -103.85, 43.30
@@ -93,10 +70,6 @@ Snyder TX, -100.90, 32.70
Blacksburg VA, -80.40, 37.25
Michaux VA, -77.90, 37.65
Richmond VA, -77.45, 37.55
-Charlotte Amalie (1) VI, -64.93, 18.34
-Charlotte Amalie (2) VI, -64.95, 18.35
-Christiansted VI, -64.70, 17.75
-Cruz Bay VI, -64.79, 18.33
Burlington VT, -73.20, 44.50
Milwaukee WI, -87.90, 43.05
Charleston WV, -81.65, 38.35
diff --git a/etc/nshm/sites-nrc.geojson b/etc/nshm/sites-nrc.geojson
index e67a7f94..f1e878a8 100644
--- a/etc/nshm/sites-nrc.geojson
+++ b/etc/nshm/sites-nrc.geojson
@@ -188,94 +188,6 @@
"title": "Savannah GA"
}
},
- {
- "type": "Feature",
- "geometry": {
- "type": "Point",
- "coordinates": [144.9, 13.6]
- },
- "properties": {
- "marker-size": "small",
- "title": "Anderson AFB (ATC) GU"
- }
- },
- {
- "type": "Feature",
- "geometry": {
- "type": "Point",
- "coordinates": [144.8, 13.5]
- },
- "properties": {
- "marker-size": "small",
- "title": "Central GU"
- }
- },
- {
- "type": "Feature",
- "geometry": {
- "type": "Point",
- "coordinates": [144.9, 13.5]
- },
- "properties": {
- "marker-size": "small",
- "title": "Dededo GU"
- }
- },
- {
- "type": "Feature",
- "geometry": {
- "type": "Point",
- "coordinates": [144.9, 13.6]
- },
- "properties": {
- "marker-size": "small",
- "title": "Northeast GU"
- }
- },
- {
- "type": "Feature",
- "geometry": {
- "type": "Point",
- "coordinates": [144.7, 13.4]
- },
- "properties": {
- "marker-size": "small",
- "title": "Santa Rita GU"
- }
- },
- {
- "type": "Feature",
- "geometry": {
- "type": "Point",
- "coordinates": [144.7, 13.3]
- },
- "properties": {
- "marker-size": "small",
- "title": "Southwest GU"
- }
- },
- {
- "type": "Feature",
- "geometry": {
- "type": "Point",
- "coordinates": [144.9, 13.5]
- },
- "properties": {
- "marker-size": "small",
- "title": "Yigo GU"
- }
- },
- {
- "type": "Feature",
- "geometry": {
- "type": "Point",
- "coordinates": [144.8, 13.4]
- },
- "properties": {
- "marker-size": "small",
- "title": "Yona GU"
- }
- },
{
"type": "Feature",
"geometry": {
@@ -485,39 +397,6 @@
"title": "St Louis MO"
}
},
- {
- "type": "Feature",
- "geometry": {
- "type": "Point",
- "coordinates": [145.7, 15.2]
- },
- "properties": {
- "marker-size": "small",
- "title": "Saipan (central) MP"
- }
- },
- {
- "type": "Feature",
- "geometry": {
- "type": "Point",
- "coordinates": [145.8, 15.2]
- },
- "properties": {
- "marker-size": "small",
- "title": "Saipan MP"
- }
- },
- {
- "type": "Feature",
- "geometry": {
- "type": "Point",
- "coordinates": [145.6, 15.0]
- },
- "properties": {
- "marker-size": "small",
- "title": "Tinian MP"
- }
- },
{
"type": "Feature",
"geometry": {
@@ -705,138 +584,6 @@
"title": "Pittsburg PA"
}
},
- {
- "type": "Feature",
- "geometry": {
- "type": "Point",
- "coordinates": [-66.72, 18.47]
- },
- "properties": {
- "marker-size": "small",
- "title": "Arecibo PR"
- }
- },
- {
- "type": "Feature",
- "geometry": {
- "type": "Point",
- "coordinates": [-66.16, 18.4]
- },
- "properties": {
- "marker-size": "small",
- "title": "Bayamon PR"
- }
- },
- {
- "type": "Feature",
- "geometry": {
- "type": "Point",
- "coordinates": [-66.04, 18.24]
- },
- "properties": {
- "marker-size": "small",
- "title": "Caguas PR"
- }
- },
- {
- "type": "Feature",
- "geometry": {
- "type": "Point",
- "coordinates": [-65.3, 18.3]
- },
- "properties": {
- "marker-size": "small",
- "title": "Culebra Barrio PR"
- }
- },
- {
- "type": "Feature",
- "geometry": {
- "type": "Point",
- "coordinates": [-65.65, 18.34]
- },
- "properties": {
- "marker-size": "small",
- "title": "Fajardo PR"
- }
- },
- {
- "type": "Feature",
- "geometry": {
- "type": "Point",
- "coordinates": [-65.44, 18.15]
- },
- "properties": {
- "marker-size": "small",
- "title": "Isabel II PR"
- }
- },
- {
- "type": "Feature",
- "geometry": {
- "type": "Point",
- "coordinates": [-67.14, 18.2]
- },
- "properties": {
- "marker-size": "small",
- "title": "Mayaguez PR"
- }
- },
- {
- "type": "Feature",
- "geometry": {
- "type": "Point",
- "coordinates": [-66.62, 18.0]
- },
- "properties": {
- "marker-size": "small",
- "title": "Ponce PR"
- }
- },
- {
- "type": "Feature",
- "geometry": {
- "type": "Point",
- "coordinates": [-66.1, 18.45]
- },
- "properties": {
- "marker-size": "small",
- "title": "San Juan (ATC) PR"
- }
- },
- {
- "type": "Feature",
- "geometry": {
- "type": "Point",
- "coordinates": [-66.12, 18.47]
- },
- "properties": {
- "marker-size": "small",
- "title": "San Juan PR"
- }
- },
- {
- "type": "Feature",
- "geometry": {
- "type": "Point",
- "coordinates": [-66.7, 18.27]
- },
- "properties": {
- "marker-size": "small",
- "title": "Utuado PR"
- }
- },
- {
- "type": "Feature",
- "geometry": {
- "type": "Point",
- "coordinates": [-65.88, 18.05]
- },
- "properties": {
- "marker-size": "small",
- "title": "Yabucoa PR"
- }
- },
{
"type": "Feature",
"geometry": {
@@ -1035,50 +782,6 @@
"title": "Richmond VA"
}
},
- {
- "type": "Feature",
- "geometry": {
- "type": "Point",
- "coordinates": [-64.93, 18.34]
- },
- "properties": {
- "marker-size": "small",
- "title": "Charlotte Amalie (1) VI"
- }
- },
- {
- "type": "Feature",
- "geometry": {
- "type": "Point",
- "coordinates": [-64.95, 18.35]
- },
- "properties": {
- "marker-size": "small",
- "title": "Charlotte Amalie (2) VI"
- }
- },
- {
- "type": "Feature",
- "geometry": {
- "type": "Point",
- "coordinates": [-64.7, 17.75]
- },
- "properties": {
- "marker-size": "small",
- "title": "Christiansted VI"
- }
- },
- {
- "type": "Feature",
- "geometry": {
- "type": "Point",
- "coordinates": [-64.79, 18.33]
- },
- "properties": {
- "marker-size": "small",
- "title": "Cruz Bay VI"
- }
- },
{
"type": "Feature",
"geometry": {
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 6a2f8679..00405f6d 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpSite.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpSite.java
@@ -507,7 +507,12 @@ public enum NshmpSite implements NamedLocation {
* A restricted set of CEUS sites that is clipped at -105.5°.
*/
public static EnumSet<NshmpSite> nrc() {
- return filteredSet(site -> site.location.longitude >= -105.5);
+ var coords = NshmpPolygon.CONUS_CLIP.coordinates();
+ return filteredSet(
+ site -> site.location.longitude >= -105.5 &&
+ site.location.longitude <= coords.get(1).longitude &&
+ site.location.latitude >= coords.get(0).latitude &&
+ site.location.latitude <= coords.get(1).latitude);
}
/**
--
GitLab