2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

improve state logic in map_index

Browse source
This commit is contained in:
Laura Klünder 2017-10-31 15:37:19 +01:00
parent 91bf8b9652
commit 9787d915f4
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/c3nav/site/urls.py
View file

@ -5,8 +5,7 @@ from c3nav.site.views import map_index
pos = r'(@(?P<level>\d+),(?P<x>\d+(\.\d+)?),(?P<y>\d+(\.\d+)?),(?P<zoom>\d+(\.\d+)?))?' pos = r'(@(?P<level>\d+),(?P<x>\d+(\.\d+)?),(?P<y>\d+(\.\d+)?),(?P<zoom>\d+(\.\d+)?))?'
urlpatterns = [ urlpatterns = [
url(r'^r/(?P<origin>[a-z0-9-_:]+)?/(?P<destination>[a-z0-9-_:]+)?/%s$' % pos, url(r'^r/(?P<origin>([a-z0-9-_:]+)?)/(?P<destination>([a-z0-9-_:]+)?)/%s$' % pos, map_index, name='site.index'),
map_index, name='site.routing', kwargs={'routing': True}), url(r'^l/(?P<destination>[a-z0-9-_:]+)/%s$' % pos, map_index, name='site.index'),
url(r'^l/(?P<destination>[a-z0-9-_:]+)/%s$' % pos, map_index, name='site.location'),
url(r'^%s$' % pos, map_index, name='site.index') url(r'^%s$' % pos, map_index, name='site.index')
] ]

12
src/c3nav/site/views.py
View file

@ -83,19 +83,21 @@ def check_location(location: Optional[str], request) -> Optional[SpecificLocatio
return location return location
def map_index(request, routing=False, origin=None, destination=None, level=None, x=None, y=None, zoom=None): def map_index(request, origin=None, destination=None, level=None, x=None, y=None, zoom=None):
levels = Level.qs_for_request(request).filter(on_top_of_id__isnull=True) levels = Level.qs_for_request(request).filter(on_top_of_id__isnull=True)
origin = check_location(origin, request) origin_slug, destination_slug = origin, destination
destination = check_location(destination, request)
origin = check_location(origin or None, request)
destination = check_location(destination or None, request)
state = { state = {
'routing': routing, 'routing': origin_slug is not None,
'origin': (origin.serialize(detailed=False, simple_geometry=True, geometry=False) 'origin': (origin.serialize(detailed=False, simple_geometry=True, geometry=False)
if origin else None), if origin else None),
'destination': (destination.serialize(detailed=False, simple_geometry=True, geometry=False) 'destination': (destination.serialize(detailed=False, simple_geometry=True, geometry=False)
if destination else None), if destination else None),
'sidebar': bool(routing or destination), 'sidebar': destination_slug is not None,
} }
if level is not None: if level is not None:
state.update({ state.update({