Fix "in bounds" test in updateData

[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..69f6e3bc81acce08ac5c5e3bcf3482639d8af1e9 100644 (file)
--- a/app/assets/javascripts/index/browse.js
+++ b/app/assets/javascripts/index/browse.js
@@ -42,8 +42,9 @@ 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, callback) {


@@ -58,7 +59,7 @@ function initializeBrowse(map) {
 
   var dataLoader;
 
 
   var dataLoader;
 

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

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


@@ -66,11 +67,9 @@ function initializeBrowse(map) {
       $('#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) })));
       $('#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;
+      return false;

     }
 
     }
 

-    if (inPrevious) return;
-

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


@@ -110,6 +109,7 @@ function initializeBrowse(map) {
         }
 
         dataLoader = null;
         }
 
         dataLoader = null;

+        browseBounds = bounds;

       }
     });
   }
       }
     });
   }