X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1f59ad76eff4b63c149d406868527372191e268f..b72fedb162d3fcecc304d7dfe5f67acb30844099:/app/views/site/index.rhtml

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index f924f7a14..a79ea10c3 100644
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -8,9 +8,13 @@
 <%= render :partial => 'key' %>
 <%= render :partial => 'search' %>
 
-<noscript><div id="noscript"><p>You are either using a browser that doesn't support javascript, or you have disabled javascript.</p>
-<p>OpenStreetMap uses javascript for its slippy map.</p>
-<p>Try the <a href="http://tah.openstreetmap.org/Browse/">OpenStreetMap static tile browser</a>.</p></div></noscript>
+<noscript>
+  <div id="noscript">
+    <p>You are either using a browser that doesn't support javascript, or you have disabled javascript.</p>
+    <p>OpenStreetMap uses javascript for its slippy map.</p>
+    <p>You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.</p>
+  </div>
+</noscript>
 
 <div id="map">
 <div id="permalink"><a href="/" id="permalinkanchor">Permalink</a></div>
@@ -54,8 +58,8 @@ by the OpenStreetMap project and its contributors.
 <% lat = h(params['mlat']) %>
 <% zoom =  h(params['zoom'] || '12') %>
 <% layers = h(params['layers']) %>
-<% elsif cookies.key?("location") %>
-<% lon,lat,zoom,layers = cookies["location"].split(",") %>
+<% elsif cookies.key?("_osm_location") %>
+<% lon,lat,zoom,layers = cookies["_osm_location"].split("|") %>
 <% elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil? %> 
 <% lon =  @user.home_lon %>
 <% lat =  @user.home_lat %>
@@ -72,8 +76,8 @@ by the OpenStreetMap project and its contributors.
 <% lon =  '-0.1' %>
 <% lat =  '51.5' %>
 <% zoom =  h(params['zoom'] || '5') %>
-<% layers = h(params['layers']) %>
 <% end %>
+<% layers = h(params['layers']) %>
 <% end %>
 
 <%= javascript_include_tag '/openlayers/OpenLayers.js' %>
@@ -105,7 +109,7 @@ by the OpenStreetMap project and its contributors.
     setMapCenter(centre, zoom);
     <% end %>
 
-    <% if layers %>
+    <% if !layers.nil? and !layers.empty? %>
     setMapLayers("<%= layers %>");
     <% end %>
 
@@ -144,7 +148,7 @@ by the OpenStreetMap project and its contributors.
 
     updatelinks(lonlat.lon, lonlat.lat, zoom, layers);
 
-    document.cookie = "location=" + lonlat.lon + "," + lonlat.lat + "," + zoom + "," + layers;
+    document.cookie = "_osm_location=" + lonlat.lon + "|" + lonlat.lat + "|" + zoom + "|" + layers;
   }
 
   function resizeContent() {