Migrate web site to use rails 2.0.1.

[rails.git] / app / views / site / index.rhtml

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 395c851d47c5640cbca22e8512e05f3aa3d4889f..604ecdb326a97659ab584eeec9d080992825f62c 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -43,15 +43,15 @@ by the OpenStreetMap project and it's contributors.
 <% if params['lon'] and params['lat'] %>
 <% lon =  h(params['lon']) %>
 <% lat =  h(params['lat']) %>
-<% zoom =  h(params['zoom']) || '5' %>
+<% zoom =  h(params['zoom'] || '5') %>
 <% layers = h(params['layers']) %>
 <% elsif params['mlon'] and params['mlat'] %>
 <% lon = h(params['mlon']) %> 
 <% lat = h(params['mlat']) %>
-<% zoom =  h(params['zoom']) || '12' %>
+<% 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 %>
@@ -67,12 +67,13 @@ by the OpenStreetMap project and it's contributors.
 <% else %>
 <% lon =  '-0.1' %>
 <% lat =  '51.5' %>
-<% zoom =  h(params['zoom']) || '5' %>
+<% zoom =  h(params['zoom'] || '5') %>
 <% layers = h(params['layers']) %>
 <% end %>
 <% end %>
 
-<script type="text/javascript" src="/openlayers/OpenLayers.js"></script>
+<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
+<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
 <%= javascript_include_tag 'map.js' %>
 
 
@@ -113,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();