map2lonlat() fixed on Mercator (issue 476)
fix merge conflict