X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f6695c9079f4eeeecaa796c879868f797f97cd55..refs/heads/master:/vendor/assets/leaflet/leaflet.osm.js
diff --git a/vendor/assets/leaflet/leaflet.osm.js b/vendor/assets/leaflet/leaflet.osm.js
index c6de9f749..53d18bf2c 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 contributors'
+ url: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
+ attribution: '© OpenStreetMap contributors'
},
initialize: function (options) {
@@ -16,51 +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: document.location.protocol === 'https:' ?
- 'https://{s}.tile.thunderforest.com/cycle/{z}/{x}/{y}.png?apikey={apikey}' :
- 'http://{s}.tile.thunderforest.com/cycle/{z}/{x}/{y}.png?apikey={apikey}',
- attribution: '© OpenStreetMap contributors. 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: document.location.protocol === 'https:' ?
- 'https://{s}.tile.thunderforest.com/transport/{z}/{x}/{y}.png?apikey={apikey}' :
- 'http://{s}.tile.thunderforest.com/transport/{z}/{x}/{y}.png?apikey={apikey}',
- attribution: '© OpenStreetMap contributors. 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.TransportDarkMap = L.OSM.TileLayer.extend({
+ options: {
+ 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.MapQuestOpen = L.OSM.TileLayer.extend({
+L.OSM.OPNVKarte = 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: '© OpenStreetMap contributors. ' + document.location.protocol === 'https:' ?
- 'Tiles courtesy of MapQuest 
' :
- '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: document.location.protocol === 'https:' ?
- 'https://tile-{s}.openstreetmap.fr/hot/{z}/{x}/{y}.png' :
- 'http://tile-{s}.openstreetmap.fr/hot/{z}/{x}/{y}.png',
+ url: 'https://tile-{s}.openstreetmap.fr/hot/{z}/{x}/{y}.png',
maxZoom: 20,
subdomains: 'abc',
- attribution: '© OpenStreetMap contributors. 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'
}
});
@@ -68,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) {
@@ -87,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);
@@ -108,20 +131,44 @@ L.OSM.DataLayer = L.FeatureGroup.extend({
}
}
- layer.addTo(this);
+ if (this.options.asynchronous) {
+ setTimeout(() => layer.addTo(this));
+ } else {
+ layer.addTo(this);
+ }
+
layer.feature = feature;
}
},
- buildFeatures: function (xml) {
- var features = L.OSM.getChangesets(xml),
- nodes = L.OSM.getNodes(xml),
- ways = L.OSM.getWays(xml, nodes),
- relations = L.OSM.getRelations(xml, nodes, ways);
+ buildFeatures: function (data) {
+
+ const parser = data instanceof Document ? L.OSM.XMLParser : L.OSM.JSONParser;
+
+ var features = parser.getChangesets(data),
+ nodes = parser.getNodes(data),
+ ways = parser.getWays(data, nodes),
+ relations = parser.getRelations(data, 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);
}
}
@@ -148,23 +195,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) {
@@ -174,10 +207,31 @@ 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, {
+L.OSM.XMLParser = {
getChangesets: function (xml) {
var result = [];
@@ -260,7 +314,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);
}
@@ -277,4 +331,64 @@ L.Util.extend(L.OSM, {
return result;
}
-});
+}
+
+L.OSM.JSONParser = {
+ getChangesets(json) {
+ const changesets = json.changeset ? [json.changeset] : [];
+
+ return changesets.map(cs => ({
+ id: String(cs.id),
+ type: "changeset",
+ latLngBounds: L.latLngBounds(
+ [cs.min_lat, cs.min_lon],
+ [cs.max_lat, cs.max_lon]
+ ),
+ tags: this.getTags(cs)
+ }));
+ },
+
+ getNodes(json) {
+ const nodes = json.elements?.filter(el => el.type === "node") ?? [];
+ let result = {};
+
+ for (const node of nodes) {
+ result[node.id] = {
+ id: String(node.id),
+ type: "node",
+ latLng: L.latLng(node.lat, node.lon, true),
+ tags: this.getTags(node)
+ };
+ }
+
+ return result;
+ },
+
+ getWays(json, nodes) {
+ const ways = json.elements?.filter(el => el.type === "way") ?? [];
+
+ return ways.map(way => ({
+ id: String(way.id),
+ type: "way",
+ nodes: way.nodes.map(nodeId => nodes[nodeId]),
+ tags: this.getTags(way)
+ }));
+ },
+
+ getRelations(json, nodes, ways) {
+ const relations = json.elements?.filter(el => el.type === "relation") ?? [];
+
+ return relations.map(rel => ({
+ id: String(rel.id),
+ type: "relation",
+ members: (rel.members ?? []) // relation-way and relation-relation membership not implemented
+ .map(member => member.type === "node" ? nodes[member.ref] : null)
+ .filter(Boolean), // filter out null and undefined
+ tags: this.getTags(rel)
+ }));
+ },
+
+ getTags(json) {
+ return json.tags ?? {};
+ }
+};