Merge remote-tracking branch 'upstream/pull/2797'

[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..07ad64def19417bb117c5af89f5c03712cc4994d 100644 (file)
--- a/app/assets/javascripts/index/browse.js
+++ b/app/assets/javascripts/index/browse.js
@@ -1,4 +1,4 @@
-function initializeBrowse(map) {
+OSM.initializeBrowse = function (map) {

   var browseBounds;
   var selectedLayer;
   var dataLayer = map.dataLayer;
   var browseBounds;
   var selectedLayer;
   var dataLayer = map.dataLayer;


@@ -26,55 +26,49 @@ function initializeBrowse(map) {
     onSelect(e.layer);
   });
 
     onSelect(e.layer);
   });
 

-  map.on('layeradd', function (e) {
+  map.on("layeradd", function (e) {

     if (e.layer === dataLayer) {
       map.on("moveend", updateData);
       updateData();
     }
   });
 
     if (e.layer === dataLayer) {
       map.on("moveend", updateData);
       updateData();
     }
   });
 

-  map.on('layerremove', function (e) {
+  map.on("layerremove", function (e) {

     if (e.layer === dataLayer) {
       map.off("moveend", updateData);
     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) {
-    clearStatus();
-
-    $('#browse_status').append(
-      $("<p class='warning'></p>")
-        .text(I18n.t("browse.start_rjs.loaded_an_area_with_num_features", { num_features: count, max_features: limit }))
+  function displayFeatureWarning(count, limit, add, cancel) {
+    $("#browse_status").html(
+      $("<div>")
+        .append(
+          $("<h2>")
+            .text(I18n.t("browse.start_rjs.load_data"))
+            .prepend($("<span class='icon close'></span>").click(cancel)))

         .append(
         .append(

-          $("<input type='submit'>")
-            .val(I18n.t('browse.start_rjs.load_data'))
-            .click(callback)));
+          $("<div class='inner12'>")
+            .append(
+              $("<p class='alert alert-warning clearfix'></p>")
+                .text(I18n.t("browse.start_rjs.feature_warning", { num_features: count, max_features: limit })))
+            .append(
+              $("<input type='submit'>")
+                .val(I18n.t("browse.start_rjs.load_data"))
+                .click(add))));

   }
 
   var dataLoader;
 
   function getData() {
     var bounds = map.getBounds();
   }
 
   var dataLoader;
 
   function getData() {
     var bounds = map.getBounds();

-    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;
-    }
-
-    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,14 +97,19 @@ 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);

+          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;


@@ -126,19 +125,11 @@ function initializeBrowse(map) {
 
     // Redraw in selected style
     layer.originalStyle = layer.options;
 
     // Redraw in selected style
     layer.originalStyle = layer.options;

-    layer.setStyle({color: '#0000ff', weight: 8});
+    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;
   }

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