X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/049093c5b4ccd1b6f7f5d566eff2c04083e6df4a..6c34885fe73dfdcff1de4e3c9eb7b2931efd6b81:/vendor/assets/leaflet/leaflet.osm.js?ds=sidebyside
diff --git a/vendor/assets/leaflet/leaflet.osm.js b/vendor/assets/leaflet/leaflet.osm.js
index 4f8c9e230..6b78fe9be 100644
--- a/vendor/assets/leaflet/leaflet.osm.js
+++ b/vendor/assets/leaflet/leaflet.osm.js
@@ -2,8 +2,10 @@ L.OSM = {};
L.OSM.TileLayer = L.TileLayer.extend({
options: {
- url: 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
- attribution: '© OpenStreetMap and contributors, under an open license'
+ url: document.location.protocol === 'https:' ?
+ 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png' :
+ 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+ attribution: '© OpenStreetMap contributors'
},
initialize: function (options) {
@@ -14,37 +16,51 @@ L.OSM.TileLayer = L.TileLayer.extend({
L.OSM.Mapnik = L.OSM.TileLayer.extend({
options: {
- url: 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+ url: document.location.protocol === 'https:' ?
+ 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png' :
+ 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
maxZoom: 19
}
});
L.OSM.CycleMap = L.OSM.TileLayer.extend({
options: {
- url: 'http://{s}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png'
+ url: document.location.protocol === 'https:' ?
+ 'https://{s}.tile.thunderforest.com/cycle/{z}/{x}/{y}.png' :
+ 'http://{s}.tile.thunderforest.com/cycle/{z}/{x}/{y}.png',
+ attribution: '© OpenStreetMap contributors. Tiles courtesy of Andy Allan'
}
});
L.OSM.TransportMap = L.OSM.TileLayer.extend({
options: {
- url: 'http://{s}.tile2.opencyclemap.org/transport/{z}/{x}/{y}.png'
+ url: document.location.protocol === 'https:' ?
+ 'https://{s}.tile.thunderforest.com/transport/{z}/{x}/{y}.png' :
+ 'http://{s}.tile.thunderforest.com/transport/{z}/{x}/{y}.png',
+ attribution: '© OpenStreetMap contributors. Tiles courtesy of Andy Allan'
}
});
L.OSM.MapQuestOpen = L.OSM.TileLayer.extend({
options: {
- url: 'http://otile{s}.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png',
+ url: document.location.protocol === 'https:' ?
+ 'https://otile{s}-s.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png' :
+ 'http://otile{s}.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png',
subdomains: '1234',
- attribution: "Tiles courtesy of MapQuest "
+ attribution: '© OpenStreetMap contributors. ' + document.location.protocol === 'https:' ?
+ 'Tiles courtesy of MapQuest ' :
+ 'Tiles courtesy of MapQuest '
}
});
L.OSM.HOT = L.OSM.TileLayer.extend({
options: {
- url: 'http://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png',
+ url: document.location.protocol === 'https:' ?
+ 'https://tile-{s}.openstreetmap.fr/hot/{z}/{x}/{y}.png' :
+ 'http://tile-{s}.openstreetmap.fr/hot/{z}/{x}/{y}.png',
maxZoom: 20,
subdomains: 'abc',
- attribution: "Tiles courtesy of Humanitarian OpenStreetMap Team"
+ attribution: '© OpenStreetMap contributors. Tiles courtesy of Humanitarian OpenStreetMap Team'
}
});