Unverified Commit 38f537bf authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Use hafas=DB rather than hafas=1

parent 84a3d282

lib/Travelynx/Command/dumpstops.pm

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ use Mojo::Base 'Mojolicious::Command'; 
use List::Util qw();

use Text::CSV;



has description => 'Export HAFAS/IRIS stops to CSV';

has description => 'Export known stops to CSV';



has usage => sub { shift->extract_usage };

lib/Travelynx/Controller/Traveling.pm

+8 −8
Original line number Diff line number Diff line
@@ -604,7 +604,7 @@ sub geolocation { 
					name     => $_->name,

					eva      => $_->eva,

					distance => $_->distance_m / 1000,

					hafas    => 1

					hafas    => 'DB'

				}

			} $hafas->results;

			if ( @hafas > 10 ) {
@@ -714,7 +714,7 @@ sub travel_action { 
				if ( my $destination = $params->{dest} ) {

					my $station_link = '/s/' . $destination;

					if ( $status->{train_id} =~ m{[|]} ) {

						$station_link .= '?hafas=1';

						$station_link .= '?hafas=DB';

					}

					$self->render(

						json => {
@@ -750,7 +750,7 @@ sub travel_action { 
				my ( $still_checked_in, $error ) = @_;

				my $station_link = '/s/' . $params->{station};

				if ( $status->{train_id} =~ m{[|]} ) {

					$station_link .= '?hafas=1';

					$station_link .= '?hafas=DB';

				}



				if ($error) {
@@ -801,7 +801,7 @@ sub travel_action { 
			my $redir = '/';

			if ( $status->{checked_in} or $status->{cancelled} ) {

				if ( $status->{train_id} =~ m{[|]} ) {

					$redir = '/s/' . $status->{dep_eva} . '?hafas=1';

					$redir = '/s/' . $status->{dep_eva} . '?hafas=DB';

				}

				else {

					$redir = '/s/' . $status->{dep_ds100};
@@ -999,7 +999,7 @@ sub station { 
			}

			else {



				$api_link = '/s/' . $status->{station_eva} . '?hafas=1';

				$api_link = '/s/' . $status->{station_eva} . '?hafas=DB';



				# You can't check into a train which terminates here

				@results = grep { $_->departure } @{ $status->{results} };
@@ -1128,7 +1128,7 @@ sub station { 
						my @suggestions = $hafas2->results;

						if ( @suggestions == 1 ) {

							$self->redirect_to(

								'/s/' . $suggestions[0]->eva . '?hafas=1' );

								'/s/' . $suggestions[0]->eva . '?hafas=DB' );

						}

						else {

							$self->render(
@@ -1171,14 +1171,14 @@ sub redirect_to_station { 


	if ( my $s = $self->app->stations->search($station) ) {

		if ( $s->{source} == 1 ) {

			$self->redirect_to("/s/${station}?hafas=1");

			$self->redirect_to("/s/${station}?hafas=DB");

		}

		else {

			$self->redirect_to("/s/${station}");

		}

	}

	else {

		$self->redirect_to("/s/${station}?hafas=1");

		$self->redirect_to("/s/${station}?hafas=DB");

	}

}

lib/Travelynx/Model/Users.pm

+4 −1
Original line number Diff line number Diff line
@@ -44,7 +44,10 @@ my @sb_templates = ( 
	undef,

	[ 'DBF',         'https://dbf.finalrewind.org/{name}?rt=1#{tt}{tn}' ],

	[ 'bahn.expert', 'https://bahn.expert/{name}#{id}' ],

	[ 'DBF HAFAS', 'https://dbf.finalrewind.org/{name}?rt=1&hafas=1#{tt}{tn}' ],

	[

		'DBF HAFAS',

		'https://dbf.finalrewind.org/{name}?rt=1&hafas=DB#{tt}{tn}'

	],

	[ 'bahn.expert/regional', 'https://bahn.expert/regional/{name}#{id}' ],

);

templates/departures.html.ep

+2 −2
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ 
<div class="row">

	<div class="col s4 center-align">

		% if ($hafas) {

			<a class="btn-small" href="<%= url_for('sstation', station => param('station'))->query({hafas => 1, timestamp => $datetime->clone->subtract(hours => 1)->epoch}) %>"><i class="material-icons left" aria-hidden="true">chevron_left</i><span class="hide-on-small-only">früher</span></a>

			<a class="btn-small" href="<%= url_for('sstation', station => param('station'))->query({hafas => $hafas, timestamp => $datetime->clone->subtract(hours => 1)->epoch}) %>"><i class="material-icons left" aria-hidden="true">chevron_left</i><span class="hide-on-small-only">früher</span></a>

		% }

	</div>

	<div class="col s4 center-align">
@@ -103,7 +103,7 @@ 
	</div>

	<div class="col s4 center-align">

		% if ($hafas) {

			<a class="btn-small" href="<%= url_for('sstation', station => param('station'))->query({hafas => 1, timestamp => $datetime->clone->add(hours => 1)->epoch}) %>"><span class="hide-on-small-only">später</span><i class="material-icons right" aria-hidden="true">chevron_right</i></a>

			<a class="btn-small" href="<%= url_for('sstation', station => param('station'))->query({hafas => $hafas, timestamp => $datetime->clone->add(hours => 1)->epoch}) %>"><span class="hide-on-small-only">später</span><i class="material-icons right" aria-hidden="true">chevron_right</i></a>

		% }

	</div>

</div>

templates/disambiguation.html.ep

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
	<div class="col s12">

		<ul class="suggestions">

			% for my $suggestion (@{$suggestions // []}) {

				<li><a href="<%= url_for('station' => $suggestion->{eva}) . (param('hafas') ? '?hafas=1' : q{}) %>"><%= $suggestion->{name} %></a></li>

				<li><a href="<%= url_for('station' => $suggestion->{eva}) . (param('hafas') ? '?hafas=DB' : q{}) %>"><%= $suggestion->{name} %></a></li>

			% }

		</ul>

	</div>