From b65deeda2001d62d3269460f1e494604d9c70f10 Mon Sep 17 00:00:00 2001 From: Peter Powers Date: Fri, 12 Oct 2018 15:02:29 -0600 Subject: [PATCH] updated map files from json refactor --- etc/nshm/map-alaska.geojson | 72 +++---- etc/nshm/map-ceus.geojson | 178 +++++++++--------- etc/nshm/map-cybershake.geojson | 16 +- etc/nshm/map-la-basin.geojson | 16 +- etc/nshm/map-new-madrid.geojson | 16 +- etc/nshm/map-nshmp-all.geojson | 114 ++++++----- etc/nshm/map-puget.geojson | 16 +- etc/nshm/map-sf-bay.geojson | 16 +- ...p.geojson => map-ucerf3-nshm-clip.geojson} | 15 +- etc/nshm/map-ucerf3-nshm.geojson | 34 ++-- etc/nshm/map-ucerf3-relm.geojson | 40 ++-- etc/nshm/map-wasatch.geojson | 16 +- etc/nshm/map-wus.geojson | 174 ++++++++--------- .../earthquake/nshmp/geo/json/Geometry.java | 4 +- .../nshmp/internal/NshmpSiteFiles.java | 6 +- 15 files changed, 386 insertions(+), 347 deletions(-) rename etc/nshm/{map-ucerf3-nshmp-clip.geojson => map-ucerf3-nshm-clip.geojson} (75%) diff --git a/etc/nshm/map-alaska.geojson b/etc/nshm/map-alaska.geojson index 2e1462392..d7653ef53 100644 --- a/etc/nshm/map-alaska.geojson +++ b/etc/nshm/map-alaska.geojson @@ -6,13 +6,15 @@ "id": "Extents", "geometry": { "type": "Polygon", - "coordinates": [[ - [ -200.0, 48.0 ], - [ -125.0, 48.0 ], - [ -125.0, 72.0 ], - [ -200.0, 72.0 ], - [ -200.0, 48.0 ] - ]] + "coordinates": [ + [ + [-200.0, 48.0], + [-125.0, 48.0], + [-125.0, 72.0], + [-200.0, 72.0], + [-200.0, 48.0] + ] + ] }, "properties": { "fill": "#AA0078", @@ -24,33 +26,35 @@ "type": "Feature", "geometry": { "type": "Polygon", - "coordinates": [[ - [ -137.5, 70.6 ], - [ -157.1, 72.6 ], - [ -163.6, 71.6 ], - [ -168.4, 69.7 ], - [ -175.2, 61.4 ], - [ -178.8, 56.8 ], - [ -182.5, 55.6 ], - [ -188.3, 55.4 ], - [ -191.1, 54.5 ], - [ -191.5, 52.9 ], - [ -191.1, 50.8 ], - [ -187.8, 49.5 ], - [ -178.0, 48.4 ], - [ -162.1, 50.3 ], - [ -152.2, 53.8 ], - [ -147.8, 56.3 ], - [ -142.8, 57.2 ], - [ -138.8, 55.8 ], - [ -134.9, 53.5 ], - [ -130.6, 53.0 ], - [ -126.8, 55.5 ], - [ -134.3, 60.8 ], - [ -136.6, 60.7 ], - [ -137.5, 61.4 ], - [ -137.5, 70.6 ] - ]] + "coordinates": [ + [ + [-137.5, 70.6], + [-157.1, 72.6], + [-163.6, 71.6], + [-168.4, 69.7], + [-175.2, 61.4], + [-178.8, 56.8], + [-182.5, 55.6], + [-188.3, 55.4], + [-191.1, 54.5], + [-191.5, 52.9], + [-191.1, 50.8], + [-187.8, 49.5], + [-178.0, 48.4], + [-162.1, 50.3], + [-152.2, 53.8], + [-147.8, 56.3], + [-142.8, 57.2], + [-138.8, 55.8], + [-134.9, 53.5], + [-130.6, 53.0], + [-126.8, 55.5], + [-134.3, 60.8], + [-136.6, 60.7], + [-137.5, 61.4], + [-137.5, 70.6] + ] + ] }, "properties": { "spacing": 0.1, diff --git a/etc/nshm/map-ceus.geojson b/etc/nshm/map-ceus.geojson index 63e52ee8a..a09f1d105 100644 --- a/etc/nshm/map-ceus.geojson +++ b/etc/nshm/map-ceus.geojson @@ -6,106 +6,110 @@ "id": "Extents", "geometry": { "type": "Polygon", - "coordinates": [[ - [ -115.0, 24.6 ], - [ -65.0, 24.6 ], - [ -65.0, 50.0 ], - [ -115.0, 50.0 ], - [ -115.0, 24.6 ] - ]] + "coordinates": [ + [ + [-115.0, 24.6], + [-65.0, 24.6], + [-65.0, 50.0], + [-115.0, 50.0], + [-115.0, 24.6] + ] + ] }, "properties": { "fill": "#AA0078", "marker-color": "#AA0078", - "title": "NSHMP Central & Eastern US Map Extents" + "title": "NSHMP Central \u0026 Eastern US Map Extents" } }, { "type": "Feature", "geometry": { "type": "Polygon", - "coordinates": [[ - [ -97.7, 25.6 ], - [ -96.9, 25.6 ], - [ -96.9, 27.6 ], - [ -93.5, 29.5 ], - [ -90.6, 28.7 ], - [ -88.9, 28.7 ], - [ -88.5, 30.0 ], - [ -86.2, 30.0 ], - [ -85.3, 29.4 ], - [ -84.9, 29.4 ], - [ -84.0, 29.8 ], - [ -83.0, 28.7 ], - [ -83.1, 27.7 ], - [ -82.0, 25.8 ], - [ -82.0, 24.4 ], - [ -81.2, 24.4 ], - [ -80.0, 25.0 ], - [ -79.7, 26.8 ], - [ -81.1, 30.7 ], - [ -80.7, 31.8 ], - [ -75.1, 35.2 ], - [ -75.1, 35.7 ], - [ -75.6, 36.9 ], - [ -73.4, 40.4 ], - [ -69.8, 41.1 ], - [ -69.8, 42.2 ], - [ -70.4, 42.4 ], - [ -70.4, 43.0 ], - [ -69.9, 43.6 ], - [ -68.8, 43.7 ], - [ -66.7, 44.7 ], - [ -67.5, 46.0 ], - [ -67.5, 47.1 ], - [ -68.4, 47.6 ], - [ -69.4, 47.6 ], - [ -71.8, 45.2 ], - [ -75.1, 45.2 ], - [ -76.7, 44.1 ], - [ -76.6, 43.7 ], - [ -77.0, 43.5 ], - [ -78.8, 43.5 ], - [ -79.4, 43.3 ], - [ -79.2, 42.8 ], - [ -82.2, 41.7 ], - [ -82.7, 41.7 ], - [ -82.9, 42.1 ], - [ -82.3, 42.6 ], - [ -82.2, 43.1 ], - [ -83.3, 46.4 ], - [ -88.4, 48.5 ], - [ -89.6, 48.2 ], - [ -94.4, 49.0 ], - [ -94.6, 49.6 ], - [ -95.5, 49.6 ], - [ -95.5, 49.2 ], - [ -123.7, 49.2 ], - [ -123.7, 48.6 ], - [ -125.3, 48.6 ], - [ -124.6, 46.2 ], - [ -125.0, 43.2 ], - [ -125.0, 40.0 ], - [ -119.9, 33.0 ], - [ -117.0, 32.3 ], - [ -115.0, 32.3 ], - [ -111.1, 31.1 ], - [ -107.9, 31.1 ], - [ -107.9, 31.5 ], - [ -106.6, 31.5 ], - [ -105.1, 30.2 ], - [ -104.8, 29.4 ], - [ -103.3, 28.7 ], - [ -103.0, 28.7 ], - [ -102.4, 29.5 ], - [ -101.5, 29.5 ], - [ -99.2, 26.1 ], - [ -97.7, 25.6 ] - ]] + "coordinates": [ + [ + [-97.7, 25.6], + [-96.9, 25.6], + [-96.9, 27.6], + [-93.5, 29.5], + [-90.6, 28.7], + [-88.9, 28.7], + [-88.5, 30.0], + [-86.2, 30.0], + [-85.3, 29.4], + [-84.9, 29.4], + [-84.0, 29.8], + [-83.0, 28.7], + [-83.1, 27.7], + [-82.0, 25.8], + [-82.0, 24.4], + [-81.2, 24.4], + [-80.0, 25.0], + [-79.7, 26.8], + [-81.1, 30.7], + [-80.7, 31.8], + [-75.1, 35.2], + [-75.1, 35.7], + [-75.6, 36.9], + [-73.4, 40.4], + [-69.8, 41.1], + [-69.8, 42.2], + [-70.4, 42.4], + [-70.4, 43.0], + [-69.9, 43.6], + [-68.8, 43.7], + [-66.7, 44.7], + [-67.5, 46.0], + [-67.5, 47.1], + [-68.4, 47.6], + [-69.4, 47.6], + [-71.8, 45.2], + [-75.1, 45.2], + [-76.7, 44.1], + [-76.6, 43.7], + [-77.0, 43.5], + [-78.8, 43.5], + [-79.4, 43.3], + [-79.2, 42.8], + [-82.2, 41.7], + [-82.7, 41.7], + [-82.9, 42.1], + [-82.3, 42.6], + [-82.2, 43.1], + [-83.3, 46.4], + [-88.4, 48.5], + [-89.6, 48.2], + [-94.4, 49.0], + [-94.6, 49.6], + [-95.5, 49.6], + [-95.5, 49.2], + [-123.7, 49.2], + [-123.7, 48.6], + [-125.3, 48.6], + [-124.6, 46.2], + [-125.0, 43.2], + [-125.0, 40.0], + [-119.9, 33.0], + [-117.0, 32.3], + [-115.0, 32.3], + [-111.1, 31.1], + [-107.9, 31.1], + [-107.9, 31.5], + [-106.6, 31.5], + [-105.1, 30.2], + [-104.8, 29.4], + [-103.3, 28.7], + [-103.0, 28.7], + [-102.4, 29.5], + [-101.5, 29.5], + [-99.2, 26.1], + [-97.7, 25.6] + ] + ] }, "properties": { "spacing": 0.1, - "title": "NSHMP Central & Eastern US" + "title": "NSHMP Central \u0026 Eastern US" } } ] diff --git a/etc/nshm/map-cybershake.geojson b/etc/nshm/map-cybershake.geojson index 3e4426a4f..9b49dce33 100644 --- a/etc/nshm/map-cybershake.geojson +++ b/etc/nshm/map-cybershake.geojson @@ -5,13 +5,15 @@ "type": "Feature", "geometry": { "type": "Polygon", - "coordinates": [[ - [ -119.38, 34.13 ], - [ -117.5, 33.25 ], - [ -116.85, 34.19 ], - [ -118.75, 35.08 ], - [ -119.38, 34.13 ] - ]] + "coordinates": [ + [ + [-119.38, 34.13], + [-117.5, 33.25], + [-116.85, 34.19], + [-118.75, 35.08], + [-119.38, 34.13] + ] + ] }, "properties": { "spacing": 0.1, diff --git a/etc/nshm/map-la-basin.geojson b/etc/nshm/map-la-basin.geojson index f453a873b..7f8ae430f 100644 --- a/etc/nshm/map-la-basin.geojson +++ b/etc/nshm/map-la-basin.geojson @@ -5,13 +5,15 @@ "type": "Feature", "geometry": { "type": "Polygon", - "coordinates": [[ - [ -119.8, 33.86 ], - [ -117.42, 32.94 ], - [ -116.7, 34.23 ], - [ -119.07, 35.15 ], - [ -119.8, 33.86 ] - ]] + "coordinates": [ + [ + [-119.8, 33.86], + [-117.42, 32.94], + [-116.7, 34.23], + [-119.07, 35.15], + [-119.8, 33.86] + ] + ] }, "properties": { "spacing": 0.05, diff --git a/etc/nshm/map-new-madrid.geojson b/etc/nshm/map-new-madrid.geojson index 57179b254..8d5076c92 100644 --- a/etc/nshm/map-new-madrid.geojson +++ b/etc/nshm/map-new-madrid.geojson @@ -5,13 +5,15 @@ "type": "Feature", "geometry": { "type": "Polygon", - "coordinates": [[ - [ -92.5, 34.0 ], - [ -86.5, 34.0 ], - [ -86.5, 40.0 ], - [ -92.5, 40.0 ], - [ -92.5, 34.0 ] - ]] + "coordinates": [ + [ + [-92.5, 34.0], + [-86.5, 34.0], + [-86.5, 40.0], + [-92.5, 40.0], + [-92.5, 34.0] + ] + ] }, "properties": { "spacing": 0.05, diff --git a/etc/nshm/map-nshmp-all.geojson b/etc/nshm/map-nshmp-all.geojson index c1c6731b4..b3dd53bea 100644 --- a/etc/nshm/map-nshmp-all.geojson +++ b/etc/nshm/map-nshmp-all.geojson @@ -5,13 +5,15 @@ "type": "Feature", "geometry": { "type": "Polygon", - "coordinates": [[ - [ -119.8, 33.86 ], - [ -117.42, 32.94 ], - [ -116.7, 34.23 ], - [ -119.07, 35.15 ], - [ -119.8, 33.86 ] - ]] + "coordinates": [ + [ + [-119.8, 33.86], + [-117.42, 32.94], + [-116.7, 34.23], + [-119.07, 35.15], + [-119.8, 33.86] + ] + ] }, "properties": { "spacing": 0.1, @@ -22,13 +24,15 @@ "type": "Feature", "geometry": { "type": "Polygon", - "coordinates": [[ - [ -122.09, 36.43 ], - [ -120.61, 37.19 ], - [ -122.08, 39.02 ], - [ -123.61, 38.23 ], - [ -122.09, 36.43 ] - ]] + "coordinates": [ + [ + [-122.09, 36.43], + [-120.61, 37.19], + [-122.08, 39.02], + [-123.61, 38.23], + [-122.09, 36.43] + ] + ] }, "properties": { "spacing": 0.1, @@ -39,13 +43,15 @@ "type": "Feature", "geometry": { "type": "Polygon", - "coordinates": [[ - [ -113.25, 39.0 ], - [ -110.75, 39.0 ], - [ -110.75, 42.5 ], - [ -113.25, 42.5 ], - [ -113.25, 39.0 ] - ]] + "coordinates": [ + [ + [-113.25, 39.0], + [-110.75, 39.0], + [-110.75, 42.5], + [-113.25, 42.5], + [-113.25, 39.0] + ] + ] }, "properties": { "spacing": 0.1, @@ -56,13 +62,15 @@ "type": "Feature", "geometry": { "type": "Polygon", - "coordinates": [[ - [ -92.5, 34.0 ], - [ -86.5, 34.0 ], - [ -86.5, 40.0 ], - [ -92.5, 40.0 ], - [ -92.5, 34.0 ] - ]] + "coordinates": [ + [ + [-92.5, 34.0], + [-86.5, 34.0], + [-86.5, 40.0], + [-92.5, 40.0], + [-92.5, 34.0] + ] + ] }, "properties": { "spacing": 0.1, @@ -73,13 +81,15 @@ "type": "Feature", "geometry": { "type": "Polygon", - "coordinates": [[ - [ -123.5, 46.5 ], - [ -121.5, 46.5 ], - [ -121.5, 48.5 ], - [ -123.5, 48.5 ], - [ -123.5, 46.5 ] - ]] + "coordinates": [ + [ + [-123.5, 46.5], + [-121.5, 46.5], + [-121.5, 48.5], + [-123.5, 48.5], + [-123.5, 46.5] + ] + ] }, "properties": { "spacing": 0.1, @@ -90,22 +100,24 @@ "type": "Feature", "geometry": { "type": "Polygon", - "coordinates": [[ - [ -125.2, 45.0 ], - [ -125.4, 40.5 ], - [ -125.4, 40.2 ], - [ -123.8, 37.7 ], - [ -121.6, 34.2 ], - [ -121.0, 33.7 ], - [ -118.4, 32.8 ], - [ -117.9, 31.9 ], - [ -117.1, 31.5 ], - [ -111.5, 31.5 ], - [ -111.5, 36.5 ], - [ -116.5, 40.5 ], - [ -116.5, 45.0 ], - [ -125.2, 45.0 ] - ]] + "coordinates": [ + [ + [-125.2, 45.0], + [-125.4, 40.5], + [-125.4, 40.2], + [-123.8, 37.7], + [-121.6, 34.2], + [-121.0, 33.7], + [-118.4, 32.8], + [-117.9, 31.9], + [-117.1, 31.5], + [-111.5, 31.5], + [-111.5, 36.5], + [-116.5, 40.5], + [-116.5, 45.0], + [-125.2, 45.0] + ] + ] }, "properties": { "spacing": 0.1, diff --git a/etc/nshm/map-puget.geojson b/etc/nshm/map-puget.geojson index f47d39035..1b3160d3e 100644 --- a/etc/nshm/map-puget.geojson +++ b/etc/nshm/map-puget.geojson @@ -5,13 +5,15 @@ "type": "Feature", "geometry": { "type": "Polygon", - "coordinates": [[ - [ -123.5, 46.5 ], - [ -121.5, 46.5 ], - [ -121.5, 48.5 ], - [ -123.5, 48.5 ], - [ -123.5, 46.5 ] - ]] + "coordinates": [ + [ + [-123.5, 46.5], + [-121.5, 46.5], + [-121.5, 48.5], + [-123.5, 48.5], + [-123.5, 46.5] + ] + ] }, "properties": { "spacing": 0.05, diff --git a/etc/nshm/map-sf-bay.geojson b/etc/nshm/map-sf-bay.geojson index f0a77e2f0..151b7b0c1 100644 --- a/etc/nshm/map-sf-bay.geojson +++ b/etc/nshm/map-sf-bay.geojson @@ -5,13 +5,15 @@ "type": "Feature", "geometry": { "type": "Polygon", - "coordinates": [[ - [ -122.09, 36.43 ], - [ -120.61, 37.19 ], - [ -122.08, 39.02 ], - [ -123.61, 38.23 ], - [ -122.09, 36.43 ] - ]] + "coordinates": [ + [ + [-122.09, 36.43], + [-120.61, 37.19], + [-122.08, 39.02], + [-123.61, 38.23], + [-122.09, 36.43] + ] + ] }, "properties": { "spacing": 0.05, diff --git a/etc/nshm/map-ucerf3-nshmp-clip.geojson b/etc/nshm/map-ucerf3-nshm-clip.geojson similarity index 75% rename from etc/nshm/map-ucerf3-nshmp-clip.geojson rename to etc/nshm/map-ucerf3-nshm-clip.geojson index 9f710c4f4..5678415cb 100644 --- a/etc/nshm/map-ucerf3-nshmp-clip.geojson +++ b/etc/nshm/map-ucerf3-nshm-clip.geojson @@ -7,8 +7,8 @@ "type": "Polygon", "coordinates": [ [ - [-119.999, 39.000], - [-114.635, 35.000], + [-119.999, 39.0], + [-114.635, 35.0], [-114.616, 34.848], [-114.482, 34.719], [-114.371, 34.464], @@ -17,21 +17,22 @@ [-114.519, 33.934], [-114.511, 33.616], [-114.636, 33.426], - [-114.710, 33.401], + [-114.71, 33.401], [-114.676, 33.055], - [-114.501, 33.020], + [-114.501, 33.02], [-114.455, 32.861], [-114.575, 32.741], [-114.719, 32.718], [-120.861, 32.151], - [-126.000, 39.000], - [-126.000, 42.001], + [-126.0, 39.0], + [-126.0, 42.001], [-119.999, 42.001], - [-119.999, 39.000] + [-119.999, 39.0] ] ] }, "properties": { + "spacing": 0.1, "title": "UCERF3 Clipping Region" } } diff --git a/etc/nshm/map-ucerf3-nshm.geojson b/etc/nshm/map-ucerf3-nshm.geojson index fb5405936..49b1700b8 100644 --- a/etc/nshm/map-ucerf3-nshm.geojson +++ b/etc/nshm/map-ucerf3-nshm.geojson @@ -5,22 +5,24 @@ "type": "Feature", "geometry": { "type": "Polygon", - "coordinates": [[ - [ -125.2, 45.0 ], - [ -125.4, 40.5 ], - [ -125.4, 40.2 ], - [ -123.8, 37.7 ], - [ -121.6, 34.2 ], - [ -121.0, 33.7 ], - [ -118.4, 32.8 ], - [ -117.9, 31.9 ], - [ -117.1, 31.5 ], - [ -111.5, 31.5 ], - [ -111.5, 36.5 ], - [ -116.5, 40.5 ], - [ -116.5, 45.0 ], - [ -125.2, 45.0 ] - ]] + "coordinates": [ + [ + [-125.2, 45.0], + [-125.4, 40.5], + [-125.4, 40.2], + [-123.8, 37.7], + [-121.6, 34.2], + [-121.0, 33.7], + [-118.4, 32.8], + [-117.9, 31.9], + [-117.1, 31.5], + [-111.5, 31.5], + [-111.5, 36.5], + [-116.5, 40.5], + [-116.5, 45.0], + [-125.2, 45.0] + ] + ] }, "properties": { "spacing": 0.1, diff --git a/etc/nshm/map-ucerf3-relm.geojson b/etc/nshm/map-ucerf3-relm.geojson index 79faad20d..29db6e1d2 100644 --- a/etc/nshm/map-ucerf3-relm.geojson +++ b/etc/nshm/map-ucerf3-relm.geojson @@ -5,25 +5,27 @@ "type": "Feature", "geometry": { "type": "Polygon", - "coordinates": [[ - [ -125.2, 43.0 ], - [ -125.4, 40.5 ], - [ -125.4, 40.2 ], - [ -123.8, 37.7 ], - [ -121.6, 34.2 ], - [ -121.0, 33.7 ], - [ -118.4, 32.8 ], - [ -117.9, 31.9 ], - [ -117.1, 31.5 ], - [ -114.5, 31.7 ], - [ -113.6, 32.2 ], - [ -113.5, 32.9 ], - [ -113.1, 34.3 ], - [ -114.0, 35.7 ], - [ -119.0, 39.4 ], - [ -119.0, 43.0 ], - [ -125.2, 43.0 ] - ]] + "coordinates": [ + [ + [-125.2, 43.0], + [-125.4, 40.5], + [-125.4, 40.2], + [-123.8, 37.7], + [-121.6, 34.2], + [-121.0, 33.7], + [-118.4, 32.8], + [-117.9, 31.9], + [-117.1, 31.5], + [-114.5, 31.7], + [-113.6, 32.2], + [-113.5, 32.9], + [-113.1, 34.3], + [-114.0, 35.7], + [-119.0, 39.4], + [-119.0, 43.0], + [-125.2, 43.0] + ] + ] }, "properties": { "spacing": 0.1, diff --git a/etc/nshm/map-wasatch.geojson b/etc/nshm/map-wasatch.geojson index 82b8cf5e8..3cb020b86 100644 --- a/etc/nshm/map-wasatch.geojson +++ b/etc/nshm/map-wasatch.geojson @@ -5,13 +5,15 @@ "type": "Feature", "geometry": { "type": "Polygon", - "coordinates": [[ - [ -113.25, 39.0 ], - [ -110.75, 39.0 ], - [ -110.75, 42.5 ], - [ -113.25, 42.5 ], - [ -113.25, 39.0 ] - ]] + "coordinates": [ + [ + [-113.25, 39.0], + [-110.75, 39.0], + [-110.75, 42.5], + [-113.25, 42.5], + [-113.25, 39.0] + ] + ] }, "properties": { "spacing": 0.05, diff --git a/etc/nshm/map-wus.geojson b/etc/nshm/map-wus.geojson index 11e205153..7d47f2d15 100644 --- a/etc/nshm/map-wus.geojson +++ b/etc/nshm/map-wus.geojson @@ -6,13 +6,15 @@ "id": "Extents", "geometry": { "type": "Polygon", - "coordinates": [[ - [ -125.0, 24.6 ], - [ -100.0, 24.6 ], - [ -100.0, 50.0 ], - [ -125.0, 50.0 ], - [ -125.0, 24.6 ] - ]] + "coordinates": [ + [ + [-125.0, 24.6], + [-100.0, 24.6], + [-100.0, 50.0], + [-125.0, 50.0], + [-125.0, 24.6] + ] + ] }, "properties": { "fill": "#AA0078", @@ -24,84 +26,86 @@ "type": "Feature", "geometry": { "type": "Polygon", - "coordinates": [[ - [ -97.7, 25.6 ], - [ -96.9, 25.6 ], - [ -96.9, 27.6 ], - [ -93.5, 29.5 ], - [ -90.6, 28.7 ], - [ -88.9, 28.7 ], - [ -88.5, 30.0 ], - [ -86.2, 30.0 ], - [ -85.3, 29.4 ], - [ -84.9, 29.4 ], - [ -84.0, 29.8 ], - [ -83.0, 28.7 ], - [ -83.1, 27.7 ], - [ -82.0, 25.8 ], - [ -82.0, 24.4 ], - [ -81.2, 24.4 ], - [ -80.0, 25.0 ], - [ -79.7, 26.8 ], - [ -81.1, 30.7 ], - [ -80.7, 31.8 ], - [ -75.1, 35.2 ], - [ -75.1, 35.7 ], - [ -75.6, 36.9 ], - [ -73.4, 40.4 ], - [ -69.8, 41.1 ], - [ -69.8, 42.2 ], - [ -70.4, 42.4 ], - [ -70.4, 43.0 ], - [ -69.9, 43.6 ], - [ -68.8, 43.7 ], - [ -66.7, 44.7 ], - [ -67.5, 46.0 ], - [ -67.5, 47.1 ], - [ -68.4, 47.6 ], - [ -69.4, 47.6 ], - [ -71.8, 45.2 ], - [ -75.1, 45.2 ], - [ -76.7, 44.1 ], - [ -76.6, 43.7 ], - [ -77.0, 43.5 ], - [ -78.8, 43.5 ], - [ -79.4, 43.3 ], - [ -79.2, 42.8 ], - [ -82.2, 41.7 ], - [ -82.7, 41.7 ], - [ -82.9, 42.1 ], - [ -82.3, 42.6 ], - [ -82.2, 43.1 ], - [ -83.3, 46.4 ], - [ -88.4, 48.5 ], - [ -89.6, 48.2 ], - [ -94.4, 49.0 ], - [ -94.6, 49.6 ], - [ -95.5, 49.6 ], - [ -95.5, 49.2 ], - [ -123.7, 49.2 ], - [ -123.7, 48.6 ], - [ -125.3, 48.6 ], - [ -124.6, 46.2 ], - [ -125.0, 43.2 ], - [ -125.0, 40.0 ], - [ -119.9, 33.0 ], - [ -117.0, 32.3 ], - [ -115.0, 32.3 ], - [ -111.1, 31.1 ], - [ -107.9, 31.1 ], - [ -107.9, 31.5 ], - [ -106.6, 31.5 ], - [ -105.1, 30.2 ], - [ -104.8, 29.4 ], - [ -103.3, 28.7 ], - [ -103.0, 28.7 ], - [ -102.4, 29.5 ], - [ -101.5, 29.5 ], - [ -99.2, 26.1 ], - [ -97.7, 25.6 ] - ]] + "coordinates": [ + [ + [-97.7, 25.6], + [-96.9, 25.6], + [-96.9, 27.6], + [-93.5, 29.5], + [-90.6, 28.7], + [-88.9, 28.7], + [-88.5, 30.0], + [-86.2, 30.0], + [-85.3, 29.4], + [-84.9, 29.4], + [-84.0, 29.8], + [-83.0, 28.7], + [-83.1, 27.7], + [-82.0, 25.8], + [-82.0, 24.4], + [-81.2, 24.4], + [-80.0, 25.0], + [-79.7, 26.8], + [-81.1, 30.7], + [-80.7, 31.8], + [-75.1, 35.2], + [-75.1, 35.7], + [-75.6, 36.9], + [-73.4, 40.4], + [-69.8, 41.1], + [-69.8, 42.2], + [-70.4, 42.4], + [-70.4, 43.0], + [-69.9, 43.6], + [-68.8, 43.7], + [-66.7, 44.7], + [-67.5, 46.0], + [-67.5, 47.1], + [-68.4, 47.6], + [-69.4, 47.6], + [-71.8, 45.2], + [-75.1, 45.2], + [-76.7, 44.1], + [-76.6, 43.7], + [-77.0, 43.5], + [-78.8, 43.5], + [-79.4, 43.3], + [-79.2, 42.8], + [-82.2, 41.7], + [-82.7, 41.7], + [-82.9, 42.1], + [-82.3, 42.6], + [-82.2, 43.1], + [-83.3, 46.4], + [-88.4, 48.5], + [-89.6, 48.2], + [-94.4, 49.0], + [-94.6, 49.6], + [-95.5, 49.6], + [-95.5, 49.2], + [-123.7, 49.2], + [-123.7, 48.6], + [-125.3, 48.6], + [-124.6, 46.2], + [-125.0, 43.2], + [-125.0, 40.0], + [-119.9, 33.0], + [-117.0, 32.3], + [-115.0, 32.3], + [-111.1, 31.1], + [-107.9, 31.1], + [-107.9, 31.5], + [-106.6, 31.5], + [-105.1, 30.2], + [-104.8, 29.4], + [-103.3, 28.7], + [-103.0, 28.7], + [-102.4, 29.5], + [-101.5, 29.5], + [-99.2, 26.1], + [-97.7, 25.6] + ] + ] }, "properties": { "spacing": 0.1, diff --git a/src/gov/usgs/earthquake/nshmp/geo/json/Geometry.java b/src/gov/usgs/earthquake/nshmp/geo/json/Geometry.java index b9ae3b45c..1e9327caa 100644 --- a/src/gov/usgs/earthquake/nshmp/geo/json/Geometry.java +++ b/src/gov/usgs/earthquake/nshmp/geo/json/Geometry.java @@ -119,8 +119,8 @@ protected double[] doForward(Location location) { * updated */ return new double[] { - Maths.round(location.lon(), 8), - Maths.round(location.lat(), 8) + Maths.round(location.lon(), 5), + Maths.round(location.lat(), 5) }; } diff --git a/src/gov/usgs/earthquake/nshmp/internal/NshmpSiteFiles.java b/src/gov/usgs/earthquake/nshmp/internal/NshmpSiteFiles.java index 6cf9aad0b..538348bf2 100644 --- a/src/gov/usgs/earthquake/nshmp/internal/NshmpSiteFiles.java +++ b/src/gov/usgs/earthquake/nshmp/internal/NshmpSiteFiles.java @@ -72,9 +72,9 @@ public static void main(String[] args) throws IOException { writeCybershakeSites("cybershake", EnumSet.allOf(CybershakeSite.class)); writeNshmpPolys(); - // writeNshmpSummaryPoly(); + writeNshmpSummaryPoly(); // writeNshmpSites_0p1(); - + } /* @@ -163,8 +163,6 @@ static void writeNshmpPolys() throws IOException { CYBERSHAKE.coordinates(), 0.1, null); - - }