X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/f5c9a41e8729ab9bfc54fff6be9c1a9b6e0f4d56..f1c0834c5cd5ddfa3d79d24b200e995597fe11f4:/app/views/site/index.rhtml

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index e88643588..edd755ddb 100644
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -51,7 +51,7 @@ by the OpenStreetMap project and it's contributors.
 <% zoom =  h(params['zoom'] || '12') %>
 <% layers = h(params['layers']) %>
 <% elsif cookies.key?("location") %>
-<% lon,lat,zoom,layers = cookies["location"].value.first.split(",") %>
+<% lon,lat,zoom,layers = cookies["location"].split(",") %>
 <% elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil? %> 
 <% lon =  @user.home_lon %>
 <% lat =  @user.home_lat %>
@@ -72,18 +72,18 @@ by the OpenStreetMap project and it's contributors.
 <% end %>
 <% end %>
 
-<script type="text/javascript" src="/openlayers/OpenLayers.js"></script>
-<script type="text/javascript" src="/openlayers/OpenStreetMap.js"></script>
+<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
+<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
 <%= javascript_include_tag 'map.js' %>
 
 
-<script type="text/javascript">
+<script type="text/javascript" defer="defer">
   <!--
   var brokenContentSize = $("content").offsetWidth == 0;
   var marker;
   var map;
 
-  function init(){
+  function mapInit(){
     map = createMap("map");
 
     <% if bbox %>
@@ -114,6 +114,7 @@ by the OpenStreetMap project and it's contributors.
     map.events.register("zoomend", map, updateKey);
 
     map.events.register("moveend", map, updateLocation);
+    map.events.register("changelayer", map, updateLocation);
     updateLocation();
 
     handleResize();
@@ -176,8 +177,10 @@ by the OpenStreetMap project and it's contributors.
 
     resizeMap();
   }
+  
+  mapInit();
 
+  window.onload = handleResize;
   window.onresize = handleResize;
-  window.onload = init;
 // -->
 </script>