X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b756c5fd6ea4a982a654e07f42c8250c7f7d85fc..f2bf38606e281290fee8273e247afc54f08a0a47:/vendor/assets/leaflet/leaflet.osm.js?ds=inline diff --git a/vendor/assets/leaflet/leaflet.osm.js b/vendor/assets/leaflet/leaflet.osm.js index 144dfbfa0..2fe41be1a 100644 --- a/vendor/assets/leaflet/leaflet.osm.js +++ b/vendor/assets/leaflet/leaflet.osm.js @@ -2,7 +2,9 @@ L.OSM = {}; L.OSM.TileLayer = L.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', attribution: '© OpenStreetMap and contributors, under an open license' }, @@ -14,28 +16,36 @@ 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: 'http://{s}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png', + attribution: "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: 'http://{s}.tile2.opencyclemap.org/transport/{z}/{x}/{y}.png', + attribution: "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: document.location.protocol === 'https:' ? + "Tiles courtesy of MapQuest " : + "Tiles courtesy of MapQuest " } }); @@ -73,7 +83,9 @@ L.OSM.DataLayer = L.FeatureGroup.extend({ for (var i = 0; i < features.length; i++) { var feature = features[i], layer; - if (feature.type === "node") { + if (feature.type === "changeset") { + layer = L.rectangle(feature.latLngBounds, this.options.styles.changeset); + } else if (feature.type === "node") { layer = L.circleMarker(feature.latLng, this.options.styles.node); } else { var latLngs = new Array(feature.nodes.length); @@ -96,7 +108,7 @@ L.OSM.DataLayer = L.FeatureGroup.extend({ }, buildFeatures: function (xml) { - var features = [], + var features = L.OSM.getChangesets(xml), nodes = L.OSM.getNodes(xml), ways = L.OSM.getWays(xml, nodes), relations = L.OSM.getRelations(xml, nodes, ways); @@ -160,6 +172,25 @@ L.OSM.DataLayer = L.FeatureGroup.extend({ }); L.Util.extend(L.OSM, { + getChangesets: function (xml) { + var result = []; + + var nodes = xml.getElementsByTagName("changeset"); + for (var i = 0; i < nodes.length; i++) { + var node = nodes[i], id = node.getAttribute("id"); + result.push({ + id: id, + type: "changeset", + latLngBounds: L.latLngBounds( + [node.getAttribute("min_lat"), node.getAttribute("min_lon")], + [node.getAttribute("max_lat"), node.getAttribute("max_lon")]), + tags: this.getTags(node) + }); + } + + return result; + }, + getNodes: function (xml) { var result = {};