Refactor geospatial.