refactor geolocator and geolocatorview