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

fix level_change_description check

Browse source
This commit is contained in:
Laura Klünder 2017-12-23 02:27:10 +01:00
parent 89a3a7f4c6
commit d51bc684bb
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/c3nav/mapdata/models/graph.py
View file

@ -45,7 +45,7 @@ class WayType(SerializableMixin, models.Model):
speed_up = models.DecimalField(_('speed upwards (m/s)'), max_digits=3, decimal_places=1, default=1,
validators=[MinValueValidator(Decimal('0.1'))])
description_up = I18nField(_('description upwards'), fallback_any=True)
level_change_description = I18nField(_('level change description'), default='')
level_change_description = I18nField(_('level change description'))
class Meta:
verbose_name = _('Way Type')

3
src/c3nav/routing/route.py
View file

@ -83,7 +83,8 @@ class Route:
description = item.waytype.description
if item.waytype.up_separate and item.edge.rise > 0:
description = item.waytype.description_up
if item.waytype.level_change_description and item.last_item and item.level != item.last_item.level:
if (item.waytype.level_change_description != False and
item.last_item and item.level != item.last_item.level): # != False because it's lazy
description = (description % {
'level_change_description': ' '+(item.waytype.level_change_description %
{'level': item.level.title})+ ' '