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

diff --combined app/assets/javascripts/index/layers/data.js
index 22e1a4e6849743510167a15330d372ebeef61a54,03c774f041da010d0df1ebff91c74f63e32c87f6..6c8bdc02591fc9d03a322aeb564232f17a39289a
--- 1/app/assets/javascripts/index/layers/data.js
--- 2/app/assets/javascripts/index/layers/data.js
+++ b/app/assets/javascripts/index/layers/data.js
@@@ -2,6 -2,21 +2,6 @@@ OSM.initializeDataLayer = function (map
    let dataLoader, loadedBounds;
    const dataLayer = map.dataLayer;
  
 -  dataLayer.setStyle({
 -    way: {
 -      weight: 3,
 -      color: "#000000",
 -      opacity: 0.4
 -    },
 -    area: {
 -      weight: 3,
 -      color: "#ff0000"
 -    },
 -    node: {
 -      color: "#00ff00"
 -    }
 -  });
 -
    dataLayer.isWayArea = function () {
      return false;
    };
@@@ -117,6 -132,8 +117,8 @@@
          if (map._objectLayer) {
            map._objectLayer.bringToFront();
          }
+ 
+         dataLoader = null;
        })
        .catch(function (error) {
          if (error.name === "AbortError") return;
@@@ -124,9 -141,10 +126,10 @@@
          displayLoadError(error?.message, () => {
            $("#browse_status").empty();
          });
+ 
+         dataLoader = null;
        })
        .finally(() => {
-         dataLoader = null;
          spanLoading.remove();
        });
    }