summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2023-02-05 12:39:33 +0100
committerDaniel Friesel <derf@finalrewind.org>2023-02-05 12:39:33 +0100
commit30df90e0617e26b680f37f21696781118974bf22 (patch)
treefe4b3aadec09f4ecba5f1e033d430b118d2c17a7
parent163e0ffdd560896edb5f91a602f5b1586f46f110 (diff)
hafas: show cancellation in detail page4.15.5
-rw-r--r--lib/DBInfoscreen/Controller/Stationboard.pm2
-rw-r--r--lib/DBInfoscreen/Helper/HAFAS.pm22
2 files changed, 14 insertions, 10 deletions
diff --git a/lib/DBInfoscreen/Controller/Stationboard.pm b/lib/DBInfoscreen/Controller/Stationboard.pm
index 39b3a3d..04b0ba3 100644
--- a/lib/DBInfoscreen/Controller/Stationboard.pm
+++ b/lib/DBInfoscreen/Controller/Stationboard.pm
@@ -1183,6 +1183,8 @@ sub train_details {
= $station_info->{arr_cancelled};
$res->{departure_is_cancelled}
= $station_info->{dep_cancelled};
+ $res->{is_cancelled} = $res->{arrival_is_cancelled}
+ || $res->{arrival_is_cancelled};
}
}
diff --git a/lib/DBInfoscreen/Helper/HAFAS.pm b/lib/DBInfoscreen/Helper/HAFAS.pm
index 6111a5b..ec5c051 100644
--- a/lib/DBInfoscreen/Helper/HAFAS.pm
+++ b/lib/DBInfoscreen/Helper/HAFAS.pm
@@ -232,16 +232,18 @@ sub get_route_timestamps_p {
for my $stop ( $journey->route ) {
my $name = $stop->{name};
$ret->{$name} = $ret->{ $stop->{eva} } = {
- name => $stop->{name},
- eva => $stop->{eva},
- sched_arr => $stop->{sched_arr},
- sched_dep => $stop->{sched_dep},
- rt_arr => $stop->{rt_arr},
- rt_dep => $stop->{rt_dep},
- arr_delay => $stop->{arr_delay},
- dep_delay => $stop->{dep_delay},
- load => $stop->{load},
- isCancelled => (
+ name => $stop->{name},
+ eva => $stop->{eva},
+ sched_arr => $stop->{sched_arr},
+ sched_dep => $stop->{sched_dep},
+ rt_arr => $stop->{rt_arr},
+ rt_dep => $stop->{rt_dep},
+ arr_delay => $stop->{arr_delay},
+ dep_delay => $stop->{dep_delay},
+ arr_cancelled => $stop->{arr_cancelled},
+ dep_cancelled => $stop->{dep_cancelled},
+ load => $stop->{load},
+ isCancelled => (
( $stop->{arr_cancelled} or not $stop->{sched_arr} )
and
( $stop->{dep_cancelled} or not $stop->{sched_dep} )