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

speed up AltitudeAreas.recalculate() even more using prepared geometries

Browse source
This commit is contained in:
Laura Klünder 2017-11-18 20:26:34 +01:00
parent 7f5b614620
commit 3245837028
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -467,12 +467,15 @@ class AltitudeArea(LevelGeometryMixin, models.Model):
space_geom = space.geometry
if space.outside:
space_geom = space_geom.difference(buildings_geom)
space_geom_prep = prepared.prep(space_geom)
holes_geom = unary_union(tuple(h.geometry for h in space.holes.all()))
remaining_space = (
tuple(o.geometry for o in space.obstacles.all()) +
tuple(o.buffered_geometry for o in space.lineobstacles.all())
)
remaining_space = tuple(g.intersection(space_geom).difference(holes_geom) for g in remaining_space)
remaining_space = tuple(g.intersection(space_geom).difference(holes_geom)
for g in remaining_space
if space_geom_prep.intersects(g))
remaining_space = tuple(chain(*(
assert_multipolygon(g) for g in remaining_space if not g.is_empty
)))