Improved lonlat logic for bettermap