From 8a9406275b4f4ce9e09d0fc272babd12d8a28781 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Tue, 20 Dec 2016 22:39:28 +0100 Subject: [PATCH] fix location_id of PointLocation --- src/c3nav/mapdata/models/locations.py | 4 ++-- src/c3nav/routing/graph.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/c3nav/mapdata/models/locations.py b/src/c3nav/mapdata/models/locations.py index 82890f0c..e57fb6ab 100644 --- a/src/c3nav/mapdata/models/locations.py +++ b/src/c3nav/mapdata/models/locations.py @@ -238,7 +238,7 @@ def get_location(request, name): level = levels.get(match.group('level')) if level is None: return None - return PointLocation(level=level, x=int(match.group('x')), y=int(match.group('y'))) + return PointLocation(level=level, x=int(match.group('x'))/100, y=int(match.group('y'))/100) if name.startswith('g:'): return filter_queryset_by_package_access(request, LocationGroup.objects.filter(name=name[2:])).first() @@ -282,7 +282,7 @@ class PointLocation(Location): @cached_property def location_id(self): - return 'c:%s:%d:%d' % (self.level.name, self.x, self.y) + return 'c:%s:%d:%d' % (self.level.name, self.x*100, self.y*100) @property def title(self) -> str: diff --git a/src/c3nav/routing/graph.py b/src/c3nav/routing/graph.py index bf3922a1..c391e97f 100644 --- a/src/c3nav/routing/graph.py +++ b/src/c3nav/routing/graph.py @@ -242,6 +242,7 @@ class Graph: def get_location_points(self, location: Location): if isinstance(location, PointLocation): + return self.levels[level.name].points_from() return 'bla' elif isinstance(location, AreaLocation): return self.levels[location.level.name].arealocation_points[location.name]