From 14d6636f9a83ef67ba8c89dd1a9a0d418271d196 Mon Sep 17 00:00:00 2001 From: Lorenzo Pini Date: Fri, 17 Mar 2017 15:57:08 +0100 Subject: [PATCH] Fix RealVista backgrounds --- .../map/leaflet/plugins/WMSLayer.js | 2 +- web/client/config.json | 4 +- web/client/examples/data/mapStoreConfig.json | 4 +- web/client/examples/rasterstyler/config.json | 4 +- web/client/examples/styler/config.json | 4 +- web/client/jsapi/MapStore2.js | 88 +++++++++---------- 6 files changed, 53 insertions(+), 53 deletions(-) diff --git a/web/client/components/map/leaflet/plugins/WMSLayer.js b/web/client/components/map/leaflet/plugins/WMSLayer.js index cc621a74ae..74ec6034d5 100644 --- a/web/client/components/map/leaflet/plugins/WMSLayer.js +++ b/web/client/components/map/leaflet/plugins/WMSLayer.js @@ -33,7 +33,7 @@ L.TileLayer.MultipleUrlWMS = L.TileLayer.WMS.extend({ for (let i in options) { // all keys that are not TileLayer options go to WMS params - if (!this.options.hasOwnProperty(i) && i !== 'crs') { + if (!this.options.hasOwnProperty(i) && i.toUpperCase() !== 'CRS') { wmsParams[i] = options[i]; } } diff --git a/web/client/config.json b/web/client/config.json index 784069c3f7..14206dd6f7 100644 --- a/web/client/config.json +++ b/web/client/config.json @@ -53,12 +53,12 @@ }, { "type": "wms", - "url":"http://213.215.135.196/reflector/open/service", + "url":"http://www.realvista.it/reflector/open/service", "visibility": false, "title": "e-Geos Ortofoto RealVista 1.0", "name": "rv1", "group": "background", - "format": "image/png" + "format": "image/jpeg" }, { "type": "wms", diff --git a/web/client/examples/data/mapStoreConfig.json b/web/client/examples/data/mapStoreConfig.json index 0c797641d6..5fd06fac98 100644 --- a/web/client/examples/data/mapStoreConfig.json +++ b/web/client/examples/data/mapStoreConfig.json @@ -17,7 +17,7 @@ "ptype": "gxp_olsource" }, "egeos":{ - "url":"http://213.215.135.196/reflector/open/service?request=getCapabilities" + "url":"http://www.realvista.it/reflector/open/service?request=getCapabilities" }, "demo":{ "url":"http://demo.geo-solutions.it/geoserver/wms" @@ -45,7 +45,7 @@ "title": "e-Geos Ortofoto RealVista 1.0", "name": "rv1", "group": "background", - "format": "image/png" + "format": "image/jpeg" }, { "source": "demo", diff --git a/web/client/examples/rasterstyler/config.json b/web/client/examples/rasterstyler/config.json index 0971fb9a1d..b10d08b879 100644 --- a/web/client/examples/rasterstyler/config.json +++ b/web/client/examples/rasterstyler/config.json @@ -49,12 +49,12 @@ "visibility": false }, { - "format": "image/png", + "format": "image/jpeg", "group": "background", "name": "rv1", "title": "e-Geos Ortofoto RealVista 1.0", "type": "wms", - "url": "http://213.215.135.196/reflector/open/service", + "url": "http://www.realvista.it/reflector/open/service", "visibility": false }, { diff --git a/web/client/examples/styler/config.json b/web/client/examples/styler/config.json index 76b05d1d75..91279a3abe 100644 --- a/web/client/examples/styler/config.json +++ b/web/client/examples/styler/config.json @@ -45,12 +45,12 @@ "visibility": false }, { - "format": "image/png", + "format": "image/jpeg", "group": "background", "name": "rv1", "title": "e-Geos Ortofoto RealVista 1.0", "type": "wms", - "url": "http://213.215.135.196/reflector/open/service", + "url": "http://www.realvista.it/reflector/open/service", "visibility": false }, { diff --git a/web/client/jsapi/MapStore2.js b/web/client/jsapi/MapStore2.js index ad2b66fabf..3cc0c326f9 100644 --- a/web/client/jsapi/MapStore2.js +++ b/web/client/jsapi/MapStore2.js @@ -40,7 +40,7 @@ const defaultConfig = { "group": "background", "visibility": true }, - { + { "type": "tileprovider", "title": "NASAGIBS Night 2012", "provider": "NASAGIBS.ViirsEarthAtNight2012", @@ -48,54 +48,54 @@ const defaultConfig = { "source": "nasagibs", "group": "background", "visibility": false - }, - { - "type": "wms", - "url": "http://213.215.135.196/reflector/open/service", + }, + { + "type": "wms", + "url": "http://www.realvista.it/reflector/open/service", "visibility": false, - "title": "e-Geos Ortofoto RealVista 1.0", - "name": "rv1", - "group": "background", - "format": "image/png" - }, - { - "type": "wms", - "url": "http://demo.geo-solutions.it/geoserver/wms", + "title": "e-Geos Ortofoto RealVista 1.0", + "name": "rv1", + "group": "background", + "format": "image/jpeg" + }, + { + "type": "wms", + "url": "https://demo.geo-solutions.it/geoserver/wms", "visibility": false, - "title": "Natural Earth", - "name": "sde:NE2_HR_LC_SR_W_DR", - "group": "background", - "format": "image/png" - }, - { - "type": "wms", - "url": "http://demo.geo-solutions.it/geoserver/wms", + "title": "Natural Earth", + "name": "sde:NE2_HR_LC_SR_W_DR", + "group": "background", + "format": "image/png" + }, + { + "type": "wms", + "url": "https://demo.geo-solutions.it/geoserver/wms", "visibility": false, - "title": "Hypsometric", - "name": "sde:HYP_HR_SR_OB_DR", - "group": "background", - "format": "image/png" - }, - { - "type": "wms", - "url": "http://demo.geo-solutions.it/geoserver/wms", + "title": "Hypsometric", + "name": "sde:HYP_HR_SR_OB_DR", + "group": "background", + "format": "image/png" + }, + { + "type": "wms", + "url": "https://demo.geo-solutions.it/geoserver/wms", "visibility": false, - "title": "Gray Earth", - "name": "sde:GRAY_HR_SR_OB_DR", - "group": "background", - "format": "image/png" - }, - { - "type": "wms", - "url": "http://demo.geo-solutions.it/geoserver/wms", + "title": "Gray Earth", + "name": "sde:GRAY_HR_SR_OB_DR", + "group": "background", + "format": "image/png" + }, + { + "type": "wms", + "url": "https://demo.geo-solutions.it/geoserver/wms", "visibility": true, "opacity": 0.5, - "title": "Weather data", - "name": "nurc:Arc_Sample", - "group": "Meteo", - "format": "image/png" - }, - { + "title": "Weather data", + "name": "nurc:Arc_Sample", + "group": "Meteo", + "format": "image/png" + }, + { "type": "tileprovider", "title": "OpenTopoMap", "provider": "OpenTopoMap", @@ -103,7 +103,7 @@ const defaultConfig = { "source": "OpenTopoMap", "group": "background", "visibility": false - }] + }] } };