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 a0bb4268599322d03beb66b7f6c921f987c65639..69f6e3bc81acce08ac5c5e3bcf3482639d8af1e9 100644 (file)
--- a/app/assets/javascripts/index/browse.js
+++ b/app/assets/javascripts/index/browse.js
@@ -36,24 +36,19 @@ function initializeBrowse(map) {
   map.on('layerremove', function (e) {
     if (e.layer === dataLayer) {
       map.off("moveend", updateData);
   map.on('layerremove', function (e) {
     if (e.layer === dataLayer) {
       map.off("moveend", updateData);

-      clearStatus();
+      $('#browse_status').empty();

     }
   });
 
   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();

     }
   }
 
   function displayFeatureWarning(count, limit, callback) {
     }
   }
 
   function displayFeatureWarning(count, limit, callback) {

-    clearStatus();
-
-    $('#browse_status').append(
+    $('#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 }))
         .append(
       $("<p class='warning'></p>")
         .text(I18n.t("browse.start_rjs.loaded_an_area_with_num_features", { num_features: count, max_features: limit }))
         .append(


@@ -69,12 +64,12 @@ function initializeBrowse(map) {
     var size = bounds.getSize();
 
     if (size > OSM.MAX_REQUEST_AREA) {
     var size = bounds.getSize();
 
     if (size > OSM.MAX_REQUEST_AREA) {

-      setStatus(I18n.t("browse.start_rjs.unable_to_load_size", { max_bbox_size: OSM.MAX_REQUEST_AREA, bbox_size: size }));
-      return;
+      $('#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 false;

     }
 
     }
 

-    setStatus(I18n.t('browse.start_rjs.loading'));
-

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


@@ -103,7 +98,7 @@ function initializeBrowse(map) {
         var features = dataLayer.buildFeatures(xml);
 
         function addFeatures() {
         var features = dataLayer.buildFeatures(xml);
 
         function addFeatures() {

-          clearStatus();
+          $('#browse_status').empty();

           dataLayer.addData(features);
         }
 
           dataLayer.addData(features);
         }
 


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

+        browseBounds = bounds;

       }
     });
   }
       }
     });
   }


@@ -133,12 +129,4 @@ function initializeBrowse(map) {
     // Stash the currently drawn feature
     selectedLayer = layer;
   }
     // Stash the currently drawn feature
     selectedLayer = layer;
   }

-
-  function setStatus(status) {
-    $('#browse_status').append($('<p></p>').text(status));
-  }
-
-  function clearStatus() {
-    $('#browse_status').empty();
-  }

 }
 }