Interactive interface for browsing global, full-resolution satellite imagery
replace OL graticule layer with new wmts layer
Ben87ff96415b9a
diff --git a/config/default/common/config/metadata/layers/reference/Graticule.md b/config/default/common/config/metadata/layers/reference/Graticule.mddeleted file mode 100644index a62a94ccc..000000000--- a/config/default/common/config/metadata/layers/reference/Graticule.md+++ /dev/null@@ -1,3 +0,0 @@-The Latitude-Longitude Lines layers is a vector layer displaying the grid/graticule of latitude and longitude lines over the globe.--In the geographic projection, Latitude-Longitude Lines are generated from the graticule capability within [OpenLayers](https://openlayers.org/). For the Arctic and Antarctic polar stereographic projections, the graticule layers are generated from [Polarview](https://www.polarview.aq/).diff --git a/config/default/common/config/metadata/layers/reference/Graticule_15m.md b/config/default/common/config/metadata/layers/reference/Graticule_15m.mdnew file mode 100644index 000000000..1d8210835--- /dev/null+++ b/config/default/common/config/metadata/layers/reference/Graticule_15m.md@@ -0,0 +1,3 @@+The Latitude-Longitude Lines layers is a vector layer displaying the grid/graticule of latitude and longitude lines over the globe.++In the geographic projection, Latitude-Longitude Lines were generated from Shapefiles provided by [Natural Earth](https://www.naturalearthdata.com/). For the Arctic and Antarctic polar stereographic projections, the graticule layers were generated from [Polarview](https://www.polarview.aq/).diff --git a/config/default/common/config/wv.json/layerOrder.json b/config/default/common/config/wv.json/layerOrder.jsonindex 19c1a9181..7a053fd6b 100644--- a/config/default/common/config/wv.json/layerOrder.json+++ b/config/default/common/config/wv.json/layerOrder.json@@ -968,7 +968,7 @@"Coastlines_15m","Reference_Features_15m","Reference_Labels_15m",- "Graticule",+ "Graticule_15m","HLS_MGRS_Granule_Grid","MODIS_Water_Mask","MODIS_Terra_Data_No_Data",@@ -1035,4 +1035,4 @@"SCAR_Land_Mask","SCAR_Land_Water_Map"]-}+}\ No newline at end of filediff --git a/config/default/common/config/wv.json/layers/reference/Graticule.json b/config/default/common/config/wv.json/layers/reference/Graticule_15m.jsonsimilarity index 67%rename from config/default/common/config/wv.json/layers/reference/Graticule.jsonrename to config/default/common/config/wv.json/layers/reference/Graticule_15m.jsonindex 23a5b4586..5e5a37b55 100644--- a/config/default/common/config/wv.json/layers/reference/Graticule.json+++ b/config/default/common/config/wv.json/layers/reference/Graticule_15m.json@@ -1,10 +1,10 @@{"layers": {- "Graticule": {- "id": "Graticule",+ "Graticule_15m": {+ "id": "Graticule_15m","tags": "lat lon lat-lon","title": "Latitude-Longitude Lines",- "description": "reference/Graticule",+ "description": "reference/Graticule_15m","group": "overlays","format": "image/png","noTransition": true,@@ -12,21 +12,25 @@"layergroup": "Latitude-Longitude Lines","projections": {"arctic": {+ "id": "Graticule",+ "layer": "Graticule","subtitle": "Polarview / Graticule","type": "wmts","source": "GIBS:arctic","matrixSet": "250m"},"antarctic": {+ "id": "Graticule",+ "layer": "Graticule","subtitle": "Polarview / Graticule","type": "wmts","source": "GIBS:antarctic","matrixSet": "250m"},"geographic": {- "subtitle": "OpenLayers / Graticule Control",- "type": "graticule",- "source": ""+ "subtitle": "Natural Earth",+ "type": "wmts",+ "source": "GIBS:geographic"}}}diff --git a/config/default/common/config/wv.json/measurements/Latitude Longitude Lines.json b/config/default/common/config/wv.json/measurements/Latitude Longitude Lines.jsonindex 34aeb9e36..9dfe39337 100644--- a/config/default/common/config/wv.json/measurements/Latitude Longitude Lines.json+++ b/config/default/common/config/wv.json/measurements/Latitude Longitude Lines.json@@ -2,20 +2,20 @@"measurements": {"Latitude-Longitude Lines": {"id": "latitude-longitude-lines",- "title": "Latitude-Longitude Lines",- "subtitle": "OpenLayers/Graticule Control",+ "title": "Latitude-Longitude Lines",+ "subtitle": "Natural Earth/Graticule Control","multichoice": true,"sources": {- "OpenLayers": {- "id": "openlayers",- "title": "OpenLayers",+ "naturalearthdata.com": {+ "id": "natural-earth",+ "title": "Natural Earth","description": "","image": "","settings": [- "Graticule"+ "Graticule_15m"]}}}}-}+}\ No newline at end of filediff --git a/config/default/common/config/wv.json/redirects.json b/config/default/common/config/wv.json/redirects.jsonindex 8ef20101f..ac2fae074 100644--- a/config/default/common/config/wv.json/redirects.json+++ b/config/default/common/config/wv.json/redirects.json@@ -1,8 +1,9 @@{"redirects": {"layers": {- "polarview:graticuleN": "Graticule",- "polarview:graticule3031_10x30": "Graticule",+ "Graticule": "Graticule_15m",+ "polarview:graticuleN": "Graticule_15m",+ "polarview:graticule3031_10x30": "Graticule_15m","Aqua_Antarctic_Orbit_Asc": "OrbitTracks_Aqua_Ascending","Aqua_Arctic_Orbit_Asc": "OrbitTracks_Aqua_Ascending","Aqua_Antarctic_Orbit_Dsc": "OrbitTracks_Aqua_Descending",@@ -11,14 +12,14 @@"Aura_Arctic_Orbit_Asc": "OrbitTracks_Aura_Ascending","Aura_Antarctic_Orbit_Dsc": "OrbitTracks_Aura_Descending","Aura_Arctic_Orbit_Dsc": "OrbitTracks_Aura_Descending",- "antarctic_graticule": "Graticule",+ "antarctic_graticule": "Graticule_15m","antarctic_coastlines": "Coastlines_15m","arctic_coastlines_3413": "Coastlines_15m",- "arctic_graticule_3413": "Graticule",+ "arctic_graticule_3413": "Graticule_15m","gpw-v3-coastlines": "Coastlines_15m","land_water_map": "Land_Water_Map","land_mask": "Land_Mask",- "ol_graticule": "Graticule",+ "ol_graticule": "Graticule_15m","sedac_bound": "Coastlines_15m","cartographic:esri-administrative-boundaries_level-1": "Reference_Features_15m","cartographic:00-global-labels": "Reference_Labels_15m",diff --git a/tasks/python3/fetchPreviewSnapshots.py b/tasks/python3/fetchPreviewSnapshots.pyindex 9f98d4a27..c36c07aaa 100755--- a/tasks/python3/fetchPreviewSnapshots.py+++ b/tasks/python3/fetchPreviewSnapshots.py@@ -48,7 +48,7 @@ param_dict = {}# These layers should not be combined with the reference layerstandalone_layers = [- 'Graticule',+ 'Graticule_15m','Coastlines_15m','Reference_Features_15m','Reference_Labels_15m'diff --git a/web/images/layers/previews/antarctic/Graticule.jpg b/web/images/layers/previews/antarctic/Graticule_15m.jpgsimilarity index 100%rename from web/images/layers/previews/antarctic/Graticule.jpgrename to web/images/layers/previews/antarctic/Graticule_15m.jpgdiff --git a/web/images/layers/previews/arctic/Graticule.jpg b/web/images/layers/previews/arctic/Graticule_15m.jpgsimilarity index 100%rename from web/images/layers/previews/arctic/Graticule.jpgrename to web/images/layers/previews/arctic/Graticule_15m.jpgdiff --git a/web/images/layers/previews/geographic/Graticule.jpg b/web/images/layers/previews/geographic/Graticule.jpgdeleted file mode 100644index 4476e07f9..000000000Binary files a/web/images/layers/previews/geographic/Graticule.jpg and /dev/null differdiff --git a/web/images/layers/previews/geographic/Graticule_15m.jpg b/web/images/layers/previews/geographic/Graticule_15m.jpgnew file mode 100644index 000000000..ea2c96663Binary files /dev/null and b/web/images/layers/previews/geographic/Graticule_15m.jpg differ