Update to iD 1.0.0

[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 55b27e7cff5cdc70dcde58eebad047b5ecc69e72..927d2c3b75287e7dc878974d004feec17cf8feb0 100644 (file)
--- a/vendor/assets/leaflet/leaflet.osm.js
+++ b/vendor/assets/leaflet/leaflet.osm.js
@@ -55,40 +55,54 @@ 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 === "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 = [],
+      nodes = L.OSM.getNodes(xml),
+      ways = L.OSM.getWays(xml, nodes);
 
     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)) {
+        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 +119,22 @@ L.OSM.DataLayer = L.FeatureGroup.extend({
     return false;
   },
 
-  interestingNode: function (node) {
+  interestingNode: function (node, ways) {
+    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 key in node.tags) {
-      if (!~this.options.uninterestingTags.indexOf(key)) {
+      if (this.options.uninterestingTags.indexOf(key) < 0) {
         return true;
       }
     }
@@ -136,7 +163,7 @@ L.Util.extend(L.OSM, {
     return result;
   },
 
-  getWays: function (xml) {
+  getWays: function (xml, nodes) {
     var result = [];
 
     var ways = xml.getElementsByTagName("way");
@@ -151,7 +178,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);