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

add outside areas and rename former areas to rooms

Browse source
This commit is contained in:
Laura Klünder 2016-11-28 19:15:36 +01:00
parent 1ce0e41bb9
commit 218c9a1884
7 changed files with 86 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/c3nav/mapdata/models/level.py
View file

@ -56,12 +56,16 @@ class LevelGeometries():
return cascaded_union([building.geometry for building in self.level.buildings.all()])
@cached_property
def areas(self):
return cascaded_union([area.geometry for area in self.level.areas.all()])
def rooms(self):
return cascaded_union([room.geometry for room in self.level.rooms.all()]).intersection(self.buildings)
@cached_property
def outsides(self):
return cascaded_union([outside.geometry for outside in self.level.outsides.all()]).difference(self.buildings)
@cached_property
def mapped(self):
return cascaded_union([self.buildings, self.areas])
return cascaded_union([self.buildings, self.outsides])
@cached_property
def obstacles(self):
@ -73,11 +77,11 @@ class LevelGeometries():
@cached_property
def areas_and_doors(self):
return cascaded_union([self.areas, self.raw_doors])
return cascaded_union([self.rooms, self.raw_doors])
@cached_property
def walls(self):
return self.buildings.difference(self.areas)
return self.buildings.difference(self.rooms)
@cached_property
def walls_without_doors(self):
@ -89,4 +93,4 @@ class LevelGeometries():
@cached_property
def doors(self):
return self.raw_doors.difference(self.areas)
return self.raw_doors.difference(self.rooms).difference(self.outsides)