diff --git a/virtual_metro/__init__.py b/virtual_metro/__init__.py index 6e39ebd..bfc9bfb 100755 --- a/virtual_metro/__init__.py +++ b/virtual_metro/__init__.py @@ -80,7 +80,7 @@ def parse_departure(departure, departures, timenow): if stop['stop_id'] in pattern_stops: result['stops'].append(stop['stop_name'].replace(' Station', '')) else: - result['stops'].append('---') + result['stops'].append(' ---') express_stops.append(stop['stop_name'].replace(' Station', '')) if stop['stop_id'] == departures['runs'][str(departure['run_id'])]['final_stop_id']: break diff --git a/virtual_metro/static/template.svg b/virtual_metro/static/template1.svg similarity index 89% rename from virtual_metro/static/template.svg rename to virtual_metro/static/template1.svg index 49a1f5b..f3ced01 100644 --- a/virtual_metro/static/template.svg +++ b/virtual_metro/static/template1.svg @@ -15,7 +15,7 @@ version="1.1" id="svg8" inkscape:version="0.92.2 2405546, 2018-03-11" - sodipodi:docname="template.svg" + sodipodi:docname="template1.svg" inkscape:export-filename="Clayton-Flinders.png" inkscape:export-xdpi="96" inkscape:export-ydpi="96"> @@ -29,8 +29,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.7" - inkscape:cx="1923.5929" - inkscape:cy="258.31501" + inkscape:cx="2007.1643" + inkscape:cy="246.88644" inkscape:document-units="mm" inkscape:current-layer="layer2" showgrid="false" @@ -129,16 +129,16 @@ id="text943" y="146.35385" x="-29.251959" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16.72009468px;line-height:1.25;font-family:'Arial';-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.69666886" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16.72009468px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.69666886" xml:space="preserve">{{stops[0]}} {{stops[1]}} + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16.72009468px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke-width:0.69666886">{{stops[1]}} {{stops[2]}} {{stops[3]}} + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16.72009468px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke-width:0.69666886">{{stops[3]}} {{stops[4]}} {{stops[5]}} + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16.72009468px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke-width:0.69666886">{{stops[5]}} {% if stops[21] %}({{stops.length-20}} more){% else %}{{stops[20]}}{% endif %} + id="tspan900">{% if stops[21] %}({{stops.length-20}} more){% else %}{{stops[20]}}{% endif %} + + + + + + + + + image/svg+xml + + + + + + + + + {{dest}} + Scheduled + {{sch}} + {{stops[0]}} + {{stops[1]}} + {{stops[2]}} + {{stops[3]}} + {{stops[4]}} + {{stops[5]}} + {{stops[6]}} + {{stops[7]}} + Next Trains + {{next[0].sch}} + {{next[0].dest}} + {{next[0].desc}} + {{stops[8]}} + {{stops[9]}} + {{stops[10]}} + {{stops[11]}} + {{stops[12]}} + {{stops[13]}} + {{stops[14]}} + {{stops[15]}} + {{stops[16]}} + {{stops[17]}} + {{stops[18]}} + {{stops[19]}} + {{stops[20]}} + {{stops[21]}} + {{stops[22]}} + {{stops[23]}} + {{next[1].sch}} + {{next[0].dest}} + {{next[1].desc}} + {{stops[24]}} + {{stops[25]}} + {{stops[26]}} + {{stops[27]}} + {{stops[28]}} + {{stops[29]}} + {{stops[30]}} + {% if stops[32] %}({{stops.length-31}} more){% else %}{{stops[31]}}{% endif %} + + + diff --git a/virtual_metro/templates/index.html b/virtual_metro/templates/index.html index 93c26fe..30baf97 100644 --- a/virtual_metro/templates/index.html +++ b/virtual_metro/templates/index.html @@ -30,6 +30,7 @@ +
Stop ? [change] Platform ? [change] Style ? [change: 1, 2]
-
Stop ? [change] Platform ? [change]
- -