X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/fbc431f4646ae7086956e0b05074a603e7861176..a894e75a1d898804ea6bc41c73384135ed83e87e:/app/views/site/index.rhtml
diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index d6a0fe8a3..08cbfaeda 100644
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -1,176 +1,156 @@
+<% 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();" } %>
-
- <%= start_form_tag :controller => 'geocoder', :action => 'search' %>
- <%= text_field 'query', 'postcode' %>
- <%= text_field 'query', 'place_name'%>
- <%= submit_tag 'Search' %>
- <%= end_form_tag %>
-
-
-
- Enter a postcode or zip code, eg: SW15 6JH, 95472
-
-
- Enter a place-name, eg:Essen
-
-
+
<% if params['mlon'] and params['mlat'] %>
<% marker = true %>
<% mlon = params['mlon'] %>
<% mlat = params['mlat'] %>
-<% lon = params['mlon'] %>
-<% lat = params['mlat'] %>
+<% end %>
+
+<% if params['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat'] %>
+<% bbox = true %>
+<% minlon = params['minlon'] %>
+<% minlat = params['minlat'] %>
+<% maxlon = params['maxlon'] %>
+<% maxlat = params['maxlat'] %>
+<% end %>
+
+<% if params['lon'] and params['lat'] %>
+<% lon = params['lon'] %>
+<% lat = params['lat'] %>
+<% zoom = params['zoom'] || '5' %>
+<% layers = params['layers'] %>
+<% elsif params['mlon'] and params['mlat'] %>
+<% lon = params['mlon'] %>
+<% lat = params['mlat'] %>
<% zoom = params['zoom'] || '12' %>
-
-<% elsif @user and params['lon'].nil? and params['lat'].nil? %>
+<% layers = params['layers'] %>
+<% elsif cookies.key?("location") %>
+<% lon,lat,zoom,layers = cookies["location"].value.first.split(",") %>
+<% elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>
<% lon = @user.home_lon %>
<% lat = @user.home_lat %>
<% zoom = '10' %>
-<%else%>
-<% lon = params['lon'] || '-0.1' %>
-<% lat = params['lat'] || '51.5' %>
-<% zoom = params['zoom'] || '4' %>
+<% 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 %>
+
+<%= javascript_include_tag 'map.js' %>
-
-
-