From a9b5b0a8a3c5b3964e5c89b0e4e58706658b3b44 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Sat, 26 Dec 2020 09:39:31 +0100 Subject: distinguish between IC2 KISS and IC2 Twindexx --- lib/Travel/Status/DE/DBWagenreihung.pm | 24 ++++++++++++++---------- lib/Travel/Status/DE/DBWagenreihung/Wagon.pm | 2 +- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/lib/Travel/Status/DE/DBWagenreihung.pm b/lib/Travel/Status/DE/DBWagenreihung.pm index 32c1468..9b70f00 100644 --- a/lib/Travel/Status/DE/DBWagenreihung.pm +++ b/lib/Travel/Status/DE/DBWagenreihung.pm @@ -309,14 +309,15 @@ sub train_subtype { my $with_restaurant = 0; my %ml = ( - 'ICE 1' => 0, - 'ICE 2' => 0, - 'ICE 3' => 0, - 'ICE 3 V' => 0, - 'ICE 4' => 0, - 'ICE T 411' => 0, - 'ICE T 415' => 0, - 'IC2' => 0, + 'ICE 1' => 0, + 'ICE 2' => 0, + 'ICE 3' => 0, + 'ICE 3 V' => 0, + 'ICE 4' => 0, + 'ICE T 411' => 0, + 'ICE T 415' => 0, + 'IC2 Twindexx' => 0, + 'IC2 KISS' => 0, ); for my $wagon (@wagons) { @@ -351,8 +352,11 @@ sub train_subtype { elsif ( $wagon->model == 475 ) { $ml{'TGV'}++; } + elsif ( $self->train_type eq 'IC' and $wagon->model == 110 ) { + $ml{'IC2 KISS'}++; + } elsif ( $self->train_type eq 'IC' and $wagon->is_dosto ) { - $ml{'IC2'}++; + $ml{'IC2 Twindexx'}++; } } @@ -593,7 +597,7 @@ Returns a string describing the train type, e.g. "ICE" or "IC". =item $wr->train_subtype Returns a string describing the rolling stock used for this train, e.g. "ICE 4" -or "IC2". +or "IC2 KISS". =item $wr->wagons diff --git a/lib/Travel/Status/DE/DBWagenreihung/Wagon.pm b/lib/Travel/Status/DE/DBWagenreihung/Wagon.pm index 53ac9e2..9be8ce5 100644 --- a/lib/Travel/Status/DE/DBWagenreihung/Wagon.pm +++ b/lib/Travel/Status/DE/DBWagenreihung/Wagon.pm @@ -58,7 +58,7 @@ our %type_attributes = ( undef, undef, ['has_family_area'], [ 'has_quiet_area', 'has_bahn_comfort' ] # (5) (6) 7 8 ], - 'IC2' => [ + 'IC2 Twindexx' => [ [ 'has_family_area', 'has_bike_storage' ], ['has_bike_storage'], # 1 2 ['has_bike_storage'], [ 'has_bike_storage', 'has_bahn_comfort' ], # 3 4 [ 'has_bahn_comfort', 'has_quiet_area', 'has_phone_area' ] # 5 -- cgit v1.2.3