Resolve conflict

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

diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb
index f1c6286cee6d3a8e90fc639ea07bca73dd4a2d55..00eba741f578b5acbfa79d57045b4d1d88c3db31 100644 (file)
--- a/app/controllers/export_controller.rb
+++ b/app/controllers/export_controller.rb
@@ -1,8 +1,28 @@
 class ExportController < ApplicationController
 class ExportController < ApplicationController

-  def start
-    render :update do |page|
-      page.replace_html :sidebar_content, :partial => 'start'
-      page.call "openSidebar"
+
+  before_filter :authorize_web
+  before_filter :set_locale
+
+  caches_page :embed
+
+  #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"
+      #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://render.openstreetmap.org/cgi-bin/export?bbox=#{bbox}&scale=#{scale}&format=#{format}"

     end
   end
     end
   end

+
+  def embed
+  end

 end
 end