diff --git a/project/static/localConfig.json b/project/static/localConfig.json index aeaff9c6e2..8bcc641b25 100644 --- a/project/static/localConfig.json +++ b/project/static/localConfig.json @@ -1,7 +1,7 @@ { "proxyUrl": "/mapstore/proxy/?url=", "geoStoreUrl": "/mapstore/rest/geostore", - "printUrl": "http://demo.geo-solutions.it/geoserver/pdf/info.json", + "printUrl": "https://demo.geo-solutions.it/geoserver/pdf/info.json", "bingApiKey": "AhuXBu7ipR1gNbBfXhtUAyCZ6rkC5PkWpxs2MnMRZ1ZupxQfivjLCch22ozKSCAn", "translationsPath": "./MapStore2/web/client/translations", "plugins": { diff --git a/web/client/components/map/leaflet/plugins/BingLayer.js b/web/client/components/map/leaflet/plugins/BingLayer.js index dbc25c9126..7353811c18 100644 --- a/web/client/components/map/leaflet/plugins/BingLayer.js +++ b/web/client/components/map/leaflet/plugins/BingLayer.js @@ -25,7 +25,7 @@ Bing.prototype.loadMetadata = function() { } _this.initMetadata(); }; - const urlScheme = (document.location.protocol === 'file:') ? 'http' : document.location.protocol.slice(0, -1); + const urlScheme = (document.location.protocol === 'file:') ? 'https' : document.location.protocol.slice(0, -1); const url = urlScheme + '://dev.virtualearth.net/REST/v1/Imagery/Metadata/' + this.options.type + '?include=ImageryProviders&jsonp=' + cbid + '&key=' + this._key + '&UriScheme=' + urlScheme; diff --git a/web/client/examples/api/localConfig.json b/web/client/examples/api/localConfig.json index 407de4acf4..438804a6f4 100644 --- a/web/client/examples/api/localConfig.json +++ b/web/client/examples/api/localConfig.json @@ -1,7 +1,7 @@ { "proxyUrl": "/mapstore/proxy/?url=", "geoStoreUrl": "/mapstore/rest/geostore/", - "printUrl": "http://demo.geo-solutions.it/geoserver/pdf/info.json", + "printUrl": "https://demo.geo-solutions.it/geoserver/pdf/info.json", "bingApiKey": "AhuXBu7ipR1gNbBfXhtUAyCZ6rkC5PkWpxs2MnMRZ1ZupxQfivjLCch22ozKSCAn", "translationsPath": "../../translations" } diff --git a/web/client/examples/login/localConfig.json b/web/client/examples/login/localConfig.json index 217a8e0bbc..4337e5294a 100644 --- a/web/client/examples/login/localConfig.json +++ b/web/client/examples/login/localConfig.json @@ -1,5 +1,5 @@ { "proxyUrl": "/mapstore/proxy/?url=", "geoStoreUrl": "/mapstore/rest/geostore/", - "printUrl": "http://demo.geo-solutions.it/geoserver/pdf/info.json" + "printUrl": "https://demo.geo-solutions.it/geoserver/pdf/info.json" } diff --git a/web/client/examples/plugins/localConfig.json b/web/client/examples/plugins/localConfig.json index 407de4acf4..438804a6f4 100644 --- a/web/client/examples/plugins/localConfig.json +++ b/web/client/examples/plugins/localConfig.json @@ -1,7 +1,7 @@ { "proxyUrl": "/mapstore/proxy/?url=", "geoStoreUrl": "/mapstore/rest/geostore/", - "printUrl": "http://demo.geo-solutions.it/geoserver/pdf/info.json", + "printUrl": "https://demo.geo-solutions.it/geoserver/pdf/info.json", "bingApiKey": "AhuXBu7ipR1gNbBfXhtUAyCZ6rkC5PkWpxs2MnMRZ1ZupxQfivjLCch22ozKSCAn", "translationsPath": "../../translations" } diff --git a/web/client/examples/print/localConfig.json b/web/client/examples/print/localConfig.json index 217a8e0bbc..4337e5294a 100644 --- a/web/client/examples/print/localConfig.json +++ b/web/client/examples/print/localConfig.json @@ -1,5 +1,5 @@ { "proxyUrl": "/mapstore/proxy/?url=", "geoStoreUrl": "/mapstore/rest/geostore/", - "printUrl": "http://demo.geo-solutions.it/geoserver/pdf/info.json" + "printUrl": "https://demo.geo-solutions.it/geoserver/pdf/info.json" } diff --git a/web/client/examples/rasterstyler/localConfig.json b/web/client/examples/rasterstyler/localConfig.json index 18a984cb30..590eb63af5 100644 --- a/web/client/examples/rasterstyler/localConfig.json +++ b/web/client/examples/rasterstyler/localConfig.json @@ -1,7 +1,7 @@ { "proxyUrl": "/mapstore/proxy/?url=", "geoStoreUrl": "/mapstore/rest/geostore/", - "printUrl": "http://demo.geo-solutions.it/geoserver/pdf/info.json", + "printUrl": "https://demo.geo-solutions.it/geoserver/pdf/info.json", "translationsPath": "../../translations", "plugins": { "mobile": [{ diff --git a/web/client/examples/styler/localConfig.json b/web/client/examples/styler/localConfig.json index e1a72c5933..7ef7d97d37 100644 --- a/web/client/examples/styler/localConfig.json +++ b/web/client/examples/styler/localConfig.json @@ -86,7 +86,7 @@ } ] }, - "printUrl": "http://demo.geo-solutions.it/geoserver/pdf/info.json", + "printUrl": "https://demo.geo-solutions.it/geoserver/pdf/info.json", "proxyUrl": "/mapstore/proxy/?url=", "translationsPath": "../../translations" } diff --git a/web/client/localConfig.json b/web/client/localConfig.json index b09607f474..d5f9bd6201 100644 --- a/web/client/localConfig.json +++ b/web/client/localConfig.json @@ -1,10 +1,10 @@ { "proxyUrl": { "url": "/mapstore/proxy/?url=", - "useCORS": ["http://demo.geo-solutions.it/geoserver"] + "useCORS": ["https://demo.geo-solutions.it/geoserver"] }, "geoStoreUrl": "/mapstore/rest/geostore/", - "printUrl": "http://demo.geo-solutions.it/geoserver/pdf/info.json", + "printUrl": "https://demo.geo-solutions.it/geoserver/pdf/info.json", "bingApiKey": "AhuXBu7ipR1gNbBfXhtUAyCZ6rkC5PkWpxs2MnMRZ1ZupxQfivjLCch22ozKSCAn", "mapquestApiKey": "__API_KEY_MAPQUEST__", "initialMapFilter": "", diff --git a/web/client/simple.json b/web/client/simple.json index a69e68d5ca..8ce5fb64aa 100644 --- a/web/client/simple.json +++ b/web/client/simple.json @@ -1,7 +1,7 @@ { "proxyUrl": "/mapstore/proxy/?url=", "geoStoreUrl": "/mapstore/rest/geostore/", - "printUrl": "http://demo.geo-solutions.it/geoserver/pdf/info.json", + "printUrl": "https://demo.geo-solutions.it/geoserver/pdf/info.json", "bingApiKey": "AhuXBu7ipR1gNbBfXhtUAyCZ6rkC5PkWpxs2MnMRZ1ZupxQfivjLCch22ozKSCAn", "initialMapFilter": "MS2", "plugins": {