diff options
| -rw-r--r-- | chimere/static/chimere/js/jquery.chimere.js | 3 | ||||
| -rw-r--r-- | chimere/views.py | 13 |
2 files changed, 14 insertions, 2 deletions
diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js index 3dbc80c..844ec1c 100644 --- a/chimere/static/chimere/js/jquery.chimere.js +++ b/chimere/static/chimere/js/jquery.chimere.js @@ -1217,8 +1217,7 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, { uri += settings.routing_transport + "/" } if(settings.routing_speed){ - //uri += speed.split('_')[1] + "/" - uri += routing_settings.speed + "/" + uri += settings.routing_speed + "/" } for (var i = 0; i < steps.length; i++) { var step = steps[i].transform( diff --git a/chimere/views.py b/chimere/views.py index 968492c..a696d5a 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -762,6 +762,19 @@ 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') + + # prevent incoherent transport and speed + if transport not in dict(settings.CHIMERE_ROUTING_TRANSPORT): + transport = settings.CHIMERE_ROUTING_TRANSPORT[0][0] + if speed: + speed = unicode(speed) + available_speed = [unicode(sp) + for sp, lbl in settings.CHIMERE_ROUTING_SPEEDS[transport]] + if speed not in available_speed: + speed = None + if not speed: + speed = settings.CHIMERE_ROUTING_SPEEDS[transport][0][0] + jsons, desc, total = router.route(lon1, lat1, lon2, lat2, steps=steps, transport=transport, speed=speed) if not jsons: |