Merge pull request #819 from mtmail/tiger-2017-import

Tiger 2017 data no longer contains -divroad- field
This commit is contained in:
Sarah Hoffmann 2017-10-21 15:50:05 +02:00 committed by GitHub
commit 2cf21a3008

View File

@ -3469,6 +3469,12 @@ def parse_shp_for_osm( filename ):
poLayer = poDS.GetLayer( 0 )
fieldNameList = []
layerDefinition = poLayer.GetLayerDefn()
for i in range(layerDefinition.GetFieldCount()):
fieldNameList.append(layerDefinition.GetFieldDefn(i).GetName())
# sys.stderr.write(",".join(fieldNameList))
poLayer.ResetReading()
ret = []
@ -3561,11 +3567,13 @@ def parse_shp_for_osm( filename ):
if tags["highway"] != "primary":
tags["highway"] = "secondary"
divroad = poFeature.GetField("DIVROAD")
if divroad != None:
if divroad == "Y" and "highway" in tags and tags["highway"] == "residential":
tags["highway"] = "tertiary"
tags["tiger:separated"] = divroad
# TIGER 2017 no longer contains this field
if 'DIVROAD' in fieldNameList:
divroad = poFeature.GetField("DIVROAD")
if divroad != None:
if divroad == "Y" and "highway" in tags and tags["highway"] == "residential":
tags["highway"] = "tertiary"
tags["tiger:separated"] = divroad
statefp = poFeature.GetField("STATEFP")
countyfp = poFeature.GetField("COUNTYFP")