diff --git a/etc/nshm/sites-nshmp.csv b/etc/nshm/sites-nshmp.csv
index 0b16b054a0e3de8666a136fbe0de7ec3564c7997..b8c22a7394c72048b8e5176e39d8a83557853d56 100644
--- a/etc/nshm/sites-nshmp.csv
+++ b/etc/nshm/sites-nshmp.csv
@@ -1,157 +1,158 @@
-Big Sur CA,                      -121.75,  36.25
-Coalinga CA,                     -120.40,  36.15
-Concord CA,                      -122.00,  37.95
-Eureka CA,                       -124.20,  40.80
-Fresno CA,                       -119.75,  36.75
-Monterey CA,                     -121.90,  36.60
-Morgan Hill CA,                  -121.65,  37.15
-Oakland CA,                      -122.25,  37.80
-Redding CA,                      -122.40,  40.60
-Sacramento CA,                   -121.50,  38.60
-San Francisco CA,                -122.40,  37.75
-San Jose CA,                     -121.90,  37.35
-San Mateo CA,                    -122.30,  37.55
-Santa Cruz CA,                   -122.05,  36.95
-Santa Rosa CA,                   -122.70,  38.45
-Vallejo CA,                      -122.25,  38.10
-Bakersfield CA,                  -119.35,  35.35
-Brawley CA,                      -115.55,  33.00
-Century City CA,                 -118.40,  34.05
-Cucamonga CA,                    -117.55,  34.20
-Death Valley CA,                 -116.85,  36.35
-Diablo Canyon CA,                -120.85,  35.20
-Irvine CA,                       -117.80,  33.65
-Long Beach CA,                   -118.20,  33.80
-Los Angeles CA,                  -118.25,  34.05
-Malibu West CA,                  -118.95,  34.05
-Mammoth Lakes CA,                -119.00,  37.65
-Northridge CA,                   -118.55,  34.20
-Palmdale CA,                     -118.00,  34.50
-Palm Springs CA,                 -116.55,  33.85
-Pasadena CA,                     -118.15,  34.15
-Riverside CA,                    -117.40,  33.95
-San Bernardino CA,               -117.30,  34.10
-San Diego CA,                    -117.15,  32.70
-San Luis Obispo CA,              -120.65,  35.30
-San Onofre CA,                   -117.55,  33.40
-Santa Barbara CA,                -119.70,  34.45
-Ventura CA,                      -119.30,  34.30
-Grand Canyon Village AZ,         -112.15,  36.05
-Palo Verde AZ,                   -112.85,  33.40
-Phoenix AZ,                      -112.10,  33.45
-Tucson AZ,                       -110.95,  32.20
-Paradox CO,                      -108.95,  38.40
-Rangely CO,                      -108.80,  40.10
-Boise ID,                        -116.20,  43.60
-Idaho National Lab ID,           -112.85,  43.60
-Lima MT,                         -112.60,  44.65
-Bozeman MT,                      -111.05,  45.70
-Billings MT,                     -108.50,  45.80
-Missoula MT,                     -114.00,  46.90
-Carson City NV,                  -119.75,  39.15
-Elko NV,                         -115.75,  40.85
-Las Vegas NV,                    -115.15,  36.20
-Reno NV,                         -119.80,  39.55
-Albuquerque NM,                  -106.60,  35.10
-Artesia NM,                      -104.40,  32.85
-Los Alamos National Lab NM,      -106.30,  35.85
-Las Cruces NM,                   -106.75,  32.30
-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
-Casper WY,                       -106.30,  42.85
-Jackson WY,                      -110.75,  43.50
-Yellowstone WY,                  -110.55,  44.40
-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
-Klamath Falls OR,                -121.80,  42.20
-Medford OR,                      -122.90,  42.35
-Newport OR,                      -124.05,  44.65
-Pendleton OR,                    -118.80,  45.70
-Portland OR,                     -122.65,  45.50
-Salem OR,                        -123.05,  44.95
-Aberdeen WA,                     -123.80,  47.00
-Bellingham WA,                   -122.50,  48.75
-Ellensburg WA,                   -120.55,  47.00
-Everett WA,                      -122.20,  48.00
-Hanford Site WA,                 -119.60,  46.55
-Olympia WA,                      -122.90,  47.05
-Seattle WA,                      -122.30,  47.60
-Spokane WA,                      -117.40,  47.65
-Tacoma WA,                       -122.45,  47.25
-Yakima WA,                       -120.50,  46.60
-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
-Greenbrier AR,                    -92.40,  35.20
-Little Rock AR,                   -92.30,  34.75
-Denver CO,                       -105.00,  39.75
-La Junta CO,                     -103.55,  38.00
-Trinidad CO,                     -104.50,  37.20
-Hartford CT,                      -72.70,  41.75
-Wilmington DE,                    -75.55,  39.75
-Jacksonville FL,                  -81.65,  30.35
-Miami FL,                         -80.20,  25.75
-Atlanta GA,                       -84.40,  33.75
-Lincolnton GA,                    -82.50,  33.80
-Savannah GA,                      -81.10,  32.10
-Central IL,                       -90.00,  40.00
-Chicago IL,                       -87.65,  41.85
-Evansville IN,                    -87.60,  38.00
-Indianapolis IN,                  -86.15,  39.80
-Des Moines IA,                    -93.60,  41.60
-Topeka KS,                        -95.70,  39.05
-Wichita KS,                       -97.35,  37.70
-Louisville KY,                    -85.75,  38.25
-New Orleans LA,                   -90.05,  29.95
-Augusta ME,                       -69.80,  44.30
-Bangor ME,                        -68.80,  44.80
-Portland ME,                      -70.25,  43.65
-Baltimore MD,                     -76.60,  39.30
-Boston MA,                        -71.05,  42.35
-Detroit MI,                       -83.05,  42.35
-Minneapolis MN,                   -93.30,  45.00
-Jackson MS,                       -90.20,  32.30
-Cape Girardeau MO,                -89.50,  37.30
-New Madrid MO,                    -89.55,  36.60
-St Louis MO,                      -90.20,  38.60
-Omaha NE,                         -96.00,  41.25
-Manchester NH,                    -71.45,  43.00
-Trenton NJ,                       -74.75,  40.20
-Batavia NY,                       -78.20,  43.00
-Malone NY,                        -74.30,  44.85
-New York NY,                      -74.00,  40.75
-Charlotte NC,                     -80.85,  35.25
-Fargo ND,                         -96.80,  46.90
-Columbus OH,                      -83.00,  39.95
-Sidney OH,                        -84.15,  40.30
-Youngstown OH,                    -80.65,  41.10
-Elgin OK,                         -98.30,  34.80
-Oklahoma City OK,                 -97.50,  35.50
-Philadelphia PA,                  -75.15,  39.95
-Providence RI,                    -71.40,  41.80
-Charleston SC,                    -79.95,  32.80
-Edgemont SD,                     -103.85,  43.30
-Platte SD,                        -98.85,  43.40
-Sioux Falls SD,                   -96.75,  43.55
-Chattanooga TN,                   -85.25,  35.05
-Knoxville TN,                     -83.90,  35.95
-Maryville TN,                     -84.00,  35.75
-Memphis TN,                       -90.05,  35.15
-Amarillo TX,                     -101.85,  35.20
-Dallas TX,                        -96.80,  32.80
-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
-Burlington VT,                    -73.20,  44.50
-Richmond VA,                      -77.45,  37.55
-Charleston WV,                    -81.65,  38.35
-Milwaukee WI,                     -87.90,  43.05
-Cheyenne WY,                     -104.80,  41.15
+name,                            lon,    lat
+Big Sur CA,                  -121.75,  36.25
+Coalinga CA,                 -120.40,  36.15
+Concord CA,                  -122.00,  37.95
+Eureka CA,                   -124.20,  40.80
+Fresno CA,                   -119.75,  36.75
+Monterey CA,                 -121.90,  36.60
+Morgan Hill CA,              -121.65,  37.15
+Oakland CA,                  -122.25,  37.80
+Redding CA,                  -122.40,  40.60
+Sacramento CA,               -121.50,  38.60
+San Francisco CA,            -122.40,  37.75
+San Jose CA,                 -121.90,  37.35
+San Mateo CA,                -122.30,  37.55
+Santa Cruz CA,               -122.05,  36.95
+Santa Rosa CA,               -122.70,  38.45
+Vallejo CA,                  -122.25,  38.10
+Bakersfield CA,              -119.35,  35.35
+Brawley CA,                  -115.55,  33.00
+Century City CA,             -118.40,  34.05
+Cucamonga CA,                -117.55,  34.20
+Death Valley CA,             -116.85,  36.35
+Diablo Canyon CA,            -120.85,  35.20
+Irvine CA,                   -117.80,  33.65
+Long Beach CA,               -118.20,  33.80
+Los Angeles CA,              -118.25,  34.05
+Malibu West CA,              -118.95,  34.05
+Mammoth Lakes CA,            -119.00,  37.65
+Northridge CA,               -118.55,  34.20
+Palmdale CA,                 -118.00,  34.50
+Palm Springs CA,             -116.55,  33.85
+Pasadena CA,                 -118.15,  34.15
+Riverside CA,                -117.40,  33.95
+San Bernardino CA,           -117.30,  34.10
+San Diego CA,                -117.15,  32.70
+San Luis Obispo CA,          -120.65,  35.30
+San Onofre CA,               -117.55,  33.40
+Santa Barbara CA,            -119.70,  34.45
+Ventura CA,                  -119.30,  34.30
+Grand Canyon Village AZ,     -112.15,  36.05
+Palo Verde AZ,               -112.85,  33.40
+Phoenix AZ,                  -112.10,  33.45
+Tucson AZ,                   -110.95,  32.20
+Paradox CO,                  -108.95,  38.40
+Rangely CO,                  -108.80,  40.10
+Boise ID,                    -116.20,  43.60
+Idaho National Lab ID,       -112.85,  43.60
+Lima MT,                     -112.60,  44.65
+Bozeman MT,                  -111.05,  45.70
+Billings MT,                 -108.50,  45.80
+Missoula MT,                 -114.00,  46.90
+Carson City NV,              -119.75,  39.15
+Elko NV,                     -115.75,  40.85
+Las Vegas NV,                -115.15,  36.20
+Reno NV,                     -119.80,  39.55
+Albuquerque NM,              -106.60,  35.10
+Artesia NM,                  -104.40,  32.85
+Los Alamos National Lab NM,  -106.30,  35.85
+Las Cruces NM,               -106.75,  32.30
+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
+Casper WY,                   -106.30,  42.85
+Jackson WY,                  -110.75,  43.50
+Yellowstone WY,              -110.55,  44.40
+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
+Klamath Falls OR,            -121.80,  42.20
+Medford OR,                  -122.90,  42.35
+Newport OR,                  -124.05,  44.65
+Pendleton OR,                -118.80,  45.70
+Portland OR,                 -122.65,  45.50
+Salem OR,                    -123.05,  44.95
+Aberdeen WA,                 -123.80,  47.00
+Bellingham WA,               -122.50,  48.75
+Ellensburg WA,               -120.55,  47.00
+Everett WA,                  -122.20,  48.00
+Hanford Site WA,             -119.60,  46.55
+Olympia WA,                  -122.90,  47.05
+Seattle WA,                  -122.30,  47.60
+Spokane WA,                  -117.40,  47.65
+Tacoma WA,                   -122.45,  47.25
+Yakima WA,                   -120.50,  46.60
+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
+Greenbrier AR,                -92.40,  35.20
+Little Rock AR,               -92.30,  34.75
+Denver CO,                   -105.00,  39.75
+La Junta CO,                 -103.55,  38.00
+Trinidad CO,                 -104.50,  37.20
+Hartford CT,                  -72.70,  41.75
+Wilmington DE,                -75.55,  39.75
+Jacksonville FL,              -81.65,  30.35
+Miami FL,                     -80.20,  25.75
+Atlanta GA,                   -84.40,  33.75
+Lincolnton GA,                -82.50,  33.80
+Savannah GA,                  -81.10,  32.10
+Central IL,                   -90.00,  40.00
+Chicago IL,                   -87.65,  41.85
+Evansville IN,                -87.60,  38.00
+Indianapolis IN,              -86.15,  39.80
+Des Moines IA,                -93.60,  41.60
+Topeka KS,                    -95.70,  39.05
+Wichita KS,                   -97.35,  37.70
+Louisville KY,                -85.75,  38.25
+New Orleans LA,               -90.05,  29.95
+Augusta ME,                   -69.80,  44.30
+Bangor ME,                    -68.80,  44.80
+Portland ME,                  -70.25,  43.65
+Baltimore MD,                 -76.60,  39.30
+Boston MA,                    -71.05,  42.35
+Detroit MI,                   -83.05,  42.35
+Minneapolis MN,               -93.30,  45.00
+Jackson MS,                   -90.20,  32.30
+Cape Girardeau MO,            -89.50,  37.30
+New Madrid MO,                -89.55,  36.60
+St Louis MO,                  -90.20,  38.60
+Omaha NE,                     -96.00,  41.25
+Manchester NH,                -71.45,  43.00
+Trenton NJ,                   -74.75,  40.20
+Batavia NY,                   -78.20,  43.00
+Malone NY,                    -74.30,  44.85
+New York NY,                  -74.00,  40.75
+Charlotte NC,                 -80.85,  35.25
+Fargo ND,                     -96.80,  46.90
+Columbus OH,                  -83.00,  39.95
+Sidney OH,                    -84.15,  40.30
+Youngstown OH,                -80.65,  41.10
+Elgin OK,                     -98.30,  34.80
+Oklahoma City OK,             -97.50,  35.50
+Philadelphia PA,              -75.15,  39.95
+Providence RI,                -71.40,  41.80
+Charleston SC,                -79.95,  32.80
+Edgemont SD,                 -103.85,  43.30
+Platte SD,                    -98.85,  43.40
+Sioux Falls SD,               -96.75,  43.55
+Chattanooga TN,               -85.25,  35.05
+Knoxville TN,                 -83.90,  35.95
+Maryville TN,                 -84.00,  35.75
+Memphis TN,                   -90.05,  35.15
+Amarillo TX,                 -101.85,  35.20
+Dallas TX,                    -96.80,  32.80
+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
+Burlington VT,                -73.20,  44.50
+Richmond VA,                  -77.45,  37.55
+Charleston WV,                -81.65,  38.35
+Milwaukee WI,                 -87.90,  43.05
+Cheyenne WY,                 -104.80,  41.15