X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/d4625e77416b0a5b556e0f2df29f9238c6b5dd6e..93b2bac094fa0b67f891cf293a43d3cd146b2ea5:/utils/tigerAddressImport.py

diff --git a/utils/tigerAddressImport.py b/utils/tigerAddressImport.py
index 9bb63590..a784b93b 100755
--- a/utils/tigerAddressImport.py
+++ b/utils/tigerAddressImport.py
@@ -197,12 +197,14 @@ county_fips = {
 '02013' : 'Aleutians East, AK' ,
 '02016' : 'Aleutians West, AK' ,
 '02020' : 'Anchorage, AK' ,
+'02230' : 'Skagway Municipality' ,
 '02050' : 'Bethel, AK' ,
 '02060' : 'Bristol Bay, AK' ,
 '02068' : 'Denali, AK' ,
 '02070' : 'Dillingham, AK' ,
 '02090' : 'Fairbanks North Star, AK' ,
 '02100' : 'Haines, AK' ,
+'02105' : 'Hoonah-Angoon Census Area' ,
 '02110' : 'Juneau, AK' ,
 '02122' : 'Kenai Peninsula, AK' ,
 '02130' : 'Ketchikan Gateway, AK' ,
@@ -212,12 +214,15 @@ county_fips = {
 '02180' : 'Nome, AK' ,
 '02185' : 'North Slope, AK' ,
 '02188' : 'Northwest Arctic, AK' ,
+'02195' : 'Petersburg Census Area' , 
+'02198' : 'Prince of Wales-Hyder Census Area' ,
 '02201' : 'Prince of Wales-Outer Ketchikan, AK' ,
 '02220' : 'Sitka, AK' ,
 '02232' : 'Skagway-Hoonah-Angoon, AK' ,
 '02240' : 'Southeast Fairbanks, AK' ,
 '02261' : 'Valdez-Cordova, AK' ,
 '02270' : 'Wade Hampton, AK' ,
+'02275' : 'Wrangell City and Borough' ,
 '02280' : 'Wrangell-Petersburg, AK' ,
 '02282' : 'Yakutat, AK' ,
 '02290' : 'Yukon-Koyukuk, AK' ,
@@ -380,6 +385,7 @@ county_fips = {
 '08011' : 'Bent, CO' ,
 '08013' : 'Boulder, CO' ,
 '08015' : 'Chaffee, CO' ,
+'08014' : 'Broomfield, CO',
 '08017' : 'Cheyenne, CO' ,
 '08019' : 'Clear Creek, CO' ,
 '08021' : 'Conejos, CO' ,
@@ -494,6 +500,7 @@ county_fips = {
 '12081' : 'Manatee, FL' ,
 '12083' : 'Marion, FL' ,
 '12085' : 'Martin, FL' ,
+'12086' : 'Miami-Dade, FL' ,
 '12087' : 'Monroe, FL' ,
 '12089' : 'Nassau, FL' ,
 '12091' : 'Okaloosa, FL' ,
@@ -996,7 +1003,7 @@ county_fips = {
 '19135' : 'Monroe, IA' ,
 '19137' : 'Montgomery, IA' ,
 '19139' : 'Muscatine, IA' ,
-'19141' : 'O'Brien, IA' ,
+'19141' : 'O\'Brien, IA' ,
 '19143' : 'Osceola, IA' ,
 '19145' : 'Page, IA' ,
 '19147' : 'Palo Alto, IA' ,
@@ -1350,9 +1357,9 @@ county_fips = {
 '24027' : 'Howard, MD' ,
 '24029' : 'Kent, MD' ,
 '24031' : 'Montgomery, MD' ,
-'24033' : 'Prince George's, MD' ,
-'24035' : 'Queen Anne's, MD' ,
-'24037' : 'St. Mary's, MD' ,
+'24033' : 'Prince George\'s, MD' ,
+'24035' : 'Queen Anne\'s, MD' ,
+'24037' : 'St. Mary\'s, MD' ,
 '24039' : 'Somerset, MD' ,
 '24041' : 'Talbot, MD' ,
 '24043' : 'Washington, MD' ,
@@ -3458,7 +3465,7 @@ def parse_shp_for_osm( filename ):
 
         divroad = poFeature.GetField("DIVROAD")
         if divroad != None:
-	    if divroad == "Y" and tags["highway"] == "residential":
+	    if divroad == "Y" and "highway" in tags and tags["highway"] == "residential":
                 tags["highway"] = "tertiary"
             tags["tiger:separated"] = divroad
 
@@ -3690,6 +3697,10 @@ def addressways(waylist, nodelist, first_id):
 		rtags = []
 		ltags = []
 		tags = []
+                zipr = ''
+                zipl = ''
+                name = ''
+                county = ''
     		if "tiger:zip_right" in waykey:
 		    zipr = waykey["tiger:zip_right"]
                     rtags.append( "<tag k=\"addr:postcode\" v=\"%s\" />" % zipr )
@@ -3719,11 +3730,11 @@ def addressways(waylist, nodelist, first_id):
 		if right:
                     rlinestring = [];
                     for i, point in rsegment:
-                        rlinestring.append( "%f %f" % (point[0], point[1]) )
+                        rlinestring.append( "%f %f" % (point[1], point[0]) )
 		if left:
                     llinestring = [];
                     for i, point in lsegment:
-                        llinestring.append( "%f %f" % (point[0], point[1]) )
+                        llinestring.append( "%f %f" % (point[1], point[0]) )
 		if right:
                     rsegments.append( rsegment )
 		if left:
@@ -3786,7 +3797,7 @@ def addressways(waylist, nodelist, first_id):
 #                    ret.append( "</way>" )
 
                     ret.append( "select tigger_create_interpolation(ST_GeomFromText('LINESTRING(%s)',4326), '%s', '%s', '%s', '%s', '%s', '%s');" %
-                                ( ",".join(rlinestring), rfromadd, rtoadd, interpolationtype, name, county, zipr ) )
+                                ( ",".join(rlinestring), rfromadd.replace("'", "''"), rtoadd.replace("'", "''"), interpolationtype.replace("'", "''"), name.replace("'", "''"), county.replace("'", "''"), zipr.replace("'", "''") ) )
 
 		if left:
 		    id += 1
@@ -3811,7 +3822,7 @@ def addressways(waylist, nodelist, first_id):
 		    else:
                         interpolationtype = "all";
                     ret.append( "select tigger_create_interpolation(ST_GeomFromText('LINESTRING(%s)',4326), '%s', '%s', '%s', '%s', '%s', '%s');" %
-                                ( ",".join(llinestring), lfromadd, ltoadd, interpolationtype, name, county, zipl ) )
+                                ( ",".join(llinestring), lfromadd.replace("'", "''"), ltoadd.replace("'", "''"), interpolationtype.replace("'", "''"), name.replace("'", "''"), county.replace("'", "''"), zipl.replace("'", "''") ) )
 
     return ret