X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/073ea140d8b3506d1e7fdad8e406801dcd214779..9a7e246102f3e40471d2f5e5ed1fbf4a3f50ba94:/app/views/site/index.rhtml diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml index 86dbb9e70..94b24debf 100644 --- a/app/views/site/index.rhtml +++ b/app/views/site/index.rhtml @@ -1,182 +1,188 @@ +<% 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 %> - -
- <%= start_form_tag :controller => 'geocoder', :action => 'search' %> - <%= text_field 'query', 'postcode'%> - <%= text_field 'query', 'place_name'%> - <%= submit_tag 'Search' %> - <%= end_form_tag %> - -
- Geolocation provided by npemap.org.uk, - geocoder.us, geocoder.ca - and geonames.org -
-
- eg: SW15 6JH, 95472 or H2L4C1 -
-
- eg:Essen -
+<%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %> +<%= render :partial => 'key' %> +<%= render :partial => 'search' %> + +
+ +
+ +
+ + + + + + + +
http://creativecommons.org/licenses/by-sa/2.0/http://openstreetmap.org/
+Licensed under the Creative Commons Attribution-Share Alike 2.0 license +by the OpenStreetMap project and it's contributors. +
<% 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? %> +<% 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']) %> +<% end %> + +<% 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?("location") %> +<% lon,lat,zoom,layers = cookies["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%> -<% lon = params['lon'] || '-0.1' %> -<% lat = params['lat'] || '51.5' %> -<% zoom = params['zoom'] || '4' %> +<% 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 = h(params['zoom'] || '5') %> +<% layers = h(params['layers']) %> +<% end %> <% end %> +<%= javascript_include_tag '/openlayers/OpenLayers.js' %> +<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %> +<%= javascript_include_tag 'map.js' %> - - + <% if params['scale'] and params['scale'].length > 0 then %> + zoom = scaleToZoom(<%= params['scale'].to_f() %>); + <% end %> -