Merge pull request #5158 from tomhughes/vagrant-debian

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

diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb
index 754cc4b8216b15acd900d3646cdb399c31d6faba..5a2b159ef6f991b96992367b3fd69e7c074de5a2 100644 (file)
--- a/app/controllers/export_controller.rb
+++ b/app/controllers/export_controller.rb
@@ -1,31 +1,41 @@
 class ExportController < ApplicationController
 class ExportController < ApplicationController

-  def start
+  before_action :authorize_web
+  before_action :set_locale
+  before_action :update_totp, :only => [:finish]
+  authorize_resource :class => false
+
+  content_security_policy(:only => :embed) do |policy|
+    policy.frame_ancestors("*")

   end
 
   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
   def finish

-    bbox = BoundingBox.new(params[:minlon], params[:minlat], params[:maxlon], params[:maxlat])
-    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
-      format = params[:mapnik_format]
+    bbox = BoundingBox.from_lon_lat_params(params)
+    style = params[:format]
+    format = params[:mapnik_format]
+
+    case style
+    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

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

+
+  def embed; end

 end
 end