nemunaire/epaper
1
0
Fork 0
Code Issues Pull Requests Releases Activity

ratp: Handle more disruptions cases
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
nemunaire 2024-06-07 09:53:26 +02:00
parent 452a6097e3
commit b985ea7a92
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
modules/ratp.py
View File

@ -194,8 +194,16 @@ class IDFMAPI:
def get_line_weather(self, res, disruptions, mode, line): def get_line_weather(self, res, disruptions, mode, line):
for l in res["lines"]: for l in res["lines"]:
if l["id"] == "line:IDFM:" + IDFMAPI.lines[mode][line]: if l["id"] == "line:IDFM:" + IDFMAPI.lines[mode][line]:
disruptionIds = []
disruptionTypes = {}
for impactedObject in l["impactedObjects"]: for impactedObject in l["impactedObjects"]:
for disruptionId in impactedObject["disruptionIds"]: for disruptionId in impactedObject["disruptionIds"]:
if disruptionId not in disruptionIds:
disruptionTypes[disruptionId] = impactedObject["type"]
disruptionIds.append(disruptionId)
for disruptionId in disruptionIds:
impactType = disruptionTypes[disruptionId]
status = "past" status = "past"
for ap in disruptions[disruptionId]["applicationPeriods"]: for ap in disruptions[disruptionId]["applicationPeriods"]:
end = datetime.strptime(ap["end"], "%Y%m%dT%H%M%S") end = datetime.strptime(ap["end"], "%Y%m%dT%H%M%S")
@ -209,7 +217,12 @@ class IDFMAPI:
status = "active" status = "active"
break break
if "cause" in disruptions and disruptions["cause"] == "INFORMATION":
continue
disruptions[disruptionId]["status"] = status disruptions[disruptionId]["status"] = status
disruptions[disruptionId]["scope"] = impactType
yield disruptions[disruptionId] yield disruptions[disruptionId]
return None return None
@ -217,12 +230,17 @@ class IDFMAPI:
def get_line_icon(config, mode, line, size, fill="gray", state=""): def get_line_icon(config, mode, line, size, fill="gray", state=""):
if mode == "M" or mode == "metros": if mode == "M" or mode == "metros":
icon_mode = "metro" icon_mode = "metro"
mode = "metros"
line = line.replace("B", "bis") line = line.replace("B", "bis")
elif mode == "T" or mode == "tramways": elif mode == "T" or mode == "tramways":
icon_mode = "tram" icon_mode = "tram"
mode = "tramways"
line = line.replace("T", "").lower() line = line.replace("T", "").lower()
elif mode == "R" or mode == "rers": elif mode == "R" or mode == "rers":
icon_mode = "RER" icon_mode = "RER"
mode = "rers"
elif mode == "B":
mode = "buses"
img_line = None img_line = None
if mode == "rers" and fill != "white": if mode == "rers" and fill != "white":
@ -415,15 +433,20 @@ class RATPWeatherModule:
state = "" state = ""
fill = "darkgray" fill = "darkgray"
if "NO_SERVICE" in states: if disruption["scope"] == "line" and ("NO_SERVICE" in states or "BLOQUANTE" in states):
fill = "black" fill = "black"
state = "_trafic_grand" state = "_trafic_grand"
elif "REDUCED_SERVICE" in states or "UNKNOWN_EFFECT" in states or "OTHER_EFFECT" in states: elif "PERTURBEE" in states:
fill = "brown"
state = "_trafic_moyen"
elif "REDUCED_SERVICE" in states or "UNKNOWN_EFFECT" in states or "OTHER_EFFECT" in states or "NO_SERVICE" in states or "BLOQUANTE" in states:
fill = "teal" fill = "teal"
state = "_trafic_moyen" state = "_trafic_moyen"
elif "BLOQUANTE TRAVAUX" in states: elif "BLOQUANTE TRAVAUX" in states:
fill = "teal" fill = "teal"
state = "_travaux_moyen" state = "_travaux_moyen"
elif "INFORMATION" in states:
state = "_travaux_petit"
elif len(states) > 0: elif len(states) > 0:
fill = "gray" fill = "gray"
state = "_trafic_petit" state = "_trafic_petit"
@ -518,6 +541,8 @@ class RATPNextStopModule:
}) })
align -= int(line_height * 0.33) align -= int(line_height * 0.33)
if align < 0:
align = 0
image = image.crop((0,0,width, min(align, height))) image = image.crop((0,0,width, min(align, height)))
return image, alerts return image, alerts