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

[polygons] Adding in country languages for regional polygons without a default language

Browse Source
This commit is contained in:
Al
2015-09-10 12:34:26 -07:00
parent 22c16b43cf
commit 440a8158b6
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/geodata/polygons/index.py
View File

@@ -31,7 +31,7 @@ class RTreePolygonIndex(object):
self.index_path = None self.index_path = None
if not index and self.index_path: if not index and self.index_path:
self.index = rtree.index.Index(self.index_path) self.index = rtree.index.Index(self.index_path, overwrite=True)
elif not index: elif not index:
self.index = rtree.index.Index() self.index = rtree.index.Index()
else: else:
@@ -45,6 +45,11 @@ class RTreePolygonIndex(object):
else: else:
self.polygons = polygons self.polygons = polygons
self.post_init()
def post_init(self):
pass
def index_polygon(self, id, polygon): def index_polygon(self, id, polygon):
self.index.insert(id, polygon.bounds) self.index.insert(id, polygon.bounds)

7
scripts/geodata/polygons/language_polys.py
View File

@@ -91,7 +91,12 @@ class LanguagePolygonIndex(RTreePolygonIndex):
if not regional: if not regional:
continue continue
languages = regional.items() if all((not default for lang, default in regional.iteritems())):
languages = get_country_languages(country)
languages.update(regional)
languages = languages.items()
else:
languages = regional.items()
else: else:
languages = get_country_languages(country).items() languages = get_country_languages(country).items()