extended geolocation and map logic