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

[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 2fa38bca1b8c24a233f55fce78e89047a577336d..8ef859d855b96650d0a579b49cc7693d6922f8a2 100644 (file)
--- a/app/assets/javascripts/index/browse.js
+++ b/app/assets/javascripts/index/browse.js
@@ -1,6 +1,5 @@
-function initializeBrowse(map) {
+OSM.initializeBrowse = function (map) {
   var browseBounds;
-  var selectedLayer;
   var dataLayer = map.dataLayer;
 
   dataLayer.setStyle({
@@ -26,30 +25,17 @@ function initializeBrowse(map) {
     onSelect(e.layer);
   });
 
-  dataLayer.on('statechange', function (e) {
-    if (e.checked) {
-      if (e.disabled) {
-        var size = map.getBounds().getSize();
-        $('#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) })));
-      } else {
-        $('#browse_status').empty();
-      }
-    }
-  });
-
-  map.on('layeradd', function (e) {
+  map.on("layeradd", function (e) {
     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);
-      $('#browse_status').empty();
+      $("#browse_status").empty();
     }
   });
 
@@ -60,14 +46,23 @@ function initializeBrowse(map) {
     }
   }
 
-  function displayFeatureWarning(count, limit, callback) {
-    $('#browse_status').html(
-      $("<p class='warning'></p>")
-        .text(I18n.t("browse.start_rjs.feature_warning", { num_features: count, max_features: limit }))
+  function displayFeatureWarning(count, limit, add, cancel) {
+    $("#browse_status").html(
+      $("<div>")
         .append(
-          $("<input type='submit'>")
-            .val(I18n.t('browse.start_rjs.load_data'))
-            .click(callback)));
+          $("<button type='button' class='btn-close float-end mt-1'>")
+            .click(cancel),
+          $("<h2>")
+            .text(I18n.t("browse.start_rjs.load_data"))
+            .prepend(),
+          $("<div>")
+            .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' class='btn btn-primary'>")
+                .val(I18n.t("browse.start_rjs.load_data"))
+                .click(add))));
   }
 
   var dataLoader;
@@ -97,40 +92,35 @@ function initializeBrowse(map) {
       url: url,
       success: function (xml) {
         dataLayer.clearLayers();
-        selectedLayer = null;
 
         var features = dataLayer.buildFeatures(xml);
 
         function addFeatures() {
-          $('#browse_status').empty();
+          $("#browse_status").empty();
           dataLayer.addData(features);
+          browseBounds = bounds;
+        }
+
+        function cancelAddFeatures() {
+          $("#browse_status").empty();
         }
 
         if (features.length < maxFeatures) {
           addFeatures();
         } else {
-          displayFeatureWarning(features.length, maxFeatures, addFeatures);
+          displayFeatureWarning(features.length, maxFeatures, addFeatures, cancelAddFeatures);
+        }
+
+        if (map._objectLayer) {
+          map._objectLayer.bringToFront();
         }
 
         dataLoader = null;
-        browseBounds = bounds;
       }
     });
   }
 
   function onSelect(layer) {
-    // Unselect previously selected feature
-    if (selectedLayer) {
-      selectedLayer.setStyle(selectedLayer.originalStyle);
-    }
-
-    // Redraw in selected style
-    layer.originalStyle = layer.options;
-    layer.setStyle({color: '#0000ff', weight: 8});
-
-    OSM.router.route('/' + layer.feature.type + '/' + layer.feature.id);
-
-    // Stash the currently drawn feature
-    selectedLayer = layer;
+    OSM.router.route("/" + layer.feature.type + "/" + layer.feature.id);
   }
-}
+};