From 8f657f59c7c306040f39057c02f705bb4a0c3158 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Tue, 8 Sep 2020 18:07:01 +0200 Subject: always calculate tripid via trainsearch.exe --- lib/DBInfoscreen/Controller/Stationboard.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/DBInfoscreen/Controller/Stationboard.pm') diff --git a/lib/DBInfoscreen/Controller/Stationboard.pm b/lib/DBInfoscreen/Controller/Stationboard.pm index f8426c5..c2aa613 100644 --- a/lib/DBInfoscreen/Controller/Stationboard.pm +++ b/lib/DBInfoscreen/Controller/Stationboard.pm @@ -412,8 +412,6 @@ sub render_train { ) ]; - $departure->{trip_id} = $self->hafas->get_tripid($result); - if ( $departure->{wr_link} and not $self->wagonorder->is_available( $result, $departure->{wr_link} ) ) @@ -421,9 +419,11 @@ sub render_train { $departure->{wr_link} = undef; } - my ( $route_ts, $route_info ) + my ( $route_ts, $route_info, $trainsearch ) = $self->hafas->get_route_timestamps( train => $result ); + $departure->{trip_id} = $trainsearch->{trip_id}; + # If a train number changes on the way, IRIS routes are incomplete, # whereas HAFAS data has all stops -> merge HAFAS stops into IRIS # stops. This is a rare case, one point where it can be observed is -- cgit v1.2.3