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

rename empty string level in editor api

Browse source
This commit is contained in:
Laura Klünder 2017-05-26 20:30:06 +02:00
parent 53d8ebbddc
commit c66b492f8f
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,10 +29,10 @@ class EditorViewSet(ViewSet):
holes_geom = cascaded_union([hole.geometry for hole in holes]) holes_geom = cascaded_union([hole.geometry for hole in holes])
buildings = section.buildings.all() buildings = section.buildings.all()
spaces = section.spaces.all() spaces = section.spaces.all()
spaces_geom = cascaded_union([space.geometry for space in spaces if space.level == '']) spaces_geom = cascaded_union([space.geometry for space in spaces if space.level == 'normal'])
holes_geom = holes_geom.intersection(spaces_geom) holes_geom = holes_geom.intersection(spaces_geom)
doors = section.doors.all() doors = section.doors.all()
for obj in chain(buildings, (s for s in spaces if s.level == '')): for obj in chain(buildings, (s for s in spaces if s.level == 'normal')):
obj.geometry = obj.geometry.difference(holes_geom) obj.geometry = obj.geometry.difference(holes_geom)
results = [] results = []
@ -58,7 +58,7 @@ class EditorViewSet(ViewSet):
doors = [door for door in section.doors.all() if door.geometry.intersects(space.geometry)] doors = [door for door in section.doors.all() if door.geometry.intersects(space.geometry)]
doors_geom = cascaded_union([door.geometry for door in doors]) doors_geom = cascaded_union([door.geometry for door in doors])
spaces = [s for s in section.spaces.filter(level='') spaces = [s for s in section.spaces.filter(level='normal')
if s.geometry.intersects(doors_geom) and s.pk != space.pk] if s.geometry.intersects(doors_geom) and s.pk != space.pk]
results = chain( results = chain(