Fix tab breakage and make key update as zoom level changes.

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

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index b9525c71ab27fc87572e5025faddf12303fdf276..5ca8b0339b0d4af168bea33403b64e6a665ee7d5 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -1,14 +1,16 @@
 <% content_for :greeting do %>
 <% content_for :greeting do %>

+<% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>

 <%= link_to_function 'home', "setPosition(#{@user.home_lat}, #{@user.home_lon}, 10)" %> |
 <% end %>
 <%= link_to_function 'home', "setPosition(#{@user.home_lat}, #{@user.home_lon}, 10)" %> |
 <% end %>

-
-<% content_for :left_menu do %>
-<%= link_to "Map key", "http://wiki.openstreetmap.org/index.php/Map_Key" %>

 <% end %>
 
 <% end %>
 

-<%= render :partial => 'search', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>
+<%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>
+<%= render :partial => 'key' %>
+<%= render :partial => 'search' %>

 
 

-<div id="map"></div> 
+<div id="map">
+<div id="permalink"><a href="/" id="permalinkanchor">Permalink</a></div>
+</div> 

 
 <% if params['mlon'] and params['mlat'] %>
 <% marker = true %>
 
 <% if params['mlon'] and params['mlat'] %>
 <% marker = true %>


@@ -86,13 +88,15 @@
     map.setCenter(centre, zoom);
     <% end %>
 
     map.setCenter(centre, zoom);
     <% end %>
 

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

     <% if marker %>
     marker = addMarkerToMap(lonLatToMercator(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>)));
     <% end %>
 
     <% if marker %>
     marker = addMarkerToMap(lonLatToMercator(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>)));
     <% end %>
 

-    <% if layers %>
-    setMapLayers("<%= layers %>");
-    <% end %>
+    map.events.register("zoomend", map, updateKey);

 
     map.events.register("moveend", map, updateLocation);
     updateLocation();
 
     map.events.register("moveend", map, updateLocation);
     updateLocation();


@@ -100,6 +104,10 @@
     handleResize();
   }
 
     handleResize();
   }
 

+  function getPosition() {
+    return mercatorToLonLat(map.getCenter());
+  }
+

   function setPosition(lat, lon, zoom) {
     var centre = lonLatToMercator(new OpenLayers.LonLat(lon, lat));
 
   function setPosition(lat, lon, zoom) {
     var centre = lonLatToMercator(new OpenLayers.LonLat(lon, lat));
 


@@ -133,14 +141,14 @@
   function resizeMap() {
     var centre = map.getCenter();
     var zoom = map.getZoom();
   function resizeMap() {
     var centre = map.getCenter();
     var zoom = map.getZoom();

-    var search_results_width = $("search_results").offsetWidth;
+    var sidebar_width = $("sidebar").offsetWidth;

 
 

-    if (search_results_width > 0) {
-      search_results_width = search_results_width + 5
+    if (sidebar_width > 0) {
+      sidebar_width = sidebar_width + 5

     }
 
     }
 

-    $("map").style.left = (search_results_width) + "px";
-    $("map").style.width = ($("content").offsetWidth - search_results_width) + "px";
+    $("map").style.left = (sidebar_width) + "px";
+    $("map").style.width = ($("content").offsetWidth - sidebar_width) + "px";

     $("map").style.height = ($("content").offsetHeight - 2) + "px";
 
     map.setCenter(centre, zoom);
     $("map").style.height = ($("content").offsetHeight - 2) + "px";
 
     map.setCenter(centre, zoom);