From 5583505fb32d23a277c357f07340347ab4cd282a Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Sat, 1 Nov 2014 19:45:45 +0100 Subject: allow realtime ppth to override static ppth This way, if a train has so much delay that its scheduled data was not requested in the first place, it's still possible to compared its scheduled route with its actual route --- Changelog | 4 ++++ lib/Travel/Status/DE/IRIS.pm | 18 ++++++++++-------- lib/Travel/Status/DE/IRIS/Result.pm | 12 ++++++++++++ t/31-result-basics.t | 2 +- 4 files changed, 27 insertions(+), 9 deletions(-) diff --git a/Changelog b/Changelog index a67282f..7878a3e 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,7 @@ +git HEAD + + * Improved support for delayed trains + Travel::Status::DE::IRIS 0.05 - Thu Oct 16 2014 * Support additional IRIS delay messages diff --git a/lib/Travel/Status/DE/IRIS.pm b/lib/Travel/Status/DE/IRIS.pm index ac7b744..06ef067 100644 --- a/lib/Travel/Status/DE/IRIS.pm +++ b/lib/Travel/Status/DE/IRIS.pm @@ -253,18 +253,20 @@ sub get_realtime { } if ($e_ar) { $result->add_ar( - arrival_ts => $e_ar->getAttribute('ct'), - platform => $e_ar->getAttribute('cp'), - route_pre => $e_ar->getAttribute('cpth'), - status => $e_ar->getAttribute('cs'), + arrival_ts => $e_ar->getAttribute('ct'), + platform => $e_ar->getAttribute('cp'), + route_pre => $e_ar->getAttribute('cpth'), + sched_route_pre => $e_ar->getAttribute('ppth'), + status => $e_ar->getAttribute('cs'), ); } if ($e_dp) { $result->add_dp( - departure_ts => $e_dp->getAttribute('ct'), - platform => $e_dp->getAttribute('cp'), - route_post => $e_dp->getAttribute('cpth'), - status => $e_dp->getAttribute('cs'), + departure_ts => $e_dp->getAttribute('ct'), + platform => $e_dp->getAttribute('cp'), + route_post => $e_dp->getAttribute('cpth'), + sched_route_post => $e_dp->getAttribute('ppth'), + status => $e_dp->getAttribute('cs'), ); } diff --git a/lib/Travel/Status/DE/IRIS/Result.pm b/lib/Travel/Status/DE/IRIS/Result.pm index a121792..930533d 100644 --- a/lib/Travel/Status/DE/IRIS/Result.pm +++ b/lib/Travel/Status/DE/IRIS/Result.pm @@ -118,6 +118,12 @@ sub add_ar { $self->{route_start} = $self->{route_pre}[0]; } + if ( $attrib{sched_route_pre} ) { + $self->{sched_route_pre} + = [ split( qr{[|]}, $attrib{sched_route_pre} // q{} ) ]; + $self->{sched_route_start} = $self->{sched_route_pre}[0]; + } + if ( $attrib{status} and $attrib{status} eq 'c' ) { $self->{is_cancelled} = 1; } @@ -149,6 +155,12 @@ sub add_dp { $self->{route_end} = $self->{route_post}[-1]; } + if ( $attrib{sched_route_post} ) { + $self->{sched_route_post} + = [ split( qr{[|]}, $attrib{sched_route_post} // q{} ) ]; + $self->{sched_route_end} = $self->{sched_route_post}[-1]; + } + if ( $attrib{status} and $attrib{status} eq 'c' ) { $self->{is_cancelled} = 1; } diff --git a/t/31-result-basics.t b/t/31-result-basics.t index 7f9423b..f88fa6f 100644 --- a/t/31-result-basics.t +++ b/t/31-result-basics.t @@ -53,7 +53,7 @@ is($ice645->raw_id, '1065350279715650378-1401031812-6', '->raw_id'); is($ice645->route_end, 'Berlin Ostbahnhof', '->routd_end'); is($ice645->route_start, 'Köln/Bonn Flughafen', '->routd_start'); is($ice645->sched_route_end, 'Berlin Ostbahnhof', '->sched_route_end'); -is($ice645->sched_route_start, 'Köln/Bonn Flughafen', '->sched_routd_start'); +is($ice645->sched_route_start, 'Köln/Bonn Flughafen', '->sched_route_start'); is($ice645->stop_no, 6, '->stop_no'); is($ice645->time, '19:23', '->time'); is($ice645->train, 'ICE 645', '->train'); -- cgit v1.2.3