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

[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 22e1a4e6849743510167a15330d372ebeef61a54..6c8bdc02591fc9d03a322aeb564232f17a39289a 100644 (file)
--- a/app/assets/javascripts/index/layers/data.js
+++ b/app/assets/javascripts/index/layers/data.js
@@ -117,6 +117,8 @@ OSM.initializeDataLayer = function (map) {
         if (map._objectLayer) {
           map._objectLayer.bringToFront();
         }
+
+        dataLoader = null;
       })
       .catch(function (error) {
         if (error.name === "AbortError") return;
@@ -124,9 +126,10 @@ OSM.initializeDataLayer = function (map) {
         displayLoadError(error?.message, () => {
           $("#browse_status").empty();
         });
+
+        dataLoader = null;
       })
       .finally(() => {
-        dataLoader = null;
         spanLoading.remove();
       });
   }