show wagon type/description in wagon view

3 files changed, 7 insertions, 1 deletions

diff --git a/lib/DBInfoscreen/Controller/Wagenreihung.pm b/lib/DBInfoscreen/Controller/Wagenreihung.pm
index 3cc8f39..349c4d2 100644
--- a/lib/DBInfoscreen/Controller/Wagenreihung.pm
+++ b/lib/DBInfoscreen/Controller/Wagenreihung.pm
@@ -280,6 +280,7 @@ sub wagen {
 		'wagen',
 		title       => $title,
 		wagon_files => [@wagon_files],
+		wagon_data  => $self->app->dbdb_wagon->{$wagon_id},
 		wref        => $wref,
 		hide_opts   => 1,
 	);
diff --git a/share/dbdb_wagen.json b/share/dbdb_wagen.json
index 3674828..c796cda 100644
--- a/share/dbdb_wagen.json
+++ b/share/dbdb_wagen.json
@@ -1 +1 @@
-{"08120":true,"1101":true,"1101_l":true,"1101_u":true,"1104":true,"1104_l":true,"1104_u":true,"1105":true,"1105_l":true,"1105_u":true,"1106":true,"1106_l":true,"1106_u":true,"14120":true,"18120":true,"24120":true,"24123":true,"24125":true,"24128":true,"31_4030":true,"31_4031":true,"31_4032":true,"31_4033":true,"31_4035":true,"31_4036":true,"31_4037":true,"31_4038":true,"32_4030":true,"32_4031":true,"32_4032":true,"32_4033":true,"32_4035":true,"32_4036":true,"32_4037":true,"32_4038":true,"3_4060":true,"3_4061":true,"3_4062":true,"3_4063":true,"3_4065":true,"3_4066":true,"3_4067":true,"3_4068":true,"3r_4030":true,"3r_4031":true,"3r_4032":true,"3r_4033":true,"3r_4035":true,"3r_4036":true,"3r_4037":true,"3r_4038":true,"3r_4060":true,"3r_4061":true,"3r_4062":true,"3r_4063":true,"3r_4065":true,"3r_4066":true,"3r_4067":true,"3r_4068":true,"4070":true,"4071":true,"4072":true,"4073":true,"4075":true,"4076":true,"4077":true,"4078":true,"4150":true,"4151":true,"4155":true,"4156":true,"4157":true,"48120":true,"58120":true,"64120":true,"8010":true,"8014":true,"8018":true,"8020":true,"8023":true,"8026":true,"8027":true,"8028":true,"8029":true,"8031":true,"8040":true,"8050":true,"8053":true,"8060":true,"8063":true,"8066":true,"8070":true,"8080":true,"88120":true,"98120":true,"ARkimbz":true,"ARkimmbz":true,"Apmmz":true,"Avmmz":true,"Avmz":true,"Bimmdzf":true,"Bpmbz":true,"Bpmmbdz":true,"Bpmmbdzf":true,"Bpmmbz":true,"Bpmmdz":true,"Bpmmz":true,"Bvmmsz":true,"Bvmmz":true,"Bvmsz":true,"DApza":true,"DApza_l":true,"DApza_u":true,"DBpbzfa":true,"DBpbzfa_l":true,"DBpbzfa_u":true,"DBpza":true,"DBpza_l":true,"DBpza_u":true,"t1_4110":true,"t1_4111":true,"t1_4112":true,"t1_4115":true,"t1_4116":true,"t1_4117":true,"t1_4118":true,"t2_4110":true,"t2_4111":true,"t2_4112":true,"t2_4115":true,"t2_4116":true,"t2_4117":true,"t2_4118":true}
+{"4077":{"name":"ICE 3 (MS) BR 407 2. Kl.-Wagen (Bpmz 407.7)"},"48120":{"name":"ICE 4 BR 412 2. Kl.-Wagen (Bpmz 4812.0)"},"3r_4065":{"name":"ICE 3 (M) BR 406 Redesign 2. Kl.-Endwagen (Bpmz 406.5)"},"t2_4118":{},"4150":{"name":"ICE T (5-tlg.) BR 415 1. Kl.-Endwagen (Apmzf 415.0)"},"8010":{"name":"ICE 1 BR 401 1. Kl.-Wagen (Avmz 801.0)"},"88120":{"name":"ICE 4 BR 412 Bordrestaurant/1. Kl.-Wagen (ARmz 8812.0)"},"DApza_u":{},"DBpza_u":{},"Bvmmz":{},"4156":{"name":"ICE T (5-tlg.) BR 415 2. Kl.-Wagen (Bpmbz 415.6)"},"98120":{"name":"ICE 4 BR 412 2. Kl.-Wagen (Bpmz 9812.0)"},"Bvmsz":{},"t1_4115":{"name":"ICE T (7-tlg.) BR 411, 1. Serie 2. Kl.-Endwagen (Bpmzf 411.5)"},"4072":{"name":"ICE 3 (MS) BR 407 Bordrestaurant /1. Kl.-Wagen (ARmz 407.2)"},"4075":{"name":"ICE 3 (MS) BR 407 2. Kl.-Endwagen (Bpmzf 407.5)"},"32_4030":{"name":"ICE 3 BR 403, 2. Serie 1. Kl.-Endwagen (Apmzf 403.0)"},"8050":{"name":"ICE 2 BR 402 1. Kl.-Wagen (Apmz 805.0)"},"24120":{"name":"ICE 4 BR 412 2. Kl.-Wagen (Bpmz 2412.0)"},"3_4062":{"name":"ICE 3 (M) BR 406 2. Kl.-Wagen (Bvmz 406.2)"},"32_4032":{"name":"ICE 3 BR 403, 2. Serie 2. Kl.-Wagen (Bvmz 403.2)"},"3_4068":{"name":"ICE 3 (M) BR 406 2. Kl.-Servicewagen (Bpmbz 406.8)"},"t2_4111":{"name":"ICE T (7-tlg.) BR 411, 2. Serie 1. Kl.-/2. Kl.-Wagen (ABpmz 411.1)"},"4071":{"name":"ICE 3 (MS) BR 407 1. Kl.-Wagen (Apmz 407.1)"},"1101":{"name":"Intercity 2 Stadler-KISS BR 4110 2. Kl.-Endwagen (DBpdzfa 110.A)"},"Bpmmdz":{},"32_4037":{"name":"ICE 3 BR 403, 2. Serie 2. Kl.-Wagen (Bpmz 403.7)"},"t2_4116":{"name":"ICE T (7-tlg.) BR 411, 2. Serie 2. Kl.-Wagen (Bpmbz 411.6)"},"24123":{"name":"ICE 4 BR 412 2. Kl.-Wagen (Bpmz 2412.3)"},"3_4066":{"name":"ICE 3 (M) BR 406 2. Kl.-Wagen (Bpmz 406.6)"},"14120":{"name":"ICE 4 BR 412 1. Kl.-Wagen (Apmz 1412.0)"},"1105":{"name":"Intercity 2 Stadler-KISS BR 4110 2. Kl.-Mittelwagen (DBpza 110.E)"},"4070":{"name":"ICE 3 (MS) BR 407 1. Kl.-Endwagen (Apmzf 407.0)"},"1106":{"name":"Intercity 2 Stadler-KISS BR 4110 1./2. Kl.-Endwagen (DABpzfa 110.F)"},"31_4030":{"name":"ICE 3 BR 403, 1. Serie 1. Kl.-Endwagen (Apmzf 403.0)"},"31_4032":{"name":"ICE 3 BR 403, 1. Serie 2. Kl.-Wagen (Bvmz 403.2)"},"3r_4063":{"name":"ICE 3 (M) BR 406 Redesign Bordrestaurant (WRmz 406.3)"},"t1_4111":{"name":"ICE T (7-tlg.) BR 411, 1. Serie 1. Kl.-/2. Kl.-Wagen (ABpmz 411.1)"},"Bimmdzf":{},"8023":{"name":"ICE 1 BR 401 2. Kl.-Wagen (Bvmz 802.3)"},"3r_4066":{"name":"ICE 3 (M) BR 406 Redesign 2. Kl.-Wagen (Bpmz 406.6)"},"1104_u":{},"8070":{"name":"ICE 2 BR 402 Bordrestaurant (WRmbsz 807.0)"},"4157":{"name":"ICE T (5-tlg.) BR 415 2. Kl.-Wagen (Bpmz 415.7)"},"31_4037":{"name":"ICE 3 BR 403, 1. Serie 2. Kl.-Wagen (Bpmz 403.7)"},"t1_4116":{"name":"ICE T (7-tlg.) BR 411, 1. Serie 2. Kl.-Wagen (Bpmz 411.6)"},"DApza_l":{},"8028":{"name":"ICE 1 BR 401 2. Kl.-Wagen (Bvmz 802.8)"},"DBpza_l":{},"3_4061":{"name":"ICE 3 (M) BR 406 1. Kl.-Wagen (Avmz 406.1)"},"3r_4061":{"name":"ICE 3 (M) BR 406 Redesign 1. Kl.-Wagen (Avmz 406.1)"},"4076":{"name":"ICE 3 (MS) BR 407 2. Kl.-Wagen (Bpmz 407.6)"},"Bpmmbdz":{},"8031":{"name":"ICE 1 BR 401 1. Kl.-Wagen (Apmbsz 803.1)"},"3r_4030":{"name":"ICE 3 BR 403 Redesign 1. Kl.-Endwagen (Apmzf 403.0)"},"t1_4118":{},"4151":{"name":"ICE T (5-tlg.) BR 415 Bordbistro/2. Kl.-Wagen (BRpmz 415.1)"},"8060":{"name":"ICE 2 BR 402 2. Kl.-Wagen (Bpmbz 806.0)"},"1104_l":{},"64120":{"name":"ICE 4 BR 412 2. Kl.-Wagen (Bpmbsz 6412.0)"},"18120":{"name":"ICE 4 BR 412 1. Kl.-Wagen (Apmz 1812.0)"},"4155":{"name":"ICE T (5-tlg.) BR 415 2. Kl.-Endwagen (Bpmzf 415.5)"},"3r_4032":{"name":"ICE 3 BR 403 Redesign 2. Kl.-Wagen (Bpmz 403.2)*"},"Avmmz":{},"3_4060":{"name":"ICE 3 (M) BR 406 1. Kl.-Endwagen (Apmzf 406.0)"},"3r_4037":{"name":"ICE 3 BR 403 Redesign 2. Kl.-Wagen (Bpmz 403.7)"},"8066":{"name":"ICE 2 BR 402 2. Kl.-Wagen (Bpmz 806.6)"},"8080":{"name":"ICE 2 BR 402 2. Kl.-Steuerwagen (Bpmzf 808.0)"},"3r_4068":{"name":"ICE 3 (M) BR 406 Redesign 2. Kl.-Wagen (Bpmbz 406.8)"},"t2_4115":{"name":"ICE T (7-tlg.) BR 411, 2. Serie 2. Kl.-Endwagen (Bpmzf 411.5)"},"DBpbzfa_l":{},"DBpza":{},"Bvmmsz":{},"DApza":{},"32_4031":{"name":"ICE 3 BR 403, 2. Serie 1. Kl.-Wagen (Avmz 403.1)"},"t2_4112":{"name":"ICE T (7-tlg.) BR 411, 2. Serie Bordrestaurant (WRmz 411.2)"},"8029":{"name":"ICE 1 BR 401 2. Kl.-Wagen (Bpmz 802.9)*"},"Bpmmbz":{},"3_4065":{"name":"ICE 3 (M) BR 406 2. Kl.-Endwagen (Bpmzf 406.5)"},"t2_4110":{"name":"ICE T (7-tlg.) BR 411, 2. Serie 1. Kl.-Endwagen (Apmzf 411.0)"},"3r_4035":{"name":"ICE 3 BR 403 Redesign 2. Kl.-Endwagen (Bpmz 403.5)"},"Apmmz":{},"8053":{"name":"ICE 2 BR 402 1. Kl.-Wagen (Apmz 805.3)"},"1104":{"name":"Intercity 2 Stadler-KISS BR 4110 2. Kl.-Mittelwagen (DBpbza 110.D)"},"32_4036":{"name":"ICE 3 BR 403, 2. Serie 2. Kl.-Wagen (Bpmz 403.6)"},"t2_4117":{"name":"ICE T (7-tlg.) BR 411, 2. Serie 2. Kl.-Wagen (Bpmz 411.7)"},"1106_u":{},"32_4033":{"name":"ICE 3 BR 403, 2. Serie Bordbistro (BRmz 403.3)"},"8018":{"name":"ICE 1 BR 401 1. Kl.-Wagen (Avmz 801.8)"},"32_4038":{"name":"ICE 3 BR 403, 2. Serie 2. Kl.-Servicewagen (Bpmbz 403.8)"},"Bpmbz":{},"3_4063":{"name":"ICE 3 (M) BR 406 Bordbistro (BRmz 406.3)"},"31_4035":{"name":"ICE 3 BR 403, 1. Serie 2. Kl.-Endwagen (Bpmzf 403.5)"},"1106_l":{},"8027":{"name":"ICE 1 BR 401 2. Kl.-Wagen (Bvmz 802.7)*"},"24125":{"name":"ICE 4 BR 412 2. Kl.-Wagen (Bpmz 2412.5)"},"08120":{"name":"ICE 4 BR 412 1. Kl.-Endwagen (Apmzf 0812.0)"},"Bpmmbdzf":{},"3r_4031":{"name":"ICE 3 BR 403 Redesign 1. Kl.-Wagen (Avmz 403.1)"},"8014":{"name":"ICE 1 BR 401 1. Kl.-Wagen (Avmz 801.4)"},"1101_l":{},"ARkimbz":{},"8040":{"name":"ICE 1 BR 401 Bordrestaurant (WSmz 804.0)"},"3_4067":{"name":"ICE 3 (M) BR 406 2. Kl.-Wagen (Bpmz 406.7)"},"Avmz":{},"1105_l":{},"31_4038":{"name":"ICE 3 BR 403, 1. Serie 2. Kl.-Servicewagen (Bpmbz 403.8)"},"32_4035":{"name":"ICE 3 BR 403, 2. Serie 2. Kl.-Endwagen (Bpmzf 403.5)"},"24128":{"name":"ICE 4 BR 412 2. Kl.-Wagen (Bpmz 2412.8)"},"58120":{"name":"ICE 4 BR 412 2. Kl.-Endwagen (Bpmdzf 5812.0)"},"8063":{"name":"ICE 2 BR 402 2. Kl.-Wagen (Bpmz 806.3)"},"3r_4036":{"name":"ICE 3 BR 403 Redesign 2. Kl.-Wagen (Bpmz 403.6)"},"3r_4033":{"name":"ICE 3 BR 403 Redesign Bordrestaurant (WRmz 403.3)"},"8026":{"name":"ICE 1 BR 401 2. Kl.-Wagen (Bvmz 802.6)"},"3r_4067":{"name":"ICE 3 (M) BR 406 Redesign 2. Kl.-Wagen (Bpmz 406.7)"},"DBpbzfa_u":{},"ARkimmbz":{},"31_4031":{"name":"ICE 3 BR 403, 1. Serie 1. Kl.-Wagen (Avmz 403.1)"},"1105_u":{},"t1_4112":{"name":"ICE T (7-tlg.) BR 411, 1. Serie Bordrestaurant (WRmz 411.2)"},"1101_u":{},"t1_4110":{"name":"ICE T (7-tlg.) BR 411, 1. Serie 1. Kl.-Endwagen (Apmzf 411.0)"},"3r_4038":{"name":"ICE 3 BR 403 Redesign 2. Kl.-Wagen (Bpmbz 403.8)"},"DBpbzfa":{},"4078":{"name":"ICE 3 (MS) BR 407 2. Kl.-Wagen (Bpmz 407.8)"},"Bpmmz":{},"3r_4060":{"name":"ICE 3 (M) BR 406 Redesign 1. Kl.-Endwagen (Apmzf 406.0)"},"4073":{"name":"ICE 3 (MS) BR 407 2. Kl.-Servicewagen (Bpmbsz 407.3)"},"31_4033":{"name":"ICE 3 BR 403, 1. Serie Bordbistro (BRmz 403.3)"},"3r_4062":{"name":"ICE 3 (M) BR 406 Redesign 2. Kl.-Wagen (Bpmz 406.2)"},"31_4036":{"name":"ICE 3 BR 403, 1. Serie 2. Kl.-Wagen (Bpmz 403.6)"},"t1_4117":{"name":"ICE T (7-tlg.) BR 411, 1. Serie 2. Kl.-Wagen (Bpmbz 411.7)"},"8020":{"name":"ICE 1 BR 401 2. Kl.-Wagen (Bvmz 802.0)"}}
\ No newline at end of file
diff --git a/templates/wagen.html.ep b/templates/wagen.html.ep
index b08b212..145b3fd 100644
--- a/templates/wagen.html.ep
+++ b/templates/wagen.html.ep
@@ -37,6 +37,11 @@
 			% }
 		</div>
 	% }
+	% if ($wagon_data->{name}) {
+		<p>
+			<%= $wagon_data->{name} %>
+		</p>
+	% }
 	<p class="copyright" style="clear: both;">
 		Abbildung © Seemanngrafik d.i.p. im Auftrag der Deutschen Bahn AG,
 		lizensiert unter CC-BY-4.0