Localisation updates from https://translatewiki.net.

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

diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb
index bd020f29b6ea11a1b960ec5f8e71d0885a48fd4c..cddc97b6883e13044601c5b4a3a24b1f84d83f74 100644 (file)
--- a/app/controllers/export_controller.rb
+++ b/app/controllers/export_controller.rb
@@ -1,6 +1,12 @@
 class ExportController < ApplicationController
   before_action :authorize_web
   before_action :set_locale
 class ExportController < ApplicationController
   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

 
   caches_page :embed
 
 
   caches_page :embed
 


@@ -9,19 +15,19 @@ class ExportController < ApplicationController
     bbox = BoundingBox.from_lon_lat_params(params)
     format = params[:format]
 
     bbox = BoundingBox.from_lon_lat_params(params)
     format = params[:format]
 

-    if format == "osm"
+    case format
+    when "osm"

       # redirect to API map get
       # redirect to API map get

-      redirect_to "http://api.openstreetmap.org/api/#{API_VERSION}/map?bbox=#{bbox}"
+      redirect_to :controller => "api/map", :action => "index", :bbox => bbox

 
 

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

       # redirect to a special 'export' cgi script
       format = params[:mapnik_format]
       scale = params[:mapnik_scale]
 
       # redirect to a special 'export' cgi script
       format = params[:mapnik_format]
       scale = params[:mapnik_scale]
 

-      redirect_to "http://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

     end
   end
 
     end
   end
 

-  def embed
-  end
+  def embed; end

 end
 end