X-Git-Url: https://git.openstreetmap.org/nominatim.git/blobdiff_plain/7e8e952b66bb982f01948d250d7a83f2c682b7cf..e55ac77c9441359a44e5c4d464353a7970a648c7:/utils/tigerAddressImport.py diff --git a/utils/tigerAddressImport.py b/utils/tigerAddressImport.py index ee1c58ed..5499f50e 100755 --- a/utils/tigerAddressImport.py +++ b/utils/tigerAddressImport.py @@ -1964,7 +1964,7 @@ county_fips = { '35007' : 'Colfax, NM' , '35009' : 'Curry, NM' , '35011' : 'De Baca, NM' , -'35013' : 'Doña Ana, NM' , +'35013' : 'Dona Ana, NM' , '35015' : 'Eddy, NM' , '35017' : 'Grant, NM' , '35019' : 'Guadalupe, NM' , @@ -3893,8 +3893,8 @@ def addressways(waylist, nodelist, first_id): # ret.append( "" % (iSource, VERSION, import_guid) ) # ret.append( "" % (iAttrib) ) # ret.append( "" ) - - ret.append( "select tigger_create_interpolation(ST_GeomFromText('LINESTRING(%s)',4326), '%s', '%s', '%s', '%s', '%s', '%s');" % + # call new tiger_line_import function to save the lines in the DB. + ret.append( "select tiger_line_import(ST_GeomFromText('LINESTRING(%s)',4326), '%s', '%s', '%s', '%s', '%s', '%s');" % ( ",".join(rlinestring), rfromadd.replace("'", "''"), rtoadd.replace("'", "''"), interpolationtype.replace("'", "''"), name.replace("'", "''"), county.replace("'", "''"), zipr.replace("'", "''") ) ) if left: @@ -3919,7 +3919,7 @@ def addressways(waylist, nodelist, first_id): interpolationtype = "all"; else: interpolationtype = "all"; - ret.append( "select tigger_create_interpolation(ST_GeomFromText('LINESTRING(%s)',4326), '%s', '%s', '%s', '%s', '%s', '%s');" % + ret.append( "select tiger_line_import(ST_GeomFromText('LINESTRING(%s)',4326), '%s', '%s', '%s', '%s', '%s', '%s');" % ( ",".join(llinestring), lfromadd.replace("'", "''"), ltoadd.replace("'", "''"), interpolationtype.replace("'", "''"), name.replace("'", "''"), county.replace("'", "''"), zipl.replace("'", "''") ) ) return ret