1 files changed, 13 insertions, 119 deletions

diff --git a/lib/DBInfoscreen/Controller/Wagenreihung.pm b/lib/DBInfoscreen/Controller/Wagenreihung.pm
index 5e5f653..03a607d 100644
--- a/lib/DBInfoscreen/Controller/Wagenreihung.pm
+++ b/lib/DBInfoscreen/Controller/Wagenreihung.pm
@@ -13,126 +13,20 @@ use utf8;
 use Travel::Status::DE::DBWagenreihung;
 use Travel::Status::DE::DBWagenreihung::Wagon;
 
-sub get_zugbildung_db {
-	my ( $self, $train_no ) = @_;
-
-	my $details = $self->app->train_details_db->{$train_no};
-
-	if ( not $details ) {
-		return;
-	}
-
-	my @wagons;
-
-	for my $wagon ( @{ $details->{wagons} } ) {
-		my $wagon_type   = $wagon->{type};
-		my $wagon_number = $wagon->{number};
-		my %wagon        = (
-			fahrzeugnummer      => "",
-			fahrzeugtyp         => $wagon_type,
-			kategorie           => $wagon_type =~ m{^[0-9.]+$} ? 'LOK' : '',
-			train_no            => $train_no,
-			wagenordnungsnummer => $wagon_number,
-			positionamhalt      => {
-				startprozent => 0,
-				endeprozent  => 0,
-				startmeter   => 0,
-				endemeter    => 0,
-			}
-		);
-		my $wagon = Travel::Status::DE::DBWagenreihung::Wagon->new(%wagon);
-
-		if ( $details->{type} ) {
-			$wagon->set_traintype( $details->{type} );
-		}
-		push( @wagons, $wagon );
-	}
-
-	my $pos = 0;
-	for my $wagon (@wagons) {
-		$wagon->{position}{start_percent} = $pos;
-		$wagon->{position}{end_percent}   = $pos + 5;
-		$pos += 5;
-	}
-
-	my $train_type = $details->{rawType};
-	$train_type =~ s{ - .* }{}x;
-
-	my $route_start = $details->{route}{start} // $details->{route}{preStart};
-	my $route_end   = $details->{route}{end}   // $details->{route}{postEnd};
-	my $route       = "${route_start} → ${route_end}";
-
-	return {
-		route      => $route,
-		train_type => $train_type,
-		wagons     => [@wagons]
-	};
-}
-
-sub zugbildung_db {
-	my ($self) = @_;
-
-	my $train_no = $self->param('train');
-
-	my $details = $self->get_zugbildung_db($train_no);
-
-	if ( not $details ) {
-		$self->render( 'not_found',
-			message => "Keine Daten zu Zug ${train_no} bekannt" );
-		return;
-	}
+sub handle_wagenreihung_error {
+	my ( $self, $train_no, $err ) = @_;
 
 	$self->render(
-		'zugbildung_db',
-		description => sprintf(
-			'Soll-Wagenreihung %s %s',
-			$details->{train_type} // 'Zug', $train_no
-		),
-		wr_error  => undef,
-		title     => $details->{train_type} . ' ' . $train_no,
-		route     => $details->{route},
-		zb        => $details,
+		'wagenreihung',
+		title     => "Zug $train_no",
+		wr_error  => $err,
 		train_no  => $train_no,
-		wagons    => $details->{wagons},
+		wr        => undef,
+		wref      => undef,
 		hide_opts => 1,
 	);
 }
 
-sub handle_wagenreihung_error {
-	my ( $self, $train_no, $err ) = @_;
-
-	my $details = $self->get_zugbildung_db($train_no);
-	if ( $details and @{ $details->{wagons} } ) {
-		my $wr_error
-		  = "${err}. Ersatzweise werden die Solldaten laut Fahrplan angezeigt.";
-		$self->render(
-			'zugbildung_db',
-			description => sprintf(
-				'Soll-Wagenreihung %s %s',
-				$details->{train_type} // 'Zug', $train_no
-			),
-			wr_error  => $wr_error,
-			title     => $details->{train_type} . ' ' . $train_no,
-			route     => $details->{route},
-			zb        => $details,
-			train_no  => $train_no,
-			wagons    => $details->{wagons},
-			hide_opts => 1,
-		);
-	}
-	else {
-		$self->render(
-			'wagenreihung',
-			title     => "Zug $train_no",
-			wr_error  => $err,
-			train_no  => $train_no,
-			wr        => undef,
-			wref      => undef,
-			hide_opts => 1,
-		);
-	}
-}
-
 sub wagenreihung {
 	my ($self)    = @_;
 	my $train     = $self->stash('train');
@@ -178,7 +72,7 @@ sub wagenreihung {
 				e  => $exit_side ? substr( $exit_side, 0, 1 ) : '',
 				tt => $wr->train_type,
 				tn => $train,
-				s  => $wr->station_name,
+				s  => $wr->station->{name},
 				p  => $wr->platform
 			};
 
@@ -274,7 +168,7 @@ sub wagenreihung {
 				'wagenreihung',
 				description => sprintf(
 					'Ist-Wagenreihung %s in %s',
-					$title, $wr->station_name
+					$title, $wr->station->{name}
 				),
 				wr_error  => undef,
 				title     => $title,
@@ -290,7 +184,7 @@ sub wagenreihung {
 			my ($err) = @_;
 
 			$self->handle_wagenreihung_error( $train,
-				$err->{error}->{msg} // "Unbekannter Fehler" );
+				$err->{error}->{msg} // $err // "Unbekannter Fehler" );
 			return;
 		}
 	)->wait;
@@ -331,15 +225,15 @@ sub wagen {
 		);
 	}
 
-	my $title = $self->l('Wagen ') . $wagon_id;
+	my $title = 'Wagen ' . $wagon_id;
 
 	if ( $wref->{tt} and $wref->{tn} ) {
 		$title = sprintf( '%s %s', $wref->{tt}, $wref->{tn} );
 		if ($wagon_no) {
-			$title .= ' ' . $self->l('Wagen ') . $wagon_no;
+			$title .= ' Wagen ' . $wagon_no;
 		}
 		else {
-			$title .= ' ' . $self->l('Wagen ') . $wagon_id;
+			$title .= ' Wagen ' . $wagon_id;
 		}
 	}