X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ff7ddb6b86bf918a9418af7382836b41594d45e4..325deabc916acab952089a4b093fa6bafa66083c:/app/controllers/export_controller.rb?ds=inline diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb index 50aa2a3c9..5a2b159ef 100644 --- a/app/controllers/export_controller.rb +++ b/app/controllers/export_controller.rb @@ -4,29 +4,38 @@ class ExportController < ApplicationController before_action :update_totp, :only => [:finish] authorize_resource :class => false + content_security_policy(:only => :embed) do |policy| + policy.frame_ancestors("*") + end + caches_page :embed # When the user clicks 'Export' we redirect to a URL which generates the export download def finish bbox = BoundingBox.from_lon_lat_params(params) - format = params[:format] + style = params[:format] + format = params[:mapnik_format] - if format == "osm" + case style + when "osm" # redirect to API map get redirect_to :controller => "api/map", :action => "index", :bbox => bbox - elsif format == "mapnik" + when "mapnik" # redirect to a special 'export' cgi script - format = params[:mapnik_format] scale = params[:mapnik_scale] - redirect_to "https://render.openstreetmap.org/cgi-bin/export?bbox=#{bbox}&scale=#{scale}&format=#{format}" + redirect_to "https://render.openstreetmap.org/cgi-bin/export?bbox=#{bbox}&scale=#{scale}&format=#{format}", :allow_other_host => true + when "cyclemap", "transportmap" + zoom = params[:zoom] + lat = params[:lat] + lon = params[:lon] + width = params[:width] + height = params[:height] + + redirect_to "https://tile.thunderforest.com/static/#{style[..-4]}/#{lon},#{lat},#{zoom}/#{width}x#{height}.#{format}?apikey=#{Settings.thunderforest_key}", :allow_other_host => true end end - def embed - append_content_security_policy_directives( - :frame_ancestors => %w[*] - ) - end + def embed; end end