RunasSudo/virtual-metro
Archived
1
Fork 0
Code Issues Pull Requests Activity

Fix processing of express stations for down trains

Browse Source
This commit is contained in:
RunasSudo 2019-01-01 15:56:26 +11:00
parent 616266a177
commit 0b56e1164f
Signed by: RunasSudo
GPG Key ID: 7234E476BF21C61A
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
virtual_metro/__init__.py
View File

@ -30,6 +30,7 @@ def parse_date(dtstring):
return pytz.utc.localize(datetime.strptime(dtstring, '%Y-%m-%dT%H:%M:%SZ')).astimezone(timezone) return pytz.utc.localize(datetime.strptime(dtstring, '%Y-%m-%dT%H:%M:%SZ')).astimezone(timezone)
ROUTE_TYPE = 0 ROUTE_TYPE = 0
LOOP_STATIONS = ['Parliament', 'Melbourne Central', 'Flagstaff', 'Southern Cross', 'Flinders Street']
timezone = pytz.timezone('Australia/Melbourne') timezone = pytz.timezone('Australia/Melbourne')
@ -62,15 +63,19 @@ def parse_departure(departure, departures, timenow):
route_stops_dir = route_stops[(departure['route_id'], departure['direction_id'])] route_stops_dir = route_stops[(departure['route_id'], departure['direction_id'])]
# Calculate stopping pattern until city loop # Calculate stopping pattern
express_stops = [] # express_stop_count is unreliable for the city loop express_stops = [] # express_stop_count is unreliable for the city loop
num_city_loop = 0 num_city_loop = 0
done_city_loop = False
for j, stop in enumerate(route_stops_dir): for j, stop in enumerate(route_stops_dir):
if stop['stop_id'] == int(flask.request.args['stop_id']): if stop['stop_id'] == int(flask.request.args['stop_id']):
break break
for stop in route_stops_dir[j+1:]: for stop in route_stops_dir[j+1:]:
if stop['stop_id'] == 1155 or stop['stop_id'] == 1120 or stop['stop_id'] == 1068 or stop['stop_id'] == 1181 or stop['stop_id'] == 1071: # Parliament, MCS, Flagstaff, SXS, Flinders St if stop['stop_name'] in LOOP_STATIONS:
# Calculate stopping pattern in city loop # Calculate stopping pattern in city loop
if done_city_loop:
continue
pattern['departures'].sort(key=lambda x: x['scheduled_departure_utc']) pattern['departures'].sort(key=lambda x: x['scheduled_departure_utc'])
for k, stop2 in enumerate(pattern['departures']): for k, stop2 in enumerate(pattern['departures']):
if stop2['stop_id'] == stop['stop_id']: if stop2['stop_id'] == stop['stop_id']:
@ -78,7 +83,8 @@ def parse_departure(departure, departures, timenow):
for stop in pattern['departures'][k:]: for stop in pattern['departures'][k:]:
result['stops'].append(pattern['stops'][str(stop['stop_id'])]['stop_name'].replace(' Station', '')) result['stops'].append(pattern['stops'][str(stop['stop_id'])]['stop_name'].replace(' Station', ''))
num_city_loop += 1 num_city_loop += 1
break
done_city_loop = True
if stop['stop_id'] in pattern_stops: if stop['stop_id'] in pattern_stops:
result['stops'].append(stop['stop_name'].replace(' Station', '')) result['stops'].append(stop['stop_name'].replace(' Station', ''))
else: else:
@ -97,7 +103,7 @@ def parse_departure(departure, departures, timenow):
#result['dest'] = departures['runs'][str(departure['run_id'])]['destination_name'] #result['dest'] = departures['runs'][str(departure['run_id'])]['destination_name']
result['dest'] = result['stops'][-1] result['dest'] = result['stops'][-1]
if result['dest'] == 'Parliament' or result['dest'] == 'Melbourne Central' or result['dest'] == 'Flagstaff' or result['dest'] == 'Southern Cross' or result['dest'] == 'Flinders Street': if result['dest'] in LOOP_STATIONS:
# Is this a City Loop train? # Is this a City Loop train?
if num_city_loop >= 3: if num_city_loop >= 3:
result['dest'] = 'City Loop' result['dest'] = 'City Loop'