Persist the state of the notes layer

[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 0728907758dab6e88007e03367b4bf87ca123243..f414f0e34621d1ff6e2d6b8ce8c016ab487b4e4b 100644 (file)
--- a/app/assets/javascripts/index/notes.js.erb
+++ b/app/assets/javascripts/index/notes.js.erb
@@ -26,6 +26,11 @@ $(document).ready(function () {
   var notes = {};
   var newNote;
 
   var notes = {};
   var newNote;
 

+  layers.push({
+    layer: noteLayer,
+    layerCode: "N"
+  });
+

   map.on("layeradd", function (e) {
     if (e.layer == noteLayer) {
       loadNotes();
   map.on("layeradd", function (e) {
     if (e.layer == noteLayer) {
       loadNotes();


@@ -57,6 +62,7 @@ $(document).ready(function () {
   if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
     map.layersControl.addOverlay(noteLayer, I18n.t("browse.start_rjs.notes_layer_name"));
 
   if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
     map.layersControl.addOverlay(noteLayer, I18n.t("browse.start_rjs.notes_layer_name"));
 

+    if (params.layers) setMapLayers(params.layers);

     if (params.notes) map.addLayer(noteLayer);
 
     if (params.note) {
     if (params.notes) map.addLayer(noteLayer);
 
     if (params.note) {


@@ -171,6 +177,9 @@ $(document).ready(function () {
   function createNote(marker, form, url) {
     var location = marker.getLatLng();
 
   function createNote(marker, form, url) {
     var location = marker.getLatLng();
 

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

     $(form).find("input[type=submit]").prop("disabled", true);
 
     $.ajax({
     $(form).find("input[type=submit]").prop("disabled", true);
 
     $.ajax({


@@ -216,7 +225,7 @@ $(document).ready(function () {
     });
   }
 
     });
   }
 

-  $("#createnoteanchor").click(function (e) {
+  $(".leaflet-control-attribution").on("click", "#createnoteanchor", function (e) {

     e.preventDefault();
 
     if ($(e.target).hasClass("disabled")) return;
     e.preventDefault();
 
     if ($(e.target).hasClass("disabled")) return;