From 4a35c50f92ddb4fbdf84c20345b8eee640660d19 Mon Sep 17 00:00:00 2001 From: Al Date: Sat, 31 Oct 2015 18:30:53 -0400 Subject: [PATCH] [fix] index paths --- scripts/geodata/polygons/index.py | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/scripts/geodata/polygons/index.py b/scripts/geodata/polygons/index.py index 27da5fd0..f22df9ad 100644 --- a/scripts/geodata/polygons/index.py +++ b/scripts/geodata/polygons/index.py @@ -34,10 +34,8 @@ class PolygonIndex(object): else: self.index_path = None - if not index and self.index_path: - self.create_index(self.index_path, overwrite=True) - elif not index: - self.create_index() + if not index: + self.create_index(overwrite=True) else: self.index = index @@ -51,7 +49,7 @@ class PolygonIndex(object): self.i = 0 - def create_index(self, index_path=None, overwrite=False): + def create_index(self, overwrite=False): raise NotImplementedError('Children must implement') def index_polygon(self, polygon): @@ -229,11 +227,8 @@ class PolygonIndex(object): class RTreePolygonIndex(PolygonIndex): INDEX_FILENAME = 'index.rtree' - def create_index(self, index_path=None, overwrite=False): - if index_path: - self.index = rtree.index.Index(index_path, overwrite=overwrite) - else: - self.index = rtree.index.Index() + def create_index(self, overwrite=False): + self.index = rtree.index.Index(self.index_path, overwrite=overwrite) def index_polygon(self, polygon): self.index.insert(self.i, polygon.bounds) @@ -263,7 +258,7 @@ class GeohashPolygonIndex(PolygonIndex): INDEX_FILENAME = 'index.json' - def create_index(self, index_path=None, overwrite=False): + def create_index(self, overwrite=False): self.index = defaultdict(list) def index_point(self, lat, lon, geohash_level):