X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/69158665f3dfa5dbede350cc2aa4e58342480de1..37e74fc5cbca3082a887f02ff320f5c72254df3c:/app/views/site/index.rhtml?ds=sidebyside
diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index a7dbd15e3..4d3b4e7e8 100644
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -1,101 +1,136 @@
-
-
-
-
-
-
+<%= render :partial => 'search' %>
+
+<% 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'] || '11' %>
+<% zoom = params['zoom'] || '4' %>
+<% end %>
-
+<%= javascript_include_tag 'map.js' %>
-
-
-
-
-
-
-
- <% unless @user %>
-
- We're trialing adverts to support the project. Login and they go away.
-
- <% end %>
+<% unless @user %>
+
+<% end %>
-
+