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

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

@ -83,19 +83,21 @@ def check_location(location: Optional[str], request) -> Optional[SpecificLocatio
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)
origin = check_location(origin, request)
destination = check_location(destination, request)
origin_slug, destination_slug = origin, destination
origin = check_location(origin or None, request)
destination = check_location(destination or None, request)
state = {
'routing': routing,
'routing': origin_slug is not None,
'origin': (origin.serialize(detailed=False, simple_geometry=True, geometry=False)
if origin else None),
'destination': (destination.serialize(detailed=False, simple_geometry=True, geometry=False)
if destination else None),
'sidebar': bool(routing or destination),
'sidebar': destination_slug is not None,
}
if level is not None:
state.update({