Update Leaflet

[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..d815f41bd15c6de4e14bc1bad0fd3e87b22ee56e 100644 (file)
--- a/vendor/assets/leaflet/leaflet.osm.js
+++ b/vendor/assets/leaflet/leaflet.osm.js
@@ -1,4 +1,44 @@
-L.OSM = L.FeatureGroup.extend({
+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>'
+  },
+
+  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: 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'
+  }
+});
+
+L.OSM.CycleMap = L.OSM.TileLayer.extend({
+  options: {
+    url: 'http://{s}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png'
+  }
+});
+
+L.OSM.TransportMap = L.OSM.TileLayer.extend({
+  options: {
+    url: 'http://{s}.tile2.opencyclemap.org/transport/{z}/{x}/{y}.png'
+  }
+});
+
+L.OSM.MapQuestOpen = 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'>"
+  }
+});
+
+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'],
@@ -15,40 +55,54 @@ L.OSM = 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;
+        features.push(node);
       }
     }
+
+    for (var i = 0; i < ways.length; i++) {
+      var way = ways[i];
+      features.push(way);
+    }
+
+    return features;
   },
 
   isWayArea: function (way) {
@@ -96,7 +150,7 @@ L.Util.extend(L.OSM, {
     return result;
   },
 
-  getWays: function (xml) {
+  getWays: function (xml, nodes) {
     var result = [];
 
     var ways = xml.getElementsByTagName("way");
@@ -111,7 +165,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);