Refactor layer persistence

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index d50253318a5a6a96adbb90b4d806ea54bcf979d6..4041191343dc4b183427bc5f6027f1d225a10273 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -24,31 +24,31 @@ $(document).ready(function () {
 
   layers = [{
     layer: new L.OSM.Mapnik({
 
   layers = [{
     layer: new L.OSM.Mapnik({

-      attribution: ''
+      attribution: '',
+      code: "M"

     }),
     keyid: "mapnik",
     }),
     keyid: "mapnik",

-    layerCode: "M",

     name: I18n.t("javascripts.map.base.standard")
   }, {
     layer: new L.OSM.CycleMap({
       attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
     name: I18n.t("javascripts.map.base.standard")
   }, {
     layer: new L.OSM.CycleMap({
       attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",

+      code: "C"

     }),
     keyid: "cyclemap",
     }),
     keyid: "cyclemap",

-    layerCode: "C",

     name: I18n.t("javascripts.map.base.cycle_map")
   }, {
     layer: new L.OSM.TransportMap({
       attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
     name: I18n.t("javascripts.map.base.cycle_map")
   }, {
     layer: new L.OSM.TransportMap({
       attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",

+      code: "T"

     }),
     keyid: "transportmap",
     }),
     keyid: "transportmap",

-    layerCode: "T",

     name: I18n.t("javascripts.map.base.transport_map")
   }, {
     layer: new L.OSM.MapQuestOpen({
       attribution: "Tiles courtesy of <a href='http://www.mapquest.com/' target='_blank'>MapQuest</a> <img src='http://developer.mapquest.com/content/osm/mq_logo.png'>",
     name: I18n.t("javascripts.map.base.transport_map")
   }, {
     layer: new L.OSM.MapQuestOpen({
       attribution: "Tiles courtesy of <a href='http://www.mapquest.com/' target='_blank'>MapQuest</a> <img src='http://developer.mapquest.com/content/osm/mq_logo.png'>",

+      code: "Q"

     }),
     keyid: "mapquest",
     }),
     keyid: "mapquest",

-    layerCode: "Q",

     name: I18n.t("javascripts.map.base.mapquest")
   }];
 
     name: I18n.t("javascripts.map.base.mapquest")
   }];
 


@@ -100,7 +100,18 @@ $(document).ready(function () {
   }
 
   if (params.layers) {
   }
 
   if (params.layers) {

-    setMapLayers(params.layers);
+    var foundLayer = false;
+    for (var i = 0; i < layers.length; i++) {
+      if (params.layers.indexOf(layers[i].layer.options.code) >= 0) {
+        map.addLayer(layers[i].layer);
+        foundLayer = true;
+      } else {
+        map.removeLayer(layers[i].layer);
+      }
+    }
+    if (!foundLayer) {
+      map.addLayer(layers[0].layer);
+    }

   }
 
   if (params.marker) {
   }
 
   if (params.marker) {


@@ -214,25 +225,11 @@ function getMapBaseLayer() {
 
 function getMapLayers() {
   var layerConfig = "";
 
 function getMapLayers() {
   var layerConfig = "";

-  for (var i = 0; i < layers.length; i++) {
-    if (map.hasLayer(layers[i].layer)) {
-      layerConfig += layers[i].layerCode;
+  for (var i in map._layers) { // TODO: map.eachLayer
+    var layer = map._layers[i];
+    if (layer.options && layer.options.code) {
+      layerConfig += layer.options.code;

     }
   }
   return layerConfig;
 }
     }
   }
   return layerConfig;
 }

-
-function setMapLayers(layerConfig) {
-  var foundLayer = false;
-  for (var i = 0; i < layers.length; i++) {
-    if (layerConfig.indexOf(layers[i].layerCode) >= 0) {
-      map.addLayer(layers[i].layer);
-      foundLayer = true;
-    } else {
-      map.removeLayer(layers[i].layer);
-    }
-  }
-  if (!foundLayer) {
-    map.addLayer(layers[0].layer);
-  }
-}

diff --git a/app/assets/javascripts/index/notes.js.erb b/app/assets/javascripts/index/notes.js.erb
index ac73e13782945089c7933f60dc71ec635459e861..81d6042c707b28656caaee85d7b5804a3fe74348 100644 (file)
--- a/app/assets/javascripts/index/notes.js.erb
+++ b/app/assets/javascripts/index/notes.js.erb
@@ -3,7 +3,7 @@
 
 $(document).ready(function () {
   var params = OSM.mapParams(),
 
 $(document).ready(function () {
   var params = OSM.mapParams(),

-      noteLayer = new L.LayerGroup(),
+      noteLayer = new L.LayerGroup({code: 'N'}),

       notes = {},
       newNote;
 
       notes = {},
       newNote;
 


@@ -25,11 +25,6 @@ $(document).ready(function () {
     })
   };
 
     })
   };
 

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

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


@@ -57,8 +52,7 @@ $(document).ready(function () {
   });
 
   if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
   });
 
   if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {

-    if (params.layers) setMapLayers(params.layers);
-    if (params.notes) map.addLayer(noteLayer);
+    if (params.notes || params.layers.indexOf('N') >= 0) map.addLayer(noteLayer);

     if (params.note) {
       $.ajax({
         url: "/api/" + OSM.API_VERSION + "/notes/" + params.note + ".json",
     if (params.note) {
       $.ajax({
         url: "/api/" + OSM.API_VERSION + "/notes/" + params.note + ".json",