tommy/libpostal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fix] import and return values

Browse Source
This commit is contained in:
Al
2016-07-24 21:30:53 -04:00
parent 09b77b52a6
commit 648c016b05
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/geodata/osm/formatter.py
View File

@@ -24,6 +24,7 @@ from geodata.coordinates.conversion import *
from geodata.configs.utils import nested_get from geodata.configs.utils import nested_get
from geodata.countries.country_names import * from geodata.countries.country_names import *
from geodata.language_id.disambiguation import * from geodata.language_id.disambiguation import *
from geodata.language_id.sample import INTERNET_LANGUAGE_DISTRIBUTION
from geodata.i18n.languages import * from geodata.i18n.languages import *
from geodata.intersections.query import Intersection, IntersectionQuery from geodata.intersections.query import Intersection, IntersectionQuery
from geodata.address_formatting.formatter import AddressFormatter from geodata.address_formatting.formatter import AddressFormatter
@@ -365,11 +366,11 @@ class OSMAddressFormatter(object):
try: try:
latitude, longitude = latlon_to_decimal(tags['lat'], tags['lon']) latitude, longitude = latlon_to_decimal(tags['lat'], tags['lon'])
except Exception: except Exception:
return None return None, None, None, None
country, candidate_languages, language_props = self.language_rtree.country_and_languages(latitude, longitude) country, candidate_languages, language_props = self.language_rtree.country_and_languages(latitude, longitude)
if not (country and candidate_languages): if not (country and candidate_languages):
return None return None, None, None, None
local_languages = [(l['lang'], int(l['default'])) for l in candidate_languages] local_languages = [(l['lang'], int(l['default'])) for l in candidate_languages]
all_local_languages = set([l['lang'] for l in candidate_languages]) all_local_languages = set([l['lang'] for l in candidate_languages])