[osm/polygons] Keep OSM/Quattroshapes admin polygons in memory as there are fewer of them and they are large

This commit is contained in:
Al
2016-04-05 19:05:26 -04:00
parent f6b88ba456
commit 9755d2cee9

View File

@@ -434,9 +434,6 @@ class QuattroshapesReverseGeocoder(RTreePolygonIndex):
PRIORITIES_FILENAME = 'priorities.json' PRIORITIES_FILENAME = 'priorities.json'
persistent_polygons = True
cache_size = 100000
sorted_levels = (COUNTRY, sorted_levels = (COUNTRY,
ADMIN1_REGION, ADMIN1_REGION,
ADMIN1, ADMIN1,
@@ -651,8 +648,7 @@ class OSMReverseGeocoder(RTreePolygonIndex):
polygon_reader = OSMAdminPolygonReader polygon_reader = OSMAdminPolygonReader
persistent_polygons = True simplify_polygons = True
cache_size = 100000
include_property_patterns = set([ include_property_patterns = set([
'name', 'name',
@@ -769,7 +765,8 @@ class OSMReverseGeocoder(RTreePolygonIndex):
poly = multi[0] poly = multi[0]
else: else:
continue continue
poly = index.simplify_polygon(poly) if index.simplify_polygons:
poly = index.simplify_polygon(poly)
index.add_polygon(poly, props) index.add_polygon(poly, props)
return index return index
@@ -802,6 +799,7 @@ class OSMReverseGeocoder(RTreePolygonIndex):
class OSMSubdivisionReverseGeocoder(OSMReverseGeocoder): class OSMSubdivisionReverseGeocoder(OSMReverseGeocoder):
persistent_polygons = True persistent_polygons = True
cache_size = 10000 cache_size = 10000
simplify_polygons = True
polygon_reader = OSMSubdivisionPolygonReader polygon_reader = OSMSubdivisionPolygonReader
include_property_patterns = OSMReverseGeocoder.include_property_patterns | set(['landuse']) include_property_patterns = OSMReverseGeocoder.include_property_patterns | set(['landuse'])
@@ -809,6 +807,7 @@ class OSMSubdivisionReverseGeocoder(OSMReverseGeocoder):
class OSMBuildingReverseGeocoder(OSMReverseGeocoder): class OSMBuildingReverseGeocoder(OSMReverseGeocoder):
persistent_polygons = True persistent_polygons = True
cache_size = 10000 cache_size = 10000
simplify_polygons = True
polygon_reader = OSMBuildingPolygonReader polygon_reader = OSMBuildingPolygonReader
include_property_patterns = OSMReverseGeocoder.include_property_patterns | set(['building', 'building:levels']) include_property_patterns = OSMReverseGeocoder.include_property_patterns | set(['building', 'building:levels'])