Merge branch 'master' into redesign

[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..752c84fecee841505b14bc402ce324c9f5cde7d6 100644 (file)
--- a/app/assets/javascripts/index/browse.js
+++ b/app/assets/javascripts/index/browse.js
@@ -41,13 +41,9 @@ function initializeBrowse(map) {
   });
 
   function updateData() {
-    if (map.getZoom() >= 15) {
-      var bounds = map.getBounds();
-      if (!browseBounds || !browseBounds.contains(bounds)) {
-        browseBounds = bounds;
-        getData();
-      }
-    }
+    var bounds = map.getBounds();
+    getData(!browseBounds || !browseBounds.contains(bounds));
+    browseBounds = bounds;
   }
 
   function displayFeatureWarning(count, limit, callback) {
@@ -62,17 +58,19 @@ function initializeBrowse(map) {
 
   var dataLoader;
 
-  function getData() {
+  function getData(inPrevious) {
     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 })));
+          .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();
 
     /*