Revert accidental schema changes

[rails.git] / app / assets / javascripts / index / browse.js

diff --git a/app/assets/javascripts/index/browse.js b/app/assets/javascripts/index/browse.js
index 47d8418b1ae1e9dd58da5a9e1eeb2f147fb068e0..6309444110a1206f7f22e57a2d54f02c3d5422ee 100644 (file)
--- a/app/assets/javascripts/index/browse.js
+++ b/app/assets/javascripts/index/browse.js
@@ -1,4 +1,4 @@
-function initializeBrowse(map) {
+OSM.initializeBrowse = function (map) {
   var browseBounds;
   var selectedLayer;
   var dataLayer = map.dataLayer;
@@ -26,17 +26,17 @@ function initializeBrowse(map) {
     onSelect(e.layer);
   });
 
-  map.on('layeradd', function (e) {
+  map.on("layeradd", function (e) {
     if (e.layer === dataLayer) {
       map.on("moveend", updateData);
       updateData();
     }
   });
 
-  map.on('layerremove', function (e) {
+  map.on("layerremove", function (e) {
     if (e.layer === dataLayer) {
       map.off("moveend", updateData);
-      $('#browse_status').empty();
+      $("#browse_status").empty();
     }
   });
 
@@ -47,14 +47,17 @@ function initializeBrowse(map) {
     }
   }
 
-  function displayFeatureWarning(count, limit, callback) {
-    $('#browse_status').html(
+  function displayFeatureWarning(count, limit, add, cancel) {
+    $("#browse_status").html(
       $("<p class='warning'></p>")
         .text(I18n.t("browse.start_rjs.feature_warning", { num_features: count, max_features: limit }))
+        .prepend(
+          $("<span class='icon close'></span>")
+            .click(cancel))
         .append(
           $("<input type='submit'>")
-            .val(I18n.t('browse.start_rjs.load_data'))
-            .click(callback)));
+            .val(I18n.t("browse.start_rjs.load_data"))
+            .click(add)));
   }
 
   var dataLoader;
@@ -89,18 +92,22 @@ function initializeBrowse(map) {
         var features = dataLayer.buildFeatures(xml);
 
         function addFeatures() {
-          $('#browse_status').empty();
+          $("#browse_status").empty();
           dataLayer.addData(features);
+          browseBounds = bounds;
+        }
+
+        function cancelAddFeatures() {
+          $("#browse_status").empty();
         }
 
         if (features.length < maxFeatures) {
           addFeatures();
         } else {
-          displayFeatureWarning(features.length, maxFeatures, addFeatures);
+          displayFeatureWarning(features.length, maxFeatures, addFeatures, cancelAddFeatures);
         }
 
         dataLoader = null;
-        browseBounds = bounds;
       }
     });
   }
@@ -113,11 +120,11 @@ function initializeBrowse(map) {
 
     // Redraw in selected style
     layer.originalStyle = layer.options;
-    layer.setStyle({color: '#0000ff', weight: 8});
+    layer.setStyle({ color: "#0000ff", weight: 8 });
 
-    OSM.router.route('/' + layer.feature.type + '/' + layer.feature.id);
+    OSM.router.route("/" + layer.feature.type + "/" + layer.feature.id);
 
     // Stash the currently drawn feature
     selectedLayer = layer;
   }
-}
+};