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

routing to dynamic locations!

Browse source
This commit is contained in:
Laura Klünder 2019-12-27 22:11:51 +01:00
parent 71cf0686ac
commit cca263c605
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,6 +19,7 @@ from shapely.ops import unary_union
from c3nav.mapdata.models import AltitudeArea, Area, GraphEdge, Level, LocationGroup, MapUpdate, Space, WayType from c3nav.mapdata.models import AltitudeArea, Area, GraphEdge, Level, LocationGroup, MapUpdate, Space, WayType
from c3nav.mapdata.models.geometry.space import POI, CrossDescription, LeaveDescription from c3nav.mapdata.models.geometry.space import POI, CrossDescription, LeaveDescription
from c3nav.mapdata.models.locations import CustomLocationProxyMixin
from c3nav.mapdata.utils.geometry import assert_multipolygon, get_rings, good_representative_point from c3nav.mapdata.utils.geometry import assert_multipolygon, get_rings, good_representative_point
from c3nav.mapdata.utils.locations import CustomLocation from c3nav.mapdata.utils.locations import CustomLocation
from c3nav.routing.exceptions import LocationUnreachable, NoRouteFound, NotYetRoutable from c3nav.routing.exceptions import LocationUnreachable, NoRouteFound, NotYetRoutable
@ -326,7 +327,9 @@ class Router:
(poi for poi in (self.pois[pk] for pk in group.get('pois', ())) (poi for poi in (self.pois[pk] for pk in group.get('pois', ()))
if poi.space_id not in restrictions.spaces and poi.access_restriction_id not in restrictions), if poi.space_id not in restrictions.spaces and poi.access_restriction_id not in restrictions),
)) ))
elif isinstance(location, CustomLocation): elif isinstance(location, (CustomLocation, CustomLocationProxyMixin)):
if isinstance(location, CustomLocationProxyMixin):
location = location.get_custom_location()
point = Point(location.x, location.y) point = Point(location.x, location.y)
location = RouterPoint(location) location = RouterPoint(location)
space = self.space_for_point(location.level.pk, point, restrictions) space = self.space_for_point(location.level.pk, point, restrictions)