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

[rails.git] / app / assets / javascripts / index / layers / data.js

diff --git a/app/assets/javascripts/index/layers/data.js b/app/assets/javascripts/index/layers/data.js
index c10c6ed218d98e71066bc74af2edaaad48be3570..dc522af418d809f6e16c90ccf5b91a67bf211494 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) {
 OSM.initializeDataLayer = function (map) {

-  var loadedBounds;
-  var dataLayer = map.dataLayer;
+  let dataLoader, loadedBounds;
+  const dataLayer = map.dataLayer;

 
   dataLayer.setStyle({
     way: {
 
   dataLayer.setStyle({
     way: {


@@ -32,6 +32,8 @@ OSM.initializeDataLayer = function (map) {
   });
 
   dataLayer.on("remove", function () {
   });
 
   dataLayer.on("remove", function () {

+    if (dataLoader) dataLoader.abort();
+    dataLoader = null;

     map.off("moveend", updateData);
     $("#browse_status").empty();
     map.fire("overlayremove", { layer: this });
     map.off("moveend", updateData);
     $("#browse_status").empty();
     map.fire("overlayremove", { layer: this });


@@ -71,14 +73,10 @@ OSM.initializeDataLayer = function (map) {
             $("<button type='button' class='btn-close'>")
               .attr("aria-label", I18n.t("javascripts.close"))
               .click(close))),
             $("<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();
   function getData() {
     var bounds = map.getBounds();
     var url = "/api/" + OSM.API_VERSION + "/map?bbox=" + bounds.toBBoxString();


@@ -93,10 +91,11 @@ OSM.initializeDataLayer = function (map) {
 
     dataLoader = $.ajax({
       url: url,
 
     dataLoader = $.ajax({
       url: url,

-      success: function (xml) {
+      dataType: "json",
+      success: function (data) {

         dataLayer.clearLayers();
 
         dataLayer.clearLayers();
 

-        var features = dataLayer.buildFeatures(xml);
+        var features = dataLayer.buildFeatures(data);

 
         function addFeatures() {
           $("#browse_status").empty();
 
         function addFeatures() {
           $("#browse_status").empty();