X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a4f4714d0e1b1eeabe5e4b411800b949ef1e1139..7e6a31510401d15d20935a92c6086ad40101397d:/app/views/site/index.rhtml?ds=sidebyside
diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index bed35e36f..1b1a85d5b 100644
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -1,114 +1,173 @@
-
-
-
- <%= start_form_tag :controller => 'geocoder', :action => 'search' %>
- <%= text_field 'query', 'postcode'%>
- <%= text_field 'query', 'place_name'%>
- <%= submit_tag 'Search' %>
- <%= end_form_tag %>
-
-
-
- eg: SW15 6JH, 95472 or H2L4C1
-
-
- eg:Essen
-
-
+<%= render :partial => 'search' %>
<% 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 %>
+<% lon = '-0.1' %>
+<% lat = '51.5' %>
+<% zoom = params['zoom'] || '5' %>
+<% layers = params['layers'] %>
<% end %>
+
+<%= javascript_include_tag 'map.js' %>
+<% unless @user %>
+
+<% end %>
-
-