From 45dc2e4e2abc8da3f7fdc795ce0863c3664280ce Mon Sep 17 00:00:00 2001 From: Birte Kristina Friesel Date: Thu, 8 Aug 2024 21:13:39 +0200 Subject: Switch to new carriage formation API --- lib/Travelynx/Command/work.pm | 44 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 8 deletions(-) (limited to 'lib/Travelynx/Command') diff --git a/lib/Travelynx/Command/work.pm b/lib/Travelynx/Command/work.pm index 44d780a..42b2bc8 100644 --- a/lib/Travelynx/Command/work.pm +++ b/lib/Travelynx/Command/work.pm @@ -84,8 +84,15 @@ sub run { if ( $journey->class <= 16 and $found_dep->rt_dep->epoch > $now->epoch ) { - $self->app->add_wagonorder( $uid, 1, $train_id, - $found_dep->sched_dep, $journey->number ); + $self->app->add_wagonorder( + uid => $uid, + train_id => $journey->id, + is_departure => 1, + eva => $dep, + datetime => $found_dep->sched_dep, + train_type => $journey->type, + train_no => $journey->number, + ); $self->app->add_stationinfo( $uid, 1, $journey->id, $found_dep->loc->eva ); } @@ -102,8 +109,15 @@ sub run { if ( $journey->class <= 16 and $found_arr->rt_arr->epoch - $now->epoch < 600 ) { - $self->app->add_wagonorder( $uid, 0, $train_id, - $found_dep->sched_dep, $journey->number ); + $self->app->add_wagonorder( + uid => $uid, + train_id => $journey->id, + is_arrival => 1, + eva => $arr, + datetime => $found_arr->sched_dep, + train_type => $journey->type, + train_no => $journey->number, + ); $self->app->add_stationinfo( $uid, 0, $journey->id, $found_dep->loc->eva, $found_arr->loc->eva ); } @@ -203,8 +217,15 @@ sub run { } else { $self->app->add_route_timestamps( $uid, $train, 1 ); - $self->app->add_wagonorder( $uid, 1, $train->train_id, - $train->sched_departure, $train->train_no ); + $self->app->add_wagonorder( + uid => $uid, + train_id => $train->train_id, + is_departure => 1, + eva => $dep, + datetime => $train->sched_departure, + train_type => $train->type, + train_no => $train->train_no + ); $self->app->add_stationinfo( $uid, 1, $train->train_id, $dep, $arr ); } @@ -279,8 +300,15 @@ sub run { and $now->epoch > $entry->{real_arr_ts} ) ? 1 : 0 ); - $self->app->add_wagonorder( $uid, 0, $train->train_id, - $train->sched_departure, $train->train_no ); + $self->app->add_wagonorder( + uid => $uid, + train_id => $train->train_id, + is_arrival => 1, + eva => $arr, + datetime => $train->sched_departure, + train_type => $train->type, + train_no => $train->train_no + ); $self->app->add_stationinfo( $uid, 0, $train->train_id, $dep, $arr ); } -- cgit v1.2.3