[polygons] Adding in country languages for regional polygons without a default language
This commit is contained in:
@@ -31,7 +31,7 @@ class RTreePolygonIndex(object):
|
||||
self.index_path = None
|
||||
|
||||
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:
|
||||
self.index = rtree.index.Index()
|
||||
else:
|
||||
@@ -45,6 +45,11 @@ class RTreePolygonIndex(object):
|
||||
else:
|
||||
self.polygons = polygons
|
||||
|
||||
self.post_init()
|
||||
|
||||
def post_init(self):
|
||||
pass
|
||||
|
||||
def index_polygon(self, id, polygon):
|
||||
self.index.insert(id, polygon.bounds)
|
||||
|
||||
|
||||
@@ -91,7 +91,12 @@ class LanguagePolygonIndex(RTreePolygonIndex):
|
||||
if not regional:
|
||||
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:
|
||||
languages = get_country_languages(country).items()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user