diff options
Diffstat (limited to 'chimere/main/views.py')
| -rw-r--r-- | chimere/main/views.py | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/chimere/main/views.py b/chimere/main/views.py index 1f0e238..3ac3db1 100644 --- a/chimere/main/views.py +++ b/chimere/main/views.py @@ -244,7 +244,8 @@ def getDetail(request, area_name, marker_id): if 'simple' in request.GET and request.GET['simple']: response_dct['simple'] = True parameters = u'current_feature=%s' % marker_id - parameters += u"&checked_categories=%d" % marker.subcategory.id + parameters += u"&checked_categories=%s" % "_".join([str(m.id) \ + for m in marker.categories.all()]) net_dct = getTinyfiedUrl(parameters, area_name) share_networks = [] for network in settings.SHARE_NETWORKS: @@ -273,24 +274,24 @@ def getGeoObjects(request, area_name, category_ids, status): status = status.split('_') try: query = Route.objects.filter(status__in=status, - subcategory__in=category_ids.split('_')) + categories__in=category_ids.split('_')) except: return HttpResponse('no results') - query.order_by('subcategory') + query.order_by('categories') routes = list(query) jsons = [] current_cat, colors, idx = None, None, 0 for route in routes: - if not current_cat or current_cat != route.subcategory: + c_cat = route.categories.all()[0] + if not current_cat or current_cat != c_cat: idx = 0 - current_cat = route.subcategory - colors = list(Color.objects.filter(color_theme=\ - route.subcategory.color_theme)) + current_cat = c_cat + colors = list(Color.objects.filter(color_theme = c_cat.color_theme)) jsons.append(route.getGeoJSON(color=colors[idx % len(colors)].code)) idx += 1 try: query = Marker.objects.filter(status__in=status, - subcategory__in=category_ids.split('_')) + categories__in=category_ids.split('_')) except: return HttpResponse('no results') jsons += [geo_object.getGeoJSON() for geo_object in list(query)] @@ -299,7 +300,8 @@ def getGeoObjects(request, area_name, category_ids, status): data = '{"type": "FeatureCollection", "features":[%s]}' % ",".join(jsons) return HttpResponse(data) -def getAvailableCategories(request, area_name=None, area=None, status='A', force=None): +def getAvailableCategories(request, area_name=None, area=None, status='A', + force=None): ''' Get categories for a designed area ''' |