Include the event type in the JSON output of a note

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

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

+
+  before_filter :authorize_web
+  before_filter :set_locale
+

   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,7 +20,7 @@ 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}"
+      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
 
     elsif format == "osmarender"
       #redirect to the t@h 'MapOf' service