Merge remote-tracking branch 'upstream/pull/5398'

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

diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb
index cddc97b6883e13044601c5b4a3a24b1f84d83f74..5a2b159ef6f991b96992367b3fd69e7c074de5a2 100644 (file)
--- a/app/controllers/export_controller.rb
+++ b/app/controllers/export_controller.rb
@@ -13,19 +13,27 @@ class ExportController < ApplicationController
   # When the user clicks 'Export' we redirect to a URL which generates the export download
   def finish
     bbox = BoundingBox.from_lon_lat_params(params)
   # 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]
+    style = params[:format]
+    format = params[:mapnik_format]

 
 

-    case format
+    case style

     when "osm"
       # redirect to API map get
       redirect_to :controller => "api/map", :action => "index", :bbox => bbox
 
     when "mapnik"
       # redirect to a special 'export' cgi script
     when "osm"
       # redirect to API map get
       redirect_to :controller => "api/map", :action => "index", :bbox => bbox
 
     when "mapnik"
       # redirect to a special 'export' cgi script

-      format = params[:mapnik_format]

       scale = params[:mapnik_scale]
 
       redirect_to "https://render.openstreetmap.org/cgi-bin/export?bbox=#{bbox}&scale=#{scale}&format=#{format}", :allow_other_host => true
       scale = params[:mapnik_scale]
 
       redirect_to "https://render.openstreetmap.org/cgi-bin/export?bbox=#{bbox}&scale=#{scale}&format=#{format}", :allow_other_host => true

+    when "cyclemap", "transportmap"
+      zoom = params[:zoom]
+      lat = params[:lat]
+      lon = params[:lon]
+      width = params[:width]
+      height = params[:height]
+
+      redirect_to "https://tile.thunderforest.com/static/#{style[..-4]}/#{lon},#{lat},#{zoom}/#{width}x#{height}.#{format}?apikey=#{Settings.thunderforest_key}", :allow_other_host => true

     end
   end
 
     end
   end