class SiteController < ApplicationController
- layout 'site', :except => [:key, :permalink]
- layout false, :only => [:key, :permalink]
+ layout "site"
+ layout :map_layout, :only => [:index, :export]
- 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]
+ before_action :authorize_web
+ before_action :set_locale
+ before_action :redirect_browse_params, :only => :index
+ before_action :redirect_map_params, :only => [:index, :edit, :export]
+ before_action :require_user, :only => [:welcome]
+ before_action :require_oauth, :only => [:index]
def index
- unless STATUS == :database_readonly or STATUS == :database_offline
- session[:location] ||= OSM::IPLocation(request.env['REMOTE_ADDR'])
+ unless STATUS == :database_readonly || STATUS == :database_offline
+ session[:location] ||= OSM.ip_location(request.env["REMOTE_ADDR"])
end
end
def permalink
- lon, lat, zoom = ShortLink::decode(params[:code])
- new_params = params.except(:code, :lon, :lat, :zoom)
+ 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
- new_params[:controller] = 'site'
- new_params[:action] = 'index'
+ if params.key? :node
+ new_params[:controller] = "browse"
+ new_params[:action] = "node"
+ new_params[:id] = params[:node]
+ elsif params.key? :way
+ new_params[:controller] = "browse"
+ new_params[:action] = "way"
+ new_params[:id] = params[:way]
+ elsif params.key? :relation
+ new_params[:controller] = "browse"
+ new_params[:action] = "relation"
+ new_params[:id] = params[:relation]
+ elsif params.key? :changeset
+ new_params[:controller] = "browse"
+ new_params[:action] = "changeset"
+ new_params[:id] = params[:changeset]
+ else
+ new_params[:controller] = "site"
+ new_params[:action] = "index"
+ end
+
new_params[:anchor] = "map=#{zoom}/#{lat}/#{lon}"
+ new_params[:anchor] += "&layers=#{params[:layers]}" if params.key? :layers
- redirect_to new_params
+ redirect_to Hash[new_params]
end
def key
expires_in 7.days, :public => true
+ render :layout => false
end
def edit
if editor == "remote"
require_oauth
- render :action => :index
+ render :action => :index, :layout => map_layout
return
+ else
+ require_user
end
- @extra_body_class = "site-edit-#{editor}"
-
if params[:node]
bbox = Node.find(params[:node]).bbox.to_unscaled
@lat = bbox.centre_lat
@lon = bbox.centre_lon
+ @zoom = 18
elsif params[:way]
bbox = Way.find(params[:way]).bbox.to_unscaled
@lat = bbox.centre_lat
@lon = bbox.centre_lon
+ @zoom = 17
elsif params[:note]
note = Note.find(params[:note])
@lat = note.lat
@lon = note.lon
+ @zoom = 17
elsif params[:gpx]
trace = Trace.visible_to(@user).find(params[:gpx])
@lat = trace.latitude
@lon = trace.longitude
+ @zoom = 16
end
end
@locale = params[:copyright_locale] || I18n.locale
end
- def welcome
- end
+ def welcome; end
+
+ def help; end
+
+ def about; end
+
+ def export; end
+
+ def offline; end
def preview
render :text => RichText.new(params[:format], params[:text]).to_html
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])
+ elsif params[:query]
+ redirect_to search_path(:query => params[:query])
+ end
+ end
+
def redirect_map_params
anchor = []
if params[:layers]
anchor << "layers=#{params.delete(:layers)}"
- elsif params.delete(:notes) == 'yes'
+ elsif params.delete(:notes) == "yes"
anchor << "layers=N"
end
if anchor.present?
- redirect_to params.merge(:anchor => anchor.join('&'))
+ redirect_to Hash[params].merge(:anchor => anchor.join("&"))
end
end
end