X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/78f608b114c05f1147936a57b930831e28000c1a..43ce6e68c09cdb4e66a7af9849e36c9406d2eb05:/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 927d2c3b7..0e51f3408 100644 --- a/vendor/assets/leaflet/leaflet.osm.js +++ b/vendor/assets/leaflet/leaflet.osm.js @@ -2,8 +2,8 @@ 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: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png', + attribution: '© OpenStreetMap contributors' }, initialize: function (options) { @@ -14,27 +14,67 @@ 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: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png', + maxZoom: 19 + } +}); + +L.OSM.CyclOSM = L.OSM.TileLayer.extend({ + options: { + url: 'https://{s}.tile-cyclosm.openstreetmap.fr/cyclosm/{z}/{x}/{y}.png', + maxZoom: 20, + subdomains: 'abc', + attribution: '© OpenStreetMap contributors. Tiles courtesy of OpenStreetMap France' } }); L.OSM.CycleMap = L.OSM.TileLayer.extend({ options: { - url: 'http://{s}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png' + 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' + 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.OPNVKarte = L.OSM.TileLayer.extend({ options: { - url: 'http://otile{s}.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png', - subdomains: '1234', - attribution: "Tiles courtesy of MapQuest " + url: 'https://tileserver.memomaps.de/tilegen/{z}/{x}/{y}.png', + maxZoom: 18, + attribution: '© OpenStreetMap contributors. Tiles courtesy of MeMoMaps' + } +}); + +L.OSM.HOT = L.OSM.TileLayer.extend({ + options: { + 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.TracestrackTopo = L.OSM.TileLayer.extend({ + options: { + url: 'https://tile.tracestrack.com/topo__/{z}/{x}/{y}.png?key={apikey}', + maxZoom: 19, + attribution: '© OpenStreetMap contributors. Tiles courtesy of Tracestrack Maps' + } +}); + +L.OSM.GPS = L.OSM.TileLayer.extend({ + options: { + url: 'https://gps.tile.openstreetmap.org/lines/{z}/{x}/{y}.png', + maxZoom: 21, + maxNativeZoom: 20, + subdomains: 'abc' } }); @@ -63,7 +103,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); @@ -86,13 +128,14 @@ 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); + ways = L.OSM.getWays(xml, nodes), + relations = L.OSM.getRelations(xml, nodes, ways); for (var node_id in nodes) { var node = nodes[node_id]; - if (this.interestingNode(node, ways)) { + if (this.interestingNode(node, ways, relations)) { features.push(node); } } @@ -119,7 +162,7 @@ L.OSM.DataLayer = L.FeatureGroup.extend({ return false; }, - interestingNode: function (node, ways) { + interestingNode: function (node, ways, relations) { var used = false; for (var i = 0; i < ways.length; i++) { @@ -133,6 +176,11 @@ L.OSM.DataLayer = L.FeatureGroup.extend({ return true; } + for (var i = 0; i < relations.length; i++) { + if (relations[i].members.indexOf(node) >= 0) + return true; + } + for (var key in node.tags) { if (this.options.uninterestingTags.indexOf(key) < 0) { return true; @@ -144,6 +192,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 = {}; @@ -187,6 +254,33 @@ L.Util.extend(L.OSM, { return result; }, + getRelations: function (xml, nodes, ways) { + var result = []; + + var rels = xml.getElementsByTagName("relation"); + for (var i = 0; i < rels.length; i++) { + var rel = rels[i], members = rel.getElementsByTagName("member"); + + var rel_object = { + id: rel.getAttribute("id"), + type: "relation", + members: new Array(members.length), + tags: this.getTags(rel) + }; + + for (var j = 0; j < members.length; j++) { + if (members[j].getAttribute("type") === "node") + rel_object.members[j] = nodes[members[j].getAttribute("ref")]; + else // relation-way and relation-relation membership not implemented + rel_object.members[j] = null; + } + + result.push(rel_object); + } + + return result; + }, + getTags: function (xml) { var result = {};