Unverified Commit 7179c65a authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Carriage type updates provided by Lili Urban https://github.com/SpielenmitLili 

Squashed commit of the following:

commit 070af13f08ae279ea516482aef1329ad31a468db
Author: Birte Kristina Friesel <derf@finalrewind.org>
Date:   Sat Jul 5 07:55:20 2025 +0200

    perltidy

commit 16e4f5af05161a5ac3dbc4440d118dbbea20d3dd
Merge: 5a0b4737 4c63aac
Author: Birte Kristina Friesel <derf@finalrewind.org>
Date:   Sat Jul 5 07:55:03 2025 +0200

    Merge branch 'main' of github.com:SpielenmitLili/Travel-Status-DE-DBRIS into SpielenmitLili-main

commit 4c63aacc8b1940750e5fa9380bd74624d6168280
Author: Lili Chelsea Urban <74246564+SpielenmitLili@users.noreply.github.com>
Date:   Fri Jul 4 21:43:07 2025 +0200

    Update Group.pm

    Added ICE 4 9234 named "Ruhr"

commit 9272fd93736c80128f5b7d7a2ef5758f4b76ecd7
Author: Lili Urban <mail@lili-urban.net>
Date:   Fri Jul 4 18:21:03 2025 +0200

    - Some style changes
    - Added BR 424 to list
    - Added BR 563 to list
    - Added BR 650 to list

commit 5a5f112774ad3d409899dda63428201e54e5d912
Author: Lili Urban <mail@lili-urban.net>
Date:   Fri Jul 4 08:23:12 2025 +0200

    - Add CFL Kiss to Model Names

commit 6c6fdd1ff0cbe20115b40fbc6a2be4ae0b0d4030
Author: Lili Urban <mail@lili-urban.net>
Date:   Fri Jul 4 07:12:03 2025 +0200

    - Missing commas added

commit 1396370ec9079a70ddbd0ae0e8fe697a87e7974e
Author: Lili Urban <mail@lili-urban.net>
Date:   Fri Jul 4 07:07:33 2025 +0200

    - Fixed missing commas from Commit before
    - Added some missing names for IC 2

commit 9da327f95ed6ab8da5ef5bbd78a229e5553b0ed8
Author: Lili Urban <mail@lili-urban.net>
Date:   Fri Jul 4 06:25:08 2025 +0200

    Added some missing Tz names for ICEs
    - 4611 lost his name to 8019 - Düsseldorf
    - 8020 - Amsterdam
    - 8029 - new Europa/Europe
    - 9009 - Cottbus
    - 9208 - Nationalpark Bayrischer Wald
parent 5a0b4737

lib/Travel/Status/DE/DBRIS/Formation/Group.pm

+37 −7
Original line number Diff line number Diff line
@@ -239,7 +239,9 @@ my %ice_name = ( 
	2871 => 'Leipziger Neuseenland',

	2874 => 'Oberer Neckar',

	2875 => 'Magdeburger Börde',

	4102 => 'Naturpark Schönbuch',

	4103 => 'Allgäu',

	4108 => 'Hegau',

	4111 => 'Gäu',

	4114 => 'Dresden Elbland',

	4117 => 'Mecklenburgische Ostseeküste',
@@ -249,7 +251,6 @@ my %ice_name = ( 
	4604 => 'Brussel/Bruxelles',

	4607 => 'Hannover',

	4610 => 'Frankfurt am Main',

	4611 => 'Düsseldorf',

	4651 => 'Amsterdam',

	4652 => 'Arnhem',

	4680 => 'Würzburg',
@@ -260,9 +261,15 @@ my %ice_name = ( 
	4712 => 'Dillingen a.d. Donau',

	4710 => 'Ansbach',

	4717 => 'Paris',

	4893 => 'Bodetal',

	4898 => 'Lahntal',

	8007 => 'Rheinland',

	8019 => 'Düsseldorf',

	8020 => 'Amsterdam',

	8022 => 'Waldecker Land',

	8029 => 'Europa/Europe',

	9006 => 'Martin Luther',

	9009 => 'Cottbus/Chóśebuz',

	9018 => 'Freistaat Bayern',

	9025 => 'Nordrhein-Westfalen',

	9026 => 'Zürichsee',
@@ -271,7 +278,9 @@ my %ice_name = ( 
	9046 => 'Female ICE',

	9050 => 'Metropole Ruhr',

	9202 => 'Schleswig-Holstein',

	9208 => 'Nationalpark Bayrischer Wald',

	9212 => 'Fan-Hauptstadt Hamburg',

	9234 => 'Ruhr',

	9237 => 'Spree',

	9457 => 'Bundesrepublik Deutschland',

	9481 => 'Rheinland-Pfalz'
@@ -283,8 +292,9 @@ my %ice_name = ( 


my %model_name = (

	'011'      => [ 'ICE T',        'ÖBB 4011' ],

	'401'      => ['ICE 1'],

	'402'      => ['ICE 2'],

	'023'      => [ 'CFL KISS',     'CFL 2300' ],

	'401'      => [ 'ICE 1',        'BR 401' ],

	'402'      => [ 'ICE 2',        'BR 402' ],

	'403.S1'   => [ 'ICE 3',        'BR 403, 1. Serie' ],

	'403.S2'   => [ 'ICE 3',        'BR 403, 2. Serie' ],

	'403.R'    => [ 'ICE 3',        'BR 403 Redesign' ],
@@ -294,11 +304,12 @@ my %model_name = ( 
	'408'      => [ 'ICE 3neo',     'BR 408' ],

	'411.S1'   => [ 'ICE T',        'BR 411, 1. Serie' ],

	'411.S2'   => [ 'ICE T',        'BR 411, 2. Serie' ],

	'412'      => ['ICE 4'],

	'412'      => [ 'ICE 4',        'BR 412' ],

	'415'      => [ 'ICE T',        'BR 415' ],

	'420'      => ['BR 420'],

	'422'      => ['BR 422'],

	'423'      => ['BR 423'],

	'424'      => ['BR 424'],

	'425'      => ['BR 425'],

	'427'      => [ 'FLIRT', 'BR 427' ],

	'428'      => [ 'FLIRT', 'BR 428' ],
@@ -311,6 +322,7 @@ my %model_name = ( 
	'462'      => [ 'Desiro HC',           'BR 462' ],

	'463'      => [ 'Mireo',               'BR 463' ],

	'475'      => [ 'TGV',                 'BR 475' ],

	'563'      => [ 'Mireo Plus B',        'BR 563' ],

	'612'      => [ 'RegioSwinger',        'BR 612' ],

	'620'      => [ 'LINT 81',             'BR 620' ],

	'622'      => [ 'LINT 54',             'BR 622' ],
@@ -322,6 +334,7 @@ my %model_name = ( 
	'643'      => [ 'TALENT',              'BR 643' ],

	'644'      => [ 'TALENT',              'BR 644' ],

	'648'      => [ 'LINT 41',             'BR 648' ],

	'650'      => [ 'Regio-Shuttle RS1',   'BR 650' ],

	'IC2.TWIN' => ['IC 2 Twindexx'],

	'IC2.KISS' => ['IC 2 KISS'],

);
@@ -412,6 +425,7 @@ sub parse_model { 


	my %ml = (

		'011'      => 0,

		'023'      => 0,

		'401'      => 0,

		'402'      => 0,

		'403.S1'   => 0,
@@ -427,6 +441,7 @@ sub parse_model { 
		'420'      => 0,

		'422'      => 0,

		'423'      => 0,

		'424'      => 0,

		'425'      => 0,

		'427'      => 0,

		'428'      => 0,
@@ -439,6 +454,7 @@ sub parse_model { 
		'462'      => 0,

		'463'      => 0,

		'475'      => 0,

		'563'      => 0,

		'612'      => 0,

		'620'      => 0,

		'622'      => 0,
@@ -450,6 +466,7 @@ sub parse_model { 
		'643'      => 0,

		'644'      => 0,

		'648'      => 0,

		'650'      => 0,

		'IC2.TWIN' => 0,

		'IC2.KISS' => 0,

	);
@@ -460,7 +477,11 @@ sub parse_model { 
		if ( not $carriage->model ) {

			next;

		}

		if ( $carriage->model == 401



		if ( $carriage->model == 023 ) {

			$ml{'023'}++;

		}

		elsif ( $carriage->model == 401

			or ( $carriage->model >= 801 and $carriage->model <= 804 ) )

		{

			$ml{'401'}++;
@@ -514,6 +535,9 @@ sub parse_model { 
		elsif ( $carriage->model == 423 or $carriage->model == 433 ) {

			$ml{'423'}++;

		}

		elsif ( $carriage->model == 424 or $carriage->model == 434 ) {

			$ml{'424'}++;

		}

		elsif ( $carriage->model == 425 or $carriage->model == 435 ) {

			$ml{'425'}++;

		}
@@ -559,6 +583,9 @@ sub parse_model { 
		elsif ( $carriage->model == 475 ) {

			$ml{'475'}++;

		}

		elsif ( $carriage->model == 563 ) {

			$ml{'563'}++;

		}

		elsif ( $carriage->model == 612 ) {

			$ml{'612'}++;

		}
@@ -592,6 +619,9 @@ sub parse_model { 
		elsif ( $carriage->model == 648 ) {

			$ml{'648'}++;

		}

		elsif ( $carriage->model == 650 ) {

			$ml{'650'}++;

		}

		elsif ( $self->train_type eq 'IC' and $carriage->model == 110 ) {

			$ml{'IC2.KISS'}++;

		}