Resolve conflict

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

diff --git a/app/assets/javascripts/index/new_note.js.erb b/app/assets/javascripts/index/new_note.js.erb
index c47cb563c9ffa91abc93e71ddb23d659ee93fafb..9990da7836c366830edb216b614a2a5e5ebf6634 100644 (file)
--- a/app/assets/javascripts/index/new_note.js.erb
+++ b/app/assets/javascripts/index/new_note.js.erb
@@ -3,7 +3,8 @@ OSM.NewNote = function(map) {
     content = $('#sidebar_content'),
     page = {},
     addNoteButton = $(".control-note .control-button"),
     content = $('#sidebar_content'),
     page = {},
     addNoteButton = $(".control-note .control-button"),

-    newNote;
+    newNote,
+    halo;

 
   var noteIcons = {
     "new": L.icon({
 
   var noteIcons = {
     "new": L.icon({


@@ -27,11 +28,13 @@ OSM.NewNote = function(map) {
     e.preventDefault();
     e.stopPropagation();
 
     e.preventDefault();
     e.stopPropagation();
 

-    OSM.route('/new_note');
+    if ($(this).hasClass('disabled')) return;
+
+    OSM.router.route('/note/new');

   });
 
   function createNote(marker, form, url) {
   });
 
   function createNote(marker, form, url) {

-    var location = marker.getLatLng();
+    var location = marker.getLatLng().wrap();

 
     marker.options.draggable = false;
     marker.dragging.disable();
 
     marker.options.draggable = false;
     marker.dragging.disable();


@@ -58,7 +61,7 @@ OSM.NewNote = function(map) {
       newNote = null;
       noteLayer.removeLayer(marker);
       addNoteButton.removeClass("active");
       newNote = null;
       noteLayer.removeLayer(marker);
       addNoteButton.removeClass("active");

-      OSM.route('/browse/note/' + feature.properties.id);
+      OSM.router.route('/note/' + feature.properties.id);

     }
   }
 
     }
   }
 


@@ -77,6 +80,23 @@ OSM.NewNote = function(map) {
     OSM.loadSidebarContent(path, page.load);
   };
 
     OSM.loadSidebarContent(path, page.load);
   };
 

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

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


@@ -102,7 +122,12 @@ OSM.NewNote = function(map) {
       draggable: true
     });
 
       draggable: true
     });
 

+    newNote.on("dragstart dragend", function(a) {
+      newHalo(newNote.getLatLng(), a.type);
+    });
+

     newNote.addTo(noteLayer);
     newNote.addTo(noteLayer);

+    newHalo(newNote.getLatLng());

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


@@ -124,10 +149,13 @@ OSM.NewNote = function(map) {
       e.preventDefault();
       createNote(newNote, e.target.form, '/api/0.6/notes.json');
     });
       e.preventDefault();
       createNote(newNote, e.target.form, '/api/0.6/notes.json');
     });

+
+    return map.getState();

   };
 
   page.unload = function () {
     noteLayer.removeLayer(newNote);
   };
 
   page.unload = function () {
     noteLayer.removeLayer(newNote);

+    map.removeLayer(halo);

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