Ignore clicks on history entries if the mouse has moved

[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 752c84fecee841505b14bc402ce324c9f5cde7d6..5db23a975f5d8bebee6e29f54f5edca31d6056ef 100644 (file)
--- a/app/assets/javascripts/index/browse.js
+++ b/app/assets/javascripts/index/browse.js
@@ -42,35 +42,28 @@ function initializeBrowse(map) {
 
   function updateData() {
     var bounds = map.getBounds();
 
   function updateData() {
     var bounds = map.getBounds();

-    getData(!browseBounds || !browseBounds.contains(bounds));
-    browseBounds = bounds;
+    if (!browseBounds || !browseBounds.contains(bounds)) {
+      getData();
+    }

   }
 
   }
 

-  function displayFeatureWarning(count, limit, callback) {
+  function displayFeatureWarning(count, limit, add, cancel) {

     $('#browse_status').html(
       $("<p class='warning'></p>")
     $('#browse_status').html(
       $("<p class='warning'></p>")

-        .text(I18n.t("browse.start_rjs.loaded_an_area_with_num_features", { num_features: count, max_features: limit }))
+        .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'))
         .append(
           $("<input type='submit'>")
             .val(I18n.t('browse.start_rjs.load_data'))

-            .click(callback)));
+            .click(add)));

   }
 
   var dataLoader;
 
   }
 
   var dataLoader;
 

-  function getData(inPrevious) {
+  function getData() {

     var bounds = map.getBounds();
     var bounds = map.getBounds();

-    var size = bounds.getSize();
-
-    if (size > OSM.MAX_REQUEST_AREA) {
-      $('#browse_status').html(
-        $("<p class='warning'></p>")
-          .text(I18n.t("browse.start_rjs.unable_to_load_size", { max_bbox_size: OSM.MAX_REQUEST_AREA, bbox_size: size.toFixed(2) })));
-      return;
-    }
-
-    if (inPrevious) return;
-

     var url = "/api/" + OSM.API_VERSION + "/map?bbox=" + bounds.toBBoxString();
 
     /*
     var url = "/api/" + OSM.API_VERSION + "/map?bbox=" + bounds.toBBoxString();
 
     /*


@@ -101,12 +94,17 @@ function initializeBrowse(map) {
         function addFeatures() {
           $('#browse_status').empty();
           dataLayer.addData(features);
         function addFeatures() {
           $('#browse_status').empty();
           dataLayer.addData(features);

+          browseBounds = bounds;
+        }
+
+        function cancelAddFeatures() {
+          $('#browse_status').empty();

         }
 
         if (features.length < maxFeatures) {
           addFeatures();
         } else {
         }
 
         if (features.length < maxFeatures) {
           addFeatures();
         } else {

-          displayFeatureWarning(features.length, maxFeatures, addFeatures);
+          displayFeatureWarning(features.length, maxFeatures, addFeatures, cancelAddFeatures);

         }
 
         dataLoader = null;
         }
 
         dataLoader = null;


@@ -124,7 +122,7 @@ function initializeBrowse(map) {
     layer.originalStyle = layer.options;
     layer.setStyle({color: '#0000ff', weight: 8});
 
     layer.originalStyle = layer.options;
     layer.setStyle({color: '#0000ff', weight: 8});
 

-    OSM.route('/browse/' + layer.feature.type + '/' + layer.feature.id);
+    OSM.router.route('/' + layer.feature.type + '/' + layer.feature.id);

 
     // Stash the currently drawn feature
     selectedLayer = layer;
 
     // Stash the currently drawn feature
     selectedLayer = layer;