1 files changed, 95 insertions, 2 deletions

diff --git a/lib/DBInfoscreen/Helper/HAFAS.pm b/lib/DBInfoscreen/Helper/HAFAS.pm
index ad21c58..cdb84f0 100644
--- a/lib/DBInfoscreen/Helper/HAFAS.pm
+++ b/lib/DBInfoscreen/Helper/HAFAS.pm
@@ -39,6 +39,7 @@ sub get_route_p {
 
 	if ( $opt{trip_id} ) {
 		$hafas_promise = Travel::Status::DE::HAFAS->new_p(
+			service => $opt{service},
 			journey => {
 				id => $opt{trip_id},
 			},
@@ -104,7 +105,67 @@ sub get_route_p {
 			my $journey = $hafas->result;
 			my @ret;
 			my $station_is_past = 1;
+
+			my $num_names      = 0;
+			my $prev_name      = q{};
+			my $num_directions = 0;
+			my $prev_direction = q{};
+			my $num_operators  = 0;
+			my $prev_operator  = q{};
+
+			for my $stop ( $journey->route ) {
+				my $prod = $stop->prod_dep // $stop->prod_arr;
+				if ( $prod and $prod->name and $prod->name ne $prev_name ) {
+					$num_names++;
+					$prev_name = $prod->name;
+				}
+				if (    $prod
+					and $prod->operator
+					and $prod->operator ne $prev_operator )
+				{
+					$num_operators++;
+					$prev_operator = $prod->operator;
+				}
+				if ( $stop->direction and $stop->direction ne $prev_direction )
+				{
+					$num_directions++;
+					$prev_direction = $stop->direction;
+				}
+			}
+
+			$prev_name      = q{};
+			$prev_direction = q{};
+			$prev_operator  = q{};
+
 			for my $stop ( $journey->route ) {
+
+				my $prod = $stop->prod_dep // $stop->prod_arr;
+				my %annotation;
+				if (    $num_names > 1
+					and $prod
+					and $prod->name
+					and $prod->name ne $prev_name )
+				{
+					$prev_name = $annotation{prod_name} = $prod->name;
+				}
+				if (    $num_operators > 1
+					and $prod
+					and $prod->operator
+					and $prod->operator ne $prev_operator )
+				{
+					$prev_operator = $annotation{operator} = $prod->operator;
+				}
+				if (    $num_directions > 1
+					and $stop->direction
+					and $stop->direction ne $prev_direction )
+				{
+					$prev_direction = $annotation{direction} = $stop->direction;
+				}
+
+				if (%annotation) {
+					$annotation{is_annotated} = 1;
+				}
+
 				push(
 					@ret,
 					{
@@ -118,6 +179,7 @@ sub get_route_p {
 						dep_delay      => $stop->dep_delay,
 						arr_cancelled  => $stop->arr_cancelled,
 						dep_cancelled  => $stop->dep_cancelled,
+						tz_offset      => $stop->tz_offset,
 						platform       => $stop->platform,
 						sched_platform => $stop->sched_platform,
 						load           => $stop->load,
@@ -127,6 +189,7 @@ sub get_route_p {
 							  and
 							  ( $stop->dep_cancelled or not $stop->sched_dep )
 						),
+						%annotation,
 					}
 				);
 				if (
@@ -141,9 +204,35 @@ sub get_route_p {
 					$station_is_past = 0;
 				}
 				$ret[-1]{isPast} = $station_is_past;
+				if ( $stop->tz_offset ) {
+					if ( $stop->sched_arr ) {
+						$ret[-1]{local_sched_arr}
+						  = $stop->sched_arr->clone->add(
+							minutes => $stop->tz_offset );
+					}
+					if ( $stop->sched_dep ) {
+						$ret[-1]{local_sched_dep}
+						  = $stop->sched_dep->clone->add(
+							minutes => $stop->tz_offset );
+					}
+					if ( $stop->rt_arr ) {
+						$ret[-1]{local_rt_arr} = $stop->rt_arr->clone->add(
+							minutes => $stop->tz_offset );
+					}
+					if ( $stop->rt_dep ) {
+						$ret[-1]{local_rt_dep} = $stop->rt_dep->clone->add(
+							minutes => $stop->tz_offset );
+					}
+					$ret[-1]{local_dt_ad} = $ret[-1]{local_rt_arr}
+					  // $ret[-1]{local_sched_arr} // $ret[-1]{local_rt_dep}
+					  // $ret[-1]{local_sched_dep};
+					$ret[-1]{local_dt_da} = $ret[-1]{local_rt_dep}
+					  // $ret[-1]{local_sched_dep} // $ret[-1]{local_rt_arr}
+					  // $ret[-1]{local_sched_arr};
+				}
 			}
 
-			$promise->resolve( \@ret, $journey );
+			$promise->resolve( \@ret, $journey, $hafas );
 			return;
 		}
 	)->catch(
@@ -160,11 +249,15 @@ sub get_route_p {
 # Input: (HAFAS TripID, line number)
 # Output: Promise returning a Travel::Status::DE::HAFAS::Journey instance on success
 sub get_polyline_p {
-	my ( $self, $trip_id, $line ) = @_;
+	my ( $self, %opt ) = @_;
 
+	my $trip_id = $opt{id};
+	my $line    = $opt{line};
+	my $service = $opt{service};
 	my $promise = Mojo::Promise->new;
 
 	Travel::Status::DE::HAFAS->new_p(
+		service => $service,
 		journey => {
 			id   => $trip_id,
 			name => $line,