X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/b095b59d5e0ee805e49980af80b21bd1acff1345..783b5e3729228908d7404ae7404af1023501a906:/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 2fe41be1a..37c8bcf7d 100644 --- a/vendor/assets/leaflet/leaflet.osm.js +++ b/vendor/assets/leaflet/leaflet.osm.js @@ -2,10 +2,8 @@ L.OSM = {}; L.OSM.TileLayer = L.TileLayer.extend({ options: { - 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 and contributors, under an open license' + url: 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', + attribution: '© OpenStreetMap contributors' }, initialize: function (options) { @@ -16,45 +14,42 @@ L.OSM.TileLayer = L.TileLayer.extend({ L.OSM.Mapnik = L.OSM.TileLayer.extend({ options: { - url: document.location.protocol === 'https:' ? - 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png' : - 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', + url: 'https://{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', - attribution: "Tiles courtesy of Andy Allan" + url: 'https://{s}.tile.thunderforest.com/cycle/{z}/{x}/{y}{r}.png?apikey={apikey}', + maxZoom: 21, + 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', - attribution: "Tiles courtesy of Andy Allan" + url: 'https://{s}.tile.thunderforest.com/transport/{z}/{x}/{y}{r}.png?apikey={apikey}', + maxZoom: 21, + attribution: '© OpenStreetMap contributors. Tiles courtesy of Andy Allan' } }); -L.OSM.MapQuestOpen = L.OSM.TileLayer.extend({ +L.OSM.HOT = L.OSM.TileLayer.extend({ options: { - 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: document.location.protocol === 'https:' ? - "Tiles courtesy of MapQuest " : - "Tiles courtesy of MapQuest " + url: 'https://tile-{s}.openstreetmap.fr/hot/{z}/{x}/{y}.png', + maxZoom: 20, + subdomains: 'abc', + attribution: '© OpenStreetMap contributors. Tiles courtesy of Humanitarian OpenStreetMap Team' } }); -L.OSM.HOT = L.OSM.TileLayer.extend({ +L.OSM.GPS = L.OSM.TileLayer.extend({ options: { - url: 'http://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png', - maxZoom: 20, - subdomains: 'abc', - attribution: "Tiles courtesy of Humanitarian OpenStreetMap Team" + url: 'https://gps-{s}.tile.openstreetmap.org/lines/{z}/{x}/{y}.png', + maxZoom: 21, + maxNativeZoom: 20, + subdomains: 'abc' } });