added type and code directly to shp data