added geometry field within counties, and added countyid to districts