X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cc4f133e64a1f0d963f60fb40045145a530d5dbb..6b55cce25c2ed58c6513ae7f3f5dd24518cb489e:/app/controllers/export_controller.rb?ds=sidebyside diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb index 736efec19..5a2b159ef 100644 --- a/app/controllers/export_controller.rb +++ b/app/controllers/export_controller.rb @@ -1,27 +1,41 @@ class ExportController < ApplicationController + before_action :authorize_web + before_action :set_locale + before_action :update_totp, :only => [:finish] + authorize_resource :class => false - before_filter :authorize_web - before_filter :set_locale - - def start - render :partial => "sidebar" + content_security_policy(:only => :embed) do |policy| + policy.frame_ancestors("*") end - #When the user clicks 'Export' we redirect to a URL which generates the export download + 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" - #redirect to API map get - redirect_to "http://api.openstreetmap.org/api/#{API_VERSION}/map?bbox=#{bbox}" + case style + when "osm" + # redirect to API map get + redirect_to :controller => "api/map", :action => "index", :bbox => bbox - elsif format == "mapnik" - #redirect to a special 'export' cgi script - format = params[:mapnik_format] + when "mapnik" + # redirect to a special 'export' cgi script scale = params[:mapnik_scale] - redirect_to "http://parent.tile.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; end end