Unverified Commit 2b2fcbde authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Use Travel::Status::DE::HAFAS::Journey for journey data

parent 1c82ee17

Build.PL

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ Module::Build->new( 
		'LWP::UserAgent'                      => 0,

		'LWP::Protocol::https'                => 0,

		'Travel::Status::DE::HAFAS'           => 0,

		'Travel::Status::DE::HAFAS::Journey'  => '5.00',

		'Travel::Status::DE::HAFAS::Location' => '5.00',

		'Travel::Status::DE::HAFAS::Message'  => '4.19',

	},

bin/hafas

+9 −6
Original line number Diff line number Diff line
@@ -295,16 +295,16 @@ for my $res ( $hafas->connections ) { 
				$glance .= sprintf(

					'  (%01d:%02d)  %s',

					$sec->transfer_duration->in_units( 'hours', 'minutes' ),

					$sec->name

					$sec->journey->name

				);

			}

			else {

				$negative_transfer = 1;

				$glance .= sprintf( '  (--:--)  %s', $sec->name );

				$glance .= sprintf( '  (--:--)  %s', $sec->journey->name );

			}

		}

		else {

			$glance .= $sec->name;

			$glance .= $sec->journey->name;

		}

	}
@@ -348,9 +348,12 @@ for my $res ( $hafas->connections ) { 


	for my $sec ( $res->sections ) {

		if ( $sec->type eq 'JNY' ) {

			printf( "${output_bold}%s${output_reset} → %s  %s\n",

				$sec->name, $sec->direction,

				display_occupancies( $sec->load ) );

			printf(

				"${output_bold}%s${output_reset} → %s  %s\n",

				$sec->journey->name,

				$sec->journey->direction,

				display_occupancies( $sec->load )

			);

			printf(

				"%-5s %-${delay_fmt}s ab  %s%s%s\n",

				$sec->dep_cancelled

cpanfile

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ requires 'List::Util'; 
requires 'LWP::UserAgent';

requires 'LWP::Protocol::https';

requires 'Travel::Status::DE::HAFAS';

requires 'Travel::Status::DE::HAFAS::Journey',  '5.00';

requires 'Travel::Status::DE::HAFAS::Location', '5.00';

requires 'Travel::Status::DE::HAFAS::Message',  '4.19';

lib/Travel/Routing/DE/HAFAS.pm

+2 −1
Original line number Diff line number Diff line
@@ -647,7 +647,8 @@ Travel::Routing::DE::HAFAS - Interface to HAFAS itinerary services 
		for my $sec ($con->sections) {

			if ( $sec->type eq 'JNY' ) {

				printf("%s -> %s\n%s ab %s\n%s an %s\n\n",

					$sec->name, $sec->direction,

					$sec->journey->name,

					$sec->journey->direction,

					$sec->dep->strftime('%H:%M'),

					$sec->dep_loc->name,

					$sec->arr->strftime('%H:%M'),

lib/Travel/Routing/DE/HAFAS/Connection.pm

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ sub new { 
		time_zone => 'Europe/Berlin'

	);



	# dProgType/aProgType: CORRECTED oder PROGNOSED

	my $sched_dep = $connection->{dep}{dTimeS};

	my $rt_dep    = $connection->{dep}{dTimeR};

	my $sched_arr = $connection->{arr}{aTimeS};