Improved map generation and Salzburg map