diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-11-06 23:25:05 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-11-06 23:25:05 +0100 |
| commit | c51e119397872250d05e67d72880c5a040d7bf01 (patch) | |
| tree | 97a28511118f7f82332c0f3faa6f7072d8f9aab7 /chimere/views.py | |
| parent | 6790787ce9dd1ea080fec4fdc5a36ffa851cf9ed (diff) | |
| download | Chimère-c51e119397872250d05e67d72880c5a040d7bf01.tar.bz2 Chimère-c51e119397872250d05e67d72880c5a040d7bf01.zip | |
JS: fixes in the map display - add transport information to result routing
Diffstat (limited to 'chimere/views.py')
| -rw-r--r-- | chimere/views.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/chimere/views.py b/chimere/views.py index 03f75a6..28f1605 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -154,6 +154,7 @@ def index(request, area_name=None, default_area=None, simple=False): zoomout = None if settings.CHIMERE_ENABLE_ROUTING: response_dct['itinerary_form'] = RoutingForm() + response_dct['routing_transport'] = settings.CHIMERE_ROUTING_TRANSPORT response_dct.update({ 'actions':actions(response_dct['area_name']), 'action_selected':('view',), @@ -745,7 +746,7 @@ def route(request, area_name, lon1, lat1, lonlat_steps, lon2, lat2, route = GEOSGeometry(jsons[0]) except OGRException: return HttpResponse(_(u"Bad geometry"), status=500) - cats = SubCategory.objects.filter(routing_warn=True, routing_available=True) + cats = SubCategory.objects.filter(routing_warn=True) message = '' if cats.count(): points = [(m.point, m.categories.all()[0].icon) @@ -770,9 +771,10 @@ def route(request, area_name, lon1, lat1, lonlat_steps, lon2, lat2, "<p>%s</p>" % _(message)) else: message = '' - data = '{"properties":{"total":%s, "description":%s}, '\ - '"type": "FeatureCollection", "features":[%s]%s}' % (total, desc, - ",".join(jsons), message) + data = '{"properties":{"transport":%s, "total":%s, "description":%s}, '\ + '"type": "FeatureCollection", "features":[%s]%s}' % ( + jsonencoder.encode(transport), total, desc, ",".join(jsons), + message) return HttpResponse(data) def rss(request, area_name=''): |