Merge remote-tracking branch 'upstream/pull/2060'

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

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