Remove reference to standard layer in "no key" message

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

diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb
index b75fb1bca44d45ec9c00bb272f9ebd4590b49a8f..bd020f29b6ea11a1b960ec5f8e71d0885a48fd4c 100644 (file)
--- a/app/controllers/export_controller.rb
+++ b/app/controllers/export_controller.rb
@@ -1,35 +1,27 @@
 class ExportController < ApplicationController
 class ExportController < ApplicationController

+  before_action :authorize_web
+  before_action :set_locale

 
 

-  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
+  # When the user clicks 'Export' we redirect to a URL which generates the export download

   def finish
   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"

-      #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://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
     end
   end

+
+  def embed
+  end

 end
 end