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 a47dd348e94b0dce70a17cf957b98d750be85cce..69f6e3bc81acce08ac5c5e3bcf3482639d8af1e9 100644 (file)
--- a/app/assets/javascripts/index/browse.js
+++ b/app/assets/javascripts/index/browse.js
@@ -41,12 +41,9 @@ function initializeBrowse(map) {
   });
 
   function updateData() {
   });
 
   function updateData() {

-    if (map.getZoom() >= 15) {
-      var bounds = map.getBounds();
-      if (!browseBounds || !browseBounds.contains(bounds)) {
-        browseBounds = bounds;
-        getData();
-      }
+    var bounds = map.getBounds();
+    if (!browseBounds || !browseBounds.contains(bounds)) {
+      getData();

     }
   }
 
     }
   }
 


@@ -69,8 +66,8 @@ function initializeBrowse(map) {
     if (size > OSM.MAX_REQUEST_AREA) {
       $('#browse_status').html(
         $("<p class='warning'></p>")
     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 })));
-      return;
+          .text(I18n.t("browse.start_rjs.unable_to_load_size", { max_bbox_size: OSM.MAX_REQUEST_AREA, bbox_size: size.toFixed(2) })));
+      return false;

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


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

+        browseBounds = bounds;

       }
     });
   }
       }
     });
   }