summaryrefslogtreecommitdiff
path: root/chimere/views.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-10-07 12:12:00 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-10-07 12:12:00 +0200
commit3a9d2408ee376deb0e76601b704d561e1cac4227 (patch)
tree123a0ee0e4fb15cb8370158bb97aa77ea289ce1e /chimere/views.py
parent74e2e4e6e1b11d37e396f8907029fd8ebc3c365b (diff)
downloadChimère-3a9d2408ee376deb0e76601b704d561e1cac4227.tar.bz2
Chimère-3a9d2408ee376deb0e76601b704d561e1cac4227.zip
JS: manage routing
Diffstat (limited to 'chimere/views.py')
-rw-r--r--chimere/views.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/chimere/views.py b/chimere/views.py
index eab700e..7f7cf2d 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(_("Bad geometry"), status=500)
cats = SubCategory.objects.filter(routing_warn=True)