update to DBWagenreihung v0.164.29.2

6 files changed, 56 insertions, 62 deletions

diff --git a/cpanfile b/cpanfile
index abd0203..7a431b5 100644
--- a/cpanfile
+++ b/cpanfile
@@ -10,7 +10,7 @@ requires 'List::UtilsBy';
 requires 'LWP::UserAgent';
 requires 'LWP::Protocol::https';
 requires 'Mojolicious';
-requires 'Travel::Status::DE::DBWagenreihung', '== 0.15';
+requires 'Travel::Status::DE::DBWagenreihung', '== 0.16';
 requires 'Travel::Status::DE::EFA', '>= 2.02';
 requires 'Travel::Status::DE::HAFAS', '>= 5.06';
 requires 'Travel::Status::DE::IRIS';
diff --git a/cpanfile.snapshot b/cpanfile.snapshot
index 3488e57..35f2a27 100644
--- a/cpanfile.snapshot
+++ b/cpanfile.snapshot
@@ -385,15 +385,15 @@ DISTRIBUTIONS
       parent 0
       strict 0
       warnings 0
-  DateTime-Locale-1.42
-    pathname: D/DR/DROLSKY/DateTime-Locale-1.42.tar.gz
+  DateTime-Locale-1.43
+    pathname: D/DR/DROLSKY/DateTime-Locale-1.43.tar.gz
     provides:
-      DateTime::Locale 1.42
-      DateTime::Locale::Base 1.42
-      DateTime::Locale::Catalog 1.42
-      DateTime::Locale::Data 1.42
-      DateTime::Locale::FromData 1.42
-      DateTime::Locale::Util 1.42
+      DateTime::Locale 1.43
+      DateTime::Locale::Base 1.43
+      DateTime::Locale::Catalog 1.43
+      DateTime::Locale::Data 1.43
+      DateTime::Locale::FromData 1.43
+      DateTime::Locale::Util 1.43
     requirements:
       Carp 0
       Dist::CheckConflicts 0.02
@@ -1048,16 +1048,16 @@ DISTRIBUTIONS
       parent 0
       perl 5.008001
       strictures 2.000000
-  HTML-Parser-3.82
-    pathname: O/OA/OALDERS/HTML-Parser-3.82.tar.gz
+  HTML-Parser-3.83
+    pathname: O/OA/OALDERS/HTML-Parser-3.83.tar.gz
     provides:
-      HTML::Entities 3.82
-      HTML::Filter 3.82
-      HTML::HeadParser 3.82
-      HTML::LinkExtor 3.82
-      HTML::Parser 3.82
-      HTML::PullParser 3.82
-      HTML::TokeParser 3.82
+      HTML::Entities 3.83
+      HTML::Filter 3.83
+      HTML::HeadParser 3.83
+      HTML::LinkExtor 3.83
+      HTML::Parser 3.83
+      HTML::PullParser 3.83
+      HTML::TokeParser 3.83
     requirements:
       Carp 0
       Exporter 0
@@ -1175,22 +1175,21 @@ DISTRIBUTIONS
       Exporter 5.57
       ExtUtils::MakeMaker 0
       perl 5.008
-  IO-Socket-SSL-2.086
-    pathname: S/SU/SULLR/IO-Socket-SSL-2.086.tar.gz
+  IO-Socket-SSL-2.088
+    pathname: S/SU/SULLR/IO-Socket-SSL-2.088.tar.gz
     provides:
-      IO::Socket::SSL 2.086
+      IO::Socket::SSL 2.088
       IO::Socket::SSL::Intercept 2.056
-      IO::Socket::SSL::OCSP_Cache 2.086
-      IO::Socket::SSL::OCSP_Resolver 2.086
+      IO::Socket::SSL::OCSP_Cache 2.088
+      IO::Socket::SSL::OCSP_Resolver 2.088
       IO::Socket::SSL::PublicSuffix undef
-      IO::Socket::SSL::SSL_Context 2.086
-      IO::Socket::SSL::SSL_HANDLE 2.086
-      IO::Socket::SSL::Session_Cache 2.086
-      IO::Socket::SSL::Trace 2.086
+      IO::Socket::SSL::SSL_Context 2.088
+      IO::Socket::SSL::SSL_HANDLE 2.088
+      IO::Socket::SSL::Session_Cache 2.088
+      IO::Socket::SSL::Trace 2.088
       IO::Socket::SSL::Utils 2.015
     requirements:
       ExtUtils::MakeMaker 0
-      Mozilla::CA 0
       Net::SSLeay 1.46
       Scalar::Util 0
   IO-String-1.08
@@ -1502,12 +1501,6 @@ DISTRIBUTIONS
       IO::Socket::IP 0.37
       Sub::Util 1.41
       perl 5.016
-  Mozilla-CA-20240313
-    pathname: L/LW/LWP/Mozilla-CA-20240313.tar.gz
-    provides:
-      Mozilla::CA 20240313
-    requirements:
-      ExtUtils::MakeMaker 0
   Net-HTTP-6.23
     pathname: O/OA/OALDERS/Net-HTTP-6.23.tar.gz
     provides:
@@ -1874,13 +1867,13 @@ DISTRIBUTIONS
       TimeDate 1.21
     requirements:
       ExtUtils::MakeMaker 0
-  Travel-Status-DE-DBWagenreihung-0.14
-    pathname: D/DE/DERF/Travel-Status-DE-DBWagenreihung-0.14.tar.gz
+  Travel-Status-DE-DBWagenreihung-0.16
+    pathname: D/DE/DERF/Travel-Status-DE-DBWagenreihung-0.16.tar.gz
     provides:
-      Travel::Status::DE::DBWagenreihung 0.14
-      Travel::Status::DE::DBWagenreihung::Group 0.14
-      Travel::Status::DE::DBWagenreihung::Section 0.14
-      Travel::Status::DE::DBWagenreihung::Wagon 0.14
+      Travel::Status::DE::DBWagenreihung 0.16
+      Travel::Status::DE::DBWagenreihung::Carriage 0.16
+      Travel::Status::DE::DBWagenreihung::Group 0.16
+      Travel::Status::DE::DBWagenreihung::Sector 0.16
     requirements:
       Carp 0
       Class::Accessor 0
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');
diff --git a/templates/_wagon.html.ep b/templates/_wagon.html.ep
index 46d07b7..296b71f 100644
--- a/templates/_wagon.html.ep
+++ b/templates/_wagon.html.ep
@@ -1,8 +1,8 @@
 % my $bg = '';
 % my $extra_class = '';
-% #if ($wagon->has_first_class) {
-% #  $extra_class .= ' firstclass';
-% #}
+% if ($wagon->has_first_class) {
+%   $extra_class .= ' firstclass';
+% }
 % if ($wagon->is_locomotive or $wagon->is_powercar) {
 %   $extra_class .= ' powercar';
 % }
@@ -21,19 +21,19 @@
 %   }
 %   else {
 %=    $wagon->number // '?'
-%     if(0){ #if ($wagon->has_wheelchair_space) {
+%     if ($wagon->has_wheelchair_space) {
         <i class="material-icons" style="font-size: 20px;">accessible</i>
 %     }
-%     if(0){ #if ($wagon->has_bistro) {
+%     if ($wagon->has_bistro) {
         <i class="material-icons">restaurant</i>
 %     }
-%     if(0){ #if ($wagon->has_quiet_zone) {
+%     if ($wagon->has_quiet_zone) {
         <i class="tiny material-icons">volume_off</i>
 %     }
-%     if(0){ #if ($wagon->has_family_zone) {
+%     if ($wagon->has_family_zone) {
         <i class="material-icons">people</i>
 %     }
-%     if(0){ #if ($wagon->has_bahn_comfort) {
+%     if ($wagon->has_bahn_comfort) {
         <i class="material-icons">star</i>
 %     }
 %   }