X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a4571898806b04ecfbcadb90a96126a71c2dbfaa..3d79f9fd88ab2784b292c8eafc46070472b2a4c9:/vendor/assets/leaflet/leaflet.osm.js

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: '© <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.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 <a href='http://www.mapquest.com/' target='_blank'>MapQuest</a> <img src='http://developer.mapquest.com/content/osm/mq_logo.png'>"
+    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.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 = {};