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

it's grid square, not grid cell (even though we don't have square cells)

Browse source
This commit is contained in:
Laura Klünder 2018-12-10 19:39:32 +01:00
parent 8824026ce0
commit c666fd6db5
5 changed files with 33 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/c3nav/mapdata/utils/locations.py
View file

@ -367,13 +367,13 @@ class CustomLocation:
return self.description.near_poi
@cached_property
def grid_cell(self):
return grid.get_cell_for_point(self.x, self.y) or ''
def grid_square(self):
return grid.get_square_for_point(self.x, self.y) or ''
@cached_property
def title_subtitle(self):
grid_cell = self.grid_cell
level_subtitle = self.level.title if not grid_cell else ','.join((grid_cell, str(self.level.title)))
grid_square = self.grid_square
level_subtitle = self.level.title if not grid_square else ','.join((grid_square, str(self.level.title)))
title = _('In %(level)s') % {'level': self.level.title}
if not self.space:
@ -395,7 +395,7 @@ class CustomLocation:
else:
return _('In %(space)s') % {'space': self.space.title}, level_subtitle
subtitle_segments = chain((grid_cell, ), subtitle, (self.space.title, self.level.title))
subtitle_segments = chain((grid_square, ), subtitle, (self.space.title, self.level.title))
subtitle = ', '.join(str(title) for title in subtitle_segments if title)
return title, subtitle