nakarte

Source code of https://map.sikmir.ru (fork)
git clone git://git.sikmir.ru/nakarte
Log | Files | Refs | LICENSE

commit 8db62dcb624a780e3c80ccf3b96cca0df36c8323
parent a85df227dd4796dfe4d7a59124b530e779b71171
Author: Sergej Orlov <wladimirych@gmail.com>
Date:   Fri, 13 Apr 2018 22:53:20 +0300

layers: use https where available

Diffstat:
Msrc/layers.js | 16++++++++--------
Msrc/lib/leaflet.layer.bing/index.js | 2+-
2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/layers.js b/src/layers.js @@ -23,7 +23,7 @@ export default function getLayers() { order: 100, isOverlay: false, isDefault: true, - layer: L.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', + layer: L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {code: 'O', scaleDependent: true, print: true, jnx: true} ) }, @@ -33,7 +33,7 @@ export default function getLayers() { isOverlay: false, isDefault: true, layer: L.tileLayer( - 'http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}', + 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}', {code: 'E', scaleDependent: false, maxNativeZoom: 18, print: true, jnx: true} ) }, @@ -85,7 +85,7 @@ export default function getLayers() { order: 800, isOverlay: false, isDefault: true, - layer: L.tileLayer('http://maps.marshruty.ru/ml.ashx?x={x}&y={y}&z={z}&i=1&al=1', + layer: L.tileLayer('https://maps.marshruty.ru/ml.ashx?x={x}&y={y}&z={z}&i=1&al=1', {code: 'M', maxNativeZoom: 18, noCors: true, scaleDependent: true, print: true, jnx: true} ) }, @@ -267,7 +267,7 @@ export default function getLayers() { order: 120, isOverlay: false, isDefault: false, - layer: L.tileLayer('http://{s}.tile.thunderforest.com/cycle/{z}/{x}/{y}.png?apikey=' + config.thunderforestKey, + layer: L.tileLayer('https://{s}.tile.thunderforest.com/cycle/{z}/{x}/{y}.png?apikey=' + config.thunderforestKey, {code: 'Ocm', scaleDependent: true, print: true, jnx: true} ) }, @@ -276,7 +276,7 @@ export default function getLayers() { order: 130, isOverlay: false, isDefault: false, - layer: L.tileLayer('http://{s}.tile.thunderforest.com/outdoors/{z}/{x}/{y}.png?apikey=' + config.thunderforestKey, + layer: L.tileLayer('https://{s}.tile.thunderforest.com/outdoors/{z}/{x}/{y}.png?apikey=' + config.thunderforestKey, {code: 'Oso', scaleDependent: true, print: true, jnx: true} ) }, @@ -531,17 +531,17 @@ export default function getLayers() { { // Вместо 404 отдают 500 для отсутствующих тайлов title: 'Norway roads', - description: '<a href="http://kart.finn.no/">http://kart.finn.no/</a>', + description: '<a href="https://kart.finn.no/">https://kart.finn.no/</a>', order: 5030, isOverlay: false, isDefault: false, - layer: L.tileLayer("http://maptiles1.finncdn.no/tileService/1.0.3/normap/{z}/{x}/{y}.png", + layer: L.tileLayer("https://maptiles1.finncdn.no/tileService/1.0.3/normap/{z}/{x}/{y}.png", {code: 'Nr', tms: false, print: true, jnx: true, scaleDependent: true, noCors: true} ) }] }, { - group: 'Czech <a href="http://mapy.cz">http://mapy.cz</a>', + group: 'Czech <a href="https://mapy.cz">https://mapy.cz</a>', layers: [ { title: 'Czech base', diff --git a/src/lib/leaflet.layer.bing/index.js b/src/lib/leaflet.layer.bing/index.js @@ -54,7 +54,7 @@ const BingLayer = L.TileLayer.extend({ } _this.initMetadata(meta); }; - var urlScheme = (document.location.protocol === 'file:') ? 'http' : document.location.protocol.slice(0, -1); + var urlScheme = 'https'; var url = urlScheme + '://dev.virtualearth.net/REST/v1/Imagery/Metadata/' + this.options.type + '?include=ImageryProviders&jsonp=' + cbid + '&key=' + this._key + '&UriScheme=' + urlScheme;