Convert newHalo() to addHalo() and removeHalo()

[rails.git] / app / assets / javascripts / index / new_note.js

diff --git a/app/assets/javascripts/index/new_note.js b/app/assets/javascripts/index/new_note.js
index a3b809d0d8ededd00841b98686c30178d5c2ae09..712d03dc50f780a6f2f740dc51e3ac9a94ba68d1 100644 (file)
--- a/app/assets/javascripts/index/new_note.js
+++ b/app/assets/javascripts/index/new_note.js
@@ -49,7 +49,7 @@ OSM.NewNote = function (map) {
     });
   }
 
     });
   }
 

-  function updateMarker(feature) {
+  function addCreatedNoteMarker(feature) {

     var marker = L.marker(feature.geometry.coordinates.reverse(), {
       icon: noteIcons[feature.properties.status],
       opacity: 0.9,
     var marker = L.marker(feature.geometry.coordinates.reverse(), {
       icon: noteIcons[feature.properties.status],
       opacity: 0.9,


@@ -57,7 +57,24 @@ OSM.NewNote = function (map) {
     });
     marker.id = feature.properties.id;
     marker.addTo(noteLayer);
     });
     marker.id = feature.properties.id;
     marker.addTo(noteLayer);

-    return marker;
+  }
+
+  function addHalo(latlng) {
+    if (halo) map.removeLayer(halo);
+
+    halo = L.circleMarker(latlng, {
+      weight: 2.5,
+      radius: 20,
+      fillOpacity: 0.5,
+      color: "#FF6200"
+    });
+
+    map.addLayer(halo);
+  }
+
+  function removeHalo() {
+    if (halo) map.removeLayer(halo);
+    halo = null;

   }
 
   page.pushstate = page.popstate = function (path) {
   }
 
   page.pushstate = page.popstate = function (path) {


@@ -66,25 +83,6 @@ OSM.NewNote = function (map) {
     });
   };
 
     });
   };
 

-  function newHalo(loc, a) {
-    var hasHalo = halo && map.hasLayer(halo);
-
-    if (a === "dragstart" && hasHalo) {
-      map.removeLayer(halo);
-    } else {
-      if (hasHalo) map.removeLayer(halo);
-
-      halo = L.circleMarker(loc, {
-        weight: 2.5,
-        radius: 20,
-        fillOpacity: 0.5,
-        color: "#FF6200"
-      });
-
-      map.addLayer(halo);
-    }
-  }
-

   page.load = function (path) {
     if (addNoteButton.hasClass("disabled")) return;
     if (addNoteButton.hasClass("active")) return;
   page.load = function (path) {
     if (addNoteButton.hasClass("disabled")) return;
     if (addNoteButton.hasClass("active")) return;


@@ -113,11 +111,14 @@ OSM.NewNote = function (map) {
     });
 
     newNoteMarker.on("dragstart dragend", function (a) {
     });
 
     newNoteMarker.on("dragstart dragend", function (a) {

-      newHalo(newNoteMarker.getLatLng(), a.type);
+      removeHalo();
+      if (a.type !== "dragstart") {
+        addHalo(newNoteMarker.getLatLng());
+      }

     });
 
     });
 

-    newNoteMarker.addTo(noteLayer);
-    newHalo(newNoteMarker.getLatLng());
+    newNoteMarker.addTo(map);
+    addHalo(newNoteMarker.getLatLng());

 
     newNoteMarker.on("remove", function () {
       addNoteButton.removeClass("active");
 
     newNoteMarker.on("remove", function () {
       addNoteButton.removeClass("active");


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

-        updateMarker(feature);
-        noteLayer.removeLayer(newNoteMarker);
+        addCreatedNoteMarker(feature);
+        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);


@@ -156,8 +157,8 @@ OSM.NewNote = function (map) {
   };
 
   page.unload = function () {
   };
 
   page.unload = function () {

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

     addNoteButton.removeClass("active");
   };
 
     addNoteButton.removeClass("active");
   };