From: Tom Hughes <tom@compton.nu>
Date: Wed, 29 Jan 2025 18:41:43 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/5575'
X-Git-Tag: live~132
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/68481fe7753432ffd3051ede15f7518b1c0d73c9?ds=sidebyside;hp=-c

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

68481fe7753432ffd3051ede15f7518b1c0d73c9
diff --combined app/assets/javascripts/index/layers/data.js
index 7e4b2d256,3cc8f6135..dc522af41
--- a/app/assets/javascripts/index/layers/data.js
+++ b/app/assets/javascripts/index/layers/data.js
@@@ -1,6 -1,6 +1,6 @@@
  OSM.initializeDataLayer = function (map) {
-   var loadedBounds;
-   var dataLayer = map.dataLayer;
+   let dataLoader, loadedBounds;
+   const dataLayer = map.dataLayer;
  
    dataLayer.setStyle({
      way: {
@@@ -32,6 -32,8 +32,8 @@@
    });
  
    dataLayer.on("remove", function () {
+     if (dataLoader) dataLoader.abort();
+     dataLoader = null;
      map.off("moveend", updateData);
      $("#browse_status").empty();
      map.fire("overlayremove", { layer: this });
@@@ -71,12 -73,12 +73,10 @@@
              $("<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'>")
 -              .text(I18n.t("browse.start_rjs.feature_error", { message: message }))))));
 +        $("<p class='alert alert-warning'>")
 +          .text(I18n.t("browse.start_rjs.feature_error", { message: message }))));
    }
  
-   var dataLoader;
- 
    function getData() {
      var bounds = map.getBounds();
      var url = "/api/" + OSM.API_VERSION + "/map?bbox=" + bounds.toBBoxString();