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

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

diff --git a/app/assets/javascripts/index/layers/notes.js b/app/assets/javascripts/index/layers/notes.js
index 24bf969b3380581e9e3b07f35873b36a9fe6a170..9aa1f203f5546a82a7e7788ee3c2ff9e3a54f01f 100644 (file)
--- a/app/assets/javascripts/index/layers/notes.js
+++ b/app/assets/javascripts/index/layers/notes.js
@@ -75,18 +75,18 @@ OSM.initializeNotesLayer = function (map) {
 
       if (noteLoader) noteLoader.abort();
 
 
       if (noteLoader) noteLoader.abort();
 

-      noteLoader = $.ajax({
-        url: url,
-        success: success
-      });
+      noteLoader = new AbortController();
+      fetch(url, { signal: noteLoader.signal })
+        .then(response => response.json())
+        .then(success)
+        .catch(() => {})
+        .finally(() => noteLoader = null);

     }
 
     function success(json) {
       var oldNotes = notes;
       notes = {};
     }
 
     function success(json) {
       var oldNotes = notes;
       notes = {};

-      json.features.forEach(updateMarkers);
-
-      function updateMarkers(feature) {
+      for (const feature of json.features) {

         var marker = oldNotes[feature.properties.id];
         delete oldNotes[feature.properties.id];
         notes[feature.properties.id] = updateMarker(marker, feature);
         var marker = oldNotes[feature.properties.id];
         delete oldNotes[feature.properties.id];
         notes[feature.properties.id] = updateMarker(marker, feature);


@@ -95,8 +95,6 @@ OSM.initializeNotesLayer = function (map) {
       for (var id in oldNotes) {
         noteLayer.removeLayer(oldNotes[id]);
       }
       for (var id in oldNotes) {
         noteLayer.removeLayer(oldNotes[id]);
       }

-
-      noteLoader = null;

     }
   }
 };
     }
   }
 };