Add Bootstrap styling to changeset node/way/relation page links

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

diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb
index b37810ca90df2f616ce58a418021ad96a1f90a90..94851de96485741758d681a1247be029c402dc17 100644 (file)
--- a/app/controllers/export_controller.rb
+++ b/app/controllers/export_controller.rb
@@ -1,31 +1,33 @@
 class ExportController < ApplicationController
 class ExportController < ApplicationController

-
-  before_filter :authorize_web
-  before_filter :set_locale
+  before_action :authorize_web
+  before_action :set_locale
+  before_action :update_totp, :only => [:finish]
+  authorize_resource :class => false

 
   caches_page :embed
 
 
   caches_page :embed
 

-  def start
-  end
-
-  #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.from_lon_lat_params(params)
     format = params[:format]
 
   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]
 
       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
 
   def embed
     end
   end
 
   def embed

+    append_content_security_policy_directives(
+      :frame_ancestors => %w[*]
+    )

   end
 end
   end
 end