Handle current_user being both an admin and a moderator for building user list

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

diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb
index fa7944516620e442064b8f8d5adb118d92042761..afdf4d8d7e38005f89c310d2f8bf9f0033d84cbb 100644 (file)
--- a/app/controllers/export_controller.rb
+++ b/app/controllers/export_controller.rb
@@ -1,6 +1,7 @@
 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]

 
   caches_page :embed
 
 
   caches_page :embed
 


@@ -11,14 +12,14 @@ class ExportController < ApplicationController
 
     if format == "osm"
       # redirect to API map get
 
     if format == "osm"
       # redirect to API map get

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

 
     elsif format == "mapnik"
       # redirect to a special 'export' cgi script
       format = params[:mapnik_format]
       scale = params[:mapnik_scale]
 
 
     elsif format == "mapnik"
       # 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}"

     end
   end
 
     end
   end