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]
+ before_action :require_user, :only => [:id]
before_action :update_totp, :only => [:index]
+ authorize_resource :class => false
+
+ content_security_policy(:only => :edit) do |policy|
+ policy.frame_src(*policy.frame_src, :blob)
+ end
+
+ content_security_policy(:only => :id) do |policy|
+ policy.connect_src("*")
+ policy.img_src("*", :blob)
+ policy.script_src(*policy.script_src, "dev.virtualearth.net", :unsafe_eval)
+ policy.style_src(*policy.style_src, :unsafe_inline)
+ end
+
def index
- unless STATUS == :database_readonly || STATUS == :database_offline
- session[:location] ||= OSM.ip_location(request.env["REMOTE_ADDR"])
- end
+ session[:location] ||= OSM.ip_location(request.env["REMOTE_ADDR"]) unless Settings.status == "database_readonly" || Settings.status == "database_offline"
end
def permalink
lon, lat, zoom = ShortLink.decode(params[:code])
- new_params = params.except(:code, :lon, :lat, :zoom, :layers, :node, :way, :relation, :changeset)
+ new_params = params.except(:host, :controller, :action, :code, :lon, :lat, :zoom, :layers, :node, :way, :relation, :changeset)
if new_params.key? :m
new_params.delete :m
new_params[:mlon] = lon
end
- 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 Hash[new_params]
+ options = new_params.to_unsafe_h.to_options
+
+ path = if params.key? :node
+ node_path(params[:node], options)
+ elsif params.key? :way
+ way_path(params[:way], options)
+ elsif params.key? :relation
+ relation_path(params[:relation], options)
+ elsif params.key? :changeset
+ changeset_path(params[:changeset], options)
+ else
+ root_url(options)
+ end
+
+ redirect_to path
end
def key
expires_in 7.days, :public => true
+ @key = YAML.load_file(Rails.root.join("config/key.yml"))
+ @key.each_value do |layer_data|
+ layer_data.each do |entry|
+ entry["name"] = Array(entry["name"])
+ end
+ layer_data.each_cons(2) do |entry, next_entry|
+ entry["max_zoom"] = next_entry["min_zoom"] - 1 if entry["name"] == next_entry["name"] && !entry["max_zoom"] && next_entry["min_zoom"]
+ end
+ end
render :layout => false
end
require_user
end
- if %w[potlatch potlatch2].include?(editor)
- append_content_security_policy_directives(
- :object_src => %w[*],
- :plugin_types => %w[application/x-shockwave-flash],
- :script_src => %w['unsafe-inline']
- )
- end
-
- 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] && @user
- trace = Trace.visible_to(@user).find(params[:gpx])
- @lat = trace.latitude
- @lon = trace.longitude
- @zoom = 16
+ begin
+ if params[:node]
+ bbox = Node.visible.find(params[:node]).bbox.to_unscaled
+ @lat = bbox.centre_lat
+ @lon = bbox.centre_lon
+ @zoom = 18
+ elsif params[:way]
+ bbox = Way.visible.find(params[:way]).bbox.to_unscaled
+ @lat = bbox.centre_lat
+ @lon = bbox.centre_lon
+ @zoom = 17
+ elsif params[:note]
+ note = Note.visible.find(params[:note])
+ @lat = note.lat
+ @lon = note.lon
+ @zoom = 17
+ elsif params[:gpx] && current_user
+ trace = Trace.visible_to(current_user).find(params[:gpx])
+ @lat = trace.latitude
+ @lon = trace.longitude
+ @zoom = 16
+ end
+ rescue ActiveRecord::RecordNotFound
+ # don't try and derive a location from a missing/deleted object
end
end
def help; end
- def about; end
+ def about
+ @locale = params[:about_locale] || I18n.locale
+ end
+
+ def communities
+ @local_chapters = Community.where(:type => "osm-lc").where.not(:id => "OSMF")
+ end
def export; end
- def offline; end
+ def offline
+ flash.now[:warning] = if Settings.status == "database_offline"
+ t("layouts.osm_offline")
+ else
+ t("layouts.osm_read_only")
+ end
+ render :html => nil, :layout => true
+ end
def preview
- render :html => RichText.new(params[:format], params[:text]).to_html
+ render :html => RichText.new(params[:type], params[:text]).to_html
end
def id
- append_content_security_policy_directives(
- :connect_src => %w[taginfo.openstreetmap.org *.mapillary.com],
- :img_src => %w[*],
- :script_src => %w[dev.virtualearth.net]
- )
-
- render "id", :layout => false
+ render :layout => false
end
private
elsif params[:relation]
redirect_to relation_path(params[:relation])
elsif params[:note]
- redirect_to browse_note_path(params[:note])
+ redirect_to note_path(params[:note])
elsif params[:query]
redirect_to search_path(:query => params[:query])
end
def redirect_map_params
anchor = []
- if params[:lat] && params[:lon]
- anchor << "map=#{params.delete(:zoom) || 5}/#{params.delete(:lat)}/#{params.delete(:lon)}"
- end
+ anchor << "map=#{params.delete(:zoom) || 5}/#{params.delete(:lat)}/#{params.delete(:lon)}" if params[:lat] && params[:lon]
if params[:layers]
anchor << "layers=#{params.delete(:layers)}"
anchor << "layers=N"
end
- if anchor.present?
- redirect_to Hash[params].merge(:anchor => anchor.join("&"))
- end
+ redirect_to params.to_unsafe_h.merge(:only_path => true, :anchor => anchor.join("&")) if anchor.present?
end
end
projects / rails.git / blobdiff