X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3ba036045bc43031475eb29ca0663d33c80e1b32..2f076d8f349837751e701d9c948414abc7ddeeaf:/app/controllers/site_controller.rb diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index 0f06b2283..f4564100c 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -4,6 +4,7 @@ class SiteController < ApplicationController before_filter :authorize_web before_filter :set_locale + 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] @@ -87,6 +88,18 @@ class SiteController < ApplicationController 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 = [] @@ -100,15 +113,7 @@ class SiteController < ApplicationController anchor << "layers=N" end - 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]) - elsif anchor.present? + if anchor.present? redirect_to params.merge(:anchor => anchor.join('&')) end end