summaryrefslogtreecommitdiff
path: root/chimere/route.py
diff options
context:
space:
mode:
Diffstat (limited to 'chimere/route.py')
-rw-r--r--chimere/route.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/chimere/route.py b/chimere/route.py
index 207232b..bc08a39 100644
--- a/chimere/route.py
+++ b/chimere/route.py
@@ -39,7 +39,7 @@ class Router:
class RoutinoRouter(Router):
re_desc = [re.compile("<tr class='n'>"), re.compile("<tr class='s'>"),
re.compile("<tr class='t'>")]
- def route(self, lon1, lat1, lon2, lat2, session_id='', transport='foot'):
+ def route(self, lon1, lat1, lon2, lat2, steps=[], transport='foot'):
'''
Get a list of geojson polylines and route description
'''
@@ -53,9 +53,15 @@ class RoutinoRouter(Router):
"--output-gpx-track",
"--lat1=%0.15f" % lat1,
"--lon1=%0.15f" % lon1,
- "--lat2=%0.15f" % lat2,
- "--lon2=%0.15f" % lon2
]
+ lonlat_index = 1
+ for lon, lat in steps:
+ lonlat_index += 1
+ args += ["--lat%d=%0.15f" % (lonlat_index, lat),
+ "--lon%d=%0.15f" % (lonlat_index, lon)]
+ lonlat_index += 1
+ args += ["--lat%d=%0.15f" % (lonlat_index, lat2),
+ "--lon%d=%0.15f" % (lonlat_index, lon2)]
tmp_dir = tempfile.mkdtemp(prefix='chimere_') + os.sep
p = Popen(args, stdout=PIPE, cwd=tmp_dir)
p.communicate()