Don't try and parse an empty string as a layer config, and cope a bit

better if we do hit the end of the string. Closes #942.

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index d6247158d3bcc7d5c31a3124f4801e5c910e911b..3e0400ce4dee689340b5a3081b5359bd6a0e53e7 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -109,7 +109,7 @@ by the OpenStreetMap project and its contributors.
     setMapCenter(centre, zoom);
     <% end %>
 
     setMapCenter(centre, zoom);
     <% end %>
 

-    <% if layers %>
+    <% if !layers.empty? %>

     setMapLayers("<%= layers %>");
     <% end %>
 
     setMapLayers("<%= layers %>");
     <% end %>
 

diff --git a/public/javascripts/map.js b/public/javascripts/map.js
index 7591d7d162b4e2b73c40449efab37256d77bee3b..9f9be0987d4fa3d0071f0d5f8c55a465db16b452 100644 (file)
--- a/public/javascripts/map.js
+++ b/public/javascripts/map.js
@@ -155,7 +155,11 @@ function setMapLayers(layerConfig) {
    for (var layers = map.getLayersBy("isBaseLayer", false), i = 0; i < layers.length; i++) {
       var c = layerConfig.charAt(l++);
 
    for (var layers = map.getLayersBy("isBaseLayer", false), i = 0; i < layers.length; i++) {
       var c = layerConfig.charAt(l++);
 

-      layers[i].setVisibility(c == "T");
+      if (c == "T") {
+         layers[i].setVisibility(true);
+      } else if(c == "F") {
+         layers[i].setVisibility(false);
+      }

    }
 }
 
    }
 }