X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bbf30e76e4bfcd70e62fc84ecd32c5e494506e9e..c5152d1860a2c5164355eeeb78f4a092ceb55cc8:/app/views/site/index.html.erb?ds=sidebyside diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb index 636e6929c..0c7b53203 100644 --- a/app/views/site/index.html.erb +++ b/app/views/site/index.html.erb @@ -1,7 +1,7 @@ -<% content_for :greeting do %> <% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %> - <%= link_to_function t('layouts.home'), "setPosition(#{@user.home_lat}, #{@user.home_lon}, 10)", { :title => t('layouts.home_tooltip') } %> | -<% end %> + <% content_for :greeting do %> + <%= link_to_function t('layouts.home'), "setPosition(#{@user.home_lat}, #{@user.home_lon}, 15)", { :title => t('layouts.home_tooltip') } %> | + <% end %> <% end %> <%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %> @@ -12,25 +12,27 @@
<%= t 'site.index.js_1' %>
<%= t 'site.index.js_2' %>
-<%= t 'site.index.js_3' %>
<%= t'site.index.license.license_url' %> | -<%= t'site.index.license.project_url' %> | +<%= t'site.index.license.license_url' %> | +<%= t'site.index.license.project_url' %> |
<%= + | <%= t'site.index.license.notice', :license_name => t('site.index.license.license_name'), :project_name => t('site.index.license.project_name') @@ -40,59 +42,66 @@ <% -if params['mlon'] and params['mlat'] +if params[:mlon] and params[:mlat] marker = true - mlon = h(params['mlon']) - mlat = h(params['mlat']) + mlon = params[:mlon].to_f + mlat = params[:mlat].to_f end -if params['node'] or params['way'] or params['relation'] +if params[:node] or params[:way] or params[:relation] object = true object_zoom = true - if params['node'] + if params[:node] object_type = 'node' - object_id = h(params['node']) - elsif params['way'] + object_id = params[:node].to_i + elsif params[:way] object_type = 'way' - object_id = h(params['way']) - elsif params['relation'] + object_id = params[:way].to_i + elsif params[:relation] object_type = 'relation' - object_id = h(params['relation']) + object_id = params[:relation].to_i end end -if params['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat'] +# Decide on a lat lon to initialise the map with. Various ways of doing this +if params[:bbox] bbox = true - minlon = h(params['minlon']) - minlat = h(params['minlat']) - maxlon = h(params['maxlon']) - maxlat = h(params['maxlat']) - box = true if params['box']=="yes" + minlon, minlat, maxlon, maxlat = params[:bbox].split(",").collect { |c| c.to_f } + layers = params[:layers] + box = true if params[:box] == "yes" object_zoom = false -end - -# Decide on a lat lon to initialise the map with. Various ways of doing this -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[:minlon] and params[:minlat] and params[:maxlon] and params[:maxlat] + bbox = true + minlon = params[:minlon].to_f + minlat = params[:minlat].to_f + maxlon = params[:maxlon].to_f + maxlat = params[:maxlat].to_f + layers = params[:layers] + box = true if params[:box]=="yes" + object_zoom = false +elsif params[:lon] and params[:lat] + lon = params[:lon].to_f + lat = params[:lat].to_f + zoom = params.fetch(:zoom, 5).to_i + layers = params[:layers] object_zoom = false -elsif params['mlon'] and params['mlat'] - lon = h(params['mlon']) - lat = h(params['mlat']) - zoom = h(params['zoom'] || '12') - layers = h(params['layers']) +elsif params[:mlon] and params[:mlat] + lon = params[:mlon].to_f + lat = params[:mlat].to_f + zoom = params.fetch(:zoom, 12).to_i + layers = params[:layers] object_zoom = false elsif cookies.key?("_osm_location") lon,lat,zoom,layers = cookies["_osm_location"].split("|") -elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil? +elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil? lon = @user.home_lon lat = @user.home_lat - zoom = '10' + zoom = 10 else - session[:location] = OSM::IPLocation(request.env['REMOTE_ADDR']) unless session[:location] + unless STATUS == :database_readonly or STATUS == :database_offline + session[:location] = OSM::IPLocation(request.env['REMOTE_ADDR']) unless session[:location] + end if session[:location] bbox = true @@ -101,22 +110,21 @@ else maxlon = session[:location][:maxlon] maxlat = session[:location][:maxlat] else - lon = '-0.1' - lat = '51.5' - zoom = h(params['zoom'] || '5') + lon = -0.1 + lat = 51.5 + zoom = params.fetch(:zoom, 5).to_i end - layers = h(params['layers']) + layers = params[:layers] end %> -<%= javascript_include_tag '/openlayers/OpenLayers.js' %> -<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %> +<%= javascript_include_tag 'openlayers.js' %> <%= javascript_include_tag 'map.js' %> - |