From 738bd7b525f9493520108ee76720490dd2ef84b6 Mon Sep 17 00:00:00 2001 From: Al Date: Tue, 14 Feb 2017 01:52:59 -0500 Subject: [PATCH] [neighborhoods] logging, moving OSM/CTH before Quattroshapes for easier testing --- scripts/geodata/neighborhoods/reverse_geocode.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/geodata/neighborhoods/reverse_geocode.py b/scripts/geodata/neighborhoods/reverse_geocode.py index 22074a18..86f19d46 100644 --- a/scripts/geodata/neighborhoods/reverse_geocode.py +++ b/scripts/geodata/neighborhoods/reverse_geocode.py @@ -278,19 +278,20 @@ class NeighborhoodReverseGeocoder(RTreePolygonIndex): qs_scratch_dir = os.path.join(quattroshapes_dir, 'qs_neighborhoods') ensure_dir(qs_scratch_dir) - logger.info('Creating Quattroshapes neighborhoods') - - qs = QuattroshapesNeighborhoodsReverseGeocoder.create_neighborhoods_index(quattroshapes_dir, qs_scratch_dir) logger.info('Creating ClickThatHood neighborhoods') cth = ClickThatHoodReverseGeocoder.create_neighborhoods_index() + logger.info('Creating OSM neighborhoods') + osmn = OSMNeighborhoodReverseGeocoder.create_neighborhoods_index(osm_neighborhood_borders_file) + + logger.info('Creating Quattroshapes neighborhoods') + qs = QuattroshapesNeighborhoodsReverseGeocoder.create_neighborhoods_index(quattroshapes_dir, qs_scratch_dir) + country_rtree = OSMCountryReverseGeocoder.load(country_rtree_dir) osm_admin_rtree = OSMReverseGeocoder.load(osm_rtree_dir) osm_admin_rtree.cache_size = 1000 - osmn = OSMNeighborhoodReverseGeocoder.create_neighborhoods_index(osm_neighborhood_borders_file) - logger.info('Creating IDF index') idf = IDFIndex()