X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d59d6009e9585d49547959ef81ffe1b601472218..c03c8f4749c176df8107ef8e66b9a55db9875089:/app/views/site/index.rhtml
diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 1fe1dccd7..f816dddd2 100644
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -1,181 +1,225 @@
+<% content_for :greeting do %>
+<% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>
+<%= link_to_function t('site.index.home'), "setPosition(#{@user.home_lat}, #{@user.home_lon}, 10)" %> |
+<% end %>
+<% end %>
+<%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>
+<%= render :partial => 'key' %>
+<%= render :partial => 'search' %>
-
- <%= 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'] %>
-<% zoom = params['zoom'] || '12' %>
-
-<% elsif @user and params['lon'].nil? and params['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' %>
-<% end %>
+<%
+if params['mlon'] and params['mlat']
+ marker = true
+ mlon = h(params['mlon'])
+ mlat = h(params['mlat'])
+end
+
+if params['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat']
+ bbox = true
+ minlon = h(params['minlon'])
+ minlat = h(params['minlat'])
+ maxlon = h(params['maxlon'])
+ maxlat = h(params['maxlat'])
+ box = true if params['box']=="yes"
+end
+
+# Decide on a lat lon to initialise the map with. Various ways of doing this
+if params['lon'] and params['lat']
+ lon = h(params['lon'])
+ lat = h(params['lat'])
+ 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')
+ layers = h(params['layers'])
+
+elsif cookies.key?("_osm_location")
+ lon,lat,zoom,layers = cookies["_osm_location"].split("|")
+
+elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil?
+ lon = @user.home_lon
+ 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 = h(params['zoom'] || '5')
+ end
+ layers = h(params['layers'])
+end
+%>
+
+<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
+<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
+<%= javascript_include_tag 'map.js' %>
+
+
+
-
+ setMapCenter(centre, zoom);
+ <% end %>
-