[fix] simplify_polygons in building geocoder, and adding caching back to OSM admin polygons as it's faster when taking into account startup time. Also adding a few properties to buildings and landuse polygons
This commit is contained in:
@@ -434,6 +434,9 @@ 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,
|
||||||
@@ -648,6 +651,9 @@ class OSMReverseGeocoder(RTreePolygonIndex):
|
|||||||
|
|
||||||
polygon_reader = OSMAdminPolygonReader
|
polygon_reader = OSMAdminPolygonReader
|
||||||
|
|
||||||
|
persistent_polygons = True
|
||||||
|
# Cache everything
|
||||||
|
cache_size = 1000000
|
||||||
simplify_polygons = True
|
simplify_polygons = True
|
||||||
|
|
||||||
include_property_patterns = set([
|
include_property_patterns = set([
|
||||||
@@ -801,15 +807,15 @@ class OSMSubdivisionReverseGeocoder(OSMReverseGeocoder):
|
|||||||
cache_size = 10000
|
cache_size = 10000
|
||||||
simplify_polygons = False
|
simplify_polygons = False
|
||||||
polygon_reader = OSMSubdivisionPolygonReader
|
polygon_reader = OSMSubdivisionPolygonReader
|
||||||
include_property_patterns = OSMReverseGeocoder.include_property_patterns | set(['landuse'])
|
include_property_patterns = OSMReverseGeocoder.include_property_patterns | set(['landuse', 'place'])
|
||||||
|
|
||||||
|
|
||||||
class OSMBuildingReverseGeocoder(OSMReverseGeocoder):
|
class OSMBuildingReverseGeocoder(OSMReverseGeocoder):
|
||||||
persistent_polygons = True
|
persistent_polygons = True
|
||||||
cache_size = 10000
|
cache_size = 10000
|
||||||
simplify_polygon = False
|
simplify_polygons = False
|
||||||
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', 'addr:*'])
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
|||||||
Reference in New Issue
Block a user