diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-20 16:44:31 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-20 16:45:04 +0200 |
| commit | caad2c7f6e200d3dd1b2a0c3bb3a36c5311b442c (patch) | |
| tree | a2f771312e0653d13febae27e69566669f9696c8 /chimere/views.py | |
| parent | ea953629c654b6264ef2e4932307bbccaf8c41d9 (diff) | |
| download | Chimère-caad2c7f6e200d3dd1b2a0c3bb3a36c5311b442c.tar.bz2 Chimère-caad2c7f6e200d3dd1b2a0c3bb3a36c5311b442c.zip | |
Bulk geojson marker performance improvement
Diffstat (limited to 'chimere/views.py')
| -rw-r--r-- | chimere/views.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chimere/views.py b/chimere/views.py index f9a9bf9..af8dc67 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -752,7 +752,7 @@ def _getGeoObjects(area_name, category_ids, status='A', getjson=True, aggregated_category_ids = [] try: zoom_level = int(zoom_level) - except ValueError: + except (ValueError, TypeError): zoom_level = None if zoom_level: # pop from main category list @@ -780,8 +780,8 @@ def _getGeoObjects(area_name, category_ids, status='A', getjson=True, return empty, zoom_need_reload if getjson: - for geo_object in list(query): - items += json.loads(geo_object.getGeoJSON(category_ids)) + items += Marker.getGeoJSONs( + query, limit_to_categories=category_ids) else: items += list(query) |