From b42c66fe567a5ca693bc2645212956abd7fe6948 Mon Sep 17 00:00:00 2001 From: Claas Date: Fri, 21 Jun 2024 21:00:29 +0200 Subject: [PATCH] Add more connection data --- src/routes/journey.tsx | 414 +++++++++++++++++++++++++++++++++++------ 1 file changed, 361 insertions(+), 53 deletions(-) diff --git a/src/routes/journey.tsx b/src/routes/journey.tsx index ac159f9..0271aa9 100644 --- a/src/routes/journey.tsx +++ b/src/routes/journey.tsx @@ -27,27 +27,13 @@ function Connection({ ); } -type Connection2 = { - /** Start and at the same time destination of the parent connection before this if this is not the first connection */ - start: string; - line: string; - headsign: string; - /** Only set if this is the last connection/leaf in the connection tree. If this is the last connection, then changes should not exist */ - destination?: string; - time: { - /** Time to change from the connection before this (parent connection). Optional because this could be the first connection */ - change?: string; - arrive: string; - depart: string; - duration: string; - }; - - /** Optional because this could be the last connection and destination is set. */ - changes?: Connection2[]; -}; -function Connection3(connection: Connection2): JSX.Element { +function TransportConnection({ + connection, +}: { + connection: Transport; +}): JSX.Element { return ( -
+ <>

+ + ); +} + +function Connection3(connection: Connection2): JSX.Element { + return ( +
+ {/* TODO make this aligned through grid to area below */} + + + + + +
Walk
+ + +
{Connection3}
- +

{/* flex-none: diasable elements shrinking to fit the flex container */} -

-
Start
+
{/* overscroll-x-contain: we need to be able to scroll on the y-axis */}
- - }> - - + ); } @@ -442,21 +457,217 @@ const connections: Connection[] = [ }, ]; +type Line2 = { + type: "STR" | "Bus" | "RE" | "RB"; + color: string; + number: string; +}; +type Changes = { + /** Optional because this could be the last connection and destination is set. */ + changes?: Connection2[]; +}; +type Transport = { + type: "transport"; + /** Start and at the same time destination of the parent connection before this if this is not the first connection */ + start: string; + line: Line2; + headsign: string; + /** Only set if this is the last connection/leaf in the connection tree. If this is the last connection, then changes should not exist */ + destination?: string; + time: { + /** Time to change from the connection before this (parent connection). Optional because this could be the first connection */ + change?: string; + arrive: string; + depart: string; + duration: string; + delay?: { + arrive: string; + depart: string; + }; + }; + platform?: string; +}; + +type Walk = { + type: "walk"; + timeAvailable: string; + distance: string; + time: string; + + /** Optional because this could be the last connection and destination is set. */ + changes?: Connection2[]; +}; +type Connection2 = (Transport | Walk) & Changes; + +const WALK_BONN_HBF: Walk = { + type: "walk", + timeAvailable: "8min", + distance: "84m", + time: "6min", +}; + +const WALK_BARBAROSSAPLATZ: Walk = { + type: "walk", + timeAvailable: "9min", + distance: "334m", + time: "8min", +}; + +const RE_WESEL_1628: Connection2 = { + type: "transport", + start: "Bonn Hbf", + line: { + type: "RE", + color: "bg-[#7C818B]", + number: "5 (28524)", + }, + headsign: "Wesel", + time: { + arrive: "16:21", + depart: "16:04", + duration: "17min", + delay: { + arrive: "16:45", + depart: "16:28", + }, + }, + changes: [ + { + ...WALK_BARBAROSSAPLATZ, + timeAvailable: "9min", + changes: [ + { + type: "transport", + start: "Barbarossaplatz, Köln", + line: { + type: "STR", + color: "bg-[#9f3d53]", + number: "18", + }, + headsign: "Riehl Slabystr., Köln", + destination: "Neumarkt, Köln", + time: { + arrive: "16:57", + depart: "16:54", + duration: "3min", + delay: { + arrive: "16:57", + depart: "16:54", + }, + }, + }, + ], + }, + ], +}; + +const STR_NIEHL_1622: Connection2 = { + type: "transport", + start: "Hauptbahnhof, Bonn", + // line: "STR 16", + line: { + type: "STR", + color: "bg-[#9f3d53]", + number: "16", + }, + headsign: "Niehl Sebastianstr., Köln", + destination: "Neumarkt, Köln", + time: { + arrive: "17:15", + depart: "16:22", + duration: "53min", + delay: { + arrive: "16:22", + depart: "17:15", + }, + }, +}; + +const RB_MESSE_1633: Connection2 = { + type: "transport", + start: "Bonn Hbf", + line: { + type: "RB", + color: "bg-[#7C818B]", + number: "26 (25430)", + }, + headsign: "Köln Messe/Deutz", + destination: "Köln Süd", + time: { + arrive: "16:53", + depart: "16:33", + duration: "20min", + delay: { + arrive: "16:54", + depart: "16:34", + }, + }, + changes: [ + { + ...WALK_BARBAROSSAPLATZ, + timeAvailable: "8min", + changes: [ + { + type: "transport", + start: "Barbarossaplatz, Köln", + line: { + type: "STR", + color: "bg-[#9f3d53]", + number: "16", + }, + headsign: "Niehl Sebastianstr., Köln", + destination: "Neumarkt, Köln", + time: { + arrive: "17:05", + depart: "17:02", + duration: "3min", + delay: { + arrive: "17:05", + depart: "17:02", + }, + }, + }, + ], + }, + ], +}; + +function withChange(connection: Transport, change: string): Connection2 { + return { + ...connection, + time: { + ...connection.time, + change, + }, + }; +} + const connections2: Connection2[] = [ { + type: "transport", start: "Beuel Konrad-Adenauer-Platz, Bonn", - line: "STR 62", + // line: "STR 62", + line: { + type: "STR", + color: "bg-[#9f3d53]", + number: "62", + }, headsign: "Dottendorf Quirinusplatz, Bonn", time: { arrive: "16:07", depart: "15:58", duration: "9min", }, - destination: "Hauptbahnhof, Bonn", changes: [ { + type: "transport", start: "Hauptbahnhof, Bonn", - line: "STR 16", + // line: "STR 16", + line: { + type: "STR", + color: "bg-[#9f3d53]", + number: "16", + }, headsign: "Niehl Sebastianstr., Köln", destination: "Neumarkt, Köln", time: { @@ -464,32 +675,129 @@ const connections2: Connection2[] = [ arrive: "17:05", depart: "16:12", duration: "53min", + delay: { + arrive: "16:12", + depart: "17:05", + }, }, }, + withChange(STR_NIEHL_1622, "15min"), + withChange(RE_WESEL_1628, "21min"), ], }, { + type: "transport", start: "Beuel Konrad-Adenauer-Platz, Bonn", - line: "STR 62", + // line: "STR 62", + line: { + type: "STR", + color: "bg-[#9f3d53]", + number: "62", + }, headsign: "Dottendorf Quirinusplatz, Bonn", time: { arrive: "16:17", depart: "16:08", duration: "9min", + delay: { + arrive: "16:08", + depart: "16:17", + }, + }, + changes: [ + withChange(STR_NIEHL_1622, "5min"), + withChange(RE_WESEL_1628, "9min"), + ], + }, + { + type: "transport", + start: "Beuel Konrad-Adenauer-Platz, Bonn", + line: { + type: "Bus", + color: "bg-[#76408C]", + number: "117", + }, + headsign: "Hauptbahnhof, Bonn", + time: { + arrive: "16:15", + depart: "16:05", + duration: "10min", + }, + changes: [ + withChange(STR_NIEHL_1622, "4min"), + withChange(RE_WESEL_1628, "13min"), + ], + }, + + // Bus -> Walk -> RE + { + type: "transport", + start: "Beuel Konrad-Adenauer-Platz, Bonn", + line: { + type: "Bus", + color: "bg-[#76408C]", + number: "603", + }, + headsign: "Hauptbahnhof, Bonn", + time: { + arrive: "16:20", + depart: "16:09", + duration: "10min", + }, + changes: [ + { + ...WALK_BONN_HBF, + timeAvailable: "8min", + changes: [RE_WESEL_1628], + }, + ], + }, + { + type: "transport", + start: "Beuel Konrad-Adenauer-Platz, Bonn", + line: { + type: "STR", + color: "bg-[#9f3d53]", + number: "62", + }, + headsign: "Dottendorf Quirinusplatz, Bonn", + time: { + arrive: "16:27", + depart: "16:18", + duration: "9min", }, - destination: "Hauptbahnhof, Bonn", changes: [ { - start: "Hauptbahnhof, Bonn", - line: "STR 16", - headsign: "Niehl Sebastianstr., Köln", - destination: "Neumarkt, Köln", - time: { - change: "5min", - arrive: "17:15", - depart: "16:22", - duration: "53min", - }, + ...WALK_BONN_HBF, + timeAvailable: "7min", + changes: [RB_MESSE_1633], + }, + ], + }, + // 640 -> RB 26 + { + type: "transport", + start: "Beuel Konrad-Adenauer-Platz, Bonn", + line: { + type: "Bus", + color: "bg-[#76408C]", + number: "640", + }, + headsign: "Hauptbahnhof, Bonn", + time: { + arrive: "16:23", + depart: "16:13", + duration: "10min", + delay: { + arrive: "16:28", + depart: "16:18", + }, + }, + changes: [ + { + ...WALK_BONN_HBF, + timeAvailable: "6min", + changes: [RB_MESSE_1633], }, ], }, -- knotmirror 0.0.1