Merge remote-tracking branch 'upstream/pull/4991'

[rails.git] / app / controllers / export_controller.rb

diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb
index cc3ed70c5cb916991b547be410a1257b0b499f1b..cddc97b6883e13044601c5b4a3a24b1f84d83f74 100644 (file)
--- a/app/controllers/export_controller.rb
+++ b/app/controllers/export_controller.rb
@@ -1,35 +1,33 @@
 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
+  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]
 
-    if format == "osm"
-      #redirect to API map get
-      redirect_to "http://api.openstreetmap.org/api/#{API_VERSION}/map?bbox=#{bbox}"
+    case format
+    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
+    when "mapnik"
+      # redirect to a special 'export' cgi script
       format = params[:mapnik_format]
       scale = params[:mapnik_scale]
 
-      redirect_to "http://parent.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; end
 end