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

fix Level.nearest_point if there is no nearest point

Browse source
This commit is contained in:
Laura Klünder 2016-12-23 23:03:25 +01:00
parent 497798925b
commit c954f3976b
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/c3nav/mapdata/models/locations.py
View file

@ -210,16 +210,15 @@ class AreaLocation(LocationModelMixin, GeometryMapItemWithLevel):
@property @property
def subtitle(self): def subtitle(self):
return self.get_subtitle(with_type=False) return self.get_subtitle()
@property @property
def subtitle_without_type(self): def subtitle_without_type(self):
return self.get_subtitle(with_type=False) return self.get_subtitle()
def get_subtitle(self, with_type=True): def get_subtitle(self):
items = [] items = []
if with_type: items += [group.title for group in self.groups.all()]
items += [self.get_location_type_display()]
items += [area.title for area in self.get_in_areas() if area.can_describe] items += [area.title for area in self.get_in_areas() if area.can_describe]
return ', '.join(items) return ', '.join(items)

2
src/c3nav/routing/level.py
View file

@ -391,6 +391,8 @@ class GraphLevel():
if nearest_point is None: if nearest_point is None:
nearest_point = self._nearest_point(point, mode) nearest_point = self._nearest_point(point, mode)
cache.set(cache_key, nearest_point, 60) cache.set(cache_key, nearest_point, 60)
if nearest_point is None:
return None
return self.graph.points[nearest_point] return self.graph.points[nearest_point]
def _nearest_point(self, point, mode): def _nearest_point(self, point, mode):