Consolidate layer initialization

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

diff --git a/app/assets/javascripts/index/notes.js.erb b/app/assets/javascripts/index/notes.js.erb
index 63576c06caa4256cd45d4d4bad4436b5b19f6a4c..a30a4919be833c989af2d12f621f21513a2e1bda 100644 (file)
--- a/app/assets/javascripts/index/notes.js.erb
+++ b/app/assets/javascripts/index/notes.js.erb
@@ -49,10 +49,6 @@ function initializeNotes(map, params) {
   });
 
   if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
-    if (params.layers.indexOf(noteLayer.options.code) >= 0) {
-      map.addLayer(noteLayer);
-    }
-
     if (params.note) {
       $.ajax({
         url: "/api/" + OSM.API_VERSION + "/notes/" + params.note + ".json",
@@ -190,7 +186,7 @@ function initializeNotes(map, params) {
       notes[feature.properties.id] = updateMarker(marker, feature);
       newNote = null;
 
-      addNoteButton.removeClass("active").addClass("geolink");
+      addNoteButton.removeClass("active");
     }
   }
 
@@ -223,9 +219,10 @@ function initializeNotes(map, params) {
     e.preventDefault();
     e.stopPropagation();
 
+    if (addNoteButton.hasClass("disabled")) return;
     if (addNoteButton.hasClass("active")) return;
 
-    addNoteButton.removeClass("geolink").addClass("active");
+    addNoteButton.addClass("active");
 
     map.addLayer(noteLayer);
 
@@ -262,7 +259,7 @@ function initializeNotes(map, params) {
     newNote.addTo(noteLayer).bindPopup(popupContent[0], popupOptions()).openPopup();
 
     newNote.on("remove", function (e) {
-      addNoteButton.removeClass("active").addClass("geolink");
+      addNoteButton.removeClass("active");
     }).on("dragstart", function (e) {
       $(newNote).stopTime("removenote");
     }).on("dragend", function (e) {