Resolve conflict

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

diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb
index cc3ed70c5cb916991b547be410a1257b0b499f1b..00eba741f578b5acbfa79d57045b4d1d88c3db31 100644 (file)
--- a/app/controllers/export_controller.rb
+++ b/app/controllers/export_controller.rb
@@ -3,8 +3,7 @@ class ExportController < ApplicationController
   before_filter :authorize_web
   before_filter :set_locale
 
-  def start
-  end
+  caches_page :embed
 
   #When the user clicks 'Export' we redirect to a URL which generates the export download
   def finish
@@ -20,16 +19,10 @@ class ExportController < ApplicationController
       format = params[:mapnik_format]
       scale = params[:mapnik_scale]
 
-      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]
-      zoom = params[:osmarender_zoom].to_i
-      width = bbox.slippy_width(zoom).to_i
-      height = bbox.slippy_height(zoom).to_i
-
-      redirect_to "http://tah.openstreetmap.org/MapOf/index.php?long=#{bbox.centre_lon}&lat=#{bbox.centre_lat}&z=#{zoom}&w=#{width}&h=#{height}&format=#{format}"
+      redirect_to "http://render.openstreetmap.org/cgi-bin/export?bbox=#{bbox}&scale=#{scale}&format=#{format}"
     end
   end
+
+  def embed
+  end
 end