diff --git a/etc/nshm/sites-alaska.csv b/etc/nshm/sites-alaska.csv
index 276727977bcacffba0926059b1ea1ce1f90c5fd0..49a71df098f0c65887a4201290c59b44968db240 100644
--- a/etc/nshm/sites-alaska.csv
+++ b/etc/nshm/sites-alaska.csv
@@ -7,7 +7,6 @@ Bethel AK, -161.80, 60.80
Chitina AK, -144.50, 61.50
Delta Junction AK, -145.70, 64.00
Dillingham AK, -158.50, 59.10
-Dutch Harbor AK, -166.60, 53.90
Evansville AK, -151.50, 66.90
Fairbanks AK, -147.70, 64.90
Fairbanks (ATC) AK, -147.70, 64.90
diff --git a/etc/nshm/sites-alaska.geojson b/etc/nshm/sites-alaska.geojson
index 464fa21213f4b2222b8286ac5b92dbc617dd8074..eebac68aa8d3bc3b20d96560aaaac43380497822 100644
--- a/etc/nshm/sites-alaska.geojson
+++ b/etc/nshm/sites-alaska.geojson
@@ -89,17 +89,6 @@
"title": "Dillingham AK"
}
},
- {
- "type": "Feature",
- "geometry": {
- "type": "Point",
- "coordinates": [-166.6, 53.9]
- },
- "properties": {
- "marker-size": "small",
- "title": "Dutch Harbor AK"
- }
- },
{
"type": "Feature",
"geometry": {
diff --git a/etc/nshm/sites-amsam.csv b/etc/nshm/sites-amsam.csv
new file mode 100644
index 0000000000000000000000000000000000000000..972b81170cc68fb3e587fe3bab136e95aad1e9b9
--- /dev/null
+++ b/etc/nshm/sites-amsam.csv
@@ -0,0 +1,9 @@
+name, lon, lat
+Apia Upolu (Samoa) AS, -171.80, -13.80
+Aua AS, -170.70, -14.30
+Futiga AS, -170.80, -14.40
+Leone AS, -170.80, -14.30
+Tutuila (central) AS, -170.70, -14.30
+Tutuila (southwest) AS, -170.80, -14.30
+Vailoatai AS, -170.80, -14.40
+Vaitogi AS, -170.70, -14.40
diff --git a/etc/nshm/sites-amsam.geojson b/etc/nshm/sites-amsam.geojson
new file mode 100644
index 0000000000000000000000000000000000000000..d654ad871842d1d0f2a0ee7328c6d878a9ad7d3a
--- /dev/null
+++ b/etc/nshm/sites-amsam.geojson
@@ -0,0 +1,93 @@
+{
+ "type": "FeatureCollection",
+ "features": [
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [-171.8, -13.8]
+ },
+ "properties": {
+ "marker-size": "small",
+ "title": "Apia Upolu (Samoa) AS"
+ }
+ },
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [-170.7, -14.3]
+ },
+ "properties": {
+ "marker-size": "small",
+ "title": "Aua AS"
+ }
+ },
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [-170.8, -14.4]
+ },
+ "properties": {
+ "marker-size": "small",
+ "title": "Futiga AS"
+ }
+ },
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [-170.8, -14.3]
+ },
+ "properties": {
+ "marker-size": "small",
+ "title": "Leone AS"
+ }
+ },
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [-170.7, -14.3]
+ },
+ "properties": {
+ "marker-size": "small",
+ "title": "Tutuila (central) AS"
+ }
+ },
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [-170.8, -14.3]
+ },
+ "properties": {
+ "marker-size": "small",
+ "title": "Tutuila (southwest) AS"
+ }
+ },
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [-170.8, -14.4]
+ },
+ "properties": {
+ "marker-size": "small",
+ "title": "Vailoatai AS"
+ }
+ },
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [-170.7, -14.4]
+ },
+ "properties": {
+ "marker-size": "small",
+ "title": "Vaitogi AS"
+ }
+ }
+ ]
+}
diff --git a/etc/nshm/sites-conus.csv b/etc/nshm/sites-conus.csv
index 1bc6a43f190b63ff5fb7aac7ff21fb256e6e61da..c331732b2a0700e85fe5fd808b25af3bd328cce2 100644
--- a/etc/nshm/sites-conus.csv
+++ b/etc/nshm/sites-conus.csv
@@ -2,6 +2,7 @@ name, lon, lat
Atmore AL, -87.50, 31.00
Birmingham AL, -86.80, 33.50
El Dorado AR, -92.70, 33.20
+Enola AR, -92.20, 35.20
Greenbrier AR, -92.40, 35.20
Little Rock AR, -92.30, 34.75
Grand Canyon Village AZ, -112.15, 36.05
@@ -92,6 +93,7 @@ Manchester NH, -71.45, 43.00
Trenton NJ, -74.75, 40.20
Albuquerque NM, -106.60, 35.10
Artesia NM, -104.40, 32.85
+Crownpoint NM, -108.15, 35.70
Las Cruces NM, -106.75, 32.30
Los Alamos National Lab NM, -106.30, 35.85
Carson City NV, -119.75, 39.15
@@ -111,6 +113,7 @@ Bend OR, -121.30, 44.05
Brookings OR, -124.25, 42.05
Coos Bay OR, -124.20, 43.40
Eugene OR, -123.10, 44.05
+Hillsboro OR, -123.00, 45.50
Klamath Falls OR, -121.80, 42.20
Medford OR, -122.90, 42.35
Newport OR, -124.05, 44.65
@@ -134,12 +137,14 @@ Houston TX, -95.35, 29.75
Kermit TX, -103.10, 31.85
San Antonio TX, -98.50, 29.40
Snyder TX, -100.90, 32.70
+Angle UT, -111.95, 38.25
Brigham City UT, -112.00, 41.50
Cedar City UT, -113.05, 37.70
Green River UT, -110.15, 39.00
Provo UT, -111.65, 40.25
Salt Lake City UT, -111.90, 40.75
Blacksburg VA, -80.40, 37.25
+Michaux VA, -77.90, 37.65
Richmond VA, -77.45, 37.55
Burlington VT, -73.20, 44.50
Aberdeen WA, -123.80, 47.00
@@ -157,4 +162,6 @@ Charleston WV, -81.65, 38.35
Casper WY, -106.30, 42.85
Cheyenne WY, -104.80, 41.15
Jackson WY, -110.75, 43.50
+Kaycee WY, -106.65, 43.70
+Sunday Peak WY, -110.20, 43.50
Yellowstone WY, -110.55, 44.40
diff --git a/etc/nshm/sites-conus.geojson b/etc/nshm/sites-conus.geojson
index 109f585d8748d87b18f1d3f51a0946244b145cfd..e2c8bd81cda015896c194f968a2cf3b79c11da62 100644
--- a/etc/nshm/sites-conus.geojson
+++ b/etc/nshm/sites-conus.geojson
@@ -34,6 +34,17 @@
"title": "El Dorado AR"
}
},
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [-92.2, 35.2]
+ },
+ "properties": {
+ "marker-size": "small",
+ "title": "Enola AR"
+ }
+ },
{
"type": "Feature",
"geometry": {
@@ -1024,6 +1035,17 @@
"title": "Artesia NM"
}
},
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [-108.15, 35.7]
+ },
+ "properties": {
+ "marker-size": "small",
+ "title": "Crownpoint NM"
+ }
+ },
{
"type": "Feature",
"geometry": {
@@ -1233,6 +1255,17 @@
"title": "Eugene OR"
}
},
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [-123.0, 45.5]
+ },
+ "properties": {
+ "marker-size": "small",
+ "title": "Hillsboro OR"
+ }
+ },
{
"type": "Feature",
"geometry": {
@@ -1486,6 +1519,17 @@
"title": "Snyder TX"
}
},
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [-111.95, 38.25]
+ },
+ "properties": {
+ "marker-size": "small",
+ "title": "Angle UT"
+ }
+ },
{
"type": "Feature",
"geometry": {
@@ -1552,6 +1596,17 @@
"title": "Blacksburg VA"
}
},
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [-77.9, 37.65]
+ },
+ "properties": {
+ "marker-size": "small",
+ "title": "Michaux VA"
+ }
+ },
{
"type": "Feature",
"geometry": {
@@ -1739,6 +1794,28 @@
"title": "Jackson WY"
}
},
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [-106.65, 43.7]
+ },
+ "properties": {
+ "marker-size": "small",
+ "title": "Kaycee WY"
+ }
+ },
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [-110.2, 43.5]
+ },
+ "properties": {
+ "marker-size": "small",
+ "title": "Sunday Peak WY"
+ }
+ },
{
"type": "Feature",
"geometry": {
diff --git a/etc/nshm/sites-gnmi.csv b/etc/nshm/sites-gnmi.csv
new file mode 100644
index 0000000000000000000000000000000000000000..01bdf83ee26e9b648bcb52a3f7b5e4833fddcbeb
--- /dev/null
+++ b/etc/nshm/sites-gnmi.csv
@@ -0,0 +1,12 @@
+name, lon, lat
+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
+Saipan (central) MP, 145.70, 15.20
+Saipan MP, 145.80, 15.20
+Tinian MP, 145.60, 15.00
diff --git a/etc/nshm/sites-gnmi.geojson b/etc/nshm/sites-gnmi.geojson
new file mode 100644
index 0000000000000000000000000000000000000000..eca1c2d36306075a28de27bfe0e1212df5f3412e
--- /dev/null
+++ b/etc/nshm/sites-gnmi.geojson
@@ -0,0 +1,126 @@
+{
+ "type": "FeatureCollection",
+ "features": [
+ {
+ "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": {
+ "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"
+ }
+ }
+ ]
+}
diff --git a/etc/nshm/sites-nrc.csv b/etc/nshm/sites-nrc.csv
index 4555e04ac69f36d893805af6e929b63e2c42b9ae..1cac390a545a64f6cbfbb5c5f99247c6087cfbca 100644
--- a/etc/nshm/sites-nrc.csv
+++ b/etc/nshm/sites-nrc.csv
@@ -2,6 +2,7 @@ name, lon, lat
Atmore AL, -87.50, 31.00
Birmingham AL, -86.80, 33.50
El Dorado AR, -92.70, 33.20
+Enola AR, -92.20, 35.20
Greenbrier AR, -92.40, 35.20
Little Rock AR, -92.30, 34.75
Denver CO, -105.00, 39.75
@@ -90,6 +91,7 @@ Kermit TX, -103.10, 31.85
San Antonio TX, -98.50, 29.40
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
diff --git a/etc/nshm/sites-nrc.geojson b/etc/nshm/sites-nrc.geojson
index e5afe6a1e21661a27611ab19babc62f819a95e63..e67a7f9482317381eb1d89ec2fb75861d956d605 100644
--- a/etc/nshm/sites-nrc.geojson
+++ b/etc/nshm/sites-nrc.geojson
@@ -34,6 +34,17 @@
"title": "El Dorado AR"
}
},
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [-92.2, 35.2]
+ },
+ "properties": {
+ "marker-size": "small",
+ "title": "Enola AR"
+ }
+ },
{
"type": "Feature",
"geometry": {
@@ -1002,6 +1013,17 @@
"title": "Blacksburg VA"
}
},
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [-77.9, 37.65]
+ },
+ "properties": {
+ "marker-size": "small",
+ "title": "Michaux VA"
+ }
+ },
{
"type": "Feature",
"geometry": {
diff --git a/etc/nshm/sites-nshmp.csv b/etc/nshm/sites-nshmp.csv
index fea1644899f5f5f5ea355baf6cd3be0da0a55d46..76934221d8f0716121f3a9b45c2bbbc4e7b936d8 100644
--- a/etc/nshm/sites-nshmp.csv
+++ b/etc/nshm/sites-nshmp.csv
@@ -7,7 +7,6 @@ Bethel AK, -161.80, 60.80
Chitina AK, -144.50, 61.50
Delta Junction AK, -145.70, 64.00
Dillingham AK, -158.50, 59.10
-Dutch Harbor AK, -166.60, 53.90
Evansville AK, -151.50, 66.90
Fairbanks AK, -147.70, 64.90
Fairbanks (ATC) AK, -147.70, 64.90
@@ -38,6 +37,7 @@ Yakutat AK, -139.70, 59.60
Atmore AL, -87.50, 31.00
Birmingham AL, -86.80, 33.50
El Dorado AR, -92.70, 33.20
+Enola AR, -92.20, 35.20
Greenbrier AR, -92.40, 35.20
Little Rock AR, -92.30, 34.75
Apia Upolu (Samoa) AS, -171.80, -13.80
@@ -184,6 +184,7 @@ Manchester NH, -71.45, 43.00
Trenton NJ, -74.75, 40.20
Albuquerque NM, -106.60, 35.10
Artesia NM, -104.40, 32.85
+Crownpoint NM, -108.15, 35.70
Las Cruces NM, -106.75, 32.30
Los Alamos National Lab NM, -106.30, 35.85
Carson City NV, -119.75, 39.15
@@ -203,6 +204,7 @@ Bend OR, -121.30, 44.05
Brookings OR, -124.25, 42.05
Coos Bay OR, -124.20, 43.40
Eugene OR, -123.10, 44.05
+Hillsboro OR, -123.00, 45.50
Klamath Falls OR, -121.80, 42.20
Medford OR, -122.90, 42.35
Newport OR, -124.05, 44.65
@@ -238,12 +240,14 @@ Houston TX, -95.35, 29.75
Kermit TX, -103.10, 31.85
San Antonio TX, -98.50, 29.40
Snyder TX, -100.90, 32.70
+Angle UT, -111.95, 38.25
Brigham City UT, -112.00, 41.50
Cedar City UT, -113.05, 37.70
Green River UT, -110.15, 39.00
Provo UT, -111.65, 40.25
Salt Lake City UT, -111.90, 40.75
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
@@ -265,4 +269,6 @@ Charleston WV, -81.65, 38.35
Casper WY, -106.30, 42.85
Cheyenne WY, -104.80, 41.15
Jackson WY, -110.75, 43.50
+Kaycee WY, -106.65, 43.70
+Sunday Peak WY, -110.20, 43.50
Yellowstone WY, -110.55, 44.40
diff --git a/etc/nshm/sites-nshmp.geojson b/etc/nshm/sites-nshmp.geojson
index 5cb420815177c627f4ebc2f7043e2d911169d1ab..7010c3887dc38fb98a6e75835c36b351f0f402fc 100644
--- a/etc/nshm/sites-nshmp.geojson
+++ b/etc/nshm/sites-nshmp.geojson
@@ -89,17 +89,6 @@
"title": "Dillingham AK"
}
},
- {
- "type": "Feature",
- "geometry": {
- "type": "Point",
- "coordinates": [-166.6, 53.9]
- },
- "properties": {
- "marker-size": "small",
- "title": "Dutch Harbor AK"
- }
- },
{
"type": "Feature",
"geometry": {
@@ -430,6 +419,17 @@
"title": "El Dorado AR"
}
},
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [-92.2, 35.2]
+ },
+ "properties": {
+ "marker-size": "small",
+ "title": "Enola AR"
+ }
+ },
{
"type": "Feature",
"geometry": {
@@ -2036,6 +2036,17 @@
"title": "Artesia NM"
}
},
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [-108.15, 35.7]
+ },
+ "properties": {
+ "marker-size": "small",
+ "title": "Crownpoint NM"
+ }
+ },
{
"type": "Feature",
"geometry": {
@@ -2245,6 +2256,17 @@
"title": "Eugene OR"
}
},
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [-123.0, 45.5]
+ },
+ "properties": {
+ "marker-size": "small",
+ "title": "Hillsboro OR"
+ }
+ },
{
"type": "Feature",
"geometry": {
@@ -2630,6 +2652,17 @@
"title": "Snyder TX"
}
},
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [-111.95, 38.25]
+ },
+ "properties": {
+ "marker-size": "small",
+ "title": "Angle UT"
+ }
+ },
{
"type": "Feature",
"geometry": {
@@ -2696,6 +2729,17 @@
"title": "Blacksburg VA"
}
},
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [-77.9, 37.65]
+ },
+ "properties": {
+ "marker-size": "small",
+ "title": "Michaux VA"
+ }
+ },
{
"type": "Feature",
"geometry": {
@@ -2927,6 +2971,28 @@
"title": "Jackson WY"
}
},
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [-106.65, 43.7]
+ },
+ "properties": {
+ "marker-size": "small",
+ "title": "Kaycee WY"
+ }
+ },
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [-110.2, 43.5]
+ },
+ "properties": {
+ "marker-size": "small",
+ "title": "Sunday Peak WY"
+ }
+ },
{
"type": "Feature",
"geometry": {
diff --git a/etc/nshm/sites-prvi.csv b/etc/nshm/sites-prvi.csv
new file mode 100644
index 0000000000000000000000000000000000000000..b732b76e4a9d26f7a5241f4537ad03ba419e996a
--- /dev/null
+++ b/etc/nshm/sites-prvi.csv
@@ -0,0 +1,17 @@
+name, lon, lat
+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
+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
diff --git a/etc/nshm/sites-prvi.geojson b/etc/nshm/sites-prvi.geojson
new file mode 100644
index 0000000000000000000000000000000000000000..a6e50cd656436a5e417c5ef0904fc5c2ddf60b5f
--- /dev/null
+++ b/etc/nshm/sites-prvi.geojson
@@ -0,0 +1,181 @@
+{
+ "type": "FeatureCollection",
+ "features": [
+ {
+ "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": {
+ "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"
+ }
+ }
+ ]
+}
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 a12fd881fc7e2f6acfc8b7e56052c9bbf36a31da..d0a03c33819bc2dbd5b56b5cdc258e1e2494fe7f 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpSite.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpSite.java
@@ -62,7 +62,7 @@ public enum NshmpSite implements NamedLocation {
SANTA_BARBARA_CA(-119.70, 34.45),
VENTURA_CA(-119.30, 34.30),
- /* WUS excepting CA (32) */
+ /* WUS excepting CA (36) */
GRAND_CANYON_VILLAGE_AZ(-112.15, 36.05),
PALO_VERDE_AZ(-112.85, 33.40),
PHOENIX_AZ(-112.10, 33.45),
@@ -89,9 +89,11 @@ public enum NshmpSite implements NamedLocation {
ALBUQUERQUE_NM(-106.60, 35.10),
ARTESIA_NM(-104.40, 32.85),
+ CROWNPOINT_NM(-108.15, 35.70),
LOS_ALAMOS_NATIONAL_LAB_NM(-106.30, 35.85),
LAS_CRUCES_NM(-106.75, 32.30),
+ ANGLE_UT(-111.95, 38.25),
BRIGHAM_CITY_UT(-112.00, 41.50),
CEDAR_CITY_UT(-113.05, 37.70),
GREEN_RIVER_UT(-110.15, 39.00),
@@ -101,14 +103,17 @@ public enum NshmpSite implements NamedLocation {
CASPER_WY(-106.30, 42.85),
CHEYENNE_WY(-104.80, 41.15),
JACKSON_WY(-110.75, 43.50),
+ KAYCEE_WY(-106.65, 43.70),
+ SUNDAY_PEAK_WY(-110.20, 43.50),
YELLOWSTONE_WY(-110.55, 44.40),
- /* PNW (21) */
+ /* PNW (22) */
ASTORIA_OR(-123.85, 46.20),
BEND_OR(-121.30, 44.05),
BROOKINGS_OR(-124.25, 42.05),
COOS_BAY_OR(-124.20, 43.40),
EUGENE_OR(-123.10, 44.05),
+ HILLSBORO_OR(-123.00, 45.50),
KLAMATH_FALLS_OR(-121.80, 42.20),
MEDFORD_OR(-122.90, 42.35),
NEWPORT_OR(-124.05, 44.65),
@@ -127,11 +132,12 @@ public enum NshmpSite implements NamedLocation {
TACOMA_WA(-122.45, 47.25),
YAKIMA_WA(-120.50, 46.60),
- /* CEUS (68) */
+ /* CEUS (70) */
WASHINGTON_DC(-77.05, 38.90),
ATMORE_AL(-87.50, 31.00),
BIRMINGHAM_AL(-86.80, 33.50),
EL_DORADO_AR(-92.70, 33.20),
+ ENOLA_AR(-92.20, 35.20),
GREENBRIER_AR(-92.40, 35.20),
LITTLE_ROCK_AR(-92.30, 34.75),
HARTFORD_CT(-72.70, 41.75),
@@ -193,6 +199,7 @@ public enum NshmpSite implements NamedLocation {
SNYDER_TX(-100.90, 32.70),
BURLINGTON_VT(-73.20, 44.50),
BLACKSBURG_VA(-80.40, 37.25),
+ MICHAUX_VA(-77.90, 37.65),
RICHMOND_VA(-77.45, 37.55),
CHARLESTON_WV(-81.65, 38.35),
MILWAUKEE_WI(-87.90, 43.05),
@@ -206,7 +213,6 @@ public enum NshmpSite implements NamedLocation {
CHITINA_AK(-144.5, 61.5),
DELTA_JUNCTION_AK(-145.7, 64.0),
DILLINGHAM_AK(-158.5, 59.1),
- DUTCH_HARBOR_AK(-166.6, 53.9),
EVANSVILLE_AK(-151.5, 66.9),
FAIRBANKS_AK(-147.7, 64.9),
FAIRBANKS_ATC_AK(-147.7, 64.9),
@@ -392,6 +398,27 @@ public enum NshmpSite implements NamedLocation {
return filteredSet(site -> site.state == UsRegion.HI);
}
+ /**
+ * The set of sites used to test the Puerto Rico and U.S. Virgin Islands NSHM.
+ */
+ public static EnumSet<NshmpSite> prvi() {
+ return filteredSet(site -> (site.state == UsRegion.PR) || (site.state == UsRegion.VI));
+ }
+
+ /**
+ * The set of sites used to test the American Samoa NSHM.
+ */
+ public static EnumSet<NshmpSite> amsam() {
+ return filteredSet(site -> site.state == UsRegion.AS);
+ }
+
+ /**
+ * The set of sites used to test the Guam and Northern Mariana Islands NSHM.
+ */
+ public static EnumSet<NshmpSite> gnmi() {
+ return filteredSet(site -> (site.state == UsRegion.GU) || (site.state == UsRegion.MP));
+ }
+
/**
* The set of sites corresponding to U.S. national labs and other Dept. of
* Energy facilities.
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 07badfde449502d54134a1b13b49c34cb3bb004d..c512ce20675c6f6db4c010e65db03ef4eb2be475 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpSiteFiles.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpSiteFiles.java
@@ -78,6 +78,8 @@ final class NshmpSiteFiles {
writeNshmpPolys();
writeNshmpSummaryPoly();
// writeNshmpSites_0p1();
+
+ System.out.println("Done");
}
/*
@@ -272,6 +274,9 @@ final class NshmpSiteFiles {
writeNshmpSites("nrc", NshmpSite.nrc());
writeNshmpSites("alaska", NshmpSite.alaska());
writeNshmpSites("hawaii", NshmpSite.hawaii());
+ writeNshmpSites("prvi", NshmpSite.prvi());
+ writeNshmpSites("amsam", NshmpSite.amsam());
+ writeNshmpSites("gnmi", NshmpSite.gnmi());
writeSites("nehrp", NshmpSite.nehrp(), DEC2_FMT);
}