Add new note marker to root map layer instead of noteLayer

We want the new note marker in the same layer with its halo. Also we don't want to put anything in noteLayer because it clears its contents on certain zoom levels.

diff --git a/app/assets/javascripts/index/new_note.js b/app/assets/javascripts/index/new_note.js
index 7eb1323834aaf80e86b0676e1aa311d93da55df5..c1df93517cd59a490138622d5e5034401a2c463d 100644 (file)
--- a/app/assets/javascripts/index/new_note.js
+++ b/app/assets/javascripts/index/new_note.js
@@ -115,7 +115,7 @@ OSM.NewNote = function (map) {
       newHalo(newNoteMarker.getLatLng(), a.type);
     });
 
       newHalo(newNoteMarker.getLatLng(), a.type);
     });
 

-    newNoteMarker.addTo(noteLayer);
+    newNoteMarker.addTo(map);

     newHalo(newNoteMarker.getLatLng());
 
     newNoteMarker.on("remove", function () {
     newHalo(newNoteMarker.getLatLng());
 
     newNoteMarker.on("remove", function () {


@@ -144,7 +144,7 @@ OSM.NewNote = function (map) {
       createNote(location, text, (feature) => {
         content.find("textarea").val("");
         addCreatedNoteMarker(feature);
       createNote(location, text, (feature) => {
         content.find("textarea").val("");
         addCreatedNoteMarker(feature);

-        noteLayer.removeLayer(newNoteMarker);
+        map.removeLayer(newNoteMarker);

         newNoteMarker = null;
         addNoteButton.removeClass("active");
         OSM.router.route("/note/" + feature.properties.id);
         newNoteMarker = null;
         addNoteButton.removeClass("active");
         OSM.router.route("/note/" + feature.properties.id);


@@ -155,7 +155,7 @@ OSM.NewNote = function (map) {
   };
 
   page.unload = function () {
   };
 
   page.unload = function () {

-    if (newNoteMarker) noteLayer.removeLayer(newNoteMarker);
+    if (newNoteMarker) map.removeLayer(newNoteMarker);

     if (halo) map.removeLayer(halo);
     addNoteButton.removeClass("active");
   };
     if (halo) map.removeLayer(halo);
     addNoteButton.removeClass("active");
   };