Restore maxFeatures check
authorJohn Firebaugh <john.firebaugh@gmail.com>
Fri, 19 Oct 2012 17:57:45 +0000 (10:57 -0700)
committerJohn Firebaugh <john.firebaugh@gmail.com>
Fri, 9 Nov 2012 20:59:28 +0000 (12:59 -0800)
app/assets/javascripts/index/browse.js
vendor/assets/leaflet/leaflet.osm.js

index 0016c7b5d1c0ad35af2983886649cce0f8815fd7..98a67a421782f45bf991c138296cc21d14b6c045 100644 (file)
@@ -159,28 +159,36 @@ $(document).ready(function () {
           dataLayer.clearLayers();
           selectedLayer = null;
 
-          dataLayer.addData(xml);
-
-          layersById = {};
-          var features = [];
-
-          dataLayer.eachLayer(function (layer) {
-            var feature = layer.feature;
-            layersById[feature.id] = layer;
-            features.push({
-              typeName: featureTypeName(feature),
-              url: "/browse/" + feature.type + "/" + feature.id,
-              name: featureName(feature),
-              id: feature.id
+          var features = dataLayer.buildFeatures(xml);
+
+          function addFeatures() {
+            dataLayer.addData(features);
+
+            layersById = {};
+
+            dataLayer.eachLayer(function (layer) {
+              var feature = layer.feature;
+              layersById[feature.id] = layer;
+              $.extend(feature, {
+                typeName: featureTypeName(feature),
+                url: "/browse/" + feature.type + "/" + feature.id,
+                name: featureName(feature)
+              });
             });
-          });
 
-          browseObjectList = $(JST["templates/browse/feature_list"]({
-            features: features,
-            url: url
-          }))[0];
+            browseObjectList = $(JST["templates/browse/feature_list"]({
+              features: features,
+              url: url
+            }))[0];
 
-          loadObjectList();
+            loadObjectList();
+          }
+
+          if (features.length < maxFeatures) {
+            addFeatures();
+          } else {
+            displayFeatureWarning(features.length, maxFeatures, addFeatures);
+          }
         }
       });
     }
index 55b27e7cff5cdc70dcde58eebad047b5ecc69e72..d815f41bd15c6de4e14bc1bad0fd3e87b22ee56e 100644 (file)
@@ -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;
+        features.push(node);
       }
     }
+
+    for (var i = 0; i < ways.length; i++) {
+      var way = ways[i];
+      features.push(way);
+    }
+
+    return features;
   },
 
   isWayArea: function (way) {
@@ -136,7 +150,7 @@ L.Util.extend(L.OSM, {
     return result;
   },
 
-  getWays: function (xml) {
+  getWays: function (xml, nodes) {
     var result = [];
 
     var ways = xml.getElementsByTagName("way");
@@ -151,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);