X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/4358a6adcb2c9d55f2c2fcf53c958ed388cbc31c..10e13b8feacca7bdd04f335a5b7badc3e6ae8dba:/app/views/site/index.rhtml
diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 4b187c099..aa808085f 100644
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -4,17 +4,26 @@
<% marker = true %>
<% mlon = params['mlon'] %>
<% mlat = params['mlat'] %>
-<% lon = params['mlon'] %>
-<% lat = params['mlat'] %>
+<% end %>
+
+<% if params['lon'] and params['lat'] %>
+<% lon = params['lon'] %>
+<% lat = params['lat'] %>
+<% zoom = params['zoom'] || '5' %>
+<% 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? %>
+<% elsif cookies.key?("location") %>
+<% lon,lat,zoom = 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 %>
+<% lon = '-0.1' %>
+<% lat = '51.5' %>
+<% zoom = params['zoom'] || '5' %>
<% end %>
@@ -27,7 +36,7 @@