summaryrefslogtreecommitdiff
path: root/chimere/urls.py
diff options
context:
space:
mode:
Diffstat (limited to 'chimere/urls.py')
-rw-r--r--chimere/urls.py102
1 files changed, 63 insertions, 39 deletions
diff --git a/chimere/urls.py b/chimere/urls.py
index 913abe1..966ef4f 100644
--- a/chimere/urls.py
+++ b/chimere/urls.py
@@ -25,25 +25,29 @@ admin.autodiscover()
from chimere.views import CategoryDirectoryView, CategoryView
from chimere.feeds import LatestPOIsByCategory, LatestPOIsBySubCategory, \
- LatestPOIs, LatestPOIsByZone, LatestPOIsByZoneID
+ LatestPOIs, LatestPOIsByZone, LatestPOIsByZoneID
def i18n_javascript(request):
return admin.site.i18n_javascript(request)
-urlpatterns = patterns('chimere.views',
- url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?simple$', 'index', {'simple':True},
+urlpatterns = patterns(
+ 'chimere.views',
+ url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?simple$', 'index', {'simple': True},
name="simple_index")
)
if settings.CHIMERE_FEEDS:
- urlpatterns += patterns('',
+ urlpatterns += patterns(
+ '',
url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?feeds$', 'chimere.views.rss',
name='feeds-form'),
- url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?feeds/category/(?P<category_id>\d+)$',
+ url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?feeds/category/'
+ r'(?P<category_id>\d+)$',
LatestPOIsByCategory(), name='feeds-cat'),
- url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?feeds/subcategory/(?P<category_id>\d+)$',
+ url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?feeds/subcategory/'
+ r'(?P<category_id>\d+)$',
LatestPOIsBySubCategory(), name='feeds-subcat'),
url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?feeds/global/$', LatestPOIs(),
name='feeds-global'),
@@ -56,17 +60,19 @@ if settings.CHIMERE_FEEDS:
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"\
+ 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/'\
+ 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<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"),
+ ('|'.join([key
+ for key, lbl in settings.CHIMERE_ROUTING_TRANSPORT])),
+ 'route', name="route"),
)
if hasattr(settings, 'CHIMERE_SEARCH_ENGINE') \
@@ -74,7 +80,8 @@ if hasattr(settings, 'CHIMERE_SEARCH_ENGINE') \
from chimere.forms import SearchForm
from chimere.views import SearchView
from haystack.views import search_view_factory
- urlpatterns += patterns('chimere.views',
+ urlpatterns += patterns(
+ 'chimere.views',
url(r'^search/?$', search_view_factory(
view_class=SearchView,
template='search/search.html',
@@ -83,49 +90,66 @@ if hasattr(settings, 'CHIMERE_SEARCH_ENGINE') \
url(r'^search/autocomplete/$', 'autocomplete',
name='autocomplete-search')
)
- #urlpatterns += [url(r'^search/', include('haystack.urls')),]
+ # urlpatterns += [url(r'^search/', include('haystack.urls')),]
-urlpatterns += patterns('chimere.views',
+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_-]+/)?edit/$', 'edit',
name="edit"),
- url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit/(?P<item_id>\w+)/(?P<submited>\w+)?$',
- 'edit', name="edit-item"),
+ url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-marker/'
+ r'(?P<submited>\w+)?$', 'editMarker', name="editmarker"),
+ url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-marker/(?P<item_id>\w+)/'
+ r'(?P<submited>\w+)?$', 'editMarker', name="editmarker-item"),
url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-route/$', 'editRoute',
name="editroute"),
- url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-route/(?P<item_id>\w+)/(?P<submited>\w+)?$',
+ url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-route/(?P<item_id>\w+)/'
+ r'(?P<submited>\w+)?$',
'editRoute', name="editroute-item"),
- url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?getDetail/(?P<marker_id>\d+)/?$', 'getDetail',
- name="get_detail"),
- url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?getDescriptionDetail/?(?P<category_id>\d+)/?$',
- 'getDescriptionDetail', name="get_description_detail"),
- url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?getGeoObjects/'\
- r'(?P<category_ids>[a-zA-Z0-9_-]+)(/(?P<status>\w+))?$', 'getGeoObjects',
- name="getgeoobjects"),
- url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?get-marker/'\
+ url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-polygon/$', 'editPolygon',
+ name="editpolygon"),
+ url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-polygon/(?P<item_id>\w+)/'
+ r'(?P<submited>\w+)?$',
+ 'editPolygon', name="editpolygon-item"),
+ url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?getDetail/'
+ r'(?P<key>[a-zA-Z_-]*\d+)/?$',
+ 'getDetail', name="get_detail"),
+ url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?getDetail/undefined',
+ 'getDetailUndefined', name="get_detail_undefined"),
+ url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?getDescriptionDetail/'
+ r'?(?P<category_id>\d+)/?$', 'getDescriptionDetail',
+ name="get_description_detail"),
+ url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?getGeoObjects/'
+ r'(?P<category_ids>[a-zA-Z0-9_-]+)(/(?P<status>\w+))?$',
+ 'getGeoObjects', name="getgeoobjects"),
+ url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?get-marker/'
r'(?P<pk>[0-9]+)$', 'getMarker', name="get-marker"),
url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?getAvailableCategories/$',
- 'get_available_categories', name="get_categories"),
+ 'get_available_categories', name="get_categories"),
url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?getAllCategories/$',
- 'get_all_categories', name="get_all_categories"),
+ '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"),
+ 'getCategory', name="get_category"),
url(r'^(?P<area_name>[a-zA-Z0-9_-]*/)?get-share-url/(?P<network>\w+)?$',
- 'getShareUrl', name="get-share-url"),
+ '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'),
+ 'redirectFromTinyURN', name="tiny"),
+ url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?upload_file/'
+ r'((?P<category_id>\w+)/)?$', 'uploadFile', name='upload_file'),
+ url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?process_route_file/'
+ r'(?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'),
+ 'extraPage', name='extra_page'),
url(r'^(?:(?P<area_name>[a-zA-Z0-9_-]*)/)?categories/$',
CategoryDirectoryView.as_view(), name='category-directory'),
- url(r'^(?:(?P<area_name>[a-zA-Z0-9_-]*)/)?categories/(?P<category_slug>[a-zA-Z0-9_-]+)$',
+ url(r'^(?:(?P<area_name>[a-zA-Z0-9_-]*)/)?categories/'
+ r'(?P<category_slug>[a-zA-Z0-9_-]+)$',
CategoryView.as_view(), name='category-directory-detail'),
+ url(r'^(?:(?P<area_name>[a-zA-Z0-9_-]*)/)?property-choices/'
+ r'(?P<property_slug>[a-zA-Z0-9_-]+)/$',
+ 'property_choice_list', name='property-choices'),
# At the end, because it catches large
url(r'^(?P<area_name>[a-zA-Z0-9_-]+)?', 'index', name="index"),
)
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-18 11:18:41 +0000