display grid cell for POIs

This commit is contained in:
Laura Klünder 2018-12-10 19:06:38 +01:00
parent 875b18c730
commit f861fecee5
3 changed files with 20 additions and 4 deletions

View file

@ -366,10 +366,14 @@ class CustomLocation:
def near_poi(self):
return self.description.near_poi
@cached_property
def grid_cell(self):
return grid.get_cell_for_point(self.x, self.y) or ''
@cached_property
def title_subtitle(self):
grid_cell = grid.get_cell_for_point(self.x, self.y)
level_subtitle = self.level.title if grid_cell is None else ','.join((grid_cell, str(self.level.title)))
grid_cell = self.grid_cell
level_subtitle = self.level.title if not grid_cell else ','.join((grid_cell, str(self.level.title)))
title = _('In %(level)s') % {'level': self.level.title}
if not self.space:
@ -392,7 +396,7 @@ class CustomLocation:
return _('In %(space)s') % {'space': self.space.title}, level_subtitle
subtitle_segments = chain((grid_cell, ), subtitle, (self.space.title, self.level.title))
subtitle = ', '.join(str(title) for title in subtitle_segments if title is not None)
subtitle = ', '.join(str(title) for title in subtitle_segments if title)
return title, subtitle
@cached_property