Commit 69568899 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

set S-Bahn type for non-DB S-Bahn trains as well

parent a6681504

lib/DBInfoscreen/Controller/Stationboard.pm

+8 −2
Original line number Diff line number Diff line
@@ -993,7 +993,8 @@ sub handle_request { 
             # stops. This is a rare case, one point where it can be observed is

             # the TGV service at Frankfurt/Karlsruhe/Mannheim.

				if ( $route_info

					and my @hafas_stations = @{ $route_info->{stations} } )

					and my @hafas_stations

					= @{ $route_info->{stations} // [] } )

				{

					if ( my @iris_stations

						= @{ $departures[-1]{route_pre_diff} } )
@@ -1059,7 +1060,7 @@ sub handle_request { 
						}

					}

				}

				if ( $route_info and @{ $route_info->{messages} } ) {

				if ( $route_info and @{ $route_info->{messages} // [] } ) {

					my $him = $route_info->{messages};

					my @him_messages;

					$departures[-1]{messages}{him} = $him;
@@ -1174,6 +1175,11 @@ sub handle_request { 
			{

				$linetype = 'ext';

			}

			elsif ( $departure->{train_line}

				and $departure->{train_line} =~ m{^S\d} )

			{

				$linetype = 'sbahn';

			}



			$self->render(

				'_train_details',

templates/app.html.ep

+3 −0
Original line number Diff line number Diff line
@@ -50,6 +50,9 @@ 
%          or $departure->{train_type} eq 'FLX'

%          or $departure->{train_type} eq 'NJ') {

%     $linetype = 'ext';

%   }

%   elsif ( $departure->{train_line} and $departure->{train_line} =~ m{^S\d} ) {

%     $linetype = 'sbahn';

%   }

    <li

      data-train="<%= ($departure->{train_type} // q{}) %> <%= ($departure->{train_no} // $departure->{train} // q{}) %>"

templates/infoscreen.html.ep

+3 −0
Original line number Diff line number Diff line
@@ -42,6 +42,9 @@ 
%          or $departure->{train_type} eq 'FLX'

%          or $departure->{train_type} eq 'NJ') {

%     $linetype = 'ext';

%   }

%   elsif ( $departure->{train_line} and $departure->{train_line} =~ m{^S\d} ) {

%     $linetype = 'sbahn';

%   }

    <div class="line <%= $linetype %>">

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