Unverified Commit 22d78556 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Stop: Add is_cancelled accessor

parent ef954210

bin/efa-m

+17 −3
Original line number Diff line number Diff line
@@ -233,7 +233,13 @@ sub format_route { 
		if ( $stop->delay ) {

			$delay = sprintf( '(%+3d)', $stop->delay );

		}

		if ( defined $stop->arr and defined $stop->dep ) {

		if ( $stop->is_cancelled ) {

			$output .= sprintf(

				"   --:--     %s %s %35s %s\n",

				$delay, $occupancy, $stop->full_name, $stop->platform // q{},

			);

		}

		elsif ( defined $stop->arr and defined $stop->dep ) {

			if ( $stop->arr->epoch == $stop->dep->epoch ) {

				$output .= sprintf(

					"    %5s      %s %s %35s %s\n",
@@ -355,6 +361,10 @@ sub show_stopseq { 
		$delay_len       = length( sprintf( '(%+d)', $max_delay ) ) + 1;

	}



	if ( first { $_->is_cancelled } $trip->route and $delay_len < 3 ) {

		$delay_len = 3;

	}



	for my $stop ( $trip->route ) {

		printf(

			"%s → %s%${delay_len}s  %s (%s) %s\n",
@@ -362,8 +372,12 @@ sub show_stopseq { 
			: q{     },

			$stop->dep ? $stop->dep->strftime('%H:%M')

			: q{     },

			$stop->delay ? sprintf( " (%+${inner_delay_len}d)", $stop->delay )

			: q{},

			$stop->is_cancelled ? 'XX'

			: (

				$stop->delay

				? sprintf( " (%+${inner_delay_len}d)", $stop->delay )

				: q{}

			),

			$stop->full_name,

			$stop->niveau,

			$stop->platform

lib/Travel/Status/DE/EFA/Stop.pm

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ our $VERSION = '3.09'; 
Travel::Status::DE::EFA::Stop->mk_ro_accessors(

	qw(sched_arr rt_arr arr arr_delay

	  sched_dep rt_dep dep dep_delay

	  occupancy delay distance_m

	  occupancy delay distance_m is_cancelled

	  place name full_name id_num id_code latlon

	  platform niveau)

);

lib/Travel/Status/DE/EFA/Trip.pm

+9 −8
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ sub route { 
				sched_dep => $self->parse_dt( $stop->{departureTimePlanned} ),

				rt_arr    => $self->parse_dt( $stop->{arrivalTimeEstimated} ),

				rt_dep    => $self->parse_dt( $stop->{departureTimeEstimated} ),

				is_cancelled => $stop->{isCancelled},

				latlon       => $stop->{coord},

				full_name    => $name_full,

				name         => $name,