From 3e592c639290576ee87986d533ee64baa7f7e03d Mon Sep 17 00:00:00 2001 From: RunasSudo Date: Tue, 1 Jan 2019 14:21:25 +1100 Subject: [PATCH] Run out of room gracefully --- virtual_metro/__init__.py | 4 +--- virtual_metro/static/template.svg | 19 ++++++++----------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/virtual_metro/__init__.py b/virtual_metro/__init__.py index 0fbe25d..6e39ebd 100755 --- a/virtual_metro/__init__.py +++ b/virtual_metro/__init__.py @@ -129,9 +129,7 @@ def latest(): result['next'] = [] for departure in departures['departures'][i+1:i+3]: - dep_result = parse_departure(departure, departures, timenow) - dep_result['min'] = '{} min'.format(dep_result['min']) - result['next'].append(dep_result) + result['next'].append(parse_departure(departure, departures, timenow)) return flask.jsonify(result) diff --git a/virtual_metro/static/template.svg b/virtual_metro/static/template.svg index 6e58d12..49a1f5b 100644 --- a/virtual_metro/static/template.svg +++ b/virtual_metro/static/template.svg @@ -29,7 +29,7 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.7" - inkscape:cx="1809.3071" + inkscape:cx="1923.5929" inkscape:cy="258.31501" inkscape:document-units="mm" inkscape:current-layer="layer2" @@ -322,17 +322,15 @@ y="114.90017" id="text1041">{{next[0].min}} + id="tspan2228">{{next[0].min}} min {{next[1].min}} + id="tspan2230">{{next[1].min}} min {{stops[20]}} + y="260.45605">{% if stops[21] %}({{stops.length-20}} more){% else %}{{stops[20]}}{% endif %}