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

ignore empty altitude areas

Browse source
This commit is contained in:
Laura Klünder 2017-12-21 19:09:17 +01:00
parent cb57090f13
commit 7a02f58175
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -72,11 +72,7 @@ def good_representative_point(geometry):
if isinstance(geometry, Point): if isinstance(geometry, Point):
return geometry return geometry
c = geometry.centroid c = geometry.centroid
try: x1, y1, x2, y2 = geometry.bounds
x1, y1, x2, y2 = geometry.bounds
except ValueError:
# jup, this can happen
return c
lines = (tuple(assert_multilinestring(LineString(((x1, c.y), (x2, c.y))).intersection(geometry))) + lines = (tuple(assert_multilinestring(LineString(((x1, c.y), (x2, c.y))).intersection(geometry))) +
tuple(assert_multilinestring(LineString(((c.x, y1), (c.x, y2))).intersection(geometry)))) tuple(assert_multilinestring(LineString(((c.x, y1), (c.x, y2))).intersection(geometry))))
return min(lines, key=lambda line: (line.distance(c), line.length), return min(lines, key=lambda line: (line.distance(c), line.length),

4
src/c3nav/routing/router.py
View file

@ -119,7 +119,11 @@ class Router:
if not space.geometry_prep.intersects(area.geometry): if not space.geometry_prep.intersects(area.geometry):
continue continue
for subgeom in assert_multipolygon(accessible_geom.intersection(area.geometry)): for subgeom in assert_multipolygon(accessible_geom.intersection(area.geometry)):
if subgeom.is_empty:
continue
area_clear_geom = unary_union(tuple(get_rings(subgeom.difference(obstacles_geom)))) area_clear_geom = unary_union(tuple(get_rings(subgeom.difference(obstacles_geom))))
if area_clear_geom.is_empty:
continue
area = RouterAltitudeArea(subgeom, area_clear_geom, area = RouterAltitudeArea(subgeom, area_clear_geom,
area.altitude, area.altitude2, area.point1, area.point2) area.altitude, area.altitude2, area.point1, area.point2)
area_nodes = tuple(node for node in space_nodes if area.geometry_prep.intersects(node.point)) area_nodes = tuple(node for node in space_nodes if area.geometry_prep.intersects(node.point))