Redirect /edit and /export with old-style edit params

This commit is contained in:
John Firebaugh 2013-08-08 16:31:01 -07:00
parent bda941f49d
commit 3ca642271a
2 changed files with 32 additions and 17 deletions

View file

@ -4,27 +4,11 @@ class SiteController < ApplicationController
before_filter :authorize_web
before_filter :set_locale
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
@ -90,4 +74,24 @@ class SiteController < ApplicationController
def id
render "id", :layout => false
end
private
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