show route duration in ui

This commit is contained in:
Laura Klünder 2017-12-17 01:15:48 +01:00
parent 54c25e9f94
commit 6ebf019e5a
2 changed files with 16 additions and 1 deletions

View file

@ -77,11 +77,26 @@ class Route:
items[-1].descriptions.append(('done', _('You have reached your destination.')))
duration = round(duration)
seconds = int(duration) % 60
minutes = int(duration/60)
if minutes:
duration_str = '%d min %d s' % (minutes, seconds)
else:
duration_str = '%d s' % seconds
distance = round(distance, 1)
distance_str = '%d m' % distance
summary = '%s (%s)' % (duration_str, distance_str)
return OrderedDict((
('origin', describe_location(self.origin, locations)),
('destination', describe_location(self.destination, locations)),
('distance', round(distance, 2)),
('duration', round(duration)),
('distance_str', distance_str),
('duration_str', duration_str),
('summary', summary),
('items', tuple(item.serialize(locations=locations) for item in items)),
))

View file

@ -367,7 +367,7 @@ c3nav = {
).reverse(), true);
c3nav._firstRouteLevel = first_primary_level;
$route.find('span').text(String(result.distance)+' m');
$route.find('span').text(result.summary);
$route.removeClass('loading');
$details_wrapper.removeClass('loading');