switch mapping to use fuller geoID