X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/030b7c4052554d78b142daf4dac7fbf200ab73ad..95e1aff23493b3725d5259bcca7bcc79d7d3bc26:/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 55b27e7cf..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: '© <a target="_parent" href="http://www.openstreetmap.org">OpenStreetMap</a> and contributors, under an <a target="_parent" href="http://www.openstreetmap.org/copyright">open license</a>'
+    url: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
+    attribution: '© <a href="https://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a> 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: '© <a href="https://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a> contributors. Tiles courtesy of <a href="https://www.openstreetmap.fr" target="_blank">OpenStreetMap France</a>'
   }
 });
 
 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: '© <a href="https://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a> contributors. Tiles courtesy of <a href="http://www.thunderforest.com/" target="_blank">Andy Allan</a>'
   }
 });
 
 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: '© <a href="https://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a> contributors. Tiles courtesy of <a href="http://www.thunderforest.com/" target="_blank">Andy Allan</a>'
+  }
+});
+
+L.OSM.OPNVKarte = L.OSM.TileLayer.extend({
+  options: {
+    url: 'https://tileserver.memomaps.de/tilegen/{z}/{x}/{y}.png',
+    maxZoom: 18,
+    attribution: '© <a href="https://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a> contributors. Tiles courtesy of <a href="http://memomaps.de/" target="_blank">MeMoMaps</a>'
+  }
+});
+
+L.OSM.HOT = L.OSM.TileLayer.extend({
+  options: {
+    url: 'https://tile-{s}.openstreetmap.fr/hot/{z}/{x}/{y}.png',
+    maxZoom: 20,
+    subdomains: 'abc',
+    attribution: '© <a href="https://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a> contributors. Tiles courtesy of <a href="http://hot.openstreetmap.org/" target="_blank">Humanitarian OpenStreetMap Team</a>'
+  }
+});
+
+L.OSM.TracestrackTopo = L.OSM.TileLayer.extend({
+  options: {
+    url: 'https://tile.tracestrack.com/topo__/{z}/{x}/{y}.png?key={apikey}',
+    maxZoom: 19,
+    attribution: '© <a href="https://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a> contributors. Tiles courtesy of <a href="https://www.tracestrack.com/" target="_blank">Tracestrack Maps</a>'
   }
 });
 
-L.OSM.MapQuestOpen = L.OSM.TileLayer.extend({
+L.OSM.GPS = 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 <a href='http://www.mapquest.com/' target='_blank'>MapQuest</a> <img src='http://developer.mapquest.com/content/osm/mq_logo.png'>"
+    url: 'https://gps.tile.openstreetmap.org/lines/{z}/{x}/{y}.png',
+    maxZoom: 21,
+    maxNativeZoom: 20,
+    subdomains: 'abc'
   }
 });
 
@@ -55,40 +95,57 @@ L.OSM.DataLayer = L.FeatureGroup.extend({
     }
   },
 
-  addData: function (xml) {
-    var nodes = L.OSM.getNodes(xml),
-         ways = L.OSM.getWays(xml);
-
-    for (var i = 0; i < ways.length; i++) {
-      var way = ways[i],
-        latLngs = new Array(way.nodes.length);
-
-      for (var j = 0; j < way.nodes.length; j++) {
-        latLngs[j] = nodes[way.nodes[j]].latLng;
-      }
+  addData: function (features) {
+    if (!(features instanceof Array)) {
+      features = this.buildFeatures(features);
+    }
 
-      var layer;
+    for (var i = 0; i < features.length; i++) {
+      var feature = features[i], layer;
 
-      if (this.isWayArea(way)) {
-        latLngs.pop(); // Remove last == first.
-        layer = L.polygon(latLngs, this.options.styles.area);
+      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 {
-        layer = L.polyline(latLngs, this.options.styles.way);
+        var latLngs = new Array(feature.nodes.length);
+
+        for (var j = 0; j < feature.nodes.length; j++) {
+          latLngs[j] = feature.nodes[j].latLng;
+        }
+
+        if (this.isWayArea(feature)) {
+          latLngs.pop(); // Remove last == first.
+          layer = L.polygon(latLngs, this.options.styles.area);
+        } else {
+          layer = L.polyline(latLngs, this.options.styles.way);
+        }
       }
 
       layer.addTo(this);
-      layer.feature = way;
+      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);
 
     for (var node_id in nodes) {
       var node = nodes[node_id];
-      if (this.interestingNode(node)) {
-        var layer = L.circleMarker(node.latLng, this.options.styles.node);
-
-        layer.addTo(this);
-        layer.feature = node;
+      if (this.interestingNode(node, ways, relations)) {
+        features.push(node);
       }
     }
+
+    for (var i = 0; i < ways.length; i++) {
+      var way = ways[i];
+      features.push(way);
+    }
+
+    return features;
   },
 
   isWayArea: function (way) {
@@ -105,9 +162,27 @@ L.OSM.DataLayer = L.FeatureGroup.extend({
     return false;
   },
 
-  interestingNode: function (node) {
+  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;
+    }
+
     for (var key in node.tags) {
-      if (!~this.options.uninterestingTags.indexOf(key)) {
+      if (this.options.uninterestingTags.indexOf(key) < 0) {
         return true;
       }
     }
@@ -117,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 = {};
 
@@ -136,7 +230,7 @@ L.Util.extend(L.OSM, {
     return result;
   },
 
-  getWays: function (xml) {
+  getWays: function (xml, nodes) {
     var result = [];
 
     var ways = xml.getElementsByTagName("way");
@@ -151,7 +245,7 @@ L.Util.extend(L.OSM, {
       };
 
       for (var j = 0; j < nds.length; j++) {
-        way_object.nodes[j] = nds[j].getAttribute("ref");
+        way_object.nodes[j] = nodes[nds[j].getAttribute("ref")];
       }
 
       result.push(way_object);
@@ -160,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 = {};