reorganizing to rely primarily on lat/lon over placename