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

$departure->{direction} is also used by HAFAS, move wr to wr_direction

parent c3e12fff

lib/DBInfoscreen/Controller/Stationboard.pm

+3 −3
Original line number Diff line number Diff line
@@ -856,11 +856,11 @@ sub render_train { 
			}



			if ($direction) {

				$departure->{direction}     = $direction;

				$departure->{direction_num} = $direction eq 'l' ? 0 : 100;

				$departure->{wr_direction}     = $direction;

				$departure->{wr_direction_num} = $direction eq 'l' ? 0 : 100;

			}

			elsif ( $platform_info->{direction} ) {

				$departure->{direction} = 'a' . $platform_info->{direction};

				$departure->{wr_direction} = 'a' . $platform_info->{direction};

			}



			return;

templates/_train_details.html.ep

+6 −6
Original line number Diff line number Diff line
@@ -68,10 +68,10 @@ 
%   else {

%     my $left = '';

%     my $right = '';

%     if ($departure->{direction} and $departure->{direction} eq 'l') {

%     if ($departure->{wr_direction} and $departure->{wr_direction} eq 'l') {

%       $left = '◀ ';

%     }

%     elsif ($departure->{direction} and $departure->{direction} eq 'r') {

%     elsif ($departure->{wr_direction} and $departure->{wr_direction} eq 'r') {

%       $right = ' ▶';

%     }

%     if ($departure->{scheduled_platform} and $departure->{platform}
@@ -119,10 +119,10 @@ 
%   if (my $wr = $departure->{wr}) {

      <div class="wagonorder-preview">

%     my $direction = defined $wr->direction ? $wr->direction == 100 ? '→' : '←' : q{};

%     if ($departure->{direction}) {

%       $direction = $departure->{direction} eq 'l' ? '◀' : '▶';

%     if ($departure->{wr_direction}) {

%       $direction = $departure->{wr_direction} eq 'l' ? '◀' : '▶';

%     }

      <a href="/_wr/<%= $departure->{train_no} %>/<%= $departure->{wr_link} %>?e=<%= $departure->{direction} // '' %>">

      <a href="/_wr/<%= $departure->{train_no} %>/<%= $departure->{wr_link} %>?e=<%= $departure->{wr_direction} // '' %>">

      %= $direction

      % if (defined $departure->{direction_num} and $departure->{direction_num} != $wr->direction) {

        %= join(q{ }, reverse @{$departure->{wr_preview} // []})
@@ -144,7 +144,7 @@ 
%       }

%     }

%     if ($departure->{wr_link}) {

        <a class="smallbutton" href="/_wr/<%= $departure->{train_no} %>/<%= $departure->{wr_link} %>?e=<%= $departure->{direction} // '' %>"><i class="material-icons" aria-hidden="true">train</i> <%= $departure->{wr_text} || 'Wagen' %>

        <a class="smallbutton" href="/_wr/<%= $departure->{train_no} %>/<%= $departure->{wr_link} %>?e=<%= $departure->{wr_direction} // '' %>"><i class="material-icons" aria-hidden="true">train</i> <%= $departure->{wr_text} || 'Wagen' %>

        </a>

%     }

%     if ($departure->{train_type} and $departure->{train_no}) {