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

make altitudes reusable using GroundAltitude model

Browse source
This commit is contained in:
Laura Klünder 2023-12-11 18:17:39 +01:00
parent c939c81c71
commit 97c9c7ecb7
8 changed files with 48 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/c3nav/mapdata/models/geometry/level.py
View file

@ -218,7 +218,8 @@ class AltitudeArea(LevelGeometryMixin, models.Model):
spaces = {}
levels = Level.objects.prefetch_related('buildings', 'doors', 'spaces', 'spaces__columns',
'spaces__obstacles', 'spaces__lineobstacles', 'spaces__holes',
'spaces__stairs', 'spaces__ramps', 'spaces__altitudemarkers')
'spaces__stairs', 'spaces__ramps',
'spaces__altitudemarkers__groundaltitude')
logger = logging.getLogger('c3nav')
for level in levels:
@ -285,7 +286,7 @@ class AltitudeArea(LevelGeometryMixin, models.Model):
# give altitudes to areas
for space in level.spaces.all():
for altitudemarker in space.altitudemarkers.all():
for altitudemarker in space.altitudemarkers.select_related('groundaltitude').all():
for area in space_areas[space.pk]:
if area.geometry_prep.contains(unwrap_geom(altitudemarker.geometry)):
area.altitude = altitudemarker.altitude