Make more use of SCSS nesting

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

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

+
+  before_filter :authorize_web
+  before_filter :set_locale
+
+  caches_page :embed
+

   def start
   end
 
   #When the user clicks 'Export' we redirect to a URL which generates the export download
   def finish
   def start
   end
 
   #When the user clicks 'Export' we redirect to a URL which generates the export download
   def finish

-    bbox = BoundingBox.new(params[:minlon], params[:minlat], params[:maxlon], params[:maxlat])
+    bbox = BoundingBox.from_lon_lat_params(params)

     format = params[:format]
 
     if format == "osm"
     format = params[:format]
 
     if format == "osm"


@@ -16,16 +22,10 @@ class ExportController < ApplicationController
       format = params[:mapnik_format]
       scale = params[:mapnik_scale]
 
       format = params[:mapnik_format]
       scale = params[:mapnik_scale]
 

-      redirect_to "http://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://parent.tile.openstreetmap.org/cgi-bin/export?bbox=#{bbox}&scale=#{scale}&format=#{format}"

     end
   end
     end
   end

+
+  def embed
+  end

 end
 end