Fix diary entry creation...

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

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 000df6c1a9eeba13b33b3e88f531832debd76c9c..08cbfaedaac8f0e01b7c9a79d06b73dedc791788 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -1,3 +1,7 @@
+<% 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> 
 <%= render :partial => 'search', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>
 
 <div id="map"></div> 


@@ -33,22 +37,29 @@
 <% lat =  @user.home_lat %>
 <% zoom = '10' %>
 <% else %>
 <% 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 %>
 <% 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' %>
 
 
 <script type="text/javascript" src="/openlayers/OpenLayers.js"></script>
 <%= javascript_include_tag 'map.js' %>
 

-<% unless @user %>
-<script src="http://www.mappam.com/javascripts/mappam.js" type="text/javascript"></script>
-<% end %>

 
 <script type="text/javascript">
   <!--
   var brokenContentSize = $("content").offsetWidth == 0;
 
 <script type="text/javascript">
   <!--
   var brokenContentSize = $("content").offsetWidth == 0;

+  var marker;

   var map;
 
   function init(){
   var map;
 
   function init(){


@@ -72,7 +83,7 @@
     <% end %>
 
     <% if marker %>
     <% end %>
 
     <% if marker %>

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

     <% end %>
 
     <% if layers %>
     <% end %>
 
     <% if layers %>


@@ -82,14 +93,6 @@
     map.events.register("moveend", map, updateLocation);
     updateLocation();
 
     map.events.register("moveend", map, updateLocation);
     updateLocation();
 

-    <% unless @user %>
-    if ( window.location.hostname == "www.openstreetmap.org" ) { 
-      mappam.register( map, '10011756636067178496', '1');
-    } else if( window.location.hostname == "openstreetmap.org" ) {
-      mappam.register( map, '6738410720121976832', '1');
-    }
-    <% end %>
-

     handleResize();
   }
 
     handleResize();
   }
 


@@ -97,6 +100,11 @@
     var centre = lonLatToMercator(new OpenLayers.LonLat(lon, lat));
 
     map.setCenter(centre, zoom);
     var centre = lonLatToMercator(new OpenLayers.LonLat(lon, lat));
 
     map.setCenter(centre, zoom);

+
+    if (marker)
+      removeMarkerFromMap(marker);
+
+    marker = addMarkerToMap(centre, getArrowIcon());

   }
 
   function updateLocation() {
   }
 
   function updateLocation() {