From: Tom Hughes <tom@compton.nu>
Date: Wed, 29 Jan 2025 18:31:13 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/5577'
X-Git-Tag: live~218
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/66f519d9ccc0efb15645e089c83d2f65ae328ce5?ds=inline;hp=-c

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

66f519d9ccc0efb15645e089c83d2f65ae328ce5
diff --combined app/assets/javascripts/index/layers/notes.js
index 1068472d5,75bd73bce..24bf969b3
--- a/app/assets/javascripts/index/layers/notes.js
+++ b/app/assets/javascripts/index/layers/notes.js
@@@ -1,6 -1,7 +1,7 @@@
  OSM.initializeNotesLayer = function (map) {
-   var noteLayer = map.noteLayer,
-       notes = {};
+   let noteLoader;
+   const noteLayer = map.noteLayer;
+   let notes = {};
  
    var noteIcons = {
      "new": L.icon({
@@@ -25,6 -26,8 +26,8 @@@
      map.on("moveend", loadNotes);
      map.fire("overlayadd", { layer: noteLayer });
    }).on("remove", () => {
+     if (noteLoader) noteLoader.abort();
+     noteLoader = null;
      map.off("moveend", loadNotes);
      noteLayer.clearLayers();
      notes = {};
@@@ -40,16 -43,9 +43,16 @@@
      if (marker) {
        marker.setIcon(noteIcons[feature.properties.status]);
      } else {
 +      let title;
 +      const description = feature.properties.comments[0];
 +
 +      if (description?.action === "opened") {
 +        title = description.text;
 +      }
 +
        marker = L.marker(feature.geometry.coordinates.reverse(), {
          icon: noteIcons[feature.properties.status],
 -        title: feature.properties.comments[0].text,
 +        title,
          opacity: 0.8,
          interactive: true
        });
@@@ -63,8 -59,6 +66,6 @@@
      return marker.id;
    };
  
-   var noteLoader;
- 
    function loadNotes() {
      var bounds = map.getBounds();
      var size = bounds.getSize();