Remove references to libpgosm during travis runs

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

diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb
index 6e5016ddce4ec7eb6b0fcfaab09fb9634ffe8045..fc5b0ec80e37eeea2407028dfe517e068554ded3 100644 (file)
--- a/app/controllers/export_controller.rb
+++ b/app/controllers/export_controller.rb
@@ -2,6 +2,7 @@ class ExportController < ApplicationController
   before_action :authorize_web
   before_action :set_locale
   before_action :update_totp, :only => [:finish]
   before_action :authorize_web
   before_action :set_locale
   before_action :update_totp, :only => [:finish]

+  authorize_resource :class => false

 
   caches_page :embed
 
 
   caches_page :embed
 


@@ -12,14 +13,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/map", :action => "index", :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