Disable asynchronous object layer loading

[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 25dc66a28ffee9e0061856257f509224989bb523..c0fffd72d061dd140d809f6c6d1daf3a92380493 100644 (file)
--- a/app/assets/javascripts/index/layers/data.js
+++ b/app/assets/javascripts/index/layers/data.js
@@ -40,7 +40,7 @@ OSM.initializeDataLayer = function (map) {
   });
 
   function updateData() {
   });
 
   function updateData() {

-    var bounds = map.getBounds();
+    const bounds = map.getBounds();

     if (!loadedBounds || !loadedBounds.contains(bounds)) {
       getData();
     }
     if (!loadedBounds || !loadedBounds.contains(bounds)) {
       getData();
     }


@@ -78,8 +78,8 @@ OSM.initializeDataLayer = function (map) {
   }
 
   function getData() {
   }
 
   function getData() {

-    var bounds = map.getBounds();
-    var url = "/api/" + OSM.API_VERSION + "/map.json?bbox=" + bounds.toBBoxString();
+    const bounds = map.getBounds();
+    const url = "/api/" + OSM.API_VERSION + "/map.json?bbox=" + bounds.toBBoxString();

 
     /*
      * Modern browsers are quite happy showing far more than 100 features in
 
     /*
      * Modern browsers are quite happy showing far more than 100 features in


@@ -89,6 +89,15 @@ OSM.initializeDataLayer = function (map) {
 
     if (dataLoader) dataLoader.abort();
 
 
     if (dataLoader) dataLoader.abort();
 

+    $("#layers-data-loading").remove();
+
+    const spanLoading = $("<span>")
+      .attr("id", "layers-data-loading")
+      .attr("class", "spinner-border spinner-border-sm ms-1")
+      .attr("role", "status")
+      .html("<span class='visually-hidden'>" + I18n.t("browse.start_rjs.loading") + "</span>")
+      .appendTo($("#label-layers-data"));
+

     dataLoader = new AbortController();
     fetch(url, { signal: dataLoader.signal })
       .then(response => {
     dataLoader = new AbortController();
     fetch(url, { signal: dataLoader.signal })
       .then(response => {


@@ -102,7 +111,7 @@ OSM.initializeDataLayer = function (map) {
       .then(function (data) {
         dataLayer.clearLayers();
 
       .then(function (data) {
         dataLayer.clearLayers();
 

-        var features = dataLayer.buildFeatures(data);
+        const features = dataLayer.buildFeatures(data);

 
         function addFeatures() {
           $("#browse_status").empty();
 
         function addFeatures() {
           $("#browse_status").empty();


@@ -131,7 +140,10 @@ OSM.initializeDataLayer = function (map) {
           $("#browse_status").empty();
         });
       })
           $("#browse_status").empty();
         });
       })

-      .finally(() => dataLoader = null);
+      .finally(() => {
+        dataLoader = null;
+        spanLoading.remove();
+      });

   }
 
   function onSelect(layer) {
   }
 
   function onSelect(layer) {