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

diff --combined app/assets/javascripts/index/layers/data.js
index 7e4b2d2568b4a1704f7bb58f386c54b087e8e079,3cc8f61357d9b99c5c040978dd6012081ca9f8a8..dc522af418d809f6e16c90ccf5b91a67bf211494
--- 1/app/assets/javascripts/index/layers/data.js
--- 2/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();