diff options
Diffstat (limited to 'chimere/urls.py')
| -rw-r--r-- | chimere/urls.py | 28 | 
1 files changed, 27 insertions, 1 deletions
| diff --git a/chimere/urls.py b/chimere/urls.py index 9d4018a..164ef68 100644 --- a/chimere/urls.py +++ b/chimere/urls.py @@ -20,6 +20,7 @@  from django.conf import settings  from django.conf.urls.defaults import *  from django.contrib import admin +from django.core.exceptions import ImproperlyConfigured  admin.autodiscover()  from chimere.models import Area @@ -51,9 +52,26 @@ if settings.CHIMERE_FEEDS:              LatestPOIsByZoneID(), name='feeds-areaid'),      ) +if hasattr(settings, 'CHIMERE_ENABLE_ROUTING') \ +   and settings.CHIMERE_ENABLE_ROUTING: +    if not hasattr(settings, 'CHIMERE_ROUTING_TRANSPORT') \ +      or not settings.CHIMERE_ROUTING_TRANSPORT: +        raise ImproperlyConfigured(u"CHIMERE_ROUTING_TRANSPORT must be set in"\ +                                   u" settings if you enable routing") +    urlpatterns += patterns('chimere.views', +        url(r'^(?P<area_name>[a-zA-Z0-9_-]*/)?route/'\ +            r'(?P<transport>(%s))/((?P<speed>[0-9][0-9]*)/)?' +            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]*)$' % +           ('|'.join([key for key, lbl in settings.CHIMERE_ROUTING_TRANSPORT])), +                'route', name="route"), +    ) +  urlpatterns += patterns('chimere.views',      url(r'^charte/?$', 'charte', name="charte"), -    url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?contact/?$', 'contactus', name="contact"), +    url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?contact/?$', 'contactus', +        name="contact"),      url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit/$', 'edit',          name="edit"),      url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit/(?P<item_id>\w+)/(?P<submited>\w+)?$', @@ -71,12 +89,20 @@ urlpatterns += patterns('chimere.views',                          name="getgeoobjects"),      url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?getAvailableCategories/$',                          'get_available_categories', name="get_categories"), +    url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?getAllCategories/$', +                        'get_all_categories', name="get_all_categories"), +    url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?getCategory/(?P<category_id>\d+)/?$', +                        'getCategory', name="get_category"), +    url(r'^(?P<area_name>[a-zA-Z0-9_-]*/)?get-share-url/(?P<network>\w+)?$', +                        'getShareUrl', name="get-share-url"),      url(r'^(?P<area_name>[a-zA-Z0-9_-]*/)?ty/(?P<tiny_urn>\w+)$',                          'redirectFromTinyURN', name="tiny"),      url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?upload_file/((?P<category_id>\w+)/)?$',                          'uploadFile', name='upload_file'),      url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?process_route_file/(?P<file_id>\d+)/$',                          'processRouteFile', name='process_route_file'), +    url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?dyn/(?P<page_id>\w+)/$', +                        'extraPage', name='extra_page'),      # At the end, because it catches large      url(r'^(?P<area_name>[a-zA-Z0-9_-]+)?', 'index', name="index"),  ) | 
