Unverified Commit 59c37b4d authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Switch to VRN as default HAFAS service

parent 99b1a06f

lib/DBInfoscreen/Controller/Stationboard.pm

+3 −3
Original line number Original line Diff line number Diff line
@@ -60,7 +60,7 @@ sub handle_no_results { 
	}

	}

	elsif ($hafas) {

	elsif ($hafas) {

		$self->render_later;

		$self->render_later;

		my $service = 'DB';

		my $service = 'VRN';

		if ( $hafas ne '1' and Travel::Status::DE::HAFAS::get_service($hafas) )

		if ( $hafas ne '1' and Travel::Status::DE::HAFAS::get_service($hafas) )

		{

		{

			$service = $hafas;

			$service = $hafas;
@@ -381,7 +381,7 @@ sub get_results_p { 
		);

		);

	}

	}

	if ( $opt{hafas} ) {

	if ( $opt{hafas} ) {

		my $service = 'DB';

		my $service = 'VRN';

		if ( $opt{hafas} ne '1'

		if ( $opt{hafas} ne '1'

			and Travel::Status::DE::HAFAS::get_service( $opt{hafas} ) )

			and Travel::Status::DE::HAFAS::get_service( $opt{hafas} ) )

		{

		{
@@ -2332,7 +2332,7 @@ sub stations_by_coordinates { 
		return;

		return;

	}

	}





	my $service = 'DB';

	my $service = 'VRN';

	if (    $hafas

	if (    $hafas

		and $hafas ne '1'

		and $hafas ne '1'

		and Travel::Status::DE::HAFAS::get_service($hafas) )

		and Travel::Status::DE::HAFAS::get_service($hafas) )

lib/DBInfoscreen/Helper/HAFAS.pm

+4 −2
Original line number Original line Diff line number Diff line
@@ -50,7 +50,7 @@ sub get_route_p { 




	if ( $opt{trip_id} ) {

	if ( $opt{trip_id} ) {

		$hafas_promise = Travel::Status::DE::HAFAS->new_p(

		$hafas_promise = Travel::Status::DE::HAFAS->new_p(

			service => $opt{service},

			service => $opt{service} // 'VRN',

			journey => {

			journey => {

				id => $opt{trip_id},

				id => $opt{trip_id},

			},

			},
@@ -69,6 +69,7 @@ sub get_route_p { 
	}

	}





	$hafas_promise //= Travel::Status::DE::HAFAS->new_p(

	$hafas_promise //= Travel::Status::DE::HAFAS->new_p(

		service      => $opt{service} // 'VRN',

		journeyMatch => $opt{train_req} =~ s{^- }{}r,

		journeyMatch => $opt{train_req} =~ s{^- }{}r,

		datetime     => ( $opt{train} ? $opt{train}->start : $opt{datetime} ),

		datetime     => ( $opt{train} ? $opt{train}->start : $opt{datetime} ),

		language     => $opt{language},

		language     => $opt{language},
@@ -99,6 +100,7 @@ sub get_route_p { 
			}

			}





			return Travel::Status::DE::HAFAS->new_p(

			return Travel::Status::DE::HAFAS->new_p(

				service => $opt{service} // 'VRN',

				journey => {

				journey => {

					id => $result->id,

					id => $result->id,

				},

				},
@@ -264,7 +266,7 @@ sub get_polyline_p { 




	my $trip_id = $opt{id};

	my $trip_id = $opt{id};

	my $line    = $opt{line};

	my $line    = $opt{line};

	my $service = $opt{service};

	my $service = $opt{service} // 'VRN';

	my $promise = Mojo::Promise->new;

	my $promise = Mojo::Promise->new;





	Travel::Status::DE::HAFAS->new_p(

	Travel::Status::DE::HAFAS->new_p(