Abort loading when data layer is removed

diff --git a/app/assets/javascripts/index/layers/data.js b/app/assets/javascripts/index/layers/data.js
index e1246ca6c9d1862141f0189623d8fb2ecb8f9082..3cc8f61357d9b99c5c040978dd6012081ca9f8a8 100644 (file)
--- a/app/assets/javascripts/index/layers/data.js
+++ b/app/assets/javascripts/index/layers/data.js
@@ -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 @@ OSM.initializeDataLayer = function (map) {
   });
 
   dataLayer.on("remove", function () {
+    if (dataLoader) dataLoader.abort();
+    dataLoader = null;
     map.off("moveend", updateData);
     $("#browse_status").empty();
     map.fire("overlayremove", { layer: this });
@@ -77,8 +79,6 @@ OSM.initializeDataLayer = function (map) {
               .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();