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

[fix] index paths

Browse Source
This commit is contained in:
Al
2015-10-31 18:30:53 -04:00
parent c54fb412a3
commit 4a35c50f92
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,10 +34,8 @@ class PolygonIndex(object):
else: else:
self.index_path = None self.index_path = None
if not index and self.index_path: if not index:
self.create_index(self.index_path, overwrite=True) self.create_index(overwrite=True)
elif not index:
self.create_index()
else: else:
self.index = index self.index = index
@@ -51,7 +49,7 @@ class PolygonIndex(object):
self.i = 0 self.i = 0
def create_index(self, index_path=None, overwrite=False): def create_index(self, overwrite=False):
raise NotImplementedError('Children must implement') raise NotImplementedError('Children must implement')
def index_polygon(self, polygon): def index_polygon(self, polygon):
@@ -229,11 +227,8 @@ class PolygonIndex(object):
class RTreePolygonIndex(PolygonIndex): class RTreePolygonIndex(PolygonIndex):
INDEX_FILENAME = 'index.rtree' INDEX_FILENAME = 'index.rtree'
def create_index(self, index_path=None, overwrite=False): def create_index(self, overwrite=False):
if index_path: self.index = rtree.index.Index(self.index_path, overwrite=overwrite)
self.index = rtree.index.Index(index_path, overwrite=overwrite)
else:
self.index = rtree.index.Index()
def index_polygon(self, polygon): def index_polygon(self, polygon):
self.index.insert(self.i, polygon.bounds) self.index.insert(self.i, polygon.bounds)
@@ -263,7 +258,7 @@ class GeohashPolygonIndex(PolygonIndex):
INDEX_FILENAME = 'index.json' INDEX_FILENAME = 'index.json'
def create_index(self, index_path=None, overwrite=False): def create_index(self, overwrite=False):
self.index = defaultdict(list) self.index = defaultdict(list)
def index_point(self, lat, lon, geohash_level): def index_point(self, lat, lon, geohash_level):