X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0e96027a209d59ff5e7f5c2b1405febc59664a16..4d91fe3dd95c1058cb8d24fd4c900223e30b9059:/app/controllers/export_controller.rb diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb index b75fb1bca..2102a5704 100644 --- a/app/controllers/export_controller.rb +++ b/app/controllers/export_controller.rb @@ -8,7 +8,7 @@ class ExportController < ApplicationController #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" @@ -20,16 +20,7 @@ class ExportController < ApplicationController 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