From: Tom Hughes <tom@compton.nu>
Date: Sun, 6 Apr 2025 08:57:55 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/5893'
X-Git-Tag: live~74
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/190b601f6cefc42c90a6541f2e7fd78c3d2d5572?ds=inline;hp=-c

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

190b601f6cefc42c90a6541f2e7fd78c3d2d5572
diff --combined app/assets/javascripts/index/layers/data.js
index 22e1a4e68,03c774f04..6c8bdc025
--- a/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();
        });
    }