From 9974cc14bef79eb4ff17769a328a7c6c14c85d3b Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Wed, 23 Oct 2019 16:27:12 -0600
Subject: [PATCH] updated generated site files

---
 etc/nshm/map-alaska.geojson   |   2 +-
 etc/nshm/map-ceus.geojson     |   2 +-
 etc/nshm/map-hawaii.geojson   |  98 +++++
 etc/nshm/map-wus.geojson      |   2 +-
 etc/nshm/sites-alaska.csv     |  43 ++-
 etc/nshm/sites-alaska.geojson | 133 ++++++-
 etc/nshm/sites-ceus.csv       |  27 ++
 etc/nshm/sites-ceus.geojson   | 297 +++++++++++++++
 etc/nshm/sites-hawaii.csv     |  45 ++-
 etc/nshm/sites-hawaii.geojson | 155 +++++++-
 etc/nshm/sites-nrc.csv        |  27 ++
 etc/nshm/sites-nrc.geojson    | 297 +++++++++++++++
 etc/nshm/sites-nshmp.csv      | 123 +++++--
 etc/nshm/sites-nshmp.geojson  | 673 ++++++++++++++++++++++++++++++++--
 14 files changed, 1785 insertions(+), 139 deletions(-)
 create mode 100644 etc/nshm/map-hawaii.geojson

diff --git a/etc/nshm/map-alaska.geojson b/etc/nshm/map-alaska.geojson
index d7653ef53..c75bc4db0 100644
--- a/etc/nshm/map-alaska.geojson
+++ b/etc/nshm/map-alaska.geojson
@@ -18,7 +18,7 @@
       },
       "properties": {
         "fill": "#AA0078",
-        "marker-color": "#AA0078",
+        "stroke": "#AA0078",
         "title": "Alaska Map Extents"
       }
     },
diff --git a/etc/nshm/map-ceus.geojson b/etc/nshm/map-ceus.geojson
index 8a7b4d91b..3bf157ad0 100644
--- a/etc/nshm/map-ceus.geojson
+++ b/etc/nshm/map-ceus.geojson
@@ -18,7 +18,7 @@
       },
       "properties": {
         "fill": "#AA0078",
-        "marker-color": "#AA0078",
+        "stroke": "#AA0078",
         "title": "NSHMP Central & Eastern US Map Extents"
       }
     },
diff --git a/etc/nshm/map-hawaii.geojson b/etc/nshm/map-hawaii.geojson
new file mode 100644
index 000000000..9181a7ee0
--- /dev/null
+++ b/etc/nshm/map-hawaii.geojson
@@ -0,0 +1,98 @@
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": "Extents",
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-161.0, 18.0],
+            [-154.0, 18.0],
+            [-154.0, 23.0],
+            [-161.0, 23.0],
+            [-161.0, 18.0]
+          ]
+        ]
+      },
+      "properties": {
+        "fill": "#AA0078",
+        "stroke": "#AA0078",
+        "title": "Hawaii Map Extents"
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Polygon",
+        "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],
+            [-154.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.76, 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.35, 21.99],
+            [-160.39, 21.74]
+          ]
+        ]
+      },
+      "properties": {
+        "spacing": 0.1,
+        "title": "Hawaii"
+      }
+    }
+  ]
+}
diff --git a/etc/nshm/map-wus.geojson b/etc/nshm/map-wus.geojson
index 7d47f2d15..2942d426a 100644
--- a/etc/nshm/map-wus.geojson
+++ b/etc/nshm/map-wus.geojson
@@ -18,7 +18,7 @@
       },
       "properties": {
         "fill": "#AA0078",
-        "marker-color": "#AA0078",
+        "stroke": "#AA0078",
         "title": "NSHMP Western US Map Extents"
       }
     },
diff --git a/etc/nshm/sites-alaska.csv b/etc/nshm/sites-alaska.csv
index 7f1b85d75..06799e819 100644
--- a/etc/nshm/sites-alaska.csv
+++ b/etc/nshm/sites-alaska.csv
@@ -1,27 +1,36 @@
 name,                            lon,    lat
-Adak AK,                     -176.65,  51.90
+Adak AK,                     -176.70,  51.90
 Anchorage AK,                -149.90,  61.20
-Barrow AK,                   -156.75,  71.30
+Anchorage (ATC) AK,          -149.90,  61.20
+Barrow AK,                   -156.80,  71.30
 Bethel AK,                   -161.80,  60.80
+Chitina AK,                  -144.50,  61.50
 Delta Junction AK,           -145.70,  64.00
-Dillingham AK,               -158.45,  59.05
-Dutch Harbor AK,             -166.55,  53.90
+Dillingham AK,               -158.50,  59.10
+Dutch Harbor AK,             -166.60,  53.90
 Evansville AK,               -151.50,  66.90
-Fairbanks AK,                -147.70,  64.85
-Glennallen AK,               -145.55,  62.10
-Haines AK,                   -135.45,  59.25
-Homer AK,                    -151.50,  59.65
+Fairbanks AK,                -147.70,  64.90
+Fairbanks (ATC) AK,          -147.70,  64.90
+Gakona AK,                   -145.30,  62.30
+Galena AK,                   -156.90,  64.80
+Glennallen AK,               -145.60,  62.10
+Haines AK,                   -135.50,  59.30
+Homer AK,                    -151.50,  59.70
 Juneau AK,                   -134.40,  58.30
-Kenai AK,                    -151.25,  60.55
-Ketchikan AK,                -131.65,  55.35
+Kenai AK,                    -151.30,  60.60
+Ketchikan AK,                -131.70,  55.40
+Knik-Fairview AK,            -149.70,  61.50
 Kodiak AK,                   -152.40,  57.80
 Kotzebue AK,                 -162.60,  66.90
-McGrath AK,                  -155.60,  62.95
+Lakes AK,                    -149.40,  61.60
+McGrath AK,                  -155.60,  63.00
 Nome AK,                     -165.40,  64.50
-Paxson AK,                   -145.50,  63.05
-Prudhoe Bay AK,              -148.35,  70.25
-Sitka AK,                    -135.35,  57.05
+Paxson AK,                   -145.50,  63.10
+Prudhoe Bay AK,              -148.40,  70.30
+Sitka AK,                    -135.40,  57.10
+Sleetmute AK,                -157.20,  61.70
 Tok AK,                      -143.00,  63.30
-Valdez AK,                   -146.35,  61.15
-Wasilla AK,                  -149.45,  61.60
-Yakutat AK,                  -139.70,  59.55
+Unalaska AK,                 -166.60,  53.90
+Valdez AK,                   -146.40,  61.20
+Wasilla AK,                  -149.50,  61.60
+Yakutat AK,                  -139.70,  59.60
diff --git a/etc/nshm/sites-alaska.geojson b/etc/nshm/sites-alaska.geojson
index 28b96440e..821aa0517 100644
--- a/etc/nshm/sites-alaska.geojson
+++ b/etc/nshm/sites-alaska.geojson
@@ -5,7 +5,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-176.65, 51.9]
+        "coordinates": [-176.7, 51.9]
       },
       "properties": {
         "marker-size": "small",
@@ -27,7 +27,18 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-156.75, 71.3]
+        "coordinates": [-149.9, 61.2]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Anchorage (ATC) AK"
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-156.8, 71.3]
       },
       "properties": {
         "marker-size": "small",
@@ -45,6 +56,17 @@
         "title": "Bethel AK"
       }
     },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-144.5, 61.5]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Chitina AK"
+      }
+    },
     {
       "type": "Feature",
       "geometry": {
@@ -60,7 +82,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-158.45, 59.05]
+        "coordinates": [-158.5, 59.1]
       },
       "properties": {
         "marker-size": "small",
@@ -71,7 +93,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-166.55, 53.9]
+        "coordinates": [-166.6, 53.9]
       },
       "properties": {
         "marker-size": "small",
@@ -93,7 +115,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-147.7, 64.85]
+        "coordinates": [-147.7, 64.9]
       },
       "properties": {
         "marker-size": "small",
@@ -104,7 +126,40 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-145.55, 62.1]
+        "coordinates": [-147.7, 64.9]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Fairbanks (ATC) AK"
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-145.3, 62.3]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Gakona AK"
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-156.9, 64.8]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Galena AK"
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-145.6, 62.1]
       },
       "properties": {
         "marker-size": "small",
@@ -115,7 +170,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-135.45, 59.25]
+        "coordinates": [-135.5, 59.3]
       },
       "properties": {
         "marker-size": "small",
@@ -126,7 +181,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-151.5, 59.65]
+        "coordinates": [-151.5, 59.7]
       },
       "properties": {
         "marker-size": "small",
@@ -148,7 +203,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-151.25, 60.55]
+        "coordinates": [-151.3, 60.6]
       },
       "properties": {
         "marker-size": "small",
@@ -159,13 +214,24 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-131.65, 55.35]
+        "coordinates": [-131.7, 55.4]
       },
       "properties": {
         "marker-size": "small",
         "title": "Ketchikan AK"
       }
     },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-149.7, 61.5]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Knik-Fairview AK"
+      }
+    },
     {
       "type": "Feature",
       "geometry": {
@@ -192,7 +258,18 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-155.6, 62.95]
+        "coordinates": [-149.4, 61.6]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Lakes AK"
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-155.6, 63.0]
       },
       "properties": {
         "marker-size": "small",
@@ -214,7 +291,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-145.5, 63.05]
+        "coordinates": [-145.5, 63.1]
       },
       "properties": {
         "marker-size": "small",
@@ -225,7 +302,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-148.35, 70.25]
+        "coordinates": [-148.4, 70.3]
       },
       "properties": {
         "marker-size": "small",
@@ -236,13 +313,24 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-135.35, 57.05]
+        "coordinates": [-135.4, 57.1]
       },
       "properties": {
         "marker-size": "small",
         "title": "Sitka AK"
       }
     },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-157.2, 61.7]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Sleetmute AK"
+      }
+    },
     {
       "type": "Feature",
       "geometry": {
@@ -258,7 +346,18 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-146.35, 61.15]
+        "coordinates": [-166.6, 53.9]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Unalaska AK"
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-146.4, 61.2]
       },
       "properties": {
         "marker-size": "small",
@@ -269,7 +368,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-149.45, 61.6]
+        "coordinates": [-149.5, 61.6]
       },
       "properties": {
         "marker-size": "small",
@@ -280,7 +379,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-139.7, 59.55]
+        "coordinates": [-139.7, 59.6]
       },
       "properties": {
         "marker-size": "small",
diff --git a/etc/nshm/sites-ceus.csv b/etc/nshm/sites-ceus.csv
index ded5f8e10..1dd02ae83 100644
--- a/etc/nshm/sites-ceus.csv
+++ b/etc/nshm/sites-ceus.csv
@@ -21,6 +21,14 @@ 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
 Idaho National Lab ID,       -112.85,  43.60
 Central IL,                   -90.00,  40.00
@@ -41,6 +49,9 @@ 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
 Billings MT,                 -108.50,  45.80
 Bozeman MT,                  -111.05,  45.70
@@ -65,6 +76,18 @@ 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
@@ -87,6 +110,10 @@ Provo UT,                    -111.65,  40.25
 Salt Lake City UT,           -111.90,  40.75
 Blacksburg VA,                -80.40,  37.25
 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-ceus.geojson b/etc/nshm/sites-ceus.geojson
index 605aee1b9..2e95d9ee8 100644
--- a/etc/nshm/sites-ceus.geojson
+++ b/etc/nshm/sites-ceus.geojson
@@ -243,6 +243,94 @@
         "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": {
@@ -463,6 +551,39 @@
         "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": {
@@ -727,6 +848,138 @@
         "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": {
@@ -969,6 +1222,50 @@
         "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/etc/nshm/sites-hawaii.csv b/etc/nshm/sites-hawaii.csv
index 72161cbfb..b81bf93d7 100644
--- a/etc/nshm/sites-hawaii.csv
+++ b/etc/nshm/sites-hawaii.csv
@@ -1,27 +1,38 @@
 name,                            lon,    lat
 Barbers Point HI,            -158.10,  21.30
-Barking Sands HI,            -159.75,  22.05
-Bradshaw Airfield HI,        -155.55,  19.75
-Diamond Head HI,             -157.80,  21.25
-Haleakala Crater HI,         -156.25,  20.70
+Barking Sands HI,            -159.76,  22.06
+Bradshaw Airfield HI,        -155.56,  19.76
+Diamond Head HI,             -157.80,  21.26
+Haleakala Crater HI,         -156.26,  20.70
 Hanapepe HI,                 -159.60,  21.90
-Hilo HI,                     -155.05,  19.70
-Honolulu HI,                 -157.85,  21.30
-Kaheawa Wind HI,             -156.55,  20.80
+Hana HI,                     -155.98,  20.76
+Hawaiian Ocean View HI,      -155.78,  19.10
+Hilo (ATC) HI,               -155.10,  19.70
+Hilo HI,                     -155.06,  19.70
+Honolulu (ATC) HI,           -157.86,  21.30
+Honolulu HI,                 -157.86,  21.30
+Kaheawa Wind HI,             -156.56,  20.80
+Kahuku HI,                   -157.94,  21.68
 Kahului HI,                  -156.50,  20.90
-Kailua Kona HI,              -156.00,  19.65
+Kailua Kona HI,              -156.00,  19.66
 Kaneohe HI,                  -157.80,  21.40
 Kaunakakai HI,               -157.00,  21.10
-Kilauea HI,                  -155.25,  19.40
-Laie HI,                     -157.95,  21.65
-Lanai City HI,               -156.95,  20.80
-Lihue HI,                    -159.35,  21.95
-Marine Corps Base HI,        -157.75,  21.45
-Mauna Kea HI,                -155.45,  19.80
-Ocean View HI,               -155.75,  19.10
-Pearl Harbor HI,             -157.95,  21.35
+Kihei HI,                    -156.46,  20.78
+Kilauea HI,                  -155.26,  19.40
+Lahaina HI,                  -156.68,  20.88
+Laie HI,                     -157.96,  21.66
+Lanai City HI,               -156.96,  20.80
+Lihue HI,                    -159.36,  21.96
+Marine Corps Base HI,        -157.76,  21.46
+Mauna Kea HI,                -155.46,  19.80
+Ocean View HI,               -155.76,  19.10
+Pearl Harbor HI,             -157.96,  21.36
+Pepeekeo HI,                 -155.10,  19.84
+Princeville HI,              -159.48,  22.22
 Puuwai HI,                   -160.20,  21.90
+Volcano HI,                  -155.22,  19.44
 Wahiawa HI,                  -158.00,  21.50
-Waianae HI,                  -158.20,  21.45
+Waianae HI,                  -158.20,  21.46
+Waikoloa Village HI,         -155.78,  19.94
 Waimea HI,                   -155.70,  20.00
 Waipahu HI,                  -158.00,  21.40
diff --git a/etc/nshm/sites-hawaii.geojson b/etc/nshm/sites-hawaii.geojson
index 9a4eba103..d5a9f7e9f 100644
--- a/etc/nshm/sites-hawaii.geojson
+++ b/etc/nshm/sites-hawaii.geojson
@@ -16,7 +16,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-159.75, 22.05]
+        "coordinates": [-159.76, 22.06]
       },
       "properties": {
         "marker-size": "small",
@@ -27,7 +27,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-155.55, 19.75]
+        "coordinates": [-155.56, 19.76]
       },
       "properties": {
         "marker-size": "small",
@@ -38,7 +38,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-157.8, 21.25]
+        "coordinates": [-157.8, 21.26]
       },
       "properties": {
         "marker-size": "small",
@@ -49,7 +49,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-156.25, 20.7]
+        "coordinates": [-156.26, 20.7]
       },
       "properties": {
         "marker-size": "small",
@@ -71,7 +71,40 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-155.05, 19.7]
+        "coordinates": [-155.98, 20.76]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Hana HI"
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-155.78, 19.1]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Hawaiian Ocean View HI"
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-155.1, 19.7]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Hilo (ATC) HI"
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-155.06, 19.7]
       },
       "properties": {
         "marker-size": "small",
@@ -82,7 +115,18 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-157.85, 21.3]
+        "coordinates": [-157.86, 21.3]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Honolulu (ATC) HI"
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-157.86, 21.3]
       },
       "properties": {
         "marker-size": "small",
@@ -93,13 +137,24 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-156.55, 20.8]
+        "coordinates": [-156.56, 20.8]
       },
       "properties": {
         "marker-size": "small",
         "title": "Kaheawa Wind HI"
       }
     },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-157.94, 21.68]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Kahuku HI"
+      }
+    },
     {
       "type": "Feature",
       "geometry": {
@@ -115,7 +170,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-156.0, 19.65]
+        "coordinates": [-156.0, 19.66]
       },
       "properties": {
         "marker-size": "small",
@@ -148,7 +203,18 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-155.25, 19.4]
+        "coordinates": [-156.46, 20.78]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Kihei HI"
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-155.26, 19.4]
       },
       "properties": {
         "marker-size": "small",
@@ -159,7 +225,18 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-157.95, 21.65]
+        "coordinates": [-156.68, 20.88]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Lahaina HI"
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-157.96, 21.66]
       },
       "properties": {
         "marker-size": "small",
@@ -170,7 +247,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-156.95, 20.8]
+        "coordinates": [-156.96, 20.8]
       },
       "properties": {
         "marker-size": "small",
@@ -181,7 +258,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-159.35, 21.95]
+        "coordinates": [-159.36, 21.96]
       },
       "properties": {
         "marker-size": "small",
@@ -192,7 +269,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-157.75, 21.45]
+        "coordinates": [-157.76, 21.46]
       },
       "properties": {
         "marker-size": "small",
@@ -203,7 +280,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-155.45, 19.8]
+        "coordinates": [-155.46, 19.8]
       },
       "properties": {
         "marker-size": "small",
@@ -214,7 +291,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-155.75, 19.1]
+        "coordinates": [-155.76, 19.1]
       },
       "properties": {
         "marker-size": "small",
@@ -225,13 +302,35 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-157.95, 21.35]
+        "coordinates": [-157.96, 21.36]
       },
       "properties": {
         "marker-size": "small",
         "title": "Pearl Harbor HI"
       }
     },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-155.1, 19.84]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Pepeekeo HI"
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-159.48, 22.22]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Princeville HI"
+      }
+    },
     {
       "type": "Feature",
       "geometry": {
@@ -243,6 +342,17 @@
         "title": "Puuwai HI"
       }
     },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-155.22, 19.44]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Volcano HI"
+      }
+    },
     {
       "type": "Feature",
       "geometry": {
@@ -258,13 +368,24 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-158.2, 21.45]
+        "coordinates": [-158.2, 21.46]
       },
       "properties": {
         "marker-size": "small",
         "title": "Waianae HI"
       }
     },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-155.78, 19.94]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Waikoloa Village HI"
+      }
+    },
     {
       "type": "Feature",
       "geometry": {
diff --git a/etc/nshm/sites-nrc.csv b/etc/nshm/sites-nrc.csv
index 8c7522add..4555e04ac 100644
--- a/etc/nshm/sites-nrc.csv
+++ b/etc/nshm/sites-nrc.csv
@@ -15,6 +15,14 @@ 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
@@ -34,6 +42,9 @@ 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
@@ -51,6 +62,18 @@ 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
@@ -68,6 +91,10 @@ San Antonio TX,               -98.50,  29.40
 Snyder TX,                   -100.90,  32.70
 Blacksburg VA,                -80.40,  37.25
 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 82d6eef76..e5afe6a1e 100644
--- a/etc/nshm/sites-nrc.geojson
+++ b/etc/nshm/sites-nrc.geojson
@@ -177,6 +177,94 @@
         "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": {
@@ -386,6 +474,39 @@
         "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": {
@@ -573,6 +694,138 @@
         "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": {
@@ -760,6 +1013,50 @@
         "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/etc/nshm/sites-nshmp.csv b/etc/nshm/sites-nshmp.csv
index 1cb6a25d0..78fba33ee 100644
--- a/etc/nshm/sites-nshmp.csv
+++ b/etc/nshm/sites-nshmp.csv
@@ -1,35 +1,52 @@
 name,                            lon,    lat
-Adak AK,                     -176.65,  51.90
+Adak AK,                     -176.70,  51.90
 Anchorage AK,                -149.90,  61.20
-Barrow AK,                   -156.75,  71.30
+Anchorage (ATC) AK,          -149.90,  61.20
+Barrow AK,                   -156.80,  71.30
 Bethel AK,                   -161.80,  60.80
+Chitina AK,                  -144.50,  61.50
 Delta Junction AK,           -145.70,  64.00
-Dillingham AK,               -158.45,  59.05
-Dutch Harbor AK,             -166.55,  53.90
+Dillingham AK,               -158.50,  59.10
+Dutch Harbor AK,             -166.60,  53.90
 Evansville AK,               -151.50,  66.90
-Fairbanks AK,                -147.70,  64.85
-Glennallen AK,               -145.55,  62.10
-Haines AK,                   -135.45,  59.25
-Homer AK,                    -151.50,  59.65
+Fairbanks AK,                -147.70,  64.90
+Fairbanks (ATC) AK,          -147.70,  64.90
+Gakona AK,                   -145.30,  62.30
+Galena AK,                   -156.90,  64.80
+Glennallen AK,               -145.60,  62.10
+Haines AK,                   -135.50,  59.30
+Homer AK,                    -151.50,  59.70
 Juneau AK,                   -134.40,  58.30
-Kenai AK,                    -151.25,  60.55
-Ketchikan AK,                -131.65,  55.35
+Kenai AK,                    -151.30,  60.60
+Ketchikan AK,                -131.70,  55.40
+Knik-Fairview AK,            -149.70,  61.50
 Kodiak AK,                   -152.40,  57.80
 Kotzebue AK,                 -162.60,  66.90
-McGrath AK,                  -155.60,  62.95
+Lakes AK,                    -149.40,  61.60
+McGrath AK,                  -155.60,  63.00
 Nome AK,                     -165.40,  64.50
-Paxson AK,                   -145.50,  63.05
-Prudhoe Bay AK,              -148.35,  70.25
-Sitka AK,                    -135.35,  57.05
+Paxson AK,                   -145.50,  63.10
+Prudhoe Bay AK,              -148.40,  70.30
+Sitka AK,                    -135.40,  57.10
+Sleetmute AK,                -157.20,  61.70
 Tok AK,                      -143.00,  63.30
-Valdez AK,                   -146.35,  61.15
-Wasilla AK,                  -149.45,  61.60
-Yakutat AK,                  -139.70,  59.55
+Unalaska AK,                 -166.60,  53.90
+Valdez AK,                   -146.40,  61.20
+Wasilla AK,                  -149.50,  61.60
+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
 Greenbrier AR,                -92.40,  35.20
 Little Rock AR,               -92.30,  34.75
+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
 Grand Canyon Village AZ,     -112.15,  36.05
 Palo Verde AZ,               -112.85,  33.40
 Phoenix AZ,                  -112.10,  33.45
@@ -85,30 +102,49 @@ 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
 Barbers Point HI,            -158.10,  21.30
-Barking Sands HI,            -159.75,  22.05
-Bradshaw Airfield HI,        -155.55,  19.75
-Diamond Head HI,             -157.80,  21.25
-Haleakala Crater HI,         -156.25,  20.70
+Barking Sands HI,            -159.76,  22.06
+Bradshaw Airfield HI,        -155.56,  19.76
+Diamond Head HI,             -157.80,  21.26
+Haleakala Crater HI,         -156.26,  20.70
 Hanapepe HI,                 -159.60,  21.90
-Hilo HI,                     -155.05,  19.70
-Honolulu HI,                 -157.85,  21.30
-Kaheawa Wind HI,             -156.55,  20.80
+Hana HI,                     -155.98,  20.76
+Hawaiian Ocean View HI,      -155.78,  19.10
+Hilo (ATC) HI,               -155.10,  19.70
+Hilo HI,                     -155.06,  19.70
+Honolulu (ATC) HI,           -157.86,  21.30
+Honolulu HI,                 -157.86,  21.30
+Kaheawa Wind HI,             -156.56,  20.80
+Kahuku HI,                   -157.94,  21.68
 Kahului HI,                  -156.50,  20.90
-Kailua Kona HI,              -156.00,  19.65
+Kailua Kona HI,              -156.00,  19.66
 Kaneohe HI,                  -157.80,  21.40
 Kaunakakai HI,               -157.00,  21.10
-Kilauea HI,                  -155.25,  19.40
-Laie HI,                     -157.95,  21.65
-Lanai City HI,               -156.95,  20.80
-Lihue HI,                    -159.35,  21.95
-Marine Corps Base HI,        -157.75,  21.45
-Mauna Kea HI,                -155.45,  19.80
-Ocean View HI,               -155.75,  19.10
-Pearl Harbor HI,             -157.95,  21.35
+Kihei HI,                    -156.46,  20.78
+Kilauea HI,                  -155.26,  19.40
+Lahaina HI,                  -156.68,  20.88
+Laie HI,                     -157.96,  21.66
+Lanai City HI,               -156.96,  20.80
+Lihue HI,                    -159.36,  21.96
+Marine Corps Base HI,        -157.76,  21.46
+Mauna Kea HI,                -155.46,  19.80
+Ocean View HI,               -155.76,  19.10
+Pearl Harbor HI,             -157.96,  21.36
+Pepeekeo HI,                 -155.10,  19.84
+Princeville HI,              -159.48,  22.22
 Puuwai HI,                   -160.20,  21.90
+Volcano HI,                  -155.22,  19.44
 Wahiawa HI,                  -158.00,  21.50
-Waianae HI,                  -158.20,  21.45
+Waianae HI,                  -158.20,  21.46
+Waikoloa Village HI,         -155.78,  19.94
 Waimea HI,                   -155.70,  20.00
 Waipahu HI,                  -158.00,  21.40
 Des Moines IA,                -93.60,  41.60
@@ -132,6 +168,9 @@ 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
 Billings MT,                 -108.50,  45.80
 Bozeman MT,                  -111.05,  45.70
@@ -171,6 +210,18 @@ Portland OR,                 -122.65,  45.50
 Salem OR,                    -123.05,  44.95
 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
@@ -193,6 +244,10 @@ Provo UT,                    -111.65,  40.25
 Salt Lake City UT,           -111.90,  40.75
 Blacksburg VA,                -80.40,  37.25
 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
 Aberdeen WA,                 -123.80,  47.00
 Bellingham WA,               -122.50,  48.75
diff --git a/etc/nshm/sites-nshmp.geojson b/etc/nshm/sites-nshmp.geojson
index d93382893..6dee58a92 100644
--- a/etc/nshm/sites-nshmp.geojson
+++ b/etc/nshm/sites-nshmp.geojson
@@ -5,7 +5,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-176.65, 51.9]
+        "coordinates": [-176.7, 51.9]
       },
       "properties": {
         "marker-size": "small",
@@ -27,7 +27,18 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-156.75, 71.3]
+        "coordinates": [-149.9, 61.2]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Anchorage (ATC) AK"
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-156.8, 71.3]
       },
       "properties": {
         "marker-size": "small",
@@ -45,6 +56,17 @@
         "title": "Bethel AK"
       }
     },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-144.5, 61.5]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Chitina AK"
+      }
+    },
     {
       "type": "Feature",
       "geometry": {
@@ -60,7 +82,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-158.45, 59.05]
+        "coordinates": [-158.5, 59.1]
       },
       "properties": {
         "marker-size": "small",
@@ -71,7 +93,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-166.55, 53.9]
+        "coordinates": [-166.6, 53.9]
       },
       "properties": {
         "marker-size": "small",
@@ -93,7 +115,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-147.7, 64.85]
+        "coordinates": [-147.7, 64.9]
       },
       "properties": {
         "marker-size": "small",
@@ -104,7 +126,40 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-145.55, 62.1]
+        "coordinates": [-147.7, 64.9]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Fairbanks (ATC) AK"
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-145.3, 62.3]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Gakona AK"
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-156.9, 64.8]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Galena AK"
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-145.6, 62.1]
       },
       "properties": {
         "marker-size": "small",
@@ -115,7 +170,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-135.45, 59.25]
+        "coordinates": [-135.5, 59.3]
       },
       "properties": {
         "marker-size": "small",
@@ -126,7 +181,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-151.5, 59.65]
+        "coordinates": [-151.5, 59.7]
       },
       "properties": {
         "marker-size": "small",
@@ -148,7 +203,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-151.25, 60.55]
+        "coordinates": [-151.3, 60.6]
       },
       "properties": {
         "marker-size": "small",
@@ -159,13 +214,24 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-131.65, 55.35]
+        "coordinates": [-131.7, 55.4]
       },
       "properties": {
         "marker-size": "small",
         "title": "Ketchikan AK"
       }
     },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-149.7, 61.5]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Knik-Fairview AK"
+      }
+    },
     {
       "type": "Feature",
       "geometry": {
@@ -192,7 +258,18 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-155.6, 62.95]
+        "coordinates": [-149.4, 61.6]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Lakes AK"
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-155.6, 63.0]
       },
       "properties": {
         "marker-size": "small",
@@ -214,7 +291,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-145.5, 63.05]
+        "coordinates": [-145.5, 63.1]
       },
       "properties": {
         "marker-size": "small",
@@ -225,7 +302,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-148.35, 70.25]
+        "coordinates": [-148.4, 70.3]
       },
       "properties": {
         "marker-size": "small",
@@ -236,13 +313,24 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-135.35, 57.05]
+        "coordinates": [-135.4, 57.1]
       },
       "properties": {
         "marker-size": "small",
         "title": "Sitka AK"
       }
     },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-157.2, 61.7]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Sleetmute AK"
+      }
+    },
     {
       "type": "Feature",
       "geometry": {
@@ -258,7 +346,18 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-146.35, 61.15]
+        "coordinates": [-166.6, 53.9]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Unalaska AK"
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-146.4, 61.2]
       },
       "properties": {
         "marker-size": "small",
@@ -269,7 +368,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-149.45, 61.6]
+        "coordinates": [-149.5, 61.6]
       },
       "properties": {
         "marker-size": "small",
@@ -280,7 +379,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-139.7, 59.55]
+        "coordinates": [-139.7, 59.6]
       },
       "properties": {
         "marker-size": "small",
@@ -342,6 +441,94 @@
         "title": "Little Rock AR"
       }
     },
+    {
+      "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"
+      }
+    },
     {
       "type": "Feature",
       "geometry": {
@@ -947,6 +1134,94 @@
         "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": {
@@ -962,7 +1237,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-159.75, 22.05]
+        "coordinates": [-159.76, 22.06]
       },
       "properties": {
         "marker-size": "small",
@@ -973,7 +1248,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-155.55, 19.75]
+        "coordinates": [-155.56, 19.76]
       },
       "properties": {
         "marker-size": "small",
@@ -984,7 +1259,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-157.8, 21.25]
+        "coordinates": [-157.8, 21.26]
       },
       "properties": {
         "marker-size": "small",
@@ -995,7 +1270,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-156.25, 20.7]
+        "coordinates": [-156.26, 20.7]
       },
       "properties": {
         "marker-size": "small",
@@ -1017,7 +1292,40 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-155.05, 19.7]
+        "coordinates": [-155.98, 20.76]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Hana HI"
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-155.78, 19.1]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Hawaiian Ocean View HI"
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-155.1, 19.7]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Hilo (ATC) HI"
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-155.06, 19.7]
       },
       "properties": {
         "marker-size": "small",
@@ -1028,7 +1336,18 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-157.85, 21.3]
+        "coordinates": [-157.86, 21.3]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Honolulu (ATC) HI"
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-157.86, 21.3]
       },
       "properties": {
         "marker-size": "small",
@@ -1039,13 +1358,24 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-156.55, 20.8]
+        "coordinates": [-156.56, 20.8]
       },
       "properties": {
         "marker-size": "small",
         "title": "Kaheawa Wind HI"
       }
     },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-157.94, 21.68]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Kahuku HI"
+      }
+    },
     {
       "type": "Feature",
       "geometry": {
@@ -1061,7 +1391,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-156.0, 19.65]
+        "coordinates": [-156.0, 19.66]
       },
       "properties": {
         "marker-size": "small",
@@ -1094,7 +1424,18 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-155.25, 19.4]
+        "coordinates": [-156.46, 20.78]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Kihei HI"
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-155.26, 19.4]
       },
       "properties": {
         "marker-size": "small",
@@ -1105,7 +1446,18 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-157.95, 21.65]
+        "coordinates": [-156.68, 20.88]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Lahaina HI"
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-157.96, 21.66]
       },
       "properties": {
         "marker-size": "small",
@@ -1116,7 +1468,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-156.95, 20.8]
+        "coordinates": [-156.96, 20.8]
       },
       "properties": {
         "marker-size": "small",
@@ -1127,7 +1479,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-159.35, 21.95]
+        "coordinates": [-159.36, 21.96]
       },
       "properties": {
         "marker-size": "small",
@@ -1138,7 +1490,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-157.75, 21.45]
+        "coordinates": [-157.76, 21.46]
       },
       "properties": {
         "marker-size": "small",
@@ -1149,7 +1501,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-155.45, 19.8]
+        "coordinates": [-155.46, 19.8]
       },
       "properties": {
         "marker-size": "small",
@@ -1160,7 +1512,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-155.75, 19.1]
+        "coordinates": [-155.76, 19.1]
       },
       "properties": {
         "marker-size": "small",
@@ -1171,13 +1523,35 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-157.95, 21.35]
+        "coordinates": [-157.96, 21.36]
       },
       "properties": {
         "marker-size": "small",
         "title": "Pearl Harbor HI"
       }
     },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-155.1, 19.84]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Pepeekeo HI"
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-159.48, 22.22]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Princeville HI"
+      }
+    },
     {
       "type": "Feature",
       "geometry": {
@@ -1189,6 +1563,17 @@
         "title": "Puuwai HI"
       }
     },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-155.22, 19.44]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Volcano HI"
+      }
+    },
     {
       "type": "Feature",
       "geometry": {
@@ -1204,13 +1589,24 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-158.2, 21.45]
+        "coordinates": [-158.2, 21.46]
       },
       "properties": {
         "marker-size": "small",
         "title": "Waianae HI"
       }
     },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-155.78, 19.94]
+      },
+      "properties": {
+        "marker-size": "small",
+        "title": "Waikoloa Village HI"
+      }
+    },
     {
       "type": "Feature",
       "geometry": {
@@ -1464,6 +1860,39 @@
         "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": {
@@ -1893,6 +2322,138 @@
         "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": {
@@ -2135,6 +2696,50 @@
         "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": {
-- 
GitLab