Merge branch 'master' into overpass

[rails.git] / vendor / assets / leaflet / leaflet.osm.js

diff --git a/vendor/assets/leaflet/leaflet.osm.js b/vendor/assets/leaflet/leaflet.osm.js
index 66879d1ddb01d1c145c926f86664018c2e0fc577..f7bf207d0deca3fdb1c9e097761ff7a1ea0182b6 100644 (file)
--- a/vendor/assets/leaflet/leaflet.osm.js
+++ b/vendor/assets/leaflet/leaflet.osm.js
@@ -1,4 +1,64 @@
-L.OSM = L.FeatureGroup.extend({
+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: '© <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>'
+  },
+
+  initialize: function (options) {
+    options = L.Util.setOptions(this, options);
+    L.TileLayer.prototype.initialize.call(this, options.url);
+  }
+});
+
+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',
+    maxZoom: 19
+  }
+});
+
+L.OSM.CycleMap = L.OSM.TileLayer.extend({
+  options: {
+    url: 'http://{s}.tile.thunderforest.com/cycle/{z}/{x}/{y}.png',
+    attribution: "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}.tile.thunderforest.com/transport/{z}/{x}/{y}.png',
+    attribution: "Tiles courtesy of <a href='http://www.thunderforest.com/' target='_blank'>Andy Allan</a>"
+  }
+});
+
+L.OSM.MapQuestOpen = 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 <a href='http://www.mapquest.com/' target='_blank'>MapQuest</a> <img src='https://developer.mapquest.com/content/osm/mq_logo.png'>" :
+      "Tiles courtesy of <a href='http://www.mapquest.com/' target='_blank'>MapQuest</a> <img src='http://developer.mapquest.com/content/osm/mq_logo.png'>"
+  }
+});
+
+L.OSM.HOT = L.OSM.TileLayer.extend({
+  options: {
+    url: 'http://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png',
+    maxZoom: 20,
+    subdomains: 'abc',
+    attribution: "Tiles courtesy of <a href='http://hot.openstreetmap.org/' target='_blank'>Humanitarian OpenStreetMap Team</a>"
+  }
+});
+
+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'],
   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'],


@@ -15,40 +75,57 @@ L.OSM = L.FeatureGroup.extend({
     }
   },
 
     }
   },
 

-  addData: function (xml) {
-    var nodes = L.OSM.getNodes(xml),
-         ways = L.OSM.getWays(xml);
+  addData: function (features) {
+    if (!(features instanceof Array)) {
+      features = this.buildFeatures(features);
+    }

 
 

-    for (var i = 0; i < ways.length; i++) {
-      var way = ways[i],
-        latLngs = new Array(way.nodes.length);
+    for (var i = 0; i < features.length; i++) {
+      var feature = features[i], layer;

 
 

-      for (var j = 0; j < way.nodes.length; j++) {
-        latLngs[j] = nodes[way.nodes[j]].latLng;
-      }
+      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);

 
 

-      var layer;
+        for (var j = 0; j < feature.nodes.length; j++) {
+          latLngs[j] = feature.nodes[j].latLng;
+        }

 
 

-      if (this.isWayArea(way)) {
-        latLngs.pop(); // Remove last == first.
-        layer = L.polygon(latLngs, this.options.styles.area);
-      } else {
-        layer = L.polyline(latLngs, this.options.styles.way);
+        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.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];
 
     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) {
   },
 
   isWayArea: function (way) {


@@ -65,9 +142,27 @@ L.OSM = L.FeatureGroup.extend({
     return false;
   },
 
     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) {
     for (var key in node.tags) {

-      if (!~this.options.uninterestingTags.indexOf(key)) {
+      if (this.options.uninterestingTags.indexOf(key) < 0) {

         return true;
       }
     }
         return true;
       }
     }


@@ -77,6 +172,25 @@ L.OSM = L.FeatureGroup.extend({
 });
 
 L.Util.extend(L.OSM, {
 });
 
 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 = {};
 
   getNodes: function (xml) {
     var result = {};
 


@@ -96,7 +210,7 @@ L.Util.extend(L.OSM, {
     return result;
   },
 
     return result;
   },
 

-  getWays: function (xml) {
+  getWays: function (xml, nodes) {

     var result = [];
 
     var ways = xml.getElementsByTagName("way");
     var result = [];
 
     var ways = xml.getElementsByTagName("way");


@@ -111,7 +225,7 @@ L.Util.extend(L.OSM, {
       };
 
       for (var j = 0; j < nds.length; j++) {
       };
 
       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);
       }
 
       result.push(way_object);


@@ -120,6 +234,33 @@ L.Util.extend(L.OSM, {
     return result;
   },
 
     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 = {};
 
   getTags: function (xml) {
     var result = {};