Improvement in route display and parsing

1 files changed, 7 insertions, 4 deletions

diff --git a/chimere/views.py b/chimere/views.py
index c71b4eb..c8097a1 100644
--- a/chimere/views.py
+++ b/chimere/views.py
@@ -653,13 +653,16 @@ def route(request, area_name, lon1, lat1, lonlat_steps, lon2, lat2,
         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, steps=steps,
-                               transport=transport)
+    jsons, desc, total = router.route(lon1, lat1, lon2, lat2, steps=steps,
+                                      transport=transport)
     if not jsons:
         return HttpResponse('no results')
     jsonencoder = simplejson.JSONEncoder()
-    data = '{"properties":{"description":%s}, "type": "FeatureCollection",'\
-           '"features":[%s]}' % (jsonencoder.encode(desc), ",".join(jsons))
+    total = jsonencoder.encode(total)
+    desc = jsonencoder.encode(desc)
+    data = '{"properties":{"total":%s, "description":%s}, '\
+           '"type": "FeatureCollection", "features":[%s]}' % (total, desc,
+                                                              ",".join(jsons))
     return HttpResponse(data)
 
 def rss(request, area_name=''):