summaryrefslogtreecommitdiff
path: root/chimere/views.py
diff options
context:
space:
mode:
Diffstat (limited to 'chimere/views.py')
-rw-r--r--chimere/views.py6
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)