Persist the state of the notes layer

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 519a805bb8442961cd846d543e92b2400a990e84..6118c8e0d741c7a3ef0614d24f3e91b922e69aab 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -14,7 +14,7 @@ $(document).ready(function () {
 
   map.attributionControl.setPrefix(permalinks);
 
 
   map.attributionControl.setPrefix(permalinks);
 

-  map.on("moveend baselayerchange", updateLocation);
+  map.on("moveend layeradd layerremove", updateLocation);

 
   if (!params.object_zoom) {
     if (params.bbox) {
 
   if (!params.object_zoom) {
     if (params.bbox) {

diff --git a/app/assets/javascripts/index/notes.js.erb b/app/assets/javascripts/index/notes.js.erb
index f212c85b7562b2c6f5d9f9297d7cd1f97502bf10..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) {

diff --git a/app/assets/javascripts/map.js.erb b/app/assets/javascripts/map.js.erb
index 48fd35d0e7e4e0eaa19fdaf2072d35c921d1c0e4..8591e260a10b830480ffd5a963ed11db2a52877b 100644 (file)
--- a/app/assets/javascripts/map.js.erb
+++ b/app/assets/javascripts/map.js.erb
@@ -189,13 +189,13 @@ function getMapBaseLayer() {
 }
 
 function getMapLayers() {
 }
 
 function getMapLayers() {

+  var layerConfig = "";

   for (var i = 0; i < layers.length; i++) {
     if (map.hasLayer(layers[i].layer)) {
   for (var i = 0; i < layers.length; i++) {
     if (map.hasLayer(layers[i].layer)) {

-      return layers[i].layerCode;
+      layerConfig += layers[i].layerCode;

     }
   }
     }
   }

-
-  return "";
+  return layerConfig;

 }
 
 function setMapLayers(layerConfig) {
 }
 
 function setMapLayers(layerConfig) {