X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/cdb9d2527a8524eea02856c27fff10ad5c138344..50ba6446022079b18326ab14a05ef322ee180100:/app/views/site/index.rhtml diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml index 6971e5faa..bbd1a8a77 100644 --- a/app/views/site/index.rhtml +++ b/app/views/site/index.rhtml @@ -1,67 +1,166 @@ +<% content_for :greeting do %> +<% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %> +<%= link_to_function 'home', "setPosition(#{@user.home_lat}, #{@user.home_lon}, 10)" %> | +<% end %> +<% end %> + +<% content_for :left_menu do %> +<%= link_to "Map key", "http://wiki.openstreetmap.org/index.php/Map_Key" %> +<% end %> + +<%= render :partial => 'search', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %> + +
+ +<% if params['mlon'] and params['mlat'] %> +<% marker = true %> +<% mlon = params['mlon'] %> +<% mlat = 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' %> +<% 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 %> +<% 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 = params['zoom'] || '5' %> +<% layers = params['layers'] %> +<% end %> +<% end %> + + +<%= javascript_include_tag 'map.js' %> -
- <%= start_form_tag :controller => 'way_tag', :action => 'search' %> - <%= text_field 'query', 'query'%> - <%= submit_tag 'Search' %> - <%= end_form_tag %> -
+