Fixed current location button not working on the first time the map is loaded (backport #98)

Fixed current location button not working on the first time the map is loaded (backport #98) #654