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

better other_spaces ordering in space geometry view

Browse source
This commit is contained in:
Laura Klünder 2017-07-08 17:30:10 +02:00
parent b2ac3a5395
commit a72635e27b
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/c3nav/editor/api.py
View file

@ -107,6 +107,13 @@ class EditorViewSet(ViewSet):
other_spaces = Space.objects.filter(level__pk__in=levels).prefetch_related('groups') other_spaces = Space.objects.filter(level__pk__in=levels).prefetch_related('groups')
other_spaces = [s for s in other_spaces other_spaces = [s for s in other_spaces
if s.geometry.intersects(doors_space_geom) and s.pk != space.pk] if s.geometry.intersects(doors_space_geom) and s.pk != space.pk]
if level.on_top_of_id is None:
other_spaces_lower = [s for s in other_spaces if s.level_id in levels_under]
other_spaces_upper = [s for s in other_spaces if s.level_id in levels_on_top]
else:
other_spaces_lower = [s for s in other_spaces if s.level_id == level.on_top_of_id]
other_spaces_upper = []
other_spaces = [s for s in other_spaces if s.level_id == level.pk]
space.bounds = True space.bounds = True
@ -122,7 +129,9 @@ class EditorViewSet(ViewSet):
results = chain( results = chain(
buildings, buildings,
other_spaces_lower,
doors, doors,
other_spaces,
[space], [space],
space.areas.all().prefetch_related('groups'), space.areas.all().prefetch_related('groups'),
space.holes.all(), space.holes.all(),
@ -131,7 +140,7 @@ class EditorViewSet(ViewSet):
space.lineobstacles.all(), space.lineobstacles.all(),
space.columns.all(), space.columns.all(),
space.pois.all().prefetch_related('groups'), space.pois.all().prefetch_related('groups'),
other_spaces, other_spaces_upper,
) )
return Response(sum([self._get_geojsons(obj) for obj in results], ())) return Response(sum([self._get_geojsons(obj) for obj in results], ()))
else: else: