Merge pull request #4813 from AntonKhorev/no-fst-italic

[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 d196476f496c6167af4fe77a8e5ea2b4208910da..7a761b50036dd30d02c1ec2d2fd0ca16f6b660d0 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 browseBounds;

-  var selectedLayer;

   var dataLayer = map.dataLayer;
 
   dataLayer.setStyle({
   var dataLayer = map.dataLayer;
 
   dataLayer.setStyle({


@@ -26,17 +25,17 @@ 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);

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

     }
   });
 
     }
   });
 


@@ -47,29 +46,27 @@ 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 }))
-        .append(
-          $("<input type='submit'>")
-            .val(I18n.t('browse.start_rjs.load_data'))
-            .click(callback)));
+  function displayFeatureWarning(count, limit, add, cancel) {
+    $("#browse_status").html(
+      $("<div class='p-3'>").append(
+        $("<div class='d-flex'>").append(
+          $("<h2 class='flex-grow-1 text-break'>")
+            .text(I18n.t("browse.start_rjs.load_data")),
+          $("<div>").append(
+            $("<button type='button' class='btn-close'>")
+              .attr("aria-label", I18n.t("javascripts.close"))
+              .click(cancel))),
+        $("<p class='alert alert-warning'>")
+          .text(I18n.t("browse.start_rjs.feature_warning", { num_features: count, max_features: limit })),
+        $("<input type='submit' class='btn btn-primary d-block mx-auto'>")
+          .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) {
-      $('#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;
-    }
-

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


@@ -93,40 +90,35 @@ function initializeBrowse(map) {
       url: url,
       success: function (xml) {
         dataLayer.clearLayers();
       url: url,
       success: function (xml) {
         dataLayer.clearLayers();

-        selectedLayer = null;

 
         var features = dataLayer.buildFeatures(xml);
 
         function addFeatures() {
 
         var features = dataLayer.buildFeatures(xml);
 
         function addFeatures() {

-          $('#browse_status').empty();
+          $("#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);
+        }
+
+        if (map._objectLayer) {
+          map._objectLayer.bringToFront();

         }
 
         dataLoader = null;
         }
 
         dataLoader = null;

-        browseBounds = bounds;

       }
     });
   }
 
   function onSelect(layer) {
       }
     });
   }
 
   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);

   }
   }

-}
+};