diff options
author | Birte Kristina Friesel <derf@finalrewind.org> | 2025-01-05 11:25:13 +0100 |
---|---|---|
committer | Birte Kristina Friesel <derf@finalrewind.org> | 2025-01-05 11:25:13 +0100 |
commit | a4a5bc055b72e08e054fccf045096620162df206 (patch) | |
tree | fc5a9745fa5d5a629e1c1678a73de2741995981e | |
parent | 6e169aa0acbfa814e66e5370e130a5bb03443042 (diff) |
Adjust for Travel::Status::DE::EFA 3.06
-rw-r--r-- | cpanfile | 2 | ||||
-rw-r--r-- | lib/DBInfoscreen/Controller/Stationboard.pm | 11 |
2 files changed, 7 insertions, 6 deletions
@@ -11,7 +11,7 @@ requires 'LWP::UserAgent'; requires 'LWP::Protocol::https'; requires 'Mojolicious'; requires 'Travel::Status::DE::DBWagenreihung', '== 0.18'; -requires 'Travel::Status::DE::EFA', '>= 3.00'; +requires 'Travel::Status::DE::EFA', '>= 3.06'; requires 'Travel::Status::DE::HAFAS', '>= 5.06'; requires 'Travel::Status::DE::IRIS'; requires 'XML::LibXML'; diff --git a/lib/DBInfoscreen/Controller/Stationboard.pm b/lib/DBInfoscreen/Controller/Stationboard.pm index 1a6d560..50a4831 100644 --- a/lib/DBInfoscreen/Controller/Stationboard.pm +++ b/lib/DBInfoscreen/Controller/Stationboard.pm @@ -1292,7 +1292,7 @@ sub train_details_efa { @{ $res->{route_post_diff} }, { name => $stop->full_name, - id => $stop->stop_id, + id => $stop->id_code, sched_arr => $stop->sched_arr, sched_dep => $stop->sched_dep, rt_arr => $stop->rt_arr, @@ -1750,9 +1750,10 @@ sub handle_efa { train_line => $result->line, train_no => $result->train_no, journey_id => sprintf( '%s@%d(%s)%d', - $result->stateless, - scalar $result->route_pre ? ( $result->route_pre )[0]->id - : $result->stop_id, + $result->stateless =~ s{ }{}gr, + scalar $result->route_pre + ? ( $result->route_pre )[0]->id_num + : $result->stop_id_num, $result->sched_datetime->strftime('%Y%m%d'), $result->key ), via => [ map { $_->name } $result->route_interesting ], @@ -1767,7 +1768,7 @@ sub handle_efa { is_delayed => ( $delay and $delay >= 5 ? 1 : 0 ), has_realtime => defined $delay ? 1 : 0, occupancy => $result->occupancy, - station => $efa->stop->id, + station => $efa->stop->id_code, replaced_by => [], replacement_for => [], route_pre => [ map { $_->full_name } $result->route_pre ], |