Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

NR: Take platforms from SCHEDULE if not available in LDB

Browse source
This commit is contained in:
Evelyn 2017-08-31 19:08:09 +01:00
parent a78b713268
commit 0822d323bc
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
modules/nr.py
View file

@ -184,8 +184,9 @@ class Module(object):
"rid" : t["rid"], "rid" : t["rid"],
"uid" : t["uid"], "uid" : t["uid"],
"head" : t["trainid"], "head" : t["trainid"],
"platform": "?" if not "platform" in t else t["platform"], "platform": '?' if not "platform" in t else t["platform"],
"platform_hidden": "platformIsHidden" in t and t["platformIsHidden"], "platform_hidden": "platformIsHidden" in t and t["platformIsHidden"],
"platform_prefix": "",
"toc": t["operatorCode"], "toc": t["operatorCode"],
"cancelled" : t["isCancelled"] if "isCancelled" in t else False, "cancelled" : t["isCancelled"] if "isCancelled" in t else False,
"delayed" : t["departureType"]=="Delayed" if "departureType" in t else None, "delayed" : t["departureType"]=="Delayed" if "departureType" in t else None,
@ -220,7 +221,11 @@ class Module(object):
summary_query = Utils.get_url("%s/summaries/%s?uids=%s" % (eagle_url, datetime.now().date().isoformat(), "%20".join([a["uid"] for a in trains])), json=True) summary_query = Utils.get_url("%s/summaries/%s?uids=%s" % (eagle_url, datetime.now().date().isoformat(), "%20".join([a["uid"] for a in trains])), json=True)
if summary_query: if summary_query:
for t in trains: for t in trains:
t.update(summary_query[t["uid"]]) summary = summary_query[t["uid"]]
t.update(summary)
summary_plat = summary["platforms"].get(query["crs"])
if summary_plat and t["platform"]=="?":
t["platform"], t["platform_prefix"] = summary_plat, "s"
for t in trains: for t in trains:
t["dest_summary"] = "/".join(["%s%s" %(a["name"], " " + a["via"] t["dest_summary"] = "/".join(["%s%s" %(a["name"], " " + a["via"]
@ -249,10 +254,11 @@ class Module(object):
train_locs_toc.append((train["destinations"], train["toc"])) train_locs_toc.append((train["destinations"], train["toc"]))
trains_filtered.append(train) trains_filtered.append(train)
trains_string = ", ".join(["%s%s (%s, %s%s%s, %s%s%s%s)" % ( trains_string = ", ".join(["%s%s (%s, %s%s%s%s, %s%s%s%s)" % (
"from " if not filter["type"][0] in "ad" and t["terminating"] else '', "from " if not filter["type"][0] in "ad" and t["terminating"] else '',
t["origin_summary"] if t["terminating"] or filter["type"]=="arrival" else t["dest_summary"], t["origin_summary"] if t["terminating"] or filter["type"]=="arrival" else t["dest_summary"],
t["uid"], t["uid"],
t["platform_prefix"],
"bus" if t["bus"] else t["platform"], "bus" if t["bus"] else t["platform"],
"*" if t["platform_hidden"] else '', "*" if t["platform_hidden"] else '',
"?" if "platformsAreUnreliable" in query and query["platformsAreUnreliable"] else '', "?" if "platformsAreUnreliable" in query and query["platformsAreUnreliable"] else '',