From 440a8158b6bf3d5ebcf351c92af34b6f5809be20 Mon Sep 17 00:00:00 2001 From: Al Date: Thu, 10 Sep 2015 12:34:26 -0700 Subject: [PATCH] [polygons] Adding in country languages for regional polygons without a default language --- scripts/geodata/polygons/index.py | 7 ++++++- scripts/geodata/polygons/language_polys.py | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/scripts/geodata/polygons/index.py b/scripts/geodata/polygons/index.py index 4109bff9..8adb808b 100644 --- a/scripts/geodata/polygons/index.py +++ b/scripts/geodata/polygons/index.py @@ -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) diff --git a/scripts/geodata/polygons/language_polys.py b/scripts/geodata/polygons/language_polys.py index 2da5dfc3..68a87520 100644 --- a/scripts/geodata/polygons/language_polys.py +++ b/scripts/geodata/polygons/language_polys.py @@ -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()