fix distance calculation and move map to current location