From 69568899ff68292fb4855bf5906fb3f56c72d9a7 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Sat, 21 Dec 2019 01:05:43 +0100
Subject: set S-Bahn type for non-DB S-Bahn trains as well

---
 lib/DBInfoscreen/Controller/Stationboard.pm | 10 ++++++++--
 templates/app.html.ep                       |  3 +++
 templates/infoscreen.html.ep                |  3 +++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/lib/DBInfoscreen/Controller/Stationboard.pm b/lib/DBInfoscreen/Controller/Stationboard.pm
index 79538a0..c3c720b 100644
--- a/lib/DBInfoscreen/Controller/Stationboard.pm
+++ b/lib/DBInfoscreen/Controller/Stationboard.pm
@@ -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',
diff --git a/templates/app.html.ep b/templates/app.html.ep
index a769bd5..b35ca59 100644
--- a/templates/app.html.ep
+++ b/templates/app.html.ep
@@ -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{}) %>"
diff --git a/templates/infoscreen.html.ep b/templates/infoscreen.html.ep
index 8b1dd5c..85d0f8d 100644
--- a/templates/infoscreen.html.ep
+++ b/templates/infoscreen.html.ep
@@ -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}) {
-- 
cgit v1.2.3