Merge branch 'master' into openstreetbugs

This commit is contained in:
Tom Hughes 2011-09-18 14:26:59 +01:00
commit 3a654c8919
79 changed files with 1698 additions and 1101 deletions

View file

@ -20,7 +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}"
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