NearPoint::extractFromQuery - greedy-match optional quote sign

[nominatim.git] / utils / tigerAddressImport.py

diff --git a/utils/tigerAddressImport.py b/utils/tigerAddressImport.py
index ee1c58ed5dcee0a5944b60ab10774dd136b87da5..5499f50ea03663d4bab441b7b3c986fccc109056 100755 (executable)
--- 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( "<tag k=\"source\" v=\"%s_import_v%s_%s\" />" % (iSource, VERSION, import_guid) )
  #                   ret.append( "<tag k=\"attribution\" v=\"%s\" />" % (iAttrib) )
 #                    ret.append( "</way>" )
-
-                    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