add re-fetch location, add map to viewDivesite