summaryrefslogtreecommitdiff
path: root/chimere/views.py
diff options
context:
space:
mode:
Diffstat (limited to 'chimere/views.py')
-rw-r--r--chimere/views.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/chimere/views.py b/chimere/views.py
index ad4b0ca..df403e0 100644
--- a/chimere/views.py
+++ b/chimere/views.py
@@ -638,17 +638,21 @@ def redirectFromTinyURN(request, area_name='', tiny_urn=''):
return redir
return HttpResponseRedirect(response_dct['extra_url'] + parameters)
-def route(request, area_name, lon1, lat1, lon2, lat2, transport='foot'):
+def route(request, area_name, lon1, lat1, lonlat_steps, lon2, lat2,
+ transport='foot'):
'''
Get the JSON for a route
'''
try:
lon1, lat1 = float(lon1), float(lat1)
lon2, lat2 = float(lon2), float(lat2)
+ steps = [float(lonlat) for lonlat in lonlat_steps.split('_') if lonlat]
+ # regroup by 2
+ steps = [(steps[i*2], steps[i*2+1]) for i in range(len(steps)/2)]
except ValueError:
return HttpResponse('no results')
- jsons, desc = router.route(lon1, lat1, lon2, lat2, transport=transport,
- session_id=request.session.session_key)
+ jsons, desc = router.route(lon1, lat1, lon2, lat2, steps=steps,
+ transport=transport)
if not jsons:
return HttpResponse('no results')
jsonencoder = simplejson.JSONEncoder()