From 6ebf019e5a924d3c33a1dc4c14ff99f0a4da37bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Sun, 17 Dec 2017 01:15:48 +0100 Subject: [PATCH] show route duration in ui --- src/c3nav/routing/route.py | 15 +++++++++++++++ src/c3nav/site/static/site/js/c3nav.js | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/c3nav/routing/route.py b/src/c3nav/routing/route.py index f9f13c6a..a3170d86 100644 --- a/src/c3nav/routing/route.py +++ b/src/c3nav/routing/route.py @@ -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)), )) diff --git a/src/c3nav/site/static/site/js/c3nav.js b/src/c3nav/site/static/site/js/c3nav.js index 1c237dd6..a508b21f 100644 --- a/src/c3nav/site/static/site/js/c3nav.js +++ b/src/c3nav/site/static/site/js/c3nav.js @@ -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');