summaryrefslogtreecommitdiff
path: root/chimere/urls.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2012-08-17 13:13:15 +0200
committerÉtienne Loks <etienne.loks@peacefrogs.net>2012-08-22 02:08:33 +0200
commit1091d481584af4662488ee83d7fa1421f8d1700c (patch)
tree0fb060c8cc3c7280a4f9d643db34216597a0b302 /chimere/urls.py
parent232a1de132fa75431b45c008b72dafbcc6130b14 (diff)
downloadChimère-1091d481584af4662488ee83d7fa1421f8d1700c.tar.bz2
Chimère-1091d481584af4662488ee83d7fa1421f8d1700c.zip
Improve routing interface and functionalities
* fix POI clicking * create a nominatim widget to get coordinates from text * create a JQuery UI button select widget * create a routing form to get itinerary from a textual form * CSS for the routing form * Reverse nominatim: when a point is get for routing on the map label for this point is get from nominatim * Add transport management by user choice * Update french translation
Diffstat (limited to 'chimere/urls.py')
-rw-r--r--chimere/urls.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/chimere/urls.py b/chimere/urls.py
index aec82fb..81263a0 100644
--- a/chimere/urls.py
+++ b/chimere/urls.py
@@ -54,9 +54,11 @@ if settings.CHIMERE_FEEDS:
if settings.CHIMERE_ENABLE_ROUTING:
urlpatterns += patterns('chimere.views',
url(r'^(?P<area_name>[a-zA-Z0-9_-]*/)?route/'\
+ r'(?P<transport>(%s))/'
r'(?P<lon1>[-]?[0-9]+[.]?[0-9]*)_(?P<lat1>[-]?[0-9]+[.]?[0-9]*)_'\
r'(?P<lonlat_steps>([-]?[0-9]+[.]?[0-9]*_[-]?[0-9]+[.]?[0-9]*_)*)'\
- r'(?P<lon2>[-]?[0-9]+[.]?[0-9]*)_(?P<lat2>[-]?[0-9]+[.]?[0-9]*)$',
+ r'(?P<lon2>[-]?[0-9]+[.]?[0-9]*)_(?P<lat2>[-]?[0-9]+[.]?[0-9]*)$' %
+ ('|'.join([key for key, lbl in settings.CHIMERE_ROUTING_TRANSPORT])),
'route', name="route"),
)