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

fix more bugs caused by updates, especially using unwrap_geom

Browse source
This commit is contained in:
Laura Klünder 2023-07-24 11:51:25 +02:00
parent 1837c49ab8
commit 9618d7304f
9 changed files with 59 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/c3nav/mapdata/render/renderdata.py
View file

@ -16,7 +16,7 @@ from c3nav.mapdata.models import Level, MapUpdate, Source
from c3nav.mapdata.render.geometry import AltitudeAreaGeometries, LevelGeometries
from c3nav.mapdata.utils.cache import AccessRestrictionAffected, MapHistory
from c3nav.mapdata.utils.cache.package import CachePackage
from c3nav.mapdata.utils.geometry import get_rings
from c3nav.mapdata.utils.geometry import get_rings, unwrap_geom
empty_geometry_collection = GeometryCollection()
@ -24,7 +24,7 @@ empty_geometry_collection = GeometryCollection()
class Cropper:
def __init__(self, geometry=None):
self.geometry = geometry
self.geometry_prep = None if geometry is None else prepared.prep(geometry)
self.geometry_prep = None if geometry is None else prepared.prep(unwrap_geom(geometry))
def intersection(self, other):
if self.geometry is None:
@ -179,7 +179,7 @@ class LevelRenderData:
) if not geom.is_empty)
for altitudearea in old_geoms.altitudeareas:
new_geometry = crop_to.intersection(altitudearea.geometry)
new_geometry = crop_to.intersection(unwrap_geom(altitudearea.geometry))
if new_geometry.is_empty:
continue
new_geometry_prep = prepared.prep(new_geometry)