Improve (greatly) performance for route display on the map

1 files changed, 6 insertions, 10 deletions

diff --git a/chimere/views.py b/chimere/views.py
index b40e58a..47ce281 100644
--- a/chimere/views.py
+++ b/chimere/views.py
@@ -45,7 +45,8 @@ from django.utils.translation import ugettext as _
 
 from chimere.actions import actions
 from chimere.models import Category, SubCategory, PropertyModel, Page,\
-              Marker, Route, News, SimpleArea, Area, Color, TinyUrl, RouteFile
+     Marker, Route, News, SimpleArea, Area, Color, TinyUrl, RouteFile,\
+     AggregatedRoute
 
 from chimere.widgets import getMapJS, PointChooserWidget, \
                             RouteChooserWidget, AreaWidget
@@ -580,17 +581,12 @@ def getGeoObjects(request, area_name, category_ids, status):
         status = 'A'
     status = status.split('_')
     category_ids = category_ids.split('_')
-    try:
-        q = checkDate(Q(status__in=status, categories__in=category_ids))
-        query = Route.objects.filter(q)
-    except:
-        return HttpResponse('no results')
-    query.order_by('categories')
-    routes = list(query)
+    query = AggregatedRoute.objects.filter(status__in=status,
+                  subcategory__in=category_ids).order_by('subcategory')
     jsons = []
     current_cat, colors, idx = None, None, 0
-    for route in routes:
-        c_cat = route.categories.all()[0]
+    for route in query.all():
+        c_cat = route.subcategory
         if not current_cat or current_cat != c_cat:
             idx = 0
             current_cat = c_cat