X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b095b59d5e0ee805e49980af80b21bd1acff1345..97b14ce22a0c7d17bb0b303b3795297721bc31d4:/vendor/assets/leaflet/leaflet.osm.js
diff --git a/vendor/assets/leaflet/leaflet.osm.js b/vendor/assets/leaflet/leaflet.osm.js
index 2fe41be1a..840b1a4c8 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://tile.openstreetmap.org/{z}/{x}/{y}.png',
+ attribution: '© OpenStreetMap contributors'
},
initialize: function (options) {
@@ -16,45 +14,75 @@ 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://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',
- 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.TransportDarkMap = 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://{s}.tile.thunderforest.com/transport-dark/{z}/{x}/{y}{r}.png?apikey={apikey}',
+ maxZoom: 21,
+ attribution: '© OpenStreetMap contributors. Tiles courtesy of Andy Allan'
+ }
+});
+
+L.OSM.OPNVKarte = L.OSM.TileLayer.extend({
+ options: {
+ 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: 'http://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png',
+ url: 'https://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'
+ }
+});
+
+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'
}
});
@@ -62,7 +90,8 @@ L.OSM.DataLayer = L.FeatureGroup.extend({
options: {
areaTags: ['area', 'building', 'leisure', 'tourism', 'ruins', 'historic', 'landuse', 'military', 'natural', 'sport'],
uninterestingTags: ['source', 'source_ref', 'source:ref', 'history', 'attribution', 'created_by', 'tiger:county', 'tiger:tlid', 'tiger:upload_uuid'],
- styles: {}
+ styles: {},
+ asynchronous: false,
},
initialize: function (xml, options) {
@@ -81,7 +110,7 @@ L.OSM.DataLayer = L.FeatureGroup.extend({
}
for (var i = 0; i < features.length; i++) {
- var feature = features[i], layer;
+ let feature = features[i], layer;
if (feature.type === "changeset") {
layer = L.rectangle(feature.latLngBounds, this.options.styles.changeset);
@@ -102,7 +131,12 @@ L.OSM.DataLayer = L.FeatureGroup.extend({
}
}
- layer.addTo(this);
+ if (this.options.asynchronous) {
+ setTimeout(() => layer.addTo(this));
+ } else {
+ layer.addTo(this);
+ }
+
layer.feature = feature;
}
},
@@ -113,9 +147,25 @@ L.OSM.DataLayer = L.FeatureGroup.extend({
ways = L.OSM.getWays(xml, nodes),
relations = L.OSM.getRelations(xml, nodes, ways);
+ var wayNodes = {}
+ for (var i = 0; i < ways.length; i++) {
+ var way = ways[i];
+ for (var j = 0; j < way.nodes.length; j++) {
+ wayNodes[way.nodes[j].id] = true
+ }
+ }
+
+ var relationNodes = {}
+ for (var i = 0; i < relations.length; i++){
+ var relation = relations[i];
+ for (var j = 0; j < relation.members.length; j++) {
+ relationNodes[relation.members[j].id] = true
+ }
+ }
+
for (var node_id in nodes) {
var node = nodes[node_id];
- if (this.interestingNode(node, ways, relations)) {
+ if (this.interestingNode(node, wayNodes, relationNodes)) {
features.push(node);
}
}
@@ -142,23 +192,9 @@ L.OSM.DataLayer = L.FeatureGroup.extend({
return false;
},
- interestingNode: function (node, ways, relations) {
- var used = false;
-
- for (var i = 0; i < ways.length; i++) {
- if (ways[i].nodes.indexOf(node) >= 0) {
- used = true;
- break;
- }
- }
-
- if (!used) {
- return true;
- }
-
- for (var i = 0; i < relations.length; i++) {
- if (relations[i].members.indexOf(node) >= 0)
- return true;
+ interestingNode: function (node, wayNodes, relationNodes) {
+ if (!wayNodes[node.id] || relationNodes[node.id]) {
+ return true
}
for (var key in node.tags) {
@@ -168,7 +204,28 @@ L.OSM.DataLayer = L.FeatureGroup.extend({
}
return false;
- }
+ },
+
+ onRemove: function(map) {
+ this.eachLayer(map.removeLayer, map, this.options.asynchronous);
+ },
+
+ onAdd: function(map) {
+ this.eachLayer(map.addLayer, map, this.options.asynchronous);
+ },
+
+ eachLayer: function (method, context, asynchronous = false) {
+ for (let i in this._layers) {
+ if (asynchronous) {
+ setTimeout(() => {
+ method.call(context, this._layers[i]);
+ });
+ } else {
+ method.call(context, this._layers[i]);
+ }
+ }
+ return this;
+ },
});
L.Util.extend(L.OSM, {
@@ -254,7 +311,7 @@ L.Util.extend(L.OSM, {
else // relation-way and relation-relation membership not implemented
rel_object.members[j] = null;
}
-
+ rel_object.members = rel_object.members.filter(i => i !== null && i !== undefined)
result.push(rel_object);
}