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

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

diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb
index 18ac15c101b47feeb1b518eb12a26a4b1dfe52e9..5a2b159ef6f991b96992367b3fd69e7c074de5a2 100644 (file)
--- a/app/controllers/export_controller.rb
+++ b/app/controllers/export_controller.rb
@@ -4,23 +4,36 @@ class ExportController < ApplicationController
   before_action :update_totp, :only => [:finish]
   authorize_resource :class => false
 
   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)
   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 API map get

-      redirect_to :controller => "api", :action => "map", :bbox => bbox
+      redirect_to :controller => "api/map", :action => "index", :bbox => bbox

 
 

-    elsif format == "mapnik"
+    when "mapnik"

       # redirect to a special 'export' cgi script
       # redirect to a special 'export' cgi script

-      format = params[:mapnik_format]

       scale = params[:mapnik_scale]
 
       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
 
     end
   end