Merge remote-tracking branch 'upstream/master'

[nominatim.git] / utils / tigerAddressImport.py

diff --git a/utils/tigerAddressImport.py b/utils/tigerAddressImport.py
index c0d83cebf876d43eccb5bb46fe29653185d0d126..0dc55e99e9bc38af0789aaa2faed85cd3a630ae2 100755 (executable)
--- a/utils/tigerAddressImport.py
+++ b/utils/tigerAddressImport.py
@@ -161,9 +161,9 @@ def parse_shp_for_geom_and_tags( filename ):
         statefp = poFeature.GetField("STATEFP")
         countyfp = poFeature.GetField("COUNTYFP")
         if (statefp != None) and (countyfp != None):
         statefp = poFeature.GetField("STATEFP")
         countyfp = poFeature.GetField("COUNTYFP")
         if (statefp != None) and (countyfp != None):

-            county_name = county_fips_data[statefp + '' + countyfp]
+            county_name = county_fips_data.get(statefp + '' + countyfp)

             if county_name:
             if county_name:

-                tags["tiger:county"] = county_name
+                tags["tiger:county"] = county_name.encode("utf-8")

 
         # tlid = poFeature.GetField("TLID")
         # if tlid != None:
 
         # tlid = poFeature.GetField("TLID")
         # if tlid != None: