diff --git a/test/abi_test.cc b/test/abi_test.cc index ffd88d82..8c6b60d5 100644 --- a/test/abi_test.cc +++ b/test/abi_test.cc @@ -411,7 +411,7 @@ TEST(rt, abi_timetable) { EXPECT_EQ(596, transport->event_mams[transport->n_event_mams - 2]); EXPECT_EQ(598, transport->event_mams[transport->n_event_mams - 1]); auto const t_name = std::string{transport->name, transport->name_len}; - EXPECT_EQ("Tram iXpress Fischer-Hallman", t_name); + EXPECT_EQ("iXpress Fischer-Hallman", t_name); auto const route = nigiri_get_route(t, transport->route_idx); EXPECT_EQ(28, route->n_stops); diff --git a/test/loader/gtfs/block_id_test.cc b/test/loader/gtfs/block_id_test.cc index bc562e82..416ba77f 100644 --- a/test/loader/gtfs/block_id_test.cc +++ b/test/loader/gtfs/block_id_test.cc @@ -90,13 +90,13 @@ TRANSFERS: 0 FROM: (STOP 1, S1) [2006-07-02 21:00] TO: (STOP 8, S8) [2006-07-03 04:00] leg 0: (STOP 1, S1) [2006-07-02 21:00] -> (STOP 8, S8) [2006-07-03 04:00] - 0: S1 STOP 1.......................................... d: 02.07 21:00 [02.07 23:00] [{name=17 T1, day=2006-07-02, id=T1, src=0}] - 1: S2 STOP 2.......................................... a: 02.07 21:55 [02.07 23:55] d: 02.07 22:00 [03.07 00:00] [{name=17 T3, day=2006-07-02, id=T3, src=0}] - 2: S3 STOP 3.......................................... a: 02.07 23:00 [03.07 01:00] d: 02.07 23:00 [03.07 01:00] [{name=17 T3, day=2006-07-02, id=T3, src=0}] - 3: S4 STOP 4.......................................... a: 03.07 00:00 [03.07 02:00] d: 03.07 00:00 [03.07 02:00] [{name=17 T6, day=2006-07-02, id=T6, src=0}] - 4: S5 STOP 5.......................................... a: 03.07 01:00 [03.07 03:00] d: 03.07 01:00 [03.07 03:00] [{name=17 T6, day=2006-07-02, id=T6, src=0}] - 5: S6 STOP 6.......................................... a: 03.07 02:00 [03.07 04:00] d: 03.07 02:00 [03.07 04:00] [{name=17 T6, day=2006-07-02, id=T6, src=0}] - 6: S7 STOP 7.......................................... a: 03.07 03:00 [03.07 05:00] d: 03.07 03:00 [03.07 05:00] [{name=17 T6, day=2006-07-02, id=T6, src=0}] + 0: S1 STOP 1.......................................... d: 02.07 21:00 [02.07 23:00] [{name=17, day=2006-07-02, id=T1, src=0}] + 1: S2 STOP 2.......................................... a: 02.07 21:55 [02.07 23:55] d: 02.07 22:00 [03.07 00:00] [{name=17, day=2006-07-02, id=T3, src=0}] + 2: S3 STOP 3.......................................... a: 02.07 23:00 [03.07 01:00] d: 02.07 23:00 [03.07 01:00] [{name=17, day=2006-07-02, id=T3, src=0}] + 3: S4 STOP 4.......................................... a: 03.07 00:00 [03.07 02:00] d: 03.07 00:00 [03.07 02:00] [{name=17, day=2006-07-02, id=T6, src=0}] + 4: S5 STOP 5.......................................... a: 03.07 01:00 [03.07 03:00] d: 03.07 01:00 [03.07 03:00] [{name=17, day=2006-07-02, id=T6, src=0}] + 5: S6 STOP 6.......................................... a: 03.07 02:00 [03.07 04:00] d: 03.07 02:00 [03.07 04:00] [{name=17, day=2006-07-02, id=T6, src=0}] + 6: S7 STOP 7.......................................... a: 03.07 03:00 [03.07 05:00] d: 03.07 03:00 [03.07 05:00] [{name=17, day=2006-07-02, id=T6, src=0}] 7: S8 STOP 8.......................................... a: 03.07 04:00 [03.07 06:00] )"}; diff --git a/test/routing/bike_transport_test.cc b/test/routing/bike_transport_test.cc index fa180d11..c11d2264 100644 --- a/test/routing/bike_transport_test.cc +++ b/test/routing/bike_transport_test.cc @@ -107,8 +107,8 @@ TRANSFERS: 0 FROM: (A, A) [2019-05-01 08:00] TO: (C, C) [2019-05-01 08:20] leg 0: (A, A) [2019-05-01 08:00] -> (C, C) [2019-05-01 08:20] - 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=Bus 0, day=2019-05-01, id=T0, src=0}] - 1: B B............................................... a: 01.05 08:10 [01.05 10:10] d: 01.05 08:10 [01.05 10:10] [{name=Bus 0, day=2019-05-01, id=T0, src=0}] + 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=0, day=2019-05-01, id=T0, src=0}] + 1: B B............................................... a: 01.05 08:10 [01.05 10:10] d: 01.05 08:10 [01.05 10:10] [{name=0, day=2019-05-01, id=T0, src=0}] 2: C C............................................... a: 01.05 08:20 [01.05 10:20] @@ -117,8 +117,8 @@ TRANSFERS: 0 FROM: (A, A) [2019-05-01 09:00] TO: (C, C) [2019-05-01 09:30] leg 0: (A, A) [2019-05-01 09:00] -> (C, C) [2019-05-01 09:30] - 0: A A............................................... d: 01.05 09:00 [01.05 11:00] [{name=Bus 1, day=2019-05-01, id=T2, src=0}] - 1: B B............................................... a: 01.05 09:15 [01.05 11:15] d: 01.05 09:15 [01.05 11:15] [{name=Bus 1, day=2019-05-01, id=T2, src=0}] + 0: A A............................................... d: 01.05 09:00 [01.05 11:00] [{name=1, day=2019-05-01, id=T2, src=0}] + 1: B B............................................... a: 01.05 09:15 [01.05 11:15] d: 01.05 09:15 [01.05 11:15] [{name=1, day=2019-05-01, id=T2, src=0}] 2: C C............................................... a: 01.05 09:30 [01.05 11:30] @@ -131,8 +131,8 @@ TRANSFERS: 0 FROM: (A, A) [2019-05-01 08:00] TO: (C, C) [2019-05-01 08:30] leg 0: (A, A) [2019-05-01 08:00] -> (C, C) [2019-05-01 08:30] - 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=Bus 1, day=2019-05-01, id=T1, src=0}] - 1: B B............................................... a: 01.05 08:15 [01.05 10:15] d: 01.05 08:15 [01.05 10:15] [{name=Bus 1, day=2019-05-01, id=T1, src=0}] + 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=1, day=2019-05-01, id=T1, src=0}] + 1: B B............................................... a: 01.05 08:15 [01.05 10:15] d: 01.05 08:15 [01.05 10:15] [{name=1, day=2019-05-01, id=T1, src=0}] 2: C C............................................... a: 01.05 08:30 [01.05 10:30] @@ -145,13 +145,13 @@ TRANSFERS: 1 FROM: (A, A) [2019-05-01 08:00] TO: (D, D) [2019-05-01 08:40] leg 0: (A, A) [2019-05-01 08:00] -> (C, C) [2019-05-01 08:20] - 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=Bus 0, day=2019-05-01, id=T0, src=0}] - 1: B B............................................... a: 01.05 08:10 [01.05 10:10] d: 01.05 08:10 [01.05 10:10] [{name=Bus 0, day=2019-05-01, id=T0, src=0}] + 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=0, day=2019-05-01, id=T0, src=0}] + 1: B B............................................... a: 01.05 08:10 [01.05 10:10] d: 01.05 08:10 [01.05 10:10] [{name=0, day=2019-05-01, id=T0, src=0}] 2: C C............................................... a: 01.05 08:20 [01.05 10:20] leg 1: (C, C) [2019-05-01 08:20] -> (C, C) [2019-05-01 08:22] FOOTPATH (duration=2) leg 2: (C, C) [2019-05-01 08:35] -> (D, D) [2019-05-01 08:40] - 0: C C............................................... d: 01.05 08:35 [01.05 10:35] [{name=Bus 2, day=2019-05-01, id=T3, src=0}] + 0: C C............................................... d: 01.05 08:35 [01.05 10:35] [{name=2, day=2019-05-01, id=T3, src=0}] 1: D D............................................... a: 01.05 08:40 [01.05 10:40] @@ -164,13 +164,13 @@ TRANSFERS: 1 FROM: (A, A) [2019-05-01 08:00] TO: (D, D) [2019-05-01 08:40] leg 0: (A, A) [2019-05-01 08:00] -> (C, C) [2019-05-01 08:30] - 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=Bus 1, day=2019-05-01, id=T1, src=0}] - 1: B B............................................... a: 01.05 08:15 [01.05 10:15] d: 01.05 08:15 [01.05 10:15] [{name=Bus 1, day=2019-05-01, id=T1, src=0}] + 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=1, day=2019-05-01, id=T1, src=0}] + 1: B B............................................... a: 01.05 08:15 [01.05 10:15] d: 01.05 08:15 [01.05 10:15] [{name=1, day=2019-05-01, id=T1, src=0}] 2: C C............................................... a: 01.05 08:30 [01.05 10:30] leg 1: (C, C) [2019-05-01 08:30] -> (C, C) [2019-05-01 08:32] FOOTPATH (duration=2) leg 2: (C, C) [2019-05-01 08:35] -> (D, D) [2019-05-01 08:40] - 0: C C............................................... d: 01.05 08:35 [01.05 10:35] [{name=Bus 2, day=2019-05-01, id=T3, src=0}] + 0: C C............................................... d: 01.05 08:35 [01.05 10:35] [{name=2, day=2019-05-01, id=T3, src=0}] 1: D D............................................... a: 01.05 08:40 [01.05 10:40] @@ -183,7 +183,7 @@ TRANSFERS: 0 FROM: (C, C) [2019-05-01 08:35] TO: (D, D) [2019-05-01 08:40] leg 0: (C, C) [2019-05-01 08:35] -> (D, D) [2019-05-01 08:40] - 0: C C............................................... d: 01.05 08:35 [01.05 10:35] [{name=Bus 2, day=2019-05-01, id=T3, src=0}] + 0: C C............................................... d: 01.05 08:35 [01.05 10:35] [{name=2, day=2019-05-01, id=T3, src=0}] 1: D D............................................... a: 01.05 08:40 [01.05 10:40] @@ -192,7 +192,7 @@ TRANSFERS: 0 FROM: (C, C) [2019-05-01 08:45] TO: (D, D) [2019-05-01 08:50] leg 0: (C, C) [2019-05-01 08:45] -> (D, D) [2019-05-01 08:50] - 0: C C............................................... d: 01.05 08:45 [01.05 10:45] [{name=Bus 2, day=2019-05-01, id=T4, src=0}] + 0: C C............................................... d: 01.05 08:45 [01.05 10:45] [{name=2, day=2019-05-01, id=T4, src=0}] 1: D D............................................... a: 01.05 08:50 [01.05 10:50] @@ -205,15 +205,15 @@ TRANSFERS: 1 FROM: (A, A) [2019-05-01 08:00] TO: (F, F) [2019-05-01 08:55] leg 0: (A, A) [2019-05-01 08:00] -> (C, C) [2019-05-01 08:20] - 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=Bus 0, day=2019-05-01, id=T0, src=0}] - 1: B B............................................... a: 01.05 08:10 [01.05 10:10] d: 01.05 08:10 [01.05 10:10] [{name=Bus 0, day=2019-05-01, id=T0, src=0}] + 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=0, day=2019-05-01, id=T0, src=0}] + 1: B B............................................... a: 01.05 08:10 [01.05 10:10] d: 01.05 08:10 [01.05 10:10] [{name=0, day=2019-05-01, id=T0, src=0}] 2: C C............................................... a: 01.05 08:20 [01.05 10:20] leg 1: (C, C) [2019-05-01 08:20] -> (C, C) [2019-05-01 08:22] FOOTPATH (duration=2) leg 2: (C, C) [2019-05-01 08:35] -> (F, F) [2019-05-01 08:55] - 0: C C............................................... d: 01.05 08:35 [01.05 10:35] [{name=Bus 2, day=2019-05-01, id=T3, src=0}] - 1: D D............................................... a: 01.05 08:40 [01.05 10:40] d: 01.05 08:42 [01.05 10:42] [{name=Bus 3, day=2019-05-01, id=T5, src=0}] - 2: E E............................................... a: 01.05 08:50 [01.05 10:50] d: 01.05 08:50 [01.05 10:50] [{name=Bus 3, day=2019-05-01, id=T5, src=0}] + 0: C C............................................... d: 01.05 08:35 [01.05 10:35] [{name=2, day=2019-05-01, id=T3, src=0}] + 1: D D............................................... a: 01.05 08:40 [01.05 10:40] d: 01.05 08:42 [01.05 10:42] [{name=3, day=2019-05-01, id=T5, src=0}] + 2: E E............................................... a: 01.05 08:50 [01.05 10:50] d: 01.05 08:50 [01.05 10:50] [{name=3, day=2019-05-01, id=T5, src=0}] 3: F F............................................... a: 01.05 08:55 [01.05 10:55] @@ -226,15 +226,15 @@ TRANSFERS: 1 FROM: (A, A) [2019-05-01 08:00] TO: (F, F) [2019-05-01 09:05] leg 0: (A, A) [2019-05-01 08:00] -> (C, C) [2019-05-01 08:30] - 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=Bus 1, day=2019-05-01, id=T1, src=0}] - 1: B B............................................... a: 01.05 08:15 [01.05 10:15] d: 01.05 08:15 [01.05 10:15] [{name=Bus 1, day=2019-05-01, id=T1, src=0}] + 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=1, day=2019-05-01, id=T1, src=0}] + 1: B B............................................... a: 01.05 08:15 [01.05 10:15] d: 01.05 08:15 [01.05 10:15] [{name=1, day=2019-05-01, id=T1, src=0}] 2: C C............................................... a: 01.05 08:30 [01.05 10:30] leg 1: (C, C) [2019-05-01 08:30] -> (C, C) [2019-05-01 08:32] FOOTPATH (duration=2) leg 2: (C, C) [2019-05-01 08:45] -> (F, F) [2019-05-01 09:05] - 0: C C............................................... d: 01.05 08:45 [01.05 10:45] [{name=Bus 2, day=2019-05-01, id=T4, src=0}] - 1: D D............................................... a: 01.05 08:50 [01.05 10:50] d: 01.05 08:52 [01.05 10:52] [{name=Bus 3, day=2019-05-01, id=T6, src=0}] - 2: E E............................................... a: 01.05 09:00 [01.05 11:00] d: 01.05 09:00 [01.05 11:00] [{name=Bus 3, day=2019-05-01, id=T6, src=0}] + 0: C C............................................... d: 01.05 08:45 [01.05 10:45] [{name=2, day=2019-05-01, id=T4, src=0}] + 1: D D............................................... a: 01.05 08:50 [01.05 10:50] d: 01.05 08:52 [01.05 10:52] [{name=3, day=2019-05-01, id=T6, src=0}] + 2: E E............................................... a: 01.05 09:00 [01.05 11:00] d: 01.05 09:00 [01.05 11:00] [{name=3, day=2019-05-01, id=T6, src=0}] 3: F F............................................... a: 01.05 09:05 [01.05 11:05] @@ -381,9 +381,9 @@ TRANSFERS: 0 FROM: (A, A) [2019-05-01 08:00] TO: (D, D) [2019-05-01 08:25] leg 0: (A, A) [2019-05-01 08:00] -> (D, D) [2019-05-01 08:25] - 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=Bus 1, day=2019-05-01, id=T1, src=0}] - 1: B B............................................... a: 01.05 08:10 [01.05 10:10] d: 01.05 08:15 [01.05 10:15] [{name=Bus 2, day=2019-05-01, id=T2, src=0}] - 2: C C............................................... a: 01.05 08:20 [01.05 10:20] d: 01.05 08:20 [01.05 10:20] [{name=Bus 2, day=2019-05-01, id=T2, src=0}] + 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=1, day=2019-05-01, id=T1, src=0}] + 1: B B............................................... a: 01.05 08:10 [01.05 10:10] d: 01.05 08:15 [01.05 10:15] [{name=2, day=2019-05-01, id=T2, src=0}] + 2: C C............................................... a: 01.05 08:20 [01.05 10:20] d: 01.05 08:20 [01.05 10:20] [{name=2, day=2019-05-01, id=T2, src=0}] 3: D D............................................... a: 01.05 08:25 [01.05 10:25] @@ -396,9 +396,9 @@ TRANSFERS: 0 FROM: (A, A) [2019-05-01 08:00] TO: (D, D) [2019-05-01 08:35] leg 0: (A, A) [2019-05-01 08:00] -> (D, D) [2019-05-01 08:35] - 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=Bus 1, day=2019-05-01, id=T3, src=0}] - 1: B B............................................... a: 01.05 08:20 [01.05 10:20] d: 01.05 08:25 [01.05 10:25] [{name=Bus 2, day=2019-05-01, id=T4, src=0}] - 2: C C............................................... a: 01.05 08:30 [01.05 10:30] d: 01.05 08:30 [01.05 10:30] [{name=Bus 2, day=2019-05-01, id=T4, src=0}] + 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=1, day=2019-05-01, id=T3, src=0}] + 1: B B............................................... a: 01.05 08:20 [01.05 10:20] d: 01.05 08:25 [01.05 10:25] [{name=2, day=2019-05-01, id=T4, src=0}] + 2: C C............................................... a: 01.05 08:30 [01.05 10:30] d: 01.05 08:30 [01.05 10:30] [{name=2, day=2019-05-01, id=T4, src=0}] 3: D D............................................... a: 01.05 08:35 [01.05 10:35] @@ -411,9 +411,9 @@ TRANSFERS: 0 FROM: (A, A) [2019-05-01 08:00] TO: (D, D) [2019-05-01 08:30] leg 0: (A, A) [2019-05-01 08:00] -> (D, D) [2019-05-01 08:30] - 0: A A............................................... d: 01.05 08:00 [01.05 10:00] RT 01.05 08:00 [01.05 10:00] [{name=Bus 1, day=2019-05-01, id=T1, src=0}] - 1: B B............................................... a: 01.05 08:10 [01.05 10:10] RT 01.05 08:10 [01.05 10:10] d: 01.05 08:15 [01.05 10:15] RT 01.05 08:20 [01.05 10:20] [{name=Bus 2, day=2019-05-01, id=T2, src=0}] - 2: C C............................................... a: 01.05 08:20 [01.05 10:20] RT 01.05 08:25 [01.05 10:25] d: 01.05 08:20 [01.05 10:20] RT 01.05 08:25 [01.05 10:25] [{name=Bus 2, day=2019-05-01, id=T2, src=0}] + 0: A A............................................... d: 01.05 08:00 [01.05 10:00] RT 01.05 08:00 [01.05 10:00] [{name=1, day=2019-05-01, id=T1, src=0}] + 1: B B............................................... a: 01.05 08:10 [01.05 10:10] RT 01.05 08:10 [01.05 10:10] d: 01.05 08:15 [01.05 10:15] RT 01.05 08:20 [01.05 10:20] [{name=2, day=2019-05-01, id=T2, src=0}] + 2: C C............................................... a: 01.05 08:20 [01.05 10:20] RT 01.05 08:25 [01.05 10:25] d: 01.05 08:20 [01.05 10:20] RT 01.05 08:25 [01.05 10:25] [{name=2, day=2019-05-01, id=T2, src=0}] 3: D D............................................... a: 01.05 08:25 [01.05 10:25] RT 01.05 08:30 [01.05 10:30] @@ -426,9 +426,9 @@ TRANSFERS: 0 FROM: (A, A) [2019-05-01 08:00] TO: (D, D) [2019-05-01 08:37] leg 0: (A, A) [2019-05-01 08:00] -> (D, D) [2019-05-01 08:37] - 0: A A............................................... d: 01.05 08:00 [01.05 10:00] RT 01.05 08:00 [01.05 10:00] [{name=Bus 1, day=2019-05-01, id=T3, src=0}] - 1: B B............................................... a: 01.05 08:20 [01.05 10:20] RT 01.05 08:20 [01.05 10:20] d: 01.05 08:25 [01.05 10:25] RT 01.05 08:27 [01.05 10:27] [{name=Bus 2, day=2019-05-01, id=T4, src=0}] - 2: C C............................................... a: 01.05 08:30 [01.05 10:30] RT 01.05 08:32 [01.05 10:32] d: 01.05 08:30 [01.05 10:30] RT 01.05 08:32 [01.05 10:32] [{name=Bus 2, day=2019-05-01, id=T4, src=0}] + 0: A A............................................... d: 01.05 08:00 [01.05 10:00] RT 01.05 08:00 [01.05 10:00] [{name=1, day=2019-05-01, id=T3, src=0}] + 1: B B............................................... a: 01.05 08:20 [01.05 10:20] RT 01.05 08:20 [01.05 10:20] d: 01.05 08:25 [01.05 10:25] RT 01.05 08:27 [01.05 10:27] [{name=2, day=2019-05-01, id=T4, src=0}] + 2: C C............................................... a: 01.05 08:30 [01.05 10:30] RT 01.05 08:32 [01.05 10:32] d: 01.05 08:30 [01.05 10:30] RT 01.05 08:32 [01.05 10:32] [{name=2, day=2019-05-01, id=T4, src=0}] 3: D D............................................... a: 01.05 08:35 [01.05 10:35] RT 01.05 08:37 [01.05 10:37] @@ -545,9 +545,9 @@ TRANSFERS: 0 FROM: (A, A) [2019-05-01 08:00] TO: (D, D) [2019-05-01 08:30] leg 0: (A, A) [2019-05-01 08:00] -> (D, D) [2019-05-01 08:30] - 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=Bus 1, day=2019-05-01, id=T1, src=0}] - 1: B B............................................... a: 01.05 08:10 [01.05 10:10] d: 01.05 08:15 [01.05 10:15] [{name=Bus 2, day=2019-05-01, id=T2, src=0}] - 2: C C............................................... a: 01.05 08:20 [01.05 10:20] d: 01.05 08:25 [01.05 10:25] [{name=Bus 3, day=2019-05-01, id=T3, src=0}] + 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=1, day=2019-05-01, id=T1, src=0}] + 1: B B............................................... a: 01.05 08:10 [01.05 10:10] d: 01.05 08:15 [01.05 10:15] [{name=2, day=2019-05-01, id=T2, src=0}] + 2: C C............................................... a: 01.05 08:20 [01.05 10:20] d: 01.05 08:25 [01.05 10:25] [{name=3, day=2019-05-01, id=T3, src=0}] 3: D D............................................... a: 01.05 08:30 [01.05 10:30] @@ -560,9 +560,9 @@ TRANSFERS: 0 FROM: (A, A) [2019-05-01 08:00] TO: (D, D) [2019-05-01 08:40] leg 0: (A, A) [2019-05-01 08:00] -> (D, D) [2019-05-01 08:40] - 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=Bus 1, day=2019-05-01, id=T4, src=0}] - 1: B B............................................... a: 01.05 08:20 [01.05 10:20] d: 01.05 08:25 [01.05 10:25] [{name=Bus 2, day=2019-05-01, id=T5, src=0}] - 2: C C............................................... a: 01.05 08:30 [01.05 10:30] d: 01.05 08:35 [01.05 10:35] [{name=Bus 3, day=2019-05-01, id=T6, src=0}] + 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=1, day=2019-05-01, id=T4, src=0}] + 1: B B............................................... a: 01.05 08:20 [01.05 10:20] d: 01.05 08:25 [01.05 10:25] [{name=2, day=2019-05-01, id=T5, src=0}] + 2: C C............................................... a: 01.05 08:30 [01.05 10:30] d: 01.05 08:35 [01.05 10:35] [{name=3, day=2019-05-01, id=T6, src=0}] 3: D D............................................... a: 01.05 08:40 [01.05 10:40] diff --git a/test/routing/clasz_filter_test.cc b/test/routing/clasz_filter_test.cc index 16e7798f..842a3265 100644 --- a/test/routing/clasz_filter_test.cc +++ b/test/routing/clasz_filter_test.cc @@ -67,7 +67,7 @@ TRANSFERS: 0 FROM: (A, A) [2024-03-01 09:00] TO: (C, C) [2024-03-01 10:00] leg 0: (A, A) [2024-03-01 09:00] -> (C, C) [2024-03-01 10:00] - 0: A A............................................... d: 01.03 09:00 [01.03 10:00] [{name=X , day=2024-03-01, id=AIR, src=0}] + 0: A A............................................... d: 01.03 09:00 [01.03 10:00] [{name=X, day=2024-03-01, id=AIR, src=0}] 1: C C............................................... a: 01.03 10:00 [01.03 11:00] @@ -80,12 +80,12 @@ TRANSFERS: 1 FROM: (A, A) [2024-03-01 09:00] TO: (C, C) [2024-03-01 11:00] leg 0: (A, A) [2024-03-01 09:00] -> (B, B) [2024-03-01 09:55] - 0: A A............................................... d: 01.03 09:00 [01.03 10:00] [{name=Bus 1, day=2024-03-01, id=T1, src=0}] + 0: A A............................................... d: 01.03 09:00 [01.03 10:00] [{name=1, day=2024-03-01, id=T1, src=0}] 1: B B............................................... a: 01.03 09:55 [01.03 10:55] leg 1: (B, B) [2024-03-01 09:55] -> (B, B) [2024-03-01 09:57] FOOTPATH (duration=2) leg 2: (B, B) [2024-03-01 10:05] -> (C, C) [2024-03-01 11:00] - 0: B B............................................... d: 01.03 10:05 [01.03 11:05] [{name=2 , day=2024-03-01, id=T2, src=0}] + 0: B B............................................... d: 01.03 10:05 [01.03 11:05] [{name=2, day=2024-03-01, id=T2, src=0}] 1: C C............................................... a: 01.03 11:00 [01.03 12:00] @@ -98,7 +98,7 @@ TRANSFERS: 0 FROM: (A, A) [2024-03-01 09:10] TO: (C, C) [2024-03-01 10:10] leg 0: (A, A) [2024-03-01 09:10] -> (C, C) [2024-03-01 10:10] - 0: A A............................................... d: 01.03 09:00 [01.03 10:00] [{name=X , day=2024-03-01, id=AIR, src=0}] + 0: A A............................................... d: 01.03 09:00 [01.03 10:00] [{name=X, day=2024-03-01, id=AIR, src=0}] 1: C C............................................... a: 01.03 10:00 [01.03 11:00] @@ -111,12 +111,12 @@ TRANSFERS: 1 FROM: (A, A) [2024-03-01 09:10] TO: (C, C) [2024-03-01 11:10] leg 0: (A, A) [2024-03-01 09:10] -> (B, B) [2024-03-01 10:05] - 0: A A............................................... d: 01.03 09:00 [01.03 10:00] [{name=Bus 1, day=2024-03-01, id=T1, src=0}] + 0: A A............................................... d: 01.03 09:00 [01.03 10:00] [{name=1, day=2024-03-01, id=T1, src=0}] 1: B B............................................... a: 01.03 09:55 [01.03 10:55] leg 1: (B, B) [2024-03-01 10:05] -> (B, B) [2024-03-01 10:07] FOOTPATH (duration=2) leg 2: (B, B) [2024-03-01 10:15] -> (C, C) [2024-03-01 11:10] - 0: B B............................................... d: 01.03 10:05 [01.03 11:05] [{name=2 , day=2024-03-01, id=T2, src=0}] + 0: B B............................................... d: 01.03 10:05 [01.03 11:05] [{name=2, day=2024-03-01, id=T2, src=0}] 1: C C............................................... a: 01.03 11:00 [01.03 12:00] diff --git a/test/routing/rt_routing_test.cc b/test/routing/rt_routing_test.cc index f8b897a9..c26eeb01 100644 --- a/test/routing/rt_routing_test.cc +++ b/test/routing/rt_routing_test.cc @@ -74,13 +74,13 @@ TRANSFERS: 1 FROM: (A, A) [2019-05-02 23:00] TO: (D, D) [2019-05-03 01:00] leg 0: (A, A) [2019-05-02 23:00] -> (B, B) [2019-05-03 00:00] - 0: A A............................................... d: 02.05 23:00 [03.05 01:00] [{name=Bus RE 1, day=2019-05-02, id=T_RE1, src=0}] + 0: A A............................................... d: 02.05 23:00 [03.05 01:00] [{name=RE 1, day=2019-05-02, id=T_RE1, src=0}] 1: B B............................................... a: 03.05 00:00 [03.05 02:00] leg 1: (B, B) [2019-05-03 00:00] -> (B, B) [2019-05-03 00:02] FOOTPATH (duration=2) leg 2: (B, B) [2019-05-03 00:30] -> (D, D) [2019-05-03 01:00] - 0: B B............................................... d: 02.05 22:30 [03.05 00:30] RT 03.05 00:30 [03.05 02:30] [{name=Bus RE 2, day=2019-05-02, id=T_RE2, src=0}] - 1: C C............................................... a: 02.05 22:45 [03.05 00:45] RT 03.05 00:45 [03.05 02:45] d: 02.05 22:45 [03.05 00:45] RT 03.05 00:45 [03.05 02:45] [{name=Bus RE 2, day=2019-05-02, id=T_RE2, src=0}] + 0: B B............................................... d: 02.05 22:30 [03.05 00:30] RT 03.05 00:30 [03.05 02:30] [{name=RE 2, day=2019-05-02, id=T_RE2, src=0}] + 1: C C............................................... a: 02.05 22:45 [03.05 00:45] RT 03.05 00:45 [03.05 02:45] d: 02.05 22:45 [03.05 00:45] RT 03.05 00:45 [03.05 02:45] [{name=RE 2, day=2019-05-02, id=T_RE2, src=0}] 2: D D............................................... a: 02.05 23:00 [03.05 01:00] RT 03.05 01:00 [03.05 03:00] )"; @@ -145,13 +145,13 @@ TRANSFERS: 1 FROM: (A, A) [2019-05-02 23:00] TO: (D, D) [2019-05-03 01:00] leg 0: (A, A) [2019-05-02 23:00] -> (B, B) [2019-05-03 00:00] - 0: A A............................................... d: 02.05 23:00 [03.05 01:00] [{name=Bus RE 1, day=2019-05-02, id=T_RE1, src=0}] + 0: A A............................................... d: 02.05 23:00 [03.05 01:00] [{name=RE 1, day=2019-05-02, id=T_RE1, src=0}] 1: B B............................................... a: 03.05 00:00 [03.05 02:00] leg 1: (B, B) [2019-05-03 00:00] -> (B, B) [2019-05-03 00:02] FOOTPATH (duration=2) leg 2: (B, B) [2019-05-03 00:30] -> (D, D) [2019-05-03 01:00] - 0: B B............................................... d: 02.05 22:30 [03.05 00:30] RT 03.05 00:30 [03.05 02:30] [{name=Bus RE 2, day=2019-05-02, id=T_RE2, src=0}] - 1: C C............................................... a: 02.05 22:45 [03.05 00:45] RT 03.05 00:45 [03.05 02:45] d: 02.05 22:45 [03.05 00:45] RT 03.05 00:45 [03.05 02:45] [{name=Bus RE 2, day=2019-05-02, id=T_RE2, src=0}] + 0: B B............................................... d: 02.05 22:30 [03.05 00:30] RT 03.05 00:30 [03.05 02:30] [{name=RE 2, day=2019-05-02, id=T_RE2, src=0}] + 1: C C............................................... a: 02.05 22:45 [03.05 00:45] RT 03.05 00:45 [03.05 02:45] d: 02.05 22:45 [03.05 00:45] RT 03.05 00:45 [03.05 02:45] [{name=RE 2, day=2019-05-02, id=T_RE2, src=0}] 2: D D............................................... a: 02.05 23:00 [03.05 01:00] RT 03.05 01:00 [03.05 03:00] )"; diff --git a/test/routing/shortest_fp_test.cc b/test/routing/shortest_fp_test.cc index e0e55394..dc92bcbc 100644 --- a/test/routing/shortest_fp_test.cc +++ b/test/routing/shortest_fp_test.cc @@ -117,23 +117,23 @@ TRANSFERS: 2 leg 0: (START, START) [2024-06-07 23:57] -> (A0, A0) [2024-06-08 00:00] MUMO (id=23, duration=3) leg 1: (A0, A0) [2024-06-08 00:00] -> (A3, A3) [2024-06-08 00:15] - 0: A0 A0.............................................. d: 08.06 00:00 [08.06 02:00] [{name=Tram A, day=2024-06-08, id=AWE, src=0}] - 1: A1 A1.............................................. a: 08.06 00:01 [08.06 02:01] d: 08.06 00:02 [08.06 02:02] [{name=Tram A, day=2024-06-08, id=AWE, src=0}] - 2: A2 A2.............................................. a: 08.06 00:06 [08.06 02:06] d: 08.06 00:07 [08.06 02:07] [{name=Tram A, day=2024-06-08, id=AWE, src=0}] + 0: A0 A0.............................................. d: 08.06 00:00 [08.06 02:00] [{name=A, day=2024-06-08, id=AWE, src=0}] + 1: A1 A1.............................................. a: 08.06 00:01 [08.06 02:01] d: 08.06 00:02 [08.06 02:02] [{name=A, day=2024-06-08, id=AWE, src=0}] + 2: A2 A2.............................................. a: 08.06 00:06 [08.06 02:06] d: 08.06 00:07 [08.06 02:07] [{name=A, day=2024-06-08, id=AWE, src=0}] 3: A3 A3.............................................. a: 08.06 00:15 [08.06 02:15] leg 2: (A3, A3) [2024-06-08 00:15] -> (B0, B0) [2024-06-08 00:20] FOOTPATH (duration=5) leg 3: (B0, B0) [2024-06-08 01:00] -> (B3, B3) [2024-06-08 01:40] - 0: B0 B0.............................................. d: 08.06 01:00 [08.06 03:00] [{name=Tram B, day=2024-06-08, id=BWE, src=0}] - 1: B1 B1.............................................. a: 08.06 01:20 [08.06 03:20] d: 08.06 01:22 [08.06 03:22] [{name=Tram B, day=2024-06-08, id=BWE, src=0}] - 2: B2 B2.............................................. a: 08.06 01:30 [08.06 03:30] d: 08.06 01:32 [08.06 03:32] [{name=Tram B, day=2024-06-08, id=BWE, src=0}] + 0: B0 B0.............................................. d: 08.06 01:00 [08.06 03:00] [{name=B, day=2024-06-08, id=BWE, src=0}] + 1: B1 B1.............................................. a: 08.06 01:20 [08.06 03:20] d: 08.06 01:22 [08.06 03:22] [{name=B, day=2024-06-08, id=BWE, src=0}] + 2: B2 B2.............................................. a: 08.06 01:30 [08.06 03:30] d: 08.06 01:32 [08.06 03:32] [{name=B, day=2024-06-08, id=BWE, src=0}] 3: B3 B3.............................................. a: 08.06 01:40 [08.06 03:40] leg 4: (B3, B3) [2024-06-08 01:40] -> (C2, C2) [2024-06-08 01:45] FOOTPATH (duration=5) leg 5: (C2, C2) [2024-06-08 02:20] -> (C5, C5) [2024-06-08 02:50] - 2: C2 C2.............................................. d: 08.06 02:20 [08.06 04:20] [{name=Tram C, day=2024-06-08, id=CWE, src=0}] - 3: C3 C3.............................................. a: 08.06 02:30 [08.06 04:30] d: 08.06 02:32 [08.06 04:32] [{name=Tram C, day=2024-06-08, id=CWE, src=0}] - 4: C4 C4.............................................. a: 08.06 02:40 [08.06 04:40] d: 08.06 02:42 [08.06 04:42] [{name=Tram C, day=2024-06-08, id=CWE, src=0}] + 2: C2 C2.............................................. d: 08.06 02:20 [08.06 04:20] [{name=C, day=2024-06-08, id=CWE, src=0}] + 3: C3 C3.............................................. a: 08.06 02:30 [08.06 04:30] d: 08.06 02:32 [08.06 04:32] [{name=C, day=2024-06-08, id=CWE, src=0}] + 4: C4 C4.............................................. a: 08.06 02:40 [08.06 04:40] d: 08.06 02:42 [08.06 04:42] [{name=C, day=2024-06-08, id=CWE, src=0}] 5: C5 C5.............................................. a: 08.06 02:50 [08.06 04:50] leg 6: (C5, C5) [2024-06-08 02:50] -> (END, END) [2024-06-08 03:00] MUMO (id=42, duration=10) @@ -188,23 +188,23 @@ TRANSFERS: 2 leg 0: (END, END) [2024-06-07 23:57] -> (A0, A0) [2024-06-08 00:00] MUMO (id=23, duration=3) leg 1: (A0, A0) [2024-06-08 00:00] -> (A3, A3) [2024-06-08 00:15] - 0: A0 A0.............................................. d: 08.06 00:00 [08.06 02:00] [{name=Tram A, day=2024-06-08, id=AWE, src=0}] - 1: A1 A1.............................................. a: 08.06 00:01 [08.06 02:01] d: 08.06 00:02 [08.06 02:02] [{name=Tram A, day=2024-06-08, id=AWE, src=0}] - 2: A2 A2.............................................. a: 08.06 00:06 [08.06 02:06] d: 08.06 00:07 [08.06 02:07] [{name=Tram A, day=2024-06-08, id=AWE, src=0}] + 0: A0 A0.............................................. d: 08.06 00:00 [08.06 02:00] [{name=A, day=2024-06-08, id=AWE, src=0}] + 1: A1 A1.............................................. a: 08.06 00:01 [08.06 02:01] d: 08.06 00:02 [08.06 02:02] [{name=A, day=2024-06-08, id=AWE, src=0}] + 2: A2 A2.............................................. a: 08.06 00:06 [08.06 02:06] d: 08.06 00:07 [08.06 02:07] [{name=A, day=2024-06-08, id=AWE, src=0}] 3: A3 A3.............................................. a: 08.06 00:15 [08.06 02:15] leg 2: (A3, A3) [2024-06-08 00:15] -> (B0, B0) [2024-06-08 00:20] FOOTPATH (duration=5) leg 3: (B0, B0) [2024-06-08 01:00] -> (B3, B3) [2024-06-08 01:40] - 0: B0 B0.............................................. d: 08.06 01:00 [08.06 03:00] [{name=Tram B, day=2024-06-08, id=BWE, src=0}] - 1: B1 B1.............................................. a: 08.06 01:20 [08.06 03:20] d: 08.06 01:22 [08.06 03:22] [{name=Tram B, day=2024-06-08, id=BWE, src=0}] - 2: B2 B2.............................................. a: 08.06 01:30 [08.06 03:30] d: 08.06 01:32 [08.06 03:32] [{name=Tram B, day=2024-06-08, id=BWE, src=0}] + 0: B0 B0.............................................. d: 08.06 01:00 [08.06 03:00] [{name=B, day=2024-06-08, id=BWE, src=0}] + 1: B1 B1.............................................. a: 08.06 01:20 [08.06 03:20] d: 08.06 01:22 [08.06 03:22] [{name=B, day=2024-06-08, id=BWE, src=0}] + 2: B2 B2.............................................. a: 08.06 01:30 [08.06 03:30] d: 08.06 01:32 [08.06 03:32] [{name=B, day=2024-06-08, id=BWE, src=0}] 3: B3 B3.............................................. a: 08.06 01:40 [08.06 03:40] leg 4: (B3, B3) [2024-06-08 01:40] -> (C2, C2) [2024-06-08 01:45] FOOTPATH (duration=5) leg 5: (C2, C2) [2024-06-08 02:20] -> (C5, C5) [2024-06-08 02:50] - 2: C2 C2.............................................. d: 08.06 02:20 [08.06 04:20] [{name=Tram C, day=2024-06-08, id=CWE, src=0}] - 3: C3 C3.............................................. a: 08.06 02:30 [08.06 04:30] d: 08.06 02:32 [08.06 04:32] [{name=Tram C, day=2024-06-08, id=CWE, src=0}] - 4: C4 C4.............................................. a: 08.06 02:40 [08.06 04:40] d: 08.06 02:42 [08.06 04:42] [{name=Tram C, day=2024-06-08, id=CWE, src=0}] + 2: C2 C2.............................................. d: 08.06 02:20 [08.06 04:20] [{name=C, day=2024-06-08, id=CWE, src=0}] + 3: C3 C3.............................................. a: 08.06 02:30 [08.06 04:30] d: 08.06 02:32 [08.06 04:32] [{name=C, day=2024-06-08, id=CWE, src=0}] + 4: C4 C4.............................................. a: 08.06 02:40 [08.06 04:40] d: 08.06 02:42 [08.06 04:42] [{name=C, day=2024-06-08, id=CWE, src=0}] 5: C5 C5.............................................. a: 08.06 02:50 [08.06 04:50] leg 6: (C5, C5) [2024-06-08 02:50] -> (START, START) [2024-06-08 03:00] MUMO (id=42, duration=10) diff --git a/test/routing/transfer_time_settings_test.cc b/test/routing/transfer_time_settings_test.cc index e064a3dc..000ab772 100644 --- a/test/routing/transfer_time_settings_test.cc +++ b/test/routing/transfer_time_settings_test.cc @@ -77,12 +77,12 @@ TRANSFERS: 1 FROM: (A, A) [2019-05-01 08:00] TO: (C, C) [2019-05-01 08:22] leg 0: (A, A) [2019-05-01 08:00] -> (B, B) [2019-05-01 08:10] - 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=Bus 1, day=2019-05-01, id=T1, src=0}] + 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=1, day=2019-05-01, id=T1, src=0}] 1: B B............................................... a: 01.05 08:10 [01.05 10:10] leg 1: (B, B) [2019-05-01 08:10] -> (B, B) [2019-05-01 08:12] FOOTPATH (duration=2) leg 2: (B, B) [2019-05-01 08:13] -> (C, C) [2019-05-01 08:22] - 0: B B............................................... d: 01.05 08:13 [01.05 10:13] [{name=Bus 2, day=2019-05-01, id=T2, src=0}] + 0: B B............................................... d: 01.05 08:13 [01.05 10:13] [{name=2, day=2019-05-01, id=T2, src=0}] 1: C C............................................... a: 01.05 08:22 [01.05 10:22] @@ -95,12 +95,12 @@ TRANSFERS: 1 FROM: (A, A) [2019-05-01 08:00] TO: (C, C) [2019-05-01 08:30] leg 0: (A, A) [2019-05-01 08:00] -> (B, B) [2019-05-01 08:10] - 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=Bus 1, day=2019-05-01, id=T1, src=0}] + 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=1, day=2019-05-01, id=T1, src=0}] 1: B B............................................... a: 01.05 08:10 [01.05 10:10] leg 1: (B, B) [2019-05-01 08:10] -> (B, B) [2019-05-01 08:20] FOOTPATH (duration=10) leg 2: (B, B) [2019-05-01 08:20] -> (C, C) [2019-05-01 08:30] - 0: B B............................................... d: 01.05 08:20 [01.05 10:20] [{name=Bus 2, day=2019-05-01, id=T3, src=0}] + 0: B B............................................... d: 01.05 08:20 [01.05 10:20] [{name=2, day=2019-05-01, id=T3, src=0}] 1: C C............................................... a: 01.05 08:30 [01.05 10:30] @@ -113,12 +113,12 @@ TRANSFERS: 1 FROM: (A, A) [2019-05-01 08:00] TO: (C, C) [2019-05-01 08:22] leg 0: (A, A) [2019-05-01 08:00] -> (B, B) [2019-05-01 08:10] - 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=Bus 1, day=2019-05-01, id=T1, src=0}] + 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=1, day=2019-05-01, id=T1, src=0}] 1: B B............................................... a: 01.05 08:10 [01.05 10:10] leg 1: (B, B) [2019-05-01 08:10] -> (B, B) [2019-05-01 08:13] FOOTPATH (duration=3) leg 2: (B, B) [2019-05-01 08:13] -> (C, C) [2019-05-01 08:22] - 0: B B............................................... d: 01.05 08:13 [01.05 10:13] [{name=Bus 2, day=2019-05-01, id=T2, src=0}] + 0: B B............................................... d: 01.05 08:13 [01.05 10:13] [{name=2, day=2019-05-01, id=T2, src=0}] 1: C C............................................... a: 01.05 08:22 [01.05 10:22] @@ -131,12 +131,12 @@ TRANSFERS: 1 FROM: (A, A) [2019-05-01 08:00] TO: (C, C) [2019-05-01 08:30] leg 0: (A, A) [2019-05-01 08:00] -> (B, B) [2019-05-01 08:10] - 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=Bus 1, day=2019-05-01, id=T1, src=0}] + 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=1, day=2019-05-01, id=T1, src=0}] 1: B B............................................... a: 01.05 08:10 [01.05 10:10] leg 1: (B, B) [2019-05-01 08:10] -> (B, B) [2019-05-01 08:14] FOOTPATH (duration=4) leg 2: (B, B) [2019-05-01 08:20] -> (C, C) [2019-05-01 08:30] - 0: B B............................................... d: 01.05 08:20 [01.05 10:20] [{name=Bus 2, day=2019-05-01, id=T3, src=0}] + 0: B B............................................... d: 01.05 08:20 [01.05 10:20] [{name=2, day=2019-05-01, id=T3, src=0}] 1: C C............................................... a: 01.05 08:30 [01.05 10:30] @@ -149,7 +149,7 @@ TRANSFERS: 0 FROM: (A, A) [2019-05-01 07:55] TO: (C, C) [2019-05-01 08:35] leg 0: (A, A) [2019-05-01 07:55] -> (C, C) [2019-05-01 08:35] - 0: A A............................................... d: 01.05 07:55 [01.05 09:55] [{name=Bus 3, day=2019-05-01, id=T4, src=0}] + 0: A A............................................... d: 01.05 07:55 [01.05 09:55] [{name=3, day=2019-05-01, id=T4, src=0}] 1: C C............................................... a: 01.05 08:35 [01.05 10:35] diff --git a/test/routing/via_search_test.cc b/test/routing/via_search_test.cc index 44aead41..c64e7b6a 100644 --- a/test/routing/via_search_test.cc +++ b/test/routing/via_search_test.cc @@ -213,8 +213,8 @@ TRANSFERS: 0 FROM: (A, A) [2019-05-01 08:00] TO: (D, D) [2019-05-01 08:40] leg 0: (A, A) [2019-05-01 08:00] -> (D, D) [2019-05-01 08:40] - 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=Bus 2, day=2019-05-01, id=T3, src=0}] - 1: C C............................................... a: 01.05 08:20 [01.05 10:20] d: 01.05 08:22 [01.05 10:22] [{name=Bus 2, day=2019-05-01, id=T3, src=0}] + 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=2, day=2019-05-01, id=T3, src=0}] + 1: C C............................................... a: 01.05 08:20 [01.05 10:20] d: 01.05 08:22 [01.05 10:22] [{name=2, day=2019-05-01, id=T3, src=0}] 2: D D............................................... a: 01.05 08:40 [01.05 10:40] @@ -223,12 +223,12 @@ TRANSFERS: 1 FROM: (A, A) [2019-05-01 08:00] TO: (D, D) [2019-05-01 08:30] leg 0: (A, A) [2019-05-01 08:00] -> (B, B) [2019-05-01 08:10] - 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=Bus 0, day=2019-05-01, id=T0, src=0}] + 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=0, day=2019-05-01, id=T0, src=0}] 1: B B............................................... a: 01.05 08:10 [01.05 10:10] leg 1: (B, B) [2019-05-01 08:10] -> (B, B) [2019-05-01 08:12] FOOTPATH (duration=2) leg 2: (B, B) [2019-05-01 08:15] -> (D, D) [2019-05-01 08:30] - 0: B B............................................... d: 01.05 08:15 [01.05 10:15] [{name=Bus 1, day=2019-05-01, id=T1, src=0}] + 0: B B............................................... d: 01.05 08:15 [01.05 10:15] [{name=1, day=2019-05-01, id=T1, src=0}] 1: D D............................................... a: 01.05 08:30 [01.05 10:30] @@ -256,12 +256,12 @@ TRANSFERS: 1 FROM: (A, A) [2019-05-01 08:00] TO: (D, D) [2019-05-01 08:30] leg 0: (A, A) [2019-05-01 08:00] -> (B, B) [2019-05-01 08:10] - 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=Bus 0, day=2019-05-01, id=T0, src=0}] + 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=0, day=2019-05-01, id=T0, src=0}] 1: B B............................................... a: 01.05 08:10 [01.05 10:10] leg 1: (B, B) [2019-05-01 08:10] -> (B, B) [2019-05-01 08:12] FOOTPATH (duration=2) leg 2: (B, B) [2019-05-01 08:15] -> (D, D) [2019-05-01 08:30] - 0: B B............................................... d: 01.05 08:15 [01.05 10:15] [{name=Bus 1, day=2019-05-01, id=T1, src=0}] + 0: B B............................................... d: 01.05 08:15 [01.05 10:15] [{name=1, day=2019-05-01, id=T1, src=0}] 1: D D............................................... a: 01.05 08:30 [01.05 10:30] @@ -300,12 +300,12 @@ TRANSFERS: 1 FROM: (A, A) [2019-05-01 08:00] TO: (D, D) [2019-05-01 08:30] leg 0: (A, A) [2019-05-01 08:00] -> (B, B) [2019-05-01 08:10] - 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=Bus 0, day=2019-05-01, id=T0, src=0}] + 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=0, day=2019-05-01, id=T0, src=0}] 1: B B............................................... a: 01.05 08:10 [01.05 10:10] leg 1: (B, B) [2019-05-01 08:13] -> (B, B) [2019-05-01 08:15] FOOTPATH (duration=2) leg 2: (B, B) [2019-05-01 08:15] -> (D, D) [2019-05-01 08:30] - 0: B B............................................... d: 01.05 08:15 [01.05 10:15] [{name=Bus 1, day=2019-05-01, id=T1, src=0}] + 0: B B............................................... d: 01.05 08:15 [01.05 10:15] [{name=1, day=2019-05-01, id=T1, src=0}] 1: D D............................................... a: 01.05 08:30 [01.05 10:30] @@ -338,12 +338,12 @@ TRANSFERS: 1 FROM: (A, A) [2019-05-01 08:00] TO: (D, D) [2019-05-01 08:45] leg 0: (A, A) [2019-05-01 08:00] -> (B, B) [2019-05-01 08:10] - 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=Bus 0, day=2019-05-01, id=T0, src=0}] + 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=0, day=2019-05-01, id=T0, src=0}] 1: B B............................................... a: 01.05 08:10 [01.05 10:10] leg 1: (B, B) [2019-05-01 08:20] -> (B, B) [2019-05-01 08:22] FOOTPATH (duration=2) leg 2: (B, B) [2019-05-01 08:30] -> (D, D) [2019-05-01 08:45] - 0: B B............................................... d: 01.05 08:30 [01.05 10:30] [{name=Bus 1, day=2019-05-01, id=T2, src=0}] + 0: B B............................................... d: 01.05 08:30 [01.05 10:30] [{name=1, day=2019-05-01, id=T2, src=0}] 1: D D............................................... a: 01.05 08:45 [01.05 10:45] @@ -382,8 +382,8 @@ TRANSFERS: 0 FROM: (A, A) [2019-05-01 08:00] TO: (D, D) [2019-05-01 08:40] leg 0: (A, A) [2019-05-01 08:00] -> (D, D) [2019-05-01 08:40] - 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=Bus 2, day=2019-05-01, id=T3, src=0}] - 1: C C............................................... a: 01.05 08:20 [01.05 10:20] d: 01.05 08:22 [01.05 10:22] [{name=Bus 2, day=2019-05-01, id=T3, src=0}] + 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=2, day=2019-05-01, id=T3, src=0}] + 1: C C............................................... a: 01.05 08:20 [01.05 10:20] d: 01.05 08:22 [01.05 10:22] [{name=2, day=2019-05-01, id=T3, src=0}] 2: D D............................................... a: 01.05 08:40 [01.05 10:40] @@ -416,12 +416,12 @@ TRANSFERS: 1 FROM: (A, A) [2019-05-01 08:00] TO: (D, D) [2019-05-01 08:55] leg 0: (A, A) [2019-05-01 08:00] -> (C, C) [2019-05-01 08:20] - 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=Bus 2, day=2019-05-01, id=T3, src=0}] + 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=2, day=2019-05-01, id=T3, src=0}] 1: C C............................................... a: 01.05 08:20 [01.05 10:20] leg 1: (C, C) [2019-05-01 08:30] -> (C, C) [2019-05-01 08:32] FOOTPATH (duration=2) leg 2: (C, C) [2019-05-01 08:37] -> (D, D) [2019-05-01 08:55] - 1: C C............................................... d: 01.05 08:37 [01.05 10:37] [{name=Bus 2, day=2019-05-01, id=T4, src=0}] + 1: C C............................................... d: 01.05 08:37 [01.05 10:37] [{name=2, day=2019-05-01, id=T4, src=0}] 2: D D............................................... a: 01.05 08:55 [01.05 10:55] @@ -451,8 +451,8 @@ TRANSFERS: 0 FROM: (A, A) [2019-05-01 13:00] TO: (J, J) [2019-05-01 13:30] leg 0: (A, A) [2019-05-01 13:00] -> (J, J) [2019-05-01 13:30] - 0: A A............................................... d: 01.05 13:00 [01.05 15:00] [{name=Bus 3, day=2019-05-01, id=T5, src=0}] - 1: I1 I1.............................................. a: 01.05 13:15 [01.05 15:15] d: 01.05 13:17 [01.05 15:17] [{name=Bus 3, day=2019-05-01, id=T5, src=0}] + 0: A A............................................... d: 01.05 13:00 [01.05 15:00] [{name=3, day=2019-05-01, id=T5, src=0}] + 1: I1 I1.............................................. a: 01.05 13:15 [01.05 15:15] d: 01.05 13:17 [01.05 15:17] [{name=3, day=2019-05-01, id=T5, src=0}] 2: J J............................................... a: 01.05 13:30 [01.05 15:30] @@ -530,8 +530,8 @@ TRANSFERS: 0 FROM: (A, A) [2019-05-01 13:00] TO: (J, J) [2019-05-01 13:30] leg 0: (A, A) [2019-05-01 13:00] -> (J, J) [2019-05-01 13:30] - 0: A A............................................... d: 01.05 13:00 [01.05 15:00] [{name=Bus 3, day=2019-05-01, id=T5, src=0}] - 1: I1 I1.............................................. a: 01.05 13:15 [01.05 15:15] d: 01.05 13:17 [01.05 15:17] [{name=Bus 3, day=2019-05-01, id=T5, src=0}] + 0: A A............................................... d: 01.05 13:00 [01.05 15:00] [{name=3, day=2019-05-01, id=T5, src=0}] + 1: I1 I1.............................................. a: 01.05 13:15 [01.05 15:15] d: 01.05 13:17 [01.05 15:17] [{name=3, day=2019-05-01, id=T5, src=0}] 2: J J............................................... a: 01.05 13:30 [01.05 15:30] @@ -540,12 +540,12 @@ TRANSFERS: 1 FROM: (A, A) [2019-05-01 14:00] TO: (J, J) [2019-05-01 14:40] leg 0: (A, A) [2019-05-01 14:00] -> (I1, I1) [2019-05-01 14:15] - 0: A A............................................... d: 01.05 14:00 [01.05 16:00] [{name=Bus 5, day=2019-05-01, id=T6, src=0}] + 0: A A............................................... d: 01.05 14:00 [01.05 16:00] [{name=5, day=2019-05-01, id=T6, src=0}] 1: I1 I1.............................................. a: 01.05 14:15 [01.05 16:15] leg 1: (I1, I1) [2019-05-01 14:15] -> (I2, I2) [2019-05-01 14:19] FOOTPATH (duration=4) leg 2: (I2, I2) [2019-05-01 14:20] -> (J, J) [2019-05-01 14:40] - 0: I2 I2.............................................. d: 01.05 14:20 [01.05 16:20] [{name=Bus 4, day=2019-05-01, id=T7, src=0}] + 0: I2 I2.............................................. d: 01.05 14:20 [01.05 16:20] [{name=4, day=2019-05-01, id=T7, src=0}] 1: J J............................................... a: 01.05 14:40 [01.05 16:40] @@ -575,12 +575,12 @@ TRANSFERS: 1 FROM: (A, A) [2019-05-01 13:00] TO: (J, J) [2019-05-01 14:40] leg 0: (A, A) [2019-05-01 13:00] -> (I1, I1) [2019-05-01 13:15] - 0: A A............................................... d: 01.05 13:00 [01.05 15:00] [{name=Bus 3, day=2019-05-01, id=T5, src=0}] + 0: A A............................................... d: 01.05 13:00 [01.05 15:00] [{name=3, day=2019-05-01, id=T5, src=0}] 1: I1 I1.............................................. a: 01.05 13:15 [01.05 15:15] leg 1: (I1, I1) [2019-05-01 13:25] -> (I2, I2) [2019-05-01 13:29] FOOTPATH (duration=4) leg 2: (I2, I2) [2019-05-01 14:20] -> (J, J) [2019-05-01 14:40] - 0: I2 I2.............................................. d: 01.05 14:20 [01.05 16:20] [{name=Bus 4, day=2019-05-01, id=T7, src=0}] + 0: I2 I2.............................................. d: 01.05 14:20 [01.05 16:20] [{name=4, day=2019-05-01, id=T7, src=0}] 1: J J............................................... a: 01.05 14:40 [01.05 16:40] @@ -610,12 +610,12 @@ TRANSFERS: 1 FROM: (A, A) [2019-05-01 13:00] TO: (J, J) [2019-05-01 14:00] leg 0: (A, A) [2019-05-01 13:00] -> (I1, I1) [2019-05-01 13:15] - 0: A A............................................... d: 01.05 13:00 [01.05 15:00] [{name=Bus 3, day=2019-05-01, id=T5, src=0}] + 0: A A............................................... d: 01.05 13:00 [01.05 15:00] [{name=3, day=2019-05-01, id=T5, src=0}] 1: I1 I1.............................................. a: 01.05 13:15 [01.05 15:15] leg 1: (I1, I1) [2019-05-01 13:15] -> (K1, K1) [2019-05-01 13:24] FOOTPATH (duration=9) leg 2: (K1, K1) [2019-05-01 13:30] -> (J, J) [2019-05-01 14:00] - 0: K1 K1.............................................. d: 01.05 13:30 [01.05 15:30] [{name=Bus 6, day=2019-05-01, id=T8, src=0}] + 0: K1 K1.............................................. d: 01.05 13:30 [01.05 15:30] [{name=6, day=2019-05-01, id=T8, src=0}] 1: J J............................................... a: 01.05 14:00 [01.05 16:00] @@ -691,15 +691,15 @@ TRANSFERS: 1 FROM: (H, H) [2019-05-01 09:00] TO: (Q, Q) [2019-05-01 11:00] leg 0: (H, H) [2019-05-01 09:00] -> (M, M) [2019-05-01 09:42] - 0: H H............................................... d: 01.05 09:00 [01.05 11:00] [{name=Bus 8, day=2019-05-01, id=T11, src=0}] + 0: H H............................................... d: 01.05 09:00 [01.05 11:00] [{name=8, day=2019-05-01, id=T11, src=0}] 1: M M............................................... a: 01.05 09:42 [01.05 11:42] leg 1: (M, M) [2019-05-01 09:42] -> (M, M) [2019-05-01 09:44] FOOTPATH (duration=2) leg 2: (M, M) [2019-05-01 10:00] -> (Q, Q) [2019-05-01 11:00] - 0: M M............................................... d: 01.05 10:00 [01.05 12:00] [{name=Bus 7, day=2019-05-01, id=T10, src=0}] - 1: N N............................................... a: 01.05 10:13 [01.05 12:13] d: 01.05 10:15 [01.05 12:15] [{name=Bus 7, day=2019-05-01, id=T10, src=0}] - 2: O O............................................... a: 01.05 10:28 [01.05 12:28] d: 01.05 10:30 [01.05 12:30] [{name=Bus 7, day=2019-05-01, id=T10, src=0}] - 3: P P............................................... a: 01.05 10:43 [01.05 12:43] d: 01.05 10:45 [01.05 12:45] [{name=Bus 7, day=2019-05-01, id=T10, src=0}] + 0: M M............................................... d: 01.05 10:00 [01.05 12:00] [{name=7, day=2019-05-01, id=T10, src=0}] + 1: N N............................................... a: 01.05 10:13 [01.05 12:13] d: 01.05 10:15 [01.05 12:15] [{name=7, day=2019-05-01, id=T10, src=0}] + 2: O O............................................... a: 01.05 10:28 [01.05 12:28] d: 01.05 10:30 [01.05 12:30] [{name=7, day=2019-05-01, id=T10, src=0}] + 3: P P............................................... a: 01.05 10:43 [01.05 12:43] d: 01.05 10:45 [01.05 12:45] [{name=7, day=2019-05-01, id=T10, src=0}] 4: Q Q............................................... a: 01.05 11:00 [01.05 13:00] @@ -737,12 +737,12 @@ TRANSFERS: 1 FROM: (A, A) [2019-05-01 08:30] TO: (D, D) [2019-05-01 09:30] leg 0: (A, A) [2019-05-01 08:30] -> (C, C) [2019-05-01 08:45] - 0: A A............................................... d: 01.05 08:30 [01.05 10:30] [{name=Bus 2, day=2019-05-01, id=T13, src=0}] + 0: A A............................................... d: 01.05 08:30 [01.05 10:30] [{name=2, day=2019-05-01, id=T13, src=0}] 1: C C............................................... a: 01.05 08:45 [01.05 10:45] leg 1: (C, C) [2019-05-01 08:50] -> (C, C) [2019-05-01 08:52] FOOTPATH (duration=2) leg 2: (C, C) [2019-05-01 08:55] -> (D, D) [2019-05-01 09:30] - 1: C C............................................... d: 01.05 08:55 [01.05 10:55] [{name=Bus 2, day=2019-05-01, id=T13, src=0}] + 1: C C............................................... d: 01.05 08:55 [01.05 10:55] [{name=2, day=2019-05-01, id=T13, src=0}] 2: D D............................................... a: 01.05 09:30 [01.05 11:30] @@ -774,8 +774,8 @@ TRANSFERS: 0 leg 0: (START, START) [2019-05-01 09:00] -> (O, O) [2019-05-01 09:40] MUMO (id=1, duration=40) leg 1: (O, O) [2019-05-01 10:30] -> (Q, Q) [2019-05-01 11:00] - 2: O O............................................... d: 01.05 10:30 [01.05 12:30] [{name=Bus 7, day=2019-05-01, id=T10, src=0}] - 3: P P............................................... a: 01.05 10:43 [01.05 12:43] d: 01.05 10:45 [01.05 12:45] [{name=Bus 7, day=2019-05-01, id=T10, src=0}] + 2: O O............................................... d: 01.05 10:30 [01.05 12:30] [{name=7, day=2019-05-01, id=T10, src=0}] + 3: P P............................................... a: 01.05 10:43 [01.05 12:43] d: 01.05 10:45 [01.05 12:45] [{name=7, day=2019-05-01, id=T10, src=0}] 4: Q Q............................................... a: 01.05 11:00 [01.05 13:00] @@ -786,13 +786,13 @@ TRANSFERS: 1 leg 0: (START, START) [2019-05-01 09:00] -> (H, H) [2019-05-01 09:00] MUMO (id=0, duration=0) leg 1: (H, H) [2019-05-01 09:00] -> (O, O) [2019-05-01 09:20] - 0: H H............................................... d: 01.05 09:00 [01.05 11:00] [{name=Bus 9, day=2019-05-01, id=T12, src=0}] + 0: H H............................................... d: 01.05 09:00 [01.05 11:00] [{name=9, day=2019-05-01, id=T12, src=0}] 1: O O............................................... a: 01.05 09:20 [01.05 11:20] leg 2: (O, O) [2019-05-01 09:20] -> (O, O) [2019-05-01 09:22] FOOTPATH (duration=2) leg 3: (O, O) [2019-05-01 09:30] -> (Q, Q) [2019-05-01 10:00] - 2: O O............................................... d: 01.05 09:30 [01.05 11:30] [{name=Bus 7, day=2019-05-01, id=T9, src=0}] - 3: P P............................................... a: 01.05 09:43 [01.05 11:43] d: 01.05 09:45 [01.05 11:45] [{name=Bus 7, day=2019-05-01, id=T9, src=0}] + 2: O O............................................... d: 01.05 09:30 [01.05 11:30] [{name=7, day=2019-05-01, id=T9, src=0}] + 3: P P............................................... a: 01.05 09:43 [01.05 11:43] d: 01.05 09:45 [01.05 11:45] [{name=7, day=2019-05-01, id=T9, src=0}] 4: Q Q............................................... a: 01.05 10:00 [01.05 12:00] @@ -886,8 +886,8 @@ TRANSFERS: 0 FROM: (N, N) [2019-05-01 09:15] TO: (END, END) [2019-05-01 09:53] leg 0: (N, N) [2019-05-01 09:15] -> (P, P) [2019-05-01 09:43] - 1: N N............................................... d: 01.05 09:15 [01.05 11:15] [{name=Bus 7, day=2019-05-01, id=T9, src=0}] - 2: O O............................................... a: 01.05 09:28 [01.05 11:28] d: 01.05 09:30 [01.05 11:30] [{name=Bus 7, day=2019-05-01, id=T9, src=0}] + 1: N N............................................... d: 01.05 09:15 [01.05 11:15] [{name=7, day=2019-05-01, id=T9, src=0}] + 2: O O............................................... a: 01.05 09:28 [01.05 11:28] d: 01.05 09:30 [01.05 11:30] [{name=7, day=2019-05-01, id=T9, src=0}] 3: P P............................................... a: 01.05 09:43 [01.05 11:43] leg 1: (P, P) [2019-05-01 09:43] -> (END, END) [2019-05-01 09:53] MUMO (id=0, duration=10) @@ -982,10 +982,10 @@ TRANSFERS: 0 FROM: (M, M) [2019-05-01 09:00] TO: (Q, Q) [2019-05-01 10:00] leg 0: (M, M) [2019-05-01 09:00] -> (Q, Q) [2019-05-01 10:00] - 0: M M............................................... d: 01.05 09:00 [01.05 11:00] [{name=Bus 7, day=2019-05-01, id=T9, src=0}] - 1: N N............................................... a: 01.05 09:13 [01.05 11:13] d: 01.05 09:15 [01.05 11:15] [{name=Bus 7, day=2019-05-01, id=T9, src=0}] - 2: O O............................................... a: 01.05 09:28 [01.05 11:28] d: 01.05 09:30 [01.05 11:30] [{name=Bus 7, day=2019-05-01, id=T9, src=0}] - 3: P P............................................... a: 01.05 09:43 [01.05 11:43] d: 01.05 09:45 [01.05 11:45] [{name=Bus 7, day=2019-05-01, id=T9, src=0}] + 0: M M............................................... d: 01.05 09:00 [01.05 11:00] [{name=7, day=2019-05-01, id=T9, src=0}] + 1: N N............................................... a: 01.05 09:13 [01.05 11:13] d: 01.05 09:15 [01.05 11:15] [{name=7, day=2019-05-01, id=T9, src=0}] + 2: O O............................................... a: 01.05 09:28 [01.05 11:28] d: 01.05 09:30 [01.05 11:30] [{name=7, day=2019-05-01, id=T9, src=0}] + 3: P P............................................... a: 01.05 09:43 [01.05 11:43] d: 01.05 09:45 [01.05 11:45] [{name=7, day=2019-05-01, id=T9, src=0}] 4: Q Q............................................... a: 01.05 10:00 [01.05 12:00] @@ -1044,13 +1044,13 @@ TRANSFERS: 1 FROM: (A, A) [2019-05-01 08:00] TO: (L, L) [2019-05-01 10:00] leg 0: (A, A) [2019-05-01 08:00] -> (C, C) [2019-05-01 08:20] - 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=Bus 2, day=2019-05-01, id=T3, src=0}] + 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=2, day=2019-05-01, id=T3, src=0}] 1: C C............................................... a: 01.05 08:20 [01.05 10:20] leg 1: (C, C) [2019-05-01 08:20] -> (G, G) [2019-05-01 08:25] FOOTPATH (duration=5) leg 2: (G, G) [2019-05-01 08:45] -> (L, L) [2019-05-01 10:00] - 1: G G............................................... d: 01.05 08:45 [01.05 10:45] [{name=Bus 10, day=2019-05-01, id=T14, src=0}] - 2: R R............................................... a: 01.05 09:02 [01.05 11:02] d: 01.05 09:05 [01.05 11:05] [{name=Bus 10, day=2019-05-01, id=T14, src=0}] + 1: G G............................................... d: 01.05 08:45 [01.05 10:45] [{name=10, day=2019-05-01, id=T14, src=0}] + 2: R R............................................... a: 01.05 09:02 [01.05 11:02] d: 01.05 09:05 [01.05 11:05] [{name=10, day=2019-05-01, id=T14, src=0}] 3: L L............................................... a: 01.05 10:00 [01.05 12:00] @@ -1118,13 +1118,13 @@ TRANSFERS: 1 FROM: (A, A) [2019-05-01 08:00] TO: (L, L) [2019-05-01 10:00] leg 0: (A, A) [2019-05-01 08:00] -> (D, D) [2019-05-01 08:40] - 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=Bus 2, day=2019-05-01, id=T3, src=0}] - 1: C C............................................... a: 01.05 08:20 [01.05 10:20] d: 01.05 08:22 [01.05 10:22] [{name=Bus 2, day=2019-05-01, id=T3, src=0}] + 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=2, day=2019-05-01, id=T3, src=0}] + 1: C C............................................... a: 01.05 08:20 [01.05 10:20] d: 01.05 08:22 [01.05 10:22] [{name=2, day=2019-05-01, id=T3, src=0}] 2: D D............................................... a: 01.05 08:40 [01.05 10:40] leg 1: (D, D) [2019-05-01 08:40] -> (R, R) [2019-05-01 08:55] FOOTPATH (duration=15) leg 2: (R, R) [2019-05-01 09:05] -> (L, L) [2019-05-01 10:00] - 2: R R............................................... d: 01.05 09:05 [01.05 11:05] [{name=Bus 10, day=2019-05-01, id=T14, src=0}] + 2: R R............................................... d: 01.05 09:05 [01.05 11:05] [{name=10, day=2019-05-01, id=T14, src=0}] 3: L L............................................... a: 01.05 10:00 [01.05 12:00] @@ -1154,13 +1154,13 @@ TRANSFERS: 1 FROM: (A, A) [2019-05-01 08:00] TO: (L, L) [2019-05-01 10:00] leg 0: (A, A) [2019-05-01 08:00] -> (D, D) [2019-05-01 08:40] - 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=Bus 2, day=2019-05-01, id=T3, src=0}] - 1: C C............................................... a: 01.05 08:20 [01.05 10:20] d: 01.05 08:22 [01.05 10:22] [{name=Bus 2, day=2019-05-01, id=T3, src=0}] + 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=2, day=2019-05-01, id=T3, src=0}] + 1: C C............................................... a: 01.05 08:20 [01.05 10:20] d: 01.05 08:22 [01.05 10:22] [{name=2, day=2019-05-01, id=T3, src=0}] 2: D D............................................... a: 01.05 08:40 [01.05 10:40] leg 1: (D, D) [2019-05-01 08:42] -> (R, R) [2019-05-01 08:57] FOOTPATH (duration=15) leg 2: (R, R) [2019-05-01 09:05] -> (L, L) [2019-05-01 10:00] - 2: R R............................................... d: 01.05 09:05 [01.05 11:05] [{name=Bus 10, day=2019-05-01, id=T14, src=0}] + 2: R R............................................... d: 01.05 09:05 [01.05 11:05] [{name=10, day=2019-05-01, id=T14, src=0}] 3: L L............................................... a: 01.05 10:00 [01.05 12:00] @@ -1189,15 +1189,15 @@ TRANSFERS: 1 FROM: (A, A) [2019-05-01 08:00] TO: (END, END) [2019-05-01 11:00] leg 0: (A, A) [2019-05-01 08:00] -> (C, C) [2019-05-01 08:20] - 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=Bus 2, day=2019-05-01, id=T3, src=0}] + 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=2, day=2019-05-01, id=T3, src=0}] 1: C C............................................... a: 01.05 08:20 [01.05 10:20] leg 1: (C, C) [2019-05-01 08:20] -> (G, G) [2019-05-01 08:25] FOOTPATH (duration=5) leg 2: (G, G) [2019-05-01 08:45] -> (P, P) [2019-05-01 10:40] - 1: G G............................................... d: 01.05 08:45 [01.05 10:45] [{name=Bus 10, day=2019-05-01, id=T14, src=0}] - 2: R R............................................... a: 01.05 09:02 [01.05 11:02] d: 01.05 09:05 [01.05 11:05] [{name=Bus 10, day=2019-05-01, id=T14, src=0}] - 3: L L............................................... a: 01.05 10:00 [01.05 12:00] d: 01.05 10:02 [01.05 12:02] [{name=Bus 10, day=2019-05-01, id=T14, src=0}] - 4: O O............................................... a: 01.05 10:22 [01.05 12:22] d: 01.05 10:25 [01.05 12:25] [{name=Bus 10, day=2019-05-01, id=T14, src=0}] + 1: G G............................................... d: 01.05 08:45 [01.05 10:45] [{name=10, day=2019-05-01, id=T14, src=0}] + 2: R R............................................... a: 01.05 09:02 [01.05 11:02] d: 01.05 09:05 [01.05 11:05] [{name=10, day=2019-05-01, id=T14, src=0}] + 3: L L............................................... a: 01.05 10:00 [01.05 12:00] d: 01.05 10:02 [01.05 12:02] [{name=10, day=2019-05-01, id=T14, src=0}] + 4: O O............................................... a: 01.05 10:22 [01.05 12:22] d: 01.05 10:25 [01.05 12:25] [{name=10, day=2019-05-01, id=T14, src=0}] 5: P P............................................... a: 01.05 10:40 [01.05 12:40] leg 3: (P, P) [2019-05-01 10:40] -> (END, END) [2019-05-01 11:00] MUMO (id=0, duration=20) @@ -1208,18 +1208,18 @@ TRANSFERS: 2 FROM: (A, A) [2019-05-01 08:00] TO: (END, END) [2019-05-01 10:03] leg 0: (A, A) [2019-05-01 08:00] -> (D, D) [2019-05-01 08:40] - 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=Bus 2, day=2019-05-01, id=T3, src=0}] - 1: C C............................................... a: 01.05 08:20 [01.05 10:20] d: 01.05 08:22 [01.05 10:22] [{name=Bus 2, day=2019-05-01, id=T3, src=0}] + 0: A A............................................... d: 01.05 08:00 [01.05 10:00] [{name=2, day=2019-05-01, id=T3, src=0}] + 1: C C............................................... a: 01.05 08:20 [01.05 10:20] d: 01.05 08:22 [01.05 10:22] [{name=2, day=2019-05-01, id=T3, src=0}] 2: D D............................................... a: 01.05 08:40 [01.05 10:40] leg 1: (D, D) [2019-05-01 08:40] -> (H, H) [2019-05-01 08:43] FOOTPATH (duration=3) leg 2: (H, H) [2019-05-01 09:00] -> (O, O) [2019-05-01 09:20] - 0: H H............................................... d: 01.05 09:00 [01.05 11:00] [{name=Bus 9, day=2019-05-01, id=T12, src=0}] + 0: H H............................................... d: 01.05 09:00 [01.05 11:00] [{name=9, day=2019-05-01, id=T12, src=0}] 1: O O............................................... a: 01.05 09:20 [01.05 11:20] leg 3: (O, O) [2019-05-01 09:20] -> (O, O) [2019-05-01 09:22] FOOTPATH (duration=2) leg 4: (O, O) [2019-05-01 09:30] -> (P, P) [2019-05-01 09:43] - 2: O O............................................... d: 01.05 09:30 [01.05 11:30] [{name=Bus 7, day=2019-05-01, id=T9, src=0}] + 2: O O............................................... d: 01.05 09:30 [01.05 11:30] [{name=7, day=2019-05-01, id=T9, src=0}] 3: P P............................................... a: 01.05 09:43 [01.05 11:43] leg 5: (P, P) [2019-05-01 09:43] -> (END, END) [2019-05-01 10:03] MUMO (id=0, duration=20) @@ -1253,10 +1253,10 @@ TRANSFERS: 0 FROM: (M, M) [2019-05-01 09:00] TO: (Q, Q) [2019-05-01 10:00] leg 0: (M, M) [2019-05-01 09:00] -> (Q, Q) [2019-05-01 10:00] - 0: M M............................................... d: 01.05 09:00 [01.05 11:00] [{name=Bus 7, day=2019-05-01, id=T9, src=0}] - 1: N N............................................... a: 01.05 09:13 [01.05 11:13] d: 01.05 09:15 [01.05 11:15] [{name=Bus 7, day=2019-05-01, id=T9, src=0}] - 2: O O............................................... a: 01.05 09:28 [01.05 11:28] d: 01.05 09:30 [01.05 11:30] [{name=Bus 7, day=2019-05-01, id=T9, src=0}] - 3: P P............................................... a: 01.05 09:43 [01.05 11:43] d: 01.05 09:45 [01.05 11:45] [{name=Bus 7, day=2019-05-01, id=T9, src=0}] + 0: M M............................................... d: 01.05 09:00 [01.05 11:00] [{name=7, day=2019-05-01, id=T9, src=0}] + 1: N N............................................... a: 01.05 09:13 [01.05 11:13] d: 01.05 09:15 [01.05 11:15] [{name=7, day=2019-05-01, id=T9, src=0}] + 2: O O............................................... a: 01.05 09:28 [01.05 11:28] d: 01.05 09:30 [01.05 11:30] [{name=7, day=2019-05-01, id=T9, src=0}] + 3: P P............................................... a: 01.05 09:43 [01.05 11:43] d: 01.05 09:45 [01.05 11:45] [{name=7, day=2019-05-01, id=T9, src=0}] 4: Q Q............................................... a: 01.05 10:00 [01.05 12:00] @@ -1290,10 +1290,10 @@ TRANSFERS: 0 FROM: (M, M) [2019-05-01 09:00] TO: (END, END) [2019-05-01 10:25] leg 0: (M, M) [2019-05-01 09:00] -> (Q, Q) [2019-05-01 10:00] - 0: M M............................................... d: 01.05 09:00 [01.05 11:00] [{name=Bus 7, day=2019-05-01, id=T9, src=0}] - 1: N N............................................... a: 01.05 09:13 [01.05 11:13] d: 01.05 09:15 [01.05 11:15] [{name=Bus 7, day=2019-05-01, id=T9, src=0}] - 2: O O............................................... a: 01.05 09:28 [01.05 11:28] d: 01.05 09:30 [01.05 11:30] [{name=Bus 7, day=2019-05-01, id=T9, src=0}] - 3: P P............................................... a: 01.05 09:43 [01.05 11:43] d: 01.05 09:45 [01.05 11:45] [{name=Bus 7, day=2019-05-01, id=T9, src=0}] + 0: M M............................................... d: 01.05 09:00 [01.05 11:00] [{name=7, day=2019-05-01, id=T9, src=0}] + 1: N N............................................... a: 01.05 09:13 [01.05 11:13] d: 01.05 09:15 [01.05 11:15] [{name=7, day=2019-05-01, id=T9, src=0}] + 2: O O............................................... a: 01.05 09:28 [01.05 11:28] d: 01.05 09:30 [01.05 11:30] [{name=7, day=2019-05-01, id=T9, src=0}] + 3: P P............................................... a: 01.05 09:43 [01.05 11:43] d: 01.05 09:45 [01.05 11:45] [{name=7, day=2019-05-01, id=T9, src=0}] 4: Q Q............................................... a: 01.05 10:00 [01.05 12:00] leg 1: (Q, Q) [2019-05-01 10:10] -> (END, END) [2019-05-01 10:25] MUMO (id=0, duration=15) @@ -1335,10 +1335,10 @@ TRANSFERS: 0 FROM: (M, M) [2019-05-01 09:00] TO: (END, END) [2019-05-01 10:15] leg 0: (M, M) [2019-05-01 09:00] -> (Q, Q) [2019-05-01 10:00] - 0: M M............................................... d: 01.05 09:00 [01.05 11:00] [{name=Bus 7, day=2019-05-01, id=T9, src=0}] - 1: N N............................................... a: 01.05 09:13 [01.05 11:13] d: 01.05 09:15 [01.05 11:15] [{name=Bus 7, day=2019-05-01, id=T9, src=0}] - 2: O O............................................... a: 01.05 09:28 [01.05 11:28] d: 01.05 09:30 [01.05 11:30] [{name=Bus 7, day=2019-05-01, id=T9, src=0}] - 3: P P............................................... a: 01.05 09:43 [01.05 11:43] d: 01.05 09:45 [01.05 11:45] [{name=Bus 7, day=2019-05-01, id=T9, src=0}] + 0: M M............................................... d: 01.05 09:00 [01.05 11:00] [{name=7, day=2019-05-01, id=T9, src=0}] + 1: N N............................................... a: 01.05 09:13 [01.05 11:13] d: 01.05 09:15 [01.05 11:15] [{name=7, day=2019-05-01, id=T9, src=0}] + 2: O O............................................... a: 01.05 09:28 [01.05 11:28] d: 01.05 09:30 [01.05 11:30] [{name=7, day=2019-05-01, id=T9, src=0}] + 3: P P............................................... a: 01.05 09:43 [01.05 11:43] d: 01.05 09:45 [01.05 11:45] [{name=7, day=2019-05-01, id=T9, src=0}] 4: Q Q............................................... a: 01.05 10:00 [01.05 12:00] leg 1: (Q, Q) [2019-05-01 10:00] -> (END, END) [2019-05-01 10:15] MUMO (id=0, duration=15) diff --git a/test/rt/gtfsrt_relative_test.cc b/test/rt/gtfsrt_relative_test.cc index b8bca1ec..0504e249 100644 --- a/test/rt/gtfsrt_relative_test.cc +++ b/test/rt/gtfsrt_relative_test.cc @@ -101,11 +101,11 @@ auto const kTripUpdate = })"s; constexpr auto const expected = R"( - 0: A A............................................... d: 26.11 09:00 [26.11 10:00] RT 26.11 09:00 [26.11 10:00] [{name=Bus Route 1, day=2023-11-26, id=TRIP_1, src=0}] - 1: B B............................................... a: 26.11 10:00 [26.11 11:00] RT 26.11 10:00 [26.11 11:00] d: 26.11 10:00 [26.11 11:00] RT 26.11 10:00 [26.11 11:00] [{name=Bus Route 1, day=2023-11-26, id=TRIP_1, src=0}] - 2: C C............................................... a: 26.11 11:00 [26.11 12:00] RT 26.11 10:00 [26.11 11:00] d: 26.11 11:00 [26.11 12:00] RT 26.11 10:00 [26.11 11:00] [{name=Bus Route 1, day=2023-11-26, id=TRIP_1, src=0}] - 3: D D............................................... a: 26.11 12:00 [26.11 13:00] RT 26.11 10:30 [26.11 11:30] d: 26.11 12:00 [26.11 13:00] RT 26.11 10:30 [26.11 11:30] [{name=Bus Route 1, day=2023-11-26, id=TRIP_1, src=0}] - 4: E E............................................... a: 26.11 13:00 [26.11 14:00] RT 26.11 11:29 [26.11 12:29] d: 26.11 13:00 [26.11 14:00] RT 26.11 11:29 [26.11 12:29] [{name=Bus Route 1, day=2023-11-26, id=TRIP_1, src=0}] + 0: A A............................................... d: 26.11 09:00 [26.11 10:00] RT 26.11 09:00 [26.11 10:00] [{name=Route 1, day=2023-11-26, id=TRIP_1, src=0}] + 1: B B............................................... a: 26.11 10:00 [26.11 11:00] RT 26.11 10:00 [26.11 11:00] d: 26.11 10:00 [26.11 11:00] RT 26.11 10:00 [26.11 11:00] [{name=Route 1, day=2023-11-26, id=TRIP_1, src=0}] + 2: C C............................................... a: 26.11 11:00 [26.11 12:00] RT 26.11 10:00 [26.11 11:00] d: 26.11 11:00 [26.11 12:00] RT 26.11 10:00 [26.11 11:00] [{name=Route 1, day=2023-11-26, id=TRIP_1, src=0}] + 3: D D............................................... a: 26.11 12:00 [26.11 13:00] RT 26.11 10:30 [26.11 11:30] d: 26.11 12:00 [26.11 13:00] RT 26.11 10:30 [26.11 11:30] [{name=Route 1, day=2023-11-26, id=TRIP_1, src=0}] + 4: E E............................................... a: 26.11 13:00 [26.11 14:00] RT 26.11 11:29 [26.11 12:29] d: 26.11 13:00 [26.11 14:00] RT 26.11 11:29 [26.11 12:29] [{name=Route 1, day=2023-11-26, id=TRIP_1, src=0}] 5: F F............................................... a: 26.11 14:00 [26.11 15:00] RT 26.11 12:28 [26.11 13:28] )"sv; diff --git a/test/rt/gtfsrt_rt_test.cc b/test/rt/gtfsrt_rt_test.cc index 01ffa4ef..c524f56e 100644 --- a/test/rt/gtfsrt_rt_test.cc +++ b/test/rt/gtfsrt_rt_test.cc @@ -329,33 +329,33 @@ auto const kTripUpdate = })"s; constexpr auto const expected = R"( - 0: 2351 Block Line Station.............................. d: 10.08 09:15 [10.08 05:15] RT 10.08 09:15 [10.08 05:15] [{name=Tram iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] - 1: 1033 Block Line / Hanover............................ a: 10.08 09:16 [10.08 05:16] RT 10.08 09:16 [10.08 05:16] d: 10.08 09:16 [10.08 05:16] RT 10.08 09:16 [10.08 05:16] [{name=Tram iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] - 2: 2086 Block Line / Kingswood.......................... a: 10.08 09:18 [10.08 05:18] RT 10.08 09:18 [10.08 05:18] d: 10.08 09:18 [10.08 05:18] RT 10.08 09:18 [10.08 05:18] [{name=Tram iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] - 3: 2885 Block Line / Strasburg.......................... a: 10.08 09:19 [10.08 05:19] RT 10.08 09:19 [10.08 05:19] d: 10.08 09:19 [10.08 05:19] RT 10.08 09:19 [10.08 05:19] [{name=Tram iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] - 4: 2888 Block Line / Laurentian......................... a: 10.08 09:21 [10.08 05:21] RT 10.08 09:21 [10.08 05:21] d: 10.08 09:21 [10.08 05:21] RT 10.08 09:21 [10.08 05:21] [{name=Tram iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] - 5: 3189 Block Line / Westmount.......................... a: 10.08 09:22 [10.08 05:22] RT 10.08 09:22 [10.08 05:22] d: 10.08 09:22 [10.08 05:22] RT 10.08 09:22 [10.08 05:22] [{name=Tram iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] - 6: 3895 Fischer-Hallman / Westmount..................... a: 10.08 09:24 [10.08 05:24] RT 10.08 09:24 [10.08 05:24] d: 10.08 09:24 [10.08 05:24] RT 10.08 09:24 [10.08 05:24] [{name=Tram iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] - 7: 3893 Fischer-Hallman / Activa........................ a: 10.08 09:26 [10.08 05:26] RT 10.08 09:26 [10.08 05:26] d: 10.08 09:26 [10.08 05:26] RT 10.08 09:26 [10.08 05:26] [{name=Tram iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] - 8: 2969 Fischer-Hallman / Ottawa........................ a: 10.08 09:27 [10.08 05:27] RT 10.08 09:27 [10.08 05:27] d: 10.08 09:27 [10.08 05:27] RT 10.08 09:27 [10.08 05:27] [{name=Tram iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] - 9: 2971 Fischer-Hallman / Mcgarry....................... a: 10.08 09:29 [10.08 05:29] RT 10.08 09:29 [10.08 05:29] d: 10.08 09:29 [10.08 05:29] RT 10.08 09:29 [10.08 05:29] [{name=Tram iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] - 10: 2986 Fischer-Hallman / Queens........................ a: 10.08 09:31 [10.08 05:31] RT 10.08 09:31 [10.08 05:31] d: 10.08 09:31 [10.08 05:31] RT 10.08 09:31 [10.08 05:31] [{name=Tram iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] - 11: 3891 Fischer-Hallman / Highland...................... a: 10.08 09:32 [10.08 05:32] RT 10.08 09:32 [10.08 05:32] d: 10.08 09:32 [10.08 05:32] RT 10.08 09:32 [10.08 05:32] [{name=Tram iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] - 12: 3143 Fischer-Hallman / Victoria...................... a: 10.08 09:33 [10.08 05:33] RT 10.08 09:33 [10.08 05:33] d: 10.08 09:33 [10.08 05:33] RT 10.08 09:33 [10.08 05:33] [{name=Tram iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] - 13: 3144 Fischer-Hallman / Stoke......................... a: 10.08 09:35 [10.08 05:35] RT 10.08 09:35 [10.08 05:35] d: 10.08 09:35 [10.08 05:35] RT 10.08 09:35 [10.08 05:35] [{name=Tram iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] - 14: 3146 Fischer-Hallman / University Ave................ a: 10.08 09:37 [10.08 05:37] RT 10.08 09:38 [10.08 05:38] d: 10.08 09:37 [10.08 05:37] RT 10.08 09:38 [10.08 05:38] [{name=Tram iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] - 15: 1992 Fischer-Hallman / Thorndale..................... a: 10.08 09:38 [10.08 05:38] RT 10.08 09:39 [10.08 05:39] d: 10.08 09:38 [10.08 05:38] RT 10.08 09:39 [10.08 05:39] [{name=Tram iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] - 16: 1972 Fischer-Hallman / Erb........................... a: 10.08 09:39 [10.08 05:39] RT 10.08 09:40 [10.08 05:40] d: 10.08 09:39 [10.08 05:39] RT 10.08 09:40 [10.08 05:40] [{name=Tram iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] - 17: 3465 Fischer-Hallman / Keats Way..................... a: 10.08 09:40 [10.08 05:40] RT 10.08 09:41 [10.08 05:41] d: 10.08 09:40 [10.08 05:40] RT 10.08 09:41 [10.08 05:41] [{name=Tram iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] - 18: 3890 Fischer-Hallman / Columbia...................... a: 10.08 09:42 [10.08 05:42] RT 10.08 09:44 [10.08 05:44] d: 10.08 09:42 [10.08 05:42] RT 10.08 09:44 [10.08 05:44] [{name=Tram iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] - 19: 1117 Columbia / U.W. - Columbia Lake Village......... a: 10.08 09:43 [10.08 05:43] RT 10.08 09:45 [10.08 05:45] d: 10.08 09:43 [10.08 05:43] RT 10.08 09:45 [10.08 05:45] [{name=Tram iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] - 20: 3899 Columbia / University Of Waterloo............... a: 10.08 09:46 [10.08 05:46] RT 10.08 09:47 [10.08 05:47] d: 10.08 09:46 [10.08 05:46] RT 10.08 09:47 [10.08 05:47] [{name=Tram iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] - 21: 1223 University Of Waterloo Station.................. a: 10.08 09:47 [10.08 05:47] RT 10.08 09:49 [10.08 05:49] d: 10.08 09:49 [10.08 05:49] RT 10.08 09:49 [10.08 05:49] [{name=Tram iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] - 22: 3887 Phillip / Columbia.............................. a: 10.08 09:50 [10.08 05:50] RT 10.08 09:50 [10.08 05:50] d: 10.08 09:50 [10.08 05:50] RT 10.08 09:50 [10.08 05:50] [{name=Tram iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] - 23: 2524 Columbia / Hazel................................ a: 10.08 09:53 [10.08 05:53] RT 10.08 09:52 [10.08 05:52] d: 10.08 09:53 [10.08 05:53] RT 10.08 09:52 [10.08 05:52] [{name=Tram iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] - 24: 4073 King / Columbia................................. a: 10.08 09:54 [10.08 05:54] RT 10.08 09:54 [10.08 05:54] d: 10.08 09:54 [10.08 05:54] RT 10.08 09:54 [10.08 05:54] [{name=Tram iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] - 25: 1916 King / Weber.................................... a: 10.08 09:55 [10.08 05:55] RT 10.08 09:54 [10.08 05:54] d: 10.08 09:55 [10.08 05:55] RT 10.08 09:54 [10.08 05:54] [{name=Tram iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] - 26: 1918 King / Manulife................................. a: 10.08 09:56 [10.08 05:56] RT 10.08 09:56 [10.08 05:56] d: 10.08 09:56 [10.08 05:56] RT 10.08 09:56 [10.08 05:56] [{name=Tram iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] + 0: 2351 Block Line Station.............................. d: 10.08 09:15 [10.08 05:15] RT 10.08 09:15 [10.08 05:15] [{name=iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] + 1: 1033 Block Line / Hanover............................ a: 10.08 09:16 [10.08 05:16] RT 10.08 09:16 [10.08 05:16] d: 10.08 09:16 [10.08 05:16] RT 10.08 09:16 [10.08 05:16] [{name=iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] + 2: 2086 Block Line / Kingswood.......................... a: 10.08 09:18 [10.08 05:18] RT 10.08 09:18 [10.08 05:18] d: 10.08 09:18 [10.08 05:18] RT 10.08 09:18 [10.08 05:18] [{name=iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] + 3: 2885 Block Line / Strasburg.......................... a: 10.08 09:19 [10.08 05:19] RT 10.08 09:19 [10.08 05:19] d: 10.08 09:19 [10.08 05:19] RT 10.08 09:19 [10.08 05:19] [{name=iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] + 4: 2888 Block Line / Laurentian......................... a: 10.08 09:21 [10.08 05:21] RT 10.08 09:21 [10.08 05:21] d: 10.08 09:21 [10.08 05:21] RT 10.08 09:21 [10.08 05:21] [{name=iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] + 5: 3189 Block Line / Westmount.......................... a: 10.08 09:22 [10.08 05:22] RT 10.08 09:22 [10.08 05:22] d: 10.08 09:22 [10.08 05:22] RT 10.08 09:22 [10.08 05:22] [{name=iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] + 6: 3895 Fischer-Hallman / Westmount..................... a: 10.08 09:24 [10.08 05:24] RT 10.08 09:24 [10.08 05:24] d: 10.08 09:24 [10.08 05:24] RT 10.08 09:24 [10.08 05:24] [{name=iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] + 7: 3893 Fischer-Hallman / Activa........................ a: 10.08 09:26 [10.08 05:26] RT 10.08 09:26 [10.08 05:26] d: 10.08 09:26 [10.08 05:26] RT 10.08 09:26 [10.08 05:26] [{name=iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] + 8: 2969 Fischer-Hallman / Ottawa........................ a: 10.08 09:27 [10.08 05:27] RT 10.08 09:27 [10.08 05:27] d: 10.08 09:27 [10.08 05:27] RT 10.08 09:27 [10.08 05:27] [{name=iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] + 9: 2971 Fischer-Hallman / Mcgarry....................... a: 10.08 09:29 [10.08 05:29] RT 10.08 09:29 [10.08 05:29] d: 10.08 09:29 [10.08 05:29] RT 10.08 09:29 [10.08 05:29] [{name=iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] + 10: 2986 Fischer-Hallman / Queens........................ a: 10.08 09:31 [10.08 05:31] RT 10.08 09:31 [10.08 05:31] d: 10.08 09:31 [10.08 05:31] RT 10.08 09:31 [10.08 05:31] [{name=iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] + 11: 3891 Fischer-Hallman / Highland...................... a: 10.08 09:32 [10.08 05:32] RT 10.08 09:32 [10.08 05:32] d: 10.08 09:32 [10.08 05:32] RT 10.08 09:32 [10.08 05:32] [{name=iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] + 12: 3143 Fischer-Hallman / Victoria...................... a: 10.08 09:33 [10.08 05:33] RT 10.08 09:33 [10.08 05:33] d: 10.08 09:33 [10.08 05:33] RT 10.08 09:33 [10.08 05:33] [{name=iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] + 13: 3144 Fischer-Hallman / Stoke......................... a: 10.08 09:35 [10.08 05:35] RT 10.08 09:35 [10.08 05:35] d: 10.08 09:35 [10.08 05:35] RT 10.08 09:35 [10.08 05:35] [{name=iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] + 14: 3146 Fischer-Hallman / University Ave................ a: 10.08 09:37 [10.08 05:37] RT 10.08 09:38 [10.08 05:38] d: 10.08 09:37 [10.08 05:37] RT 10.08 09:38 [10.08 05:38] [{name=iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] + 15: 1992 Fischer-Hallman / Thorndale..................... a: 10.08 09:38 [10.08 05:38] RT 10.08 09:39 [10.08 05:39] d: 10.08 09:38 [10.08 05:38] RT 10.08 09:39 [10.08 05:39] [{name=iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] + 16: 1972 Fischer-Hallman / Erb........................... a: 10.08 09:39 [10.08 05:39] RT 10.08 09:40 [10.08 05:40] d: 10.08 09:39 [10.08 05:39] RT 10.08 09:40 [10.08 05:40] [{name=iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] + 17: 3465 Fischer-Hallman / Keats Way..................... a: 10.08 09:40 [10.08 05:40] RT 10.08 09:41 [10.08 05:41] d: 10.08 09:40 [10.08 05:40] RT 10.08 09:41 [10.08 05:41] [{name=iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] + 18: 3890 Fischer-Hallman / Columbia...................... a: 10.08 09:42 [10.08 05:42] RT 10.08 09:44 [10.08 05:44] d: 10.08 09:42 [10.08 05:42] RT 10.08 09:44 [10.08 05:44] [{name=iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] + 19: 1117 Columbia / U.W. - Columbia Lake Village......... a: 10.08 09:43 [10.08 05:43] RT 10.08 09:45 [10.08 05:45] d: 10.08 09:43 [10.08 05:43] RT 10.08 09:45 [10.08 05:45] [{name=iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] + 20: 3899 Columbia / University Of Waterloo............... a: 10.08 09:46 [10.08 05:46] RT 10.08 09:47 [10.08 05:47] d: 10.08 09:46 [10.08 05:46] RT 10.08 09:47 [10.08 05:47] [{name=iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] + 21: 1223 University Of Waterloo Station.................. a: 10.08 09:47 [10.08 05:47] RT 10.08 09:49 [10.08 05:49] d: 10.08 09:49 [10.08 05:49] RT 10.08 09:49 [10.08 05:49] [{name=iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] + 22: 3887 Phillip / Columbia.............................. a: 10.08 09:50 [10.08 05:50] RT 10.08 09:50 [10.08 05:50] d: 10.08 09:50 [10.08 05:50] RT 10.08 09:50 [10.08 05:50] [{name=iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] + 23: 2524 Columbia / Hazel................................ a: 10.08 09:53 [10.08 05:53] RT 10.08 09:52 [10.08 05:52] d: 10.08 09:53 [10.08 05:53] RT 10.08 09:52 [10.08 05:52] [{name=iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] + 24: 4073 King / Columbia................................. a: 10.08 09:54 [10.08 05:54] RT 10.08 09:54 [10.08 05:54] d: 10.08 09:54 [10.08 05:54] RT 10.08 09:54 [10.08 05:54] [{name=iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] + 25: 1916 King / Weber.................................... a: 10.08 09:55 [10.08 05:55] RT 10.08 09:54 [10.08 05:54] d: 10.08 09:55 [10.08 05:55] RT 10.08 09:54 [10.08 05:54] [{name=iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] + 26: 1918 King / Manulife................................. a: 10.08 09:56 [10.08 05:56] RT 10.08 09:56 [10.08 05:56] d: 10.08 09:56 [10.08 05:56] RT 10.08 09:56 [10.08 05:56] [{name=iXpress Fischer-Hallman, day=2023-08-10, id=3248651, src=0}] 27: 1127 Conestoga Station............................... a: 10.08 09:58 [10.08 05:58] RT 10.08 09:58 [10.08 05:58] )"sv; diff --git a/test/rt/rt_block_id_test.cc b/test/rt/rt_block_id_test.cc index ffa40eb2..9cf885ee 100644 --- a/test/rt/rt_block_id_test.cc +++ b/test/rt/rt_block_id_test.cc @@ -74,14 +74,14 @@ S1,20190501,1 )"sv; constexpr auto const expected = - R"( 0: A A............................................... d: 30.04 22:30 [01.05 00:30] RT 30.04 23:30 [01.05 01:30] [{name=Bus RE 1, day=2019-04-30, id=T1, src=0}] + R"( 0: A A............................................... d: 30.04 22:30 [01.05 00:30] RT 30.04 23:30 [01.05 01:30] [{name=RE 1, day=2019-04-30, id=T1, src=0}] 1: B B............................................... a: 01.05 08:00 [01.05 10:00] RT 01.05 09:00 [01.05 11:00] - 1: B B............................................... d: 02.05 00:10 [02.05 02:10] RT 02.05 00:11 [02.05 02:11] [{name=Bus RE 2, day=2019-04-30, id=T2, src=0}] - 2: C C............................................... a: 02.05 01:00 [02.05 03:00] RT 02.05 02:00 [02.05 04:00] d: 02.05 01:00 [02.05 03:00] RT 02.05 02:00 [02.05 04:00] [{name=Bus RE 2, day=2019-04-30, id=T2, src=0}] + 1: B B............................................... d: 02.05 00:10 [02.05 02:10] RT 02.05 00:11 [02.05 02:11] [{name=RE 2, day=2019-04-30, id=T2, src=0}] + 2: C C............................................... a: 02.05 01:00 [02.05 03:00] RT 02.05 02:00 [02.05 04:00] d: 02.05 01:00 [02.05 03:00] RT 02.05 02:00 [02.05 04:00] [{name=RE 2, day=2019-04-30, id=T2, src=0}] 3: D D............................................... a: 02.05 02:00 [02.05 04:00] RT 02.05 03:00 [02.05 05:00] - 3: D D............................................... d: 02.05 02:30 [02.05 04:30] RT 02.05 03:00 [02.05 05:00] [{name=Bus RE 3, day=2019-04-30, id=T3, src=0}] + 3: D D............................................... d: 02.05 02:30 [02.05 04:30] RT 02.05 03:00 [02.05 05:00] [{name=RE 3, day=2019-04-30, id=T3, src=0}] 4: E E............................................... a: 02.05 02:40 [02.05 04:40] RT 02.05 03:00 [02.05 05:00] )"; @@ -201,4 +201,4 @@ TEST(rt, rt_block_id_test) { std::runtime_error); } } -} \ No newline at end of file +} diff --git a/test/rt/skip_test.cc b/test/rt/skip_test.cc index dd8803c0..71da8c0e 100644 --- a/test/rt/skip_test.cc +++ b/test/rt/skip_test.cc @@ -105,8 +105,8 @@ auto const kTripUpdate = })"s; constexpr auto const expected = R"( - 2: C C............................................... a: 26.11 11:00 [26.11 12:00] RT 26.11 11:00 [26.11 12:00] d: 26.11 11:00 [26.11 12:00] RT 26.11 11:00 [26.11 12:00] [{name=Bus Route 1, day=2023-11-26, id=TRIP_1, src=0}] - 4: E E............................................... a: 26.11 13:00 [26.11 14:00] RT 26.11 13:00 [26.11 14:00] d: 26.11 13:00 [26.11 14:00] RT 26.11 13:00 [26.11 14:00] [{name=Bus Route 1, day=2023-11-26, id=TRIP_1, src=0}] + 2: C C............................................... a: 26.11 11:00 [26.11 12:00] RT 26.11 11:00 [26.11 12:00] d: 26.11 11:00 [26.11 12:00] RT 26.11 11:00 [26.11 12:00] [{name=Route 1, day=2023-11-26, id=TRIP_1, src=0}] + 4: E E............................................... a: 26.11 13:00 [26.11 14:00] RT 26.11 13:00 [26.11 14:00] d: 26.11 13:00 [26.11 14:00] RT 26.11 13:00 [26.11 14:00] [{name=Route 1, day=2023-11-26, id=TRIP_1, src=0}] )"sv; } // namespace @@ -145,4 +145,4 @@ TEST(rt, gtfs_rt_skip) { EXPECT_EQ(from.id(), "C"); EXPECT_EQ(to.id(), "E"); } -} \ No newline at end of file +}