Unverified Commit 5699206c authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Segment: add is_cancelled accessor; dbris: indicate cancelled segments

parent 6f7e43d6
Loading
Loading
Loading
Loading
+14 −4
Original line number Diff line number Diff line
@@ -510,12 +510,22 @@ for my $connection ( $ris->connections ) {
			next;
		}
		elsif ( $segment->direction ) {
			printf( "${output_bold}%s${output_reset} → %s  %s\n",
				$segment->train_mid, $segment->direction,
				$show_full_route ? q{} : format_occupancy($segment) );
			printf(
				"${output_bold}%s%s${output_reset} → %s  %s%s\n",
				$segment->is_cancelled ? $output_critical : q{},
				$segment->train_mid,
				$segment->direction,
				$show_full_route       ? q{} : format_occupancy($segment),
				$segment->is_cancelled ? '  (cancelled)' : q{}
			);
		}
		else {
			printf( "${output_bold}%s${output_reset}\n", $segment->train_long );
			printf(
				"${output_bold}%s%s${output_reset}%s\n",
				$segment->is_cancelled ? $output_critical : q{},
				$segment->train_long,
				$segment->is_cancelled ? '  (cancelled)' : q{}
			);
		}

		printf(
+18 −13
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ Travel::Routing::DE::DBRIS::Connection::Segment->mk_ro_accessors(
	  arr_delay dep_delay delay feasibility is_unlikely transfer_duration
	  journey_id
	  occupancy occupancy_first occupancy_second
	  is_transfer is_walk walk_name distance_m
	  is_cancelled is_transfer is_walk walk_name distance_m
	)
);

@@ -44,6 +44,7 @@ sub new {
		distance_m   => $json->{distanz},
		feasibility  => $json->{anschlussBewertungCode},
		journey_id   => $json->{journeyId},
		is_cancelled => $json->{is_cancelled},
	};

	bless( $ref, $obj );
@@ -162,6 +163,10 @@ sub new {
		$ref->{arr_stop}     = $ref->{route}[-1];
		$ref->{dep_platform} = $ref->{route}[0]->platform;
		$ref->{arr_platform} = $ref->{route}[-1]->platform;
		if ( $ref->{dep_stop}{is_cancelled} or $ref->{arr_stop}{is_cancelled} )
		{
			$ref->{is_cancelled} = 1;
		}
	}

	return $ref;