JS: manage routing

Conflicts:
	chimere/route.py

1 files changed, 4 insertions, 2 deletions

diff --git a/chimere/views.py b/chimere/views.py
index 8d32270..d4fa0bb 100644
--- a/chimere/views.py
+++ b/chimere/views.py
@@ -1025,7 +1025,7 @@ def route(request, area_name, lon1, lat1, lonlat_steps, lon2, 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)]
+                 for i in range(int(len(steps) / 2))]
     except ValueError:
         return HttpResponse('no results')
 
@@ -1050,9 +1050,11 @@ def route(request, area_name, lon1, lat1, lonlat_steps, lon2, lat2,
     total = jsonencoder.encode(total)
     desc = jsonencoder.encode(desc)
 
+    jsondecoder = json.JSONDecoder()
     # get associated POIs
     try:
-        route = GEOSGeometry(jsons[0])
+        route = GEOSGeometry(jsonencoder.encode(
+            jsondecoder.decode(jsons[0])['geometry']))
     except OGRException:
         return HttpResponse(_(u"Bad geometry"), status=500)
     cats = SubCategory.objects.filter(routing_warn=True)