X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4f826acfca0ede6b7d4868e8bb45a608c44582ce..91bc3c92441bb2f85510b40741b30ee89dcf97f1:/app/views/site/index.rhtml
diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 670f10a20..de1de19f4 100644
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -1,65 +1,225 @@
-
-
+<% content_for :greeting do %>
+<% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>
+ <%= link_to_function t('layouts.home'), "setPosition(#{@user.home_lat}, #{@user.home_lon}, 10)", { :title => t('layouts.home_tooltip') } %> |
+<% end %>
+<% end %>
+
+<%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>
+<%= render :partial => 'key' %>
+<%= render :partial => 'search' %>
+
+
+
+
+
+
+<%
+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
-<% lon = params['lon'] || '-0.1' %>
-<% lat = params['lat'] || '51.5' %>
-<% zoom = params['zoom'] || '4' %>
+# 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]
-
-
-