X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5449cf4adcc1fad4b9f43426e6d3e4a8f65e6fbb..48fff2bfeabb9a9bafd78c9cd4a0077e6569b631:/app/controllers/export_controller.rb?ds=inline diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb index 754cc4b82..94851de96 100644 --- a/app/controllers/export_controller.rb +++ b/app/controllers/export_controller.rb @@ -1,31 +1,33 @@ class ExportController < ApplicationController - def start - end + before_action :authorize_web + before_action :set_locale + before_action :update_totp, :only => [:finish] + authorize_resource :class => false + + caches_page :embed - #When the user clicks 'Export' we redirect to a URL which generates the export download + # When the user clicks 'Export' we redirect to a URL which generates the export download def finish - bbox = BoundingBox.new(params[:minlon], params[:minlat], params[:maxlon], params[:maxlat]) + bbox = BoundingBox.from_lon_lat_params(params) format = params[:format] - if format == "osm" - #redirect to API map get - redirect_to "http://api.openstreetmap.org/api/#{API_VERSION}/map?bbox=#{bbox}" - - elsif format == "mapnik" - #redirect to a special 'export' cgi script + case format + when "osm" + # redirect to API map get + redirect_to :controller => "api/map", :action => "index", :bbox => bbox + + when "mapnik" + # redirect to a special 'export' cgi script format = params[:mapnik_format] scale = params[:mapnik_scale] - redirect_to "http://tile.openstreetmap.org/cgi-bin/export?bbox=#{bbox}&scale=#{scale}&format=#{format}" - - elsif format == "osmarender" - #redirect to the t@h 'MapOf' service - format = params[:osmarender_format] - zoom = params[:osmarender_zoom].to_i - width = bbox.slippy_width(zoom).to_i - height = bbox.slippy_height(zoom).to_i - - redirect_to "http://tah.openstreetmap.org/MapOf/index.php?long=#{bbox.centre_lon}&lat=#{bbox.centre_lat}&z=#{zoom}&w=#{width}&h=#{height}&format=#{format}" + redirect_to "https://render.openstreetmap.org/cgi-bin/export?bbox=#{bbox}&scale=#{scale}&format=#{format}", :allow_other_host => true end end + + def embed + append_content_security_policy_directives( + :frame_ancestors => %w[*] + ) + end end