Setup the layers before adding any marker so that the marker layer

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

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index ea756829e7482a6605fc744c7f78870dcb1b4812..bbd1a8a775887af67802e247c489a814ccf9d8eb 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -1,3 +1,13 @@
+<% 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 %>
+<% end %>
+
+<% content_for :left_menu do %>
+<%= link_to "Map key", "http://wiki.openstreetmap.org/index.php/Map_Key" %>
+<% end %>
+
 <%= render :partial => 'search', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>
 
 <div id="map"></div> 
@@ -33,11 +43,20 @@
 <% lat =  @user.home_lat %>
 <% zoom = '10' %>
 <% else %>
+<% session[:location] = OSM::IPLocation(request.env['REMOTE_ADDR']) unless session[:location] %>
+<% if session[:location] %>
+<% bbox = true %>
+<% minlon = session[:location][:minlon] %>
+<% minlat = session[:location][:minlat] %>
+<% maxlon = session[:location][:maxlon] %>
+<% maxlat = session[:location][:maxlat] %>
+<% else %>
 <% lon =  '-0.1' %>
 <% lat =  '51.5' %>
 <% zoom =  params['zoom'] || '5' %>
 <% layers = params['layers'] %>
 <% end %>
+<% end %>
 
 <script type="text/javascript" src="/openlayers/OpenLayers.js"></script>
 <%= javascript_include_tag 'map.js' %>
@@ -46,6 +65,7 @@
 <script type="text/javascript">
   <!--
   var brokenContentSize = $("content").offsetWidth == 0;
+  var marker;
   var map;
 
   function init(){
@@ -68,24 +88,33 @@
     map.setCenter(centre, zoom);
     <% end %>
 
-    <% if marker %>
-    addMarkerToMap(lonLatToMercator(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>)));
-    <% end %>
-
     <% if layers %>
     setMapLayers("<%= layers %>");
     <% end %>
 
+    <% if marker %>
+    marker = addMarkerToMap(lonLatToMercator(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>)));
+    <% end %>
+
     map.events.register("moveend", map, updateLocation);
     updateLocation();
 
     handleResize();
   }
 
+  function getPosition() {
+    return mercatorToLonLat(map.getCenter());
+  }
+
   function setPosition(lat, lon, zoom) {
     var centre = lonLatToMercator(new OpenLayers.LonLat(lon, lat));
 
     map.setCenter(centre, zoom);
+
+    if (marker)
+      removeMarkerFromMap(marker);
+
+    marker = addMarkerToMap(centre, getArrowIcon());
   }
 
   function updateLocation() {