Merge branch 'master' into openstreetbugs

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

diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb
index 754cc4b8216b15acd900d3646cdb399c31d6faba..225ddf86b3c587c0cadfa4b79b936ea487e43b53 100644 (file)
--- a/app/controllers/export_controller.rb
+++ b/app/controllers/export_controller.rb
@@ -1,4 +1,8 @@
 class ExportController < ApplicationController
+
+  before_filter :authorize_web
+  before_filter :set_locale
+
   def start
   end
 
@@ -10,14 +14,14 @@ class ExportController < ApplicationController
     if format == "osm"
       #redirect to API map get
       redirect_to "http://api.openstreetmap.org/api/#{API_VERSION}/map?bbox=#{bbox}"
-      
+
     elsif format == "mapnik"
       #redirect to a special 'export' cgi script
       format = params[:mapnik_format]
       scale = params[:mapnik_scale]
 
-      redirect_to "http://tile.openstreetmap.org/cgi-bin/export?bbox=#{bbox}&scale=#{scale}&format=#{format}"
-      
+      redirect_to "http://parent.tile.openstreetmap.org/cgi-bin/export?bbox=#{bbox}&scale=#{scale}&format=#{format}"
+
     elsif format == "osmarender"
       #redirect to the t@h 'MapOf' service
       format = params[:osmarender_format]