Use Faraday in place of Net::HTTP so we can mock responses

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

diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb
index 074a92ce82635a50e1bbc5ac5eb8ed960de7d347..bd020f29b6ea11a1b960ec5f8e71d0885a48fd4c 100644 (file)
--- a/app/controllers/export_controller.rb
+++ b/app/controllers/export_controller.rb
@@ -1,28 +1,24 @@
 class ExportController < ApplicationController
 class ExportController < ApplicationController

-
-  before_filter :authorize_web
-  before_filter :set_locale
+  before_action :authorize_web
+  before_action :set_locale

 
   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]
 
     if format == "osm"
   def finish
     bbox = BoundingBox.from_lon_lat_params(params)
     format = params[:format]
 
     if format == "osm"

-      #redirect to API map get
+      # redirect to API map get

       redirect_to "http://api.openstreetmap.org/api/#{API_VERSION}/map?bbox=#{bbox}"
 
     elsif format == "mapnik"
       redirect_to "http://api.openstreetmap.org/api/#{API_VERSION}/map?bbox=#{bbox}"
 
     elsif format == "mapnik"

-      #redirect to a special 'export' cgi script
+      # 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://parent.tile.openstreetmap.org/cgi-bin/export?bbox=#{bbox}&scale=#{scale}&format=#{format}"
+      redirect_to "http://render.openstreetmap.org/cgi-bin/export?bbox=#{bbox}&scale=#{scale}&format=#{format}"

     end
   end
 
     end
   end