Install add/remove event listeners directly on note layer

[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 eaa5c36547829691d53b881e0c002267b8bfae6f..4676aa425ea312b4f0a098d993fd306909c250d6 100644 (file)
--- a/app/assets/javascripts/index/layers/notes.js
+++ b/app/assets/javascripts/index/layers/notes.js
@@ -20,20 +20,14 @@ OSM.initializeNotesLayer = function (map) {
     })
   };
 
     })
   };
 

-  map.on("layeradd", function (e) {
-    if (e.layer === noteLayer) {
-      loadNotes();
-      map.on("moveend", loadNotes);
-    }
-  }).on("layerremove", function (e) {
-    if (e.layer === noteLayer) {
-      map.off("moveend", loadNotes);
-      noteLayer.clearLayers();
-      notes = {};
-    }
-  });
-
-  noteLayer.on("click", function (e) {
+  noteLayer.on("add", () => {
+    loadNotes();
+    map.on("moveend", loadNotes);
+  }).on("remove", () => {
+    map.off("moveend", loadNotes);
+    noteLayer.clearLayers();
+    notes = {};
+  }).on("click", function (e) {

     if (e.layer.id) {
       OSM.router.route("/note/" + e.layer.id);
     }
     if (e.layer.id) {
       OSM.router.route("/note/" + e.layer.id);
     }