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

fix multiple errors in cut_polygon_with_line

Browse source
This commit is contained in:
Laura Klünder 2017-11-16 04:11:01 +01:00
parent 023f80ab6a
commit 6c1e17f6c9
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -375,7 +375,6 @@ class AltitudeArea(LevelGeometryMixin, models.Model):
areas_by_altitude = {}
for tmpid in level_areas.get(level, []):
area = areas[tmpid]
if area.geometry: # todo: how can this be None?
areas_by_altitude.setdefault(area.altitude, []).append(area.geometry)
areas_by_altitude = {altitude: [unary_union(alt_areas)]
for altitude, alt_areas in areas_by_altitude.items()}

11
src/c3nav/mapdata/utils/geometry.py
View file

@ -146,8 +146,8 @@ def cut_polygon_with_line(polygon: Union[Polygon, MultiPolygon], line: LineStrin
if isinstance(item, Point):
points.append(cutpoint(item, i, j))
elif isinstance(item, LineString):
points.append(cutpoint(item.coords[0], i, j))
points.append(cutpoint(item.coords[-1], i, j))
points.append(cutpoint(Point(*item.coords[0]), i, j))
points.append(cutpoint(Point(*item.coords[-1]), i, j))
else:
raise ValueError
@ -230,12 +230,12 @@ def cut_polygon_with_line(polygon: Union[Polygon, MultiPolygon], line: LineStrin
old_ring = LinearRing(ring[0].coords[:-1] + segment.coords[0:])
new_ring = LinearRing(ring[1].coords[:-1] + segment.coords[::-1])
# if this is not an exterior cut but creaes a new polygon inside a hole,
# if this is not an exterior cut but creates a new polygon inside a hole,
# make sure that new_ring contains the exterior for the new polygon
if current.ring != 0 and not new_ring.is_ccw:
new_ring, old_ring = old_ring, new_ring
geom = Polygon(old_ring)
new_geom = Polygon(new_ring)
polygon[current.ring] = old_ring
new_polygon = [new_ring]
polygons.append(new_polygon)
@ -245,7 +245,8 @@ def cut_polygon_with_line(polygon: Union[Polygon, MultiPolygon], line: LineStrin
for i, interior in enumerate(polygon[1:], start=1):
if i == current.ring:
continue
if interior is not None and not geom.contains(interior):
if interior is not None and new_geom.contains(interior):
polygon[i] = None
mapping[i] = len(new_polygon)
new_polygon.append(interior)