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_user, :only => [:welcome]
before_filter :require_oauth, :only => [:index]
def index
- unless STATUS == :database_readonly or STATUS == :database_offline
+ unless STATUS == :database_readonly || STATUS == :database_offline
session[:location] ||= OSM::IPLocation(request.env['REMOTE_ADDR'])
end
end
def permalink
- lon, lat, zoom = ShortLink::decode(params[:code])
- new_params = params.except(:code, :lon, :lat, :zoom, :node, :way, :relation, :changeset)
+ lon, lat, zoom = ShortLink.decode(params[:code])
+ new_params = params.except(:code, :lon, :lat, :zoom, :layers, :node, :way, :relation, :changeset)
- if new_params.has_key? :m
+ if new_params.key? :m
new_params.delete :m
new_params[:mlat] = lat
new_params[:mlon] = lon
end
- if params.has_key? :node
+ if params.key? :node
new_params[:controller] = 'browse'
new_params[:action] = 'node'
new_params[:id] = params[:node]
- elsif params.has_key? :way
+ elsif params.key? :way
new_params[:controller] = 'browse'
new_params[:action] = 'way'
new_params[:id] = params[:way]
- elsif params.has_key? :relation
+ elsif params.key? :relation
new_params[:controller] = 'browse'
new_params[:action] = 'relation'
new_params[:id] = params[:relation]
- elsif params.has_key? :changeset
+ elsif params.key? :changeset
new_params[:controller] = 'browse'
new_params[:action] = 'changeset'
new_params[:id] = params[:changeset]
new_params[:anchor] = "map=#{zoom}/#{lat}/#{lon}"
- redirect_to new_params
+ if params.key? :layers
+ new_params[:anchor] += "&layers=#{params[:layers]}"
+ end
+
+ redirect_to Hash[new_params]
end
def key
require_oauth
render :action => :index, :layout => map_layout
return
+ else
+ require_user
end
if params[:node]
end
if anchor.present?
- redirect_to params.merge(:anchor => anchor.join('&'))
+ redirect_to Hash[params].merge(:anchor => anchor.join('&'))
end
end
end