X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/99c48285df6fc306504b4cf9c12547bd5af6bee7..64cb9b0a8b06c4d2cd9a2f7832ed990f8238dd7c:/app/controllers/site_controller.rb diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index 3b0a19cf9..cb57ddc3a 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -1,30 +1,15 @@ class SiteController < ApplicationController - layout 'site', :except => [:key, :permalink] - layout false, :only => [:key, :permalink] + layout 'site' + layout 'map', :only => [:index, :export] before_filter :authorize_web before_filter :set_locale - before_filter :require_user, :only => [:edit] + before_filter :redirect_browse_params, :only => :index + before_filter :redirect_map_params, :only => [:index, :edit, :export] + before_filter :require_user, :only => [:edit, :welcome] before_filter :require_oauth, :only => [:index] def index - anchor = [] - - if params[:lat] && params[:lon] - anchor << "map=#{params.delete(:zoom) || 5}/#{params.delete(:lat)}/#{params.delete(:lon)}" - end - - if params[:layers] - anchor << "layers=#{params.delete(:layers)}" - elsif params.delete(:notes) == 'yes' - anchor << "layers=N" - end - - if anchor.present? - redirect_to params.merge(:anchor => anchor.join('&')) - return - end - unless STATUS == :database_readonly or STATUS == :database_offline session[:location] ||= OSM::IPLocation(request.env['REMOTE_ADDR']) end @@ -49,16 +34,19 @@ class SiteController < ApplicationController def key expires_in 7.days, :public => true + render :layout => false end def edit - editor = params[:editor] || @user.preferred_editor || DEFAULT_EDITOR + editor = preferred_editor if editor == "remote" render :action => :index return end + @extra_body_class = "site-edit-#{editor}" + if params[:node] bbox = Node.find(params[:node]).bbox.to_unscaled @lat = bbox.centre_lat @@ -67,6 +55,10 @@ class SiteController < ApplicationController bbox = Way.find(params[:way]).bbox.to_unscaled @lat = bbox.centre_lat @lon = bbox.centre_lon + elsif params[:note] + note = Note.find(params[:note]) + @lat = note.lat + @lon = note.lon elsif params[:gpx] trace = Trace.visible_to(@user).find(params[:gpx]) @lat = trace.latitude @@ -78,6 +70,15 @@ class SiteController < ApplicationController @locale = params[:copyright_locale] || I18n.locale end + def welcome + end + + def help + end + + def about + end + def preview render :text => RichText.new(params[:format], params[:text]).to_html end @@ -85,4 +86,36 @@ class SiteController < ApplicationController def id render "id", :layout => false end + + private + + def redirect_browse_params + if params[:node] + redirect_to node_path(params[:node]) + elsif params[:way] + redirect_to way_path(params[:way]) + elsif params[:relation] + redirect_to relation_path(params[:relation]) + elsif params[:note] + redirect_to browse_note_path(params[:note]) + end + end + + def redirect_map_params + anchor = [] + + if params[:lat] && params[:lon] + anchor << "map=#{params.delete(:zoom) || 5}/#{params.delete(:lat)}/#{params.delete(:lon)}" + end + + if params[:layers] + anchor << "layers=#{params.delete(:layers)}" + elsif params.delete(:notes) == 'yes' + anchor << "layers=N" + end + + if anchor.present? + redirect_to params.merge(:anchor => anchor.join('&')) + end + end end