From 3faed6c31633c4e52f216a60bf07f8dbd397f242 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Mon, 27 Nov 2017 16:46:03 +0100 Subject: [PATCH] route from/to level or area --- src/c3nav/routing/router.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/c3nav/routing/router.py b/src/c3nav/routing/router.py index 461492a9..28ab1395 100644 --- a/src/c3nav/routing/router.py +++ b/src/c3nav/routing/router.py @@ -12,7 +12,7 @@ from shapely import prepared from shapely.geometry import Point from shapely.ops import unary_union -from c3nav.mapdata.models import AltitudeArea, GraphEdge, Level, Space, WayType +from c3nav.mapdata.models import AltitudeArea, Area, GraphEdge, Level, Space, WayType from c3nav.routing.route import Route @@ -144,8 +144,13 @@ class Router: return pickle.load(open(cls.filename, 'rb')) def get_locations(self, location): + if isinstance(location, Level): + return RouterLocation((self.levels[location.pk], )) if isinstance(location, Space): return RouterLocation((self.spaces[location.pk], )) + if isinstance(location, Area): + return RouterLocation((self.areas[location.pk], )) + # todo: route from POI or custom location return RouterLocation() def get_route(self, origin, destination):