add arr_cancelled / dep_cancelled accessors (24a9f8ee) · Commits · derf / Travel-Status-DE-HAFAS

bin/hafas-m

+5 −3

Original line number	Diff line number	Diff line
		@@ -249,9 +249,11 @@ if ( $opt{journey} ) {
		for my $stop ( $result->route ) {
		printf(
		"%5s %s %5s %5s %1s%1s %s%s\n",
		$stop->{arr} ? $stop->{arr}->strftime('%H:%M') : q{},
		$stop->{arr_cancelled} ? '--:--'
		: ( $stop->{arr} ? $stop->{arr}->strftime('%H:%M') : q{} ),
		( $stop->{arr} and $stop->{dep} ) ? '→' : q{ },
		$stop->{dep} ? $stop->{dep}->strftime('%H:%M') : q{},
		$stop->{dep_cancelled} ? '--:--'
		: ( $stop->{dep} ? $stop->{dep}->strftime('%H:%M') : q{} ),
		$stop->{delay} ? sprintf( '(%+d)', $stop->{delay} ) : q{},
		display_occupancy( $stop->{load}{FIRST} ),
		display_occupancy( $stop->{load}{SECOND} ),

lib/Travel/Status/DE/HAFAS/Journey.pm

+51 −34

Original line number	Diff line number	Diff line
		@@ -13,9 +13,10 @@ use parent 'Class::Accessor';
		our $VERSION = '3.01';

		Travel::Status::DE::HAFAS::Journey->mk_ro_accessors(
		qw(datetime sched_datetime rt_datetime is_cancelled operator delay
		platform sched_platform rt_platform
		id name type type_long number line load
		qw(datetime sched_datetime rt_datetime
		is_cancelled is_partially_cancelled
		platform sched_platform rt_platform operator
		id name type type_long number line load delay
		route_end route_start origin destination direction)
		);

		@@ -38,9 +39,11 @@ sub new {
		my $date = $journey->{date};

		my $direction = $journey->{dirTxt};
		my $is_cancelled = $journey->{isCncl};
		my $jid = $journey->{jid};

		my $is_cancelled = $journey->{isCncl};
		my $partially_cancelled = $journey->{isPartCncl};

		my $product = $prodL[ $journey->{prodX} ];
		my $name = $product->{addName} // $product->{name};
		my $line_no = $product->{prodCtx}{line};
		@@ -121,6 +124,9 @@ sub new {
		? ( $rt_dep->epoch - $sched_dep->epoch ) / 60
		: undef;

		my $arr_cancelled = $stop->{aCncl};
		my $dep_cancelled = $stop->{dCncl};

		my $tco = {};
		for my $tco_id ( @{ $stop->{dTrnCmpSX}{tcocX} // [] } ) {
		my $tco_kv = $tcocL[$tco_id];
		@@ -136,12 +142,14 @@ sub new {
		lat => $loc->{crd}{y} * 1e-6,
		sched_arr => $sched_arr,
		rt_arr => $rt_arr,
		sched_dep => $sched_dep,
		rt_dep => $rt_dep,
		arr => $rt_arr // $sched_arr,
		arr_delay => $arr_delay,
		arr_cancelled => $arr_cancelled,
		sched_dep => $sched_dep,
		rt_dep => $rt_dep,
		dep => $rt_dep // $sched_dep,
		dep_delay => $dep_delay,
		dep_cancelled => $dep_cancelled,
		delay => $dep_delay // $arr_delay,
		direction => $stop->{dDirTxt},
		load => $tco,
		@@ -164,6 +172,7 @@ sub new {
		operator => $operator,
		direction => $direction,
		is_cancelled => $is_cancelled,
		is_partially_cancelled => $partially_cancelled,
		route_end => $stops[-1]{name},
		messages => \@messages,
		route => \@stops,
		@@ -409,6 +418,10 @@ Also returns undef if the arrival/departure has been cancelled.

		True if the journey was cancelled, false otherwise.

		=item $journey->is_partially_cancelled

		True if part of the journey was cancelled, false otherwise.

		=item $journey->rt_platform (station only)

		Actual arrival/departure platform.
		@@ -472,6 +485,8 @@ entire route. Each hash contains the following keys:

		=item * arr_delay (arrival delay in minutes)

		=item * arr_cancelled (arrival is cancelled)

		=item * rt_dep (DateTime object for actual departure)

		=item * sched_dep (DateTime object for scheduled departure)
		@@ -480,6 +495,8 @@ entire route. Each hash contains the following keys:

		=item * dep_delay (departure delay in minutes)

		=item * dep_cancelled (departure is cancelled)

		=item * delay (departure or arrival delay in minutes)

		=item * direction (direction signage from this stop on, undef if unchanged)

Admin message