Checkbox to display markers and routes waiting for validation on the main map

git-svn-id: http://www.peacefrogs.net/svn/chimere/trunk@12 9215b0d5-fb2c-4bbd-8d3e-bd2e9090e864

1 files changed, 4 insertions, 20 deletions

diff --git a/main/views.py b/main/views.py
index 42c9229..8c26a36 100644
--- a/main/views.py
+++ b/main/views.py
@@ -165,35 +165,19 @@ def getDetail(request, marker_id):
     response_dct= {'media_path':settings.MEDIA_URL, 'marker':marker}
     return render_to_response('detail.html', response_dct)
 
-def getMarkers(request, category_ids):
-    '''
-    Get the JSON for a marker
-    '''
-    try:
-        query = Marker.objects.filter(status='A')
-        query = query.extra(where=['subcategory_id IN (%s)' % \
-                                    ",".join(category_ids.split('_'))])
-    except:
-        return HttpResponse('no results')
-    markers = list(query)
-    if not markers:
-        return HttpResponse('no results')
-    data = '{"type": "FeatureCollection", "features":[%s]}' % \
-                           ",".join([marker.getGeoJSON() for marker in markers])
-    return HttpResponse(data)
-
-def getGeoObjects(request, category_ids):
+def getGeoObjects(request, category_ids, status='A'):
     '''
     Get the JSON for a route
     '''
+    status = status.split('_')
     try:
-        query = Route.objects.filter(status='A',
+        query = Route.objects.filter(status__in=status,
                                     subcategory__in=category_ids.split('_'))
     except:
         return HttpResponse('no results')
     geo_objects = list(query)
     try:
-        query = Marker.objects.filter(status='A',
+        query = Marker.objects.filter(status__in=status,
                                     subcategory__in=category_ids.split('_'))
     except:
         return HttpResponse('no results')