Merge remote-tracking branch 'osmlab/id-default'

diff --combined app/controllers/site_controller.rb
index 7c8ee32b3f9f382504d98768b8994404c515b050,69ce8f8b1f07ef9d018c6137103d0dcac6e020a7..94cc647543c0ff526d4a5cc4d93a6b6b014f278c
--- 1/app/controllers/site_controller.rb
--- 2/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@@ -4,11 -4,27 +4,11 @@@ class SiteController < ApplicationContr
  
    before_filter :authorize_web
    before_filter :set_locale
 -  before_filter :require_user, :only => [:edit]
 +  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
@@@ -36,7 -52,7 +36,7 @@@
    end
  
    def edit
-     editor = params[:editor] || @user.preferred_editor || DEFAULT_EDITOR
+     editor = preferred_editor
  
      if editor == "remote"
        render :action => :index
@@@ -64,9 -80,6 +64,9 @@@
      @locale = params[:copyright_locale] || I18n.locale
    end
  
 +  def welcome
 +  end
 +
    def preview
      render :text => RichText.new(params[:format], params[:text]).to_html
    end
@@@ -74,24 -87,4 +74,24 @@@
    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