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

[rails.git] / app / assets / javascripts / index / layers / data.js

diff --git a/app/assets/javascripts/index/layers/data.js b/app/assets/javascripts/index/layers/data.js
index 7507a5f4e791875738f4c89023d73bcdd78133db..f779bbb9674c220a9f4b571661f1a9d75076e49e 100644 (file)
--- a/app/assets/javascripts/index/layers/data.js
+++ b/app/assets/javascripts/index/layers/data.js
@@ -25,18 +25,16 @@ OSM.initializeDataLayer = function (map) {
     onSelect(e.layer);
   });
 
     onSelect(e.layer);
   });
 

-  map.on("layeradd", function (e) {
-    if (e.layer === dataLayer) {
-      map.on("moveend", updateData);
-      updateData();
-    }
+  dataLayer.on("add", function () {
+    map.fire("overlayadd", { layer: this });
+    map.on("moveend", updateData);
+    updateData();

   });
 
   });
 

-  map.on("layerremove", function (e) {
-    if (e.layer === dataLayer) {
-      map.off("moveend", updateData);
-      $("#browse_status").empty();
-    }
+  dataLayer.on("remove", function () {
+    map.off("moveend", updateData);
+    $("#browse_status").empty();
+    map.fire("overlayremove", { layer: this });

   });
 
   function updateData() {
   });
 
   function updateData() {


@@ -63,11 +61,16 @@ OSM.initializeDataLayer = function (map) {
           .click(add)));
   }
 
           .click(add)));
   }
 

-  function displayLoadError(message) {
+  function displayLoadError(message, close) {

     $("#browse_status").html(
       $("<div class='p-3'>").append(
     $("#browse_status").html(
       $("<div class='p-3'>").append(

-        $("<h2 class='flex-grow-1 text-break'>")
-          .text(I18n.t("browse.start_rjs.load_data")),
+        $("<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(close))),

         $("<div>").append(
           $("<div class='d-flex'>").append(
             $("<p class='alert alert-warning'>")
         $("<div>").append(
           $("<div class='d-flex'>").append(
             $("<p class='alert alert-warning'>")


@@ -130,12 +133,16 @@ OSM.initializeDataLayer = function (map) {
         dataLoader = null;
         if (textStatus === "abort") { return; }
 
         dataLoader = null;
         if (textStatus === "abort") { return; }
 

+        function closeError() {
+          $("#browse_status").empty();
+        }
+

         if (XMLHttpRequest.status === 400 && XMLHttpRequest.responseText) {
         if (XMLHttpRequest.status === 400 && XMLHttpRequest.responseText) {

-          displayLoadError(XMLHttpRequest.responseText);
+          displayLoadError(XMLHttpRequest.responseText, closeError);

         } else if (XMLHttpRequest.statusText) {
         } else if (XMLHttpRequest.statusText) {

-          displayLoadError(XMLHttpRequest.statusText);
+          displayLoadError(XMLHttpRequest.statusText, closeError);

         } else {
         } else {

-          displayLoadError(String(XMLHttpRequest.status));
+          displayLoadError(String(XMLHttpRequest.status), closeError);

         }
       }
     });
         }
       }
     });