From afe639efc0edc5fddec176ee023afd768c954bf0 Mon Sep 17 00:00:00 2001
From: Birte Kristina Friesel <derf@finalrewind.org>
Date: Thu, 1 Aug 2024 09:43:09 +0200
Subject: update to DBWagenreihung v0.16

---
 lib/DBInfoscreen/Controller/Stationboard.pm | 27 ++++++++++++++-------------
 lib/DBInfoscreen/Controller/Wagenreihung.pm |  1 -
 lib/DBInfoscreen/Helper/Wagonorder.pm       |  1 +
 3 files changed, 15 insertions(+), 14 deletions(-)

(limited to 'lib/DBInfoscreen')

diff --git a/lib/DBInfoscreen/Controller/Stationboard.pm b/lib/DBInfoscreen/Controller/Stationboard.pm
index 66bf402..93c9546 100644
--- a/lib/DBInfoscreen/Controller/Stationboard.pm
+++ b/lib/DBInfoscreen/Controller/Stationboard.pm
@@ -818,19 +818,20 @@ sub render_train {
 									$entry = $wagon->number;
 								}
 								else {
-									$entry = $wagon->type;
-
-									#if ($wagon->has_first_class) {
-									#	if ($wagon->has_second_class) {
-									#		$entry = '½';
-									#	}
-									#	else {
-									#		$entry = '1.';
-									#	}
-									#}
-									#else {
-									#	$entry = '2.';
-									#}
+									if ( $wagon->has_first_class ) {
+										if ( $wagon->has_second_class ) {
+											$entry = '½';
+										}
+										else {
+											$entry = '1.';
+										}
+									}
+									elsif ( $wagon->has_second_class ) {
+										$entry = '2.';
+									}
+									else {
+										$entry = $wagon->type;
+									}
 								}
 								if (
 									$group->train_no ne $departure->{train_no} )
diff --git a/lib/DBInfoscreen/Controller/Wagenreihung.pm b/lib/DBInfoscreen/Controller/Wagenreihung.pm
index bfda626..cf7cdd3 100644
--- a/lib/DBInfoscreen/Controller/Wagenreihung.pm
+++ b/lib/DBInfoscreen/Controller/Wagenreihung.pm
@@ -11,7 +11,6 @@ use Mojo::Util qw(b64_encode b64_decode);
 use utf8;
 
 use Travel::Status::DE::DBWagenreihung;
-use Travel::Status::DE::DBWagenreihung::Wagon;
 
 sub handle_wagenreihung_error {
 	my ( $self, $train, $err ) = @_;
diff --git a/lib/DBInfoscreen/Helper/Wagonorder.pm b/lib/DBInfoscreen/Helper/Wagonorder.pm
index 33c7272..5b69da9 100644
--- a/lib/DBInfoscreen/Helper/Wagonorder.pm
+++ b/lib/DBInfoscreen/Helper/Wagonorder.pm
@@ -31,6 +31,7 @@ sub get_p {
 
 	if ( $opt{param} ) {
 		%param = %{ $opt{param} };
+		delete $param{e};
 	}
 	else {
 		my $datetime = $opt{datetime}->clone->set_time_zone('UTC');
-- 
cgit v1.2.3