remove old (blocking) connection code; only show departure baord connectionsHEAD2.17.40main

Background worker-based information about connecting departures while still
checked in will come eventually, but won't recycle the existing code either
way.

9 files changed, 110 insertions, 699 deletions

diff --git a/lib/Travelynx.pm b/lib/Travelynx.pm
index 39899c7..7b5cf99 100755
--- a/lib/Travelynx.pm
+++ b/lib/Travelynx.pm
@@ -2026,10 +2026,10 @@ sub startup {
 
 					for my $stop ( $journey->route ) {
 						$self->stations->add_or_update(
-							stop => $stop,
-							db   => $db,
+							stop      => $stop,
+							db        => $db,
 							keep_name => 1,
-							iris => 1,
+							iris      => 1,
 						);
 					}
 
diff --git a/lib/Travelynx/Controller/Traveling.pm b/lib/Travelynx/Controller/Traveling.pm
index 30c579e..02559e8 100755
--- a/lib/Travelynx/Controller/Traveling.pm
+++ b/lib/Travelynx/Controller/Traveling.pm
@@ -28,324 +28,6 @@ sub has_str_in_list {
 	return;
 }
 
-# when called with "eva" provided: look up connections from eva, either
-# for provided backend_id / hafas or (if not provided) for user backend id.
-# When calld without "eva": look up connections from current/latest arrival
-# eva, using the checkin's backend id.
-sub get_connecting_trains_p {
-	my ( $self, %opt ) = @_;
-
-	my $user        = $self->current_user;
-	my $uid         = $opt{uid} //= $user->{id};
-	my $use_history = $self->users->use_history( uid => $uid );
-
-	my ( $eva, $exclude_via, $exclude_train_id, $exclude_before );
-	my $now = $self->now->epoch;
-	my ( $stationinfo, $arr_epoch, $arr_platform, $arr_countdown );
-
-	my $promise = Mojo::Promise->new;
-
-	if ( $user->{backend_dbris} ) {
-
-		# We do get a little bit of via information, so this might work in some
-		# cases. But not reliably. Probably best to leave it out entirely then.
-		return $promise->reject;
-	}
-	if ( $user->{backend_efa} ) {
-
-		# TODO
-		return $promise->reject;
-	}
-	if ( $user->{backend_motis} ) {
-
-		# FIXME: The following code can't handle external_ids currently
-		return $promise->reject;
-	}
-
-	if ( $opt{eva} ) {
-		if ( $use_history & 0x01 ) {
-			$eva = $opt{eva};
-		}
-		elsif ( $opt{destination_name} ) {
-			$eva = $opt{eva};
-		}
-		if ( not defined $opt{backend_id} ) {
-			if ( $opt{hafas} ) {
-				$opt{backend_id}
-				  = $self->stations->get_backend_id( hafas => $opt{hafas} );
-			}
-			else {
-				$opt{backend_id} = $user->{backend_id};
-			}
-		}
-	}
-	else {
-		if ( $use_history & 0x02 ) {
-			my $status = $self->get_user_status;
-			$opt{backend_id}  = $status->{backend_id};
-			$eva              = $status->{arr_eva};
-			$exclude_via      = $status->{dep_name};
-			$exclude_train_id = $status->{train_id};
-			$arr_platform     = $status->{arr_platform};
-			$stationinfo      = $status->{extra_data}{stationinfo_arr};
-			if ( $status->{real_arrival} ) {
-				$exclude_before = $arr_epoch = $status->{real_arrival}->epoch;
-				$arr_countdown  = $status->{arrival_countdown};
-			}
-		}
-	}
-
-	$exclude_before //= $now - 300;
-
-	if ( not $eva ) {
-		return $promise->reject;
-	}
-
-	$self->log->debug(
-		"get_connecting_trains_p(backend_id => $opt{backend_id}, eva => $eva)");
-
-	my @destinations = $self->journeys->get_connection_targets(%opt);
-
-	@destinations = uniq_by { $_->{name} } @destinations;
-
-	if ($exclude_via) {
-		@destinations = grep { $_->{name} ne $exclude_via } @destinations;
-	}
-
-	if ( not @destinations ) {
-		return $promise->reject;
-	}
-
-	$self->log->debug( 'get_connection_targets returned '
-		  . join( q{, }, map { $_->{name} } @destinations ) );
-
-	my $can_check_in = not $arr_epoch || ( $arr_countdown // 1 ) < 0;
-	my $lookahead
-	  = $can_check_in ? 40 : ( ( ${arr_countdown} // 0 ) / 60 + 40 );
-
-	my $iris_promise = Mojo::Promise->new;
-	my %via_count    = map { $_->{name} => 0 } @destinations;
-
-	my $backend
-	  = $self->stations->get_backend( backend_id => $opt{backend_id} );
-	if ( $opt{backend_id} == 0 ) {
-		$self->iris->get_departures_p(
-			station      => $eva,
-			lookbehind   => 10,
-			lookahead    => $lookahead,
-			with_related => 1
-		)->then(
-			sub {
-				my ($stationboard) = @_;
-				if ( $stationboard->{errstr} ) {
-					$promise->resolve( [], [] );
-					return;
-				}
-
-				@{ $stationboard->{results} } = map { $_->[0] }
-				  sort { $a->[1] <=> $b->[1] }
-				  map  { [ $_, $_->departure ? $_->departure->epoch : 0 ] }
-				  @{ $stationboard->{results} };
-				my @results;
-				my @cancellations;
-				my $excluded_train;
-				for my $train ( @{ $stationboard->{results} } ) {
-					if ( not $train->departure ) {
-						next;
-					}
-					if (    $exclude_before
-						and $train->departure
-						and $train->departure->epoch < $exclude_before )
-					{
-						next;
-					}
-					if (    $exclude_train_id
-						and $train->train_id eq $exclude_train_id )
-					{
-						$excluded_train = $train;
-						next;
-					}
-
-					# In general, this function is meant to return feasible
-					# connections. However, cancelled connections may also be of
-					# interest and are also useful for logging cancellations.
-					# To satisfy both demands with (hopefully) little confusion and
-					# UI clutter, this function returns two concatenated arrays:
-					# actual connections (ordered by actual departure time) followed
-					# by cancelled connections (ordered by scheduled departure time).
-					# This is easiest to achieve in two separate loops.
-					#
-					# Note that a cancelled train may still have a matching destination
-					# in its route_post, e.g. if it leaves out $eva due to
-					# unscheduled route changes but continues on schedule afterwards
-					# -- so it is only cancelled at $eva, not on the remainder of
-					# the route. Also note that this specific case is not yet handled
-					# properly by the cancellation logic etc.
-
-					if ( $train->departure_is_cancelled ) {
-						my @via = (
-							$train->sched_route_post, $train->sched_route_end
-						);
-						for my $dest (@destinations) {
-							if ( has_str_in_list( $dest->{name}, @via ) ) {
-								push( @cancellations, [ $train, $dest ] );
-								next;
-							}
-						}
-					}
-					else {
-						my @via = ( $train->route_post, $train->route_end );
-						for my $dest (@destinations) {
-							if ( $via_count{ $dest->{name} } < 2
-								and has_str_in_list( $dest->{name}, @via ) )
-							{
-								push( @results, [ $train, $dest ] );
-
-								# Show all past and up to two future departures per destination
-								if ( not $train->departure
-									or $train->departure->epoch >= $now )
-								{
-									$via_count{ $dest->{name} }++;
-								}
-								next;
-							}
-						}
-					}
-				}
-
-				@results = map { $_->[0] }
-				  sort { $a->[1] <=> $b->[1] }
-				  map {
-					[
-						$_,
-						$_->[0]->departure->epoch
-						  // $_->[0]->sched_departure->epoch
-					]
-				  } @results;
-				@cancellations = map { $_->[0] }
-				  sort { $a->[1] <=> $b->[1] }
-				  map  { [ $_, $_->[0]->sched_departure->epoch ] }
-				  @cancellations;
-
-				# remove trains whose route matches the excluded one's
-				if ($excluded_train) {
-					my $route_pre
-					  = join( '|', reverse $excluded_train->route_pre );
-					@results
-					  = grep { join( '|', $_->[0]->route_post ) ne $route_pre }
-					  @results;
-					my $route_post = join( '|', $excluded_train->route_post );
-					@results
-					  = grep { join( '|', $_->[0]->route_post ) ne $route_post }
-					  @results;
-				}
-
-				# add message IDs and 'transfer short' hints
-				for my $result (@results) {
-					my $train = $result->[0];
-					my @message_ids
-					  = List::Util::uniq map { $_->[1] } $train->raw_messages;
-					$train->{message_id} = { map { $_ => 1 } @message_ids };
-					my $interchange_duration;
-					if ( exists $stationinfo->{i} ) {
-						if (    defined $arr_platform
-							and defined $train->platform )
-						{
-							$interchange_duration
-							  = $stationinfo->{i}{$arr_platform}
-							  { $train->platform };
-						}
-						$interchange_duration //= $stationinfo->{i}{"*"};
-					}
-					if ( defined $interchange_duration ) {
-						my $interchange_time
-						  = ( $train->departure->epoch - $arr_epoch ) / 60;
-						if ( $interchange_time < $interchange_duration ) {
-							$train->{interchange_text} = 'Anschluss knapp';
-							$train->{interchange_icon} = 'directions_run';
-						}
-						elsif ( $interchange_time == $interchange_duration ) {
-							$train->{interchange_text}
-							  = 'Anschluss könnte knapp werden';
-							$train->{interchange_icon} = 'directions_run';
-						}
-					}
-				}
-
-				$promise->resolve( [ @results, @cancellations ], [] );
-				return;
-			}
-		)->catch(
-			sub {
-				$promise->resolve( [], [] );
-				return;
-			}
-		)->wait;
-	}
-	elsif ( $backend->{dbris} ) {
-		return $promise->reject;
-	}
-	elsif ( $backend->{efa} ) {
-		return $promise->reject;
-	}
-	elsif ( $backend->{hafas} ) {
-		my $hafas_service = $backend->{name};
-		$self->hafas->get_departures_p(
-			service    => $hafas_service,
-			eva        => $eva,
-			lookbehind => 10,
-			lookahead  => $lookahead
-		)->then(
-			sub {
-				my ($status) = @_;
-				my @hafas_trains;
-				my @all_hafas_trains = $status->results;
-				for my $hafas_train (@all_hafas_trains) {
-					for my $stop ( $hafas_train->route ) {
-						for my $dest (@destinations) {
-							if (    $stop->loc->name
-								and $stop->loc->name eq $dest->{name}
-								and $via_count{ $dest->{name} } < 2
-								and $hafas_train->datetime )
-							{
-								my $departure = $hafas_train->datetime;
-								my $arrival   = $stop->arr;
-								my $delay     = $hafas_train->delay;
-								if (    $delay
-									and $stop->arr == $stop->sched_arr )
-								{
-									$arrival->add( minutes => $delay );
-								}
-								if ( $departure->epoch >= $exclude_before ) {
-									$via_count{ $dest->{name} }++;
-									push(
-										@hafas_trains,
-										[
-											$hafas_train, $dest,
-											$arrival,     $hafas_service
-										]
-									);
-								}
-							}
-						}
-					}
-				}
-				$promise->resolve( [], \@hafas_trains );
-				return;
-			}
-		)->catch(
-			sub {
-				my ($err) = @_;
-				$self->log->debug("get_connection_trains: hafas: $err");
-				$promise->resolve( [], [] );
-				return;
-			}
-		)->wait;
-	}
-
-	return $promise;
-}
-
 sub compute_effective_visibility {
 	my ( $self, $default_visibility, $journey_visibility ) = @_;
 	if ( $journey_visibility eq 'default' ) {
@@ -381,52 +63,16 @@ sub homepage {
 			  = $self->compute_effective_visibility(
 				$user->{default_visibility_str},
 				$status->{visibility_str} );
-			if ( defined $status->{arrival_countdown}
-				and $status->{arrival_countdown} < ( 40 * 60 ) )
-			{
-				$self->render_later;
-				$self->get_connecting_trains_p->then(
-					sub {
-						my ( $connections_iris, $connections_hafas ) = @_;
-						$self->render(
-							'landingpage',
-							user               => $user,
-							user_status        => $status,
-							journey_visibility => $journey_visibility,
-							connections_iris   => $connections_iris,
-							connections_hafas  => $connections_hafas,
-							with_map           => 1,
-							%{$map_data},
-						);
-						$self->users->mark_seen( uid => $uid );
-					}
-				)->catch(
-					sub {
-						$self->render(
-							'landingpage',
-							user               => $user,
-							user_status        => $status,
-							journey_visibility => $journey_visibility,
-							with_map           => 1,
-							%{$map_data},
-						);
-						$self->users->mark_seen( uid => $uid );
-					}
-				)->wait;
-				return;
-			}
-			else {
-				$self->render(
-					'landingpage',
-					user               => $user,
-					user_status        => $status,
-					journey_visibility => $journey_visibility,
-					with_map           => 1,
-					%{$map_data},
-				);
-				$self->users->mark_seen( uid => $uid );
-				return;
-			}
+			$self->render(
+				'landingpage',
+				user               => $user,
+				user_status        => $status,
+				journey_visibility => $journey_visibility,
+				with_map           => 1,
+				%{$map_data},
+			);
+			$self->users->mark_seen( uid => $uid );
+			return;
 		}
 		else {
 			@recent_targets = uniq_by { $_->{external_id_or_eva} }
@@ -450,12 +96,14 @@ sub homepage {
 
 sub status_card {
 	my ($self) = @_;
+	my $user   = $self->current_user;
 	my $status = $self->get_user_status;
+	my $uid    = $user->{id};
 
 	delete $self->stash->{layout};
 
 	my @timeline = $self->in_transit->get_timeline(
-		uid   => $self->current_user->{id},
+		uid   => $uid,
 		short => 1
 	);
 	$self->stash( timeline => [@timeline] );
@@ -471,36 +119,8 @@ sub status_card {
 		}
 		my $journey_visibility
 		  = $self->compute_effective_visibility(
-			$self->current_user->{default_visibility_str},
+			$user->{default_visibility_str},
 			$status->{visibility_str} );
-		if ( defined $status->{arrival_countdown}
-			and $status->{arrival_countdown} < ( 40 * 60 ) )
-		{
-			$self->render_later;
-			$self->get_connecting_trains_p->then(
-				sub {
-					my ( $connections_iris, $connections_hafas ) = @_;
-					$self->render(
-						'_checked_in',
-						journey            => $status,
-						journey_visibility => $journey_visibility,
-						connections_iris   => $connections_iris,
-						connections_hafas  => $connections_hafas,
-						%{$map_data},
-					);
-				}
-			)->catch(
-				sub {
-					$self->render(
-						'_checked_in',
-						journey            => $status,
-						journey_visibility => $journey_visibility,
-						%{$map_data},
-					);
-				}
-			)->wait;
-			return;
-		}
 		$self->render(
 			'_checked_in',
 			journey            => $status,
@@ -509,50 +129,10 @@ sub status_card {
 		);
 	}
 	elsif ( $status->{cancellation} ) {
-		$self->render_later;
-		$self->get_connecting_trains_p(
-			backend_id       => $status->{backend_id},
-			eva              => $status->{cancellation}{dep_eva},
-			destination_name => $status->{cancellation}{arr_name}
-		)->then(
-			sub {
-				my ($connecting_trains) = @_;
-				$self->render(
-					'_cancelled_departure',
-					journey          => $status->{cancellation},
-					connections_iris => $connecting_trains
-				);
-			}
-		)->catch(
-			sub {
-				$self->render( '_cancelled_departure',
-					journey => $status->{cancellation} );
-			}
-		)->wait;
-		return;
+		$self->render( '_cancelled_departure',
+			journey => $status->{cancellation} );
 	}
 	else {
-		my @connecting_trains;
-		my $now = DateTime->now( time_zone => 'Europe/Berlin' );
-		if ( $now->epoch - $status->{timestamp}->epoch < ( 30 * 60 ) ) {
-			$self->render_later;
-			$self->get_connecting_trains_p->then(
-				sub {
-					my ( $connections_iris, $connections_hafas ) = @_;
-					$self->render(
-						'_checked_out',
-						journey           => $status,
-						connections_iris  => $connections_iris,
-						connections_hafas => $connections_hafas,
-					);
-				}
-			)->catch(
-				sub {
-					$self->render( '_checked_out', journey => $status );
-				}
-			)->wait;
-			return;
-		}
 		$self->render( '_checked_out', journey => $status );
 	}
 }
@@ -1415,6 +995,28 @@ sub station {
 				  map {
 					[ $_, $_->departure->epoch // $_->sched_departure->epoch ]
 				  } @results;
+
+				my @destinations = $self->journeys->get_connection_targets(
+					uid        => $uid,
+					backend_id => 0,
+					eva        => $status->{station_eva},
+				);
+
+				for my $dep (@results) {
+					destination: for my $dest (@destinations) {
+						for my $via_name ( $dep->route_post ) {
+							if ( $via_name eq $dest->{name} ) {
+								push( @suggestions, [ $dep, $dest ] );
+								next destination;
+							}
+						}
+					}
+				}
+
+				@suggestions = map { $_->[0] }
+				  sort { $a->[1] <=> $b->[1] }
+				  grep { $_->[1] >= $now - 300 }
+				  map  { [ $_, $_->[0]->departure->epoch ] } @suggestions;
 			}
 
 			my $user_status = $self->get_user_status;
@@ -1436,7 +1038,6 @@ sub station {
 				}
 			}
 
-			my $connections_p;
 			if ( $trip_id and ( $dbris_service or $hafas_service ) ) {
 				@results = grep { $_->id eq $trip_id } @results;
 			}
@@ -1444,95 +1045,25 @@ sub station {
 				@results
 				  = grep { $_->type . ' ' . $_->train_no eq $train } @results;
 			}
-			else {
-				if (    $user_status->{cancellation}
-					and $status->{station_eva} eq
-					$user_status->{cancellation}{dep_eva} )
-				{
-					$connections_p = $self->get_connecting_trains_p(
-						eva => $user_status->{cancellation}{dep_eva},
-						destination_name =>
-						  $user_status->{cancellation}{arr_name},
-						efa   => $efa_service,
-						hafas => $hafas_service,
-					);
-				}
-				else {
-					$connections_p = $self->get_connecting_trains_p(
-						eva   => $status->{station_eva},
-						efa   => $efa_service,
-						hafas => $hafas_service
-					);
-				}
-			}
 
-			if ($connections_p) {
-				$connections_p->then(
-					sub {
-						my ( $connections_iris, $connections_hafas ) = @_;
-						$self->render(
-							'departures',
-							user              => $user,
-							dbris             => $dbris_service,
-							efa               => $efa_service,
-							hafas             => $hafas_service,
-							motis             => $motis_service,
-							eva               => $status->{station_eva},
-							datetime          => $timestamp,
-							now_in_range      => $now_within_range,
-							results           => \@results,
-							station           => $status->{station_name},
-							related_stations  => $status->{related_stations},
-							user_status       => $user_status,
-							can_check_out     => $can_check_out,
-							connections_iris  => $connections_iris,
-							connections_hafas => $connections_hafas,
-							title => "travelynx: $status->{station_name}",
-						);
-					}
-				)->catch(
-					sub {
-						$self->render(
-							'departures',
-							user             => $user,
-							dbris            => $dbris_service,
-							efa              => $efa_service,
-							hafas            => $hafas_service,
-							motis            => $motis_service,
-							eva              => $status->{station_eva},
-							datetime         => $timestamp,
-							now_in_range     => $now_within_range,
-							results          => \@results,
-							station          => $status->{station_name},
-							related_stations => $status->{related_stations},
-							user_status      => $user_status,
-							can_check_out    => $can_check_out,
-							suggestions      => \@suggestions,
-							title => "travelynx: $status->{station_name}",
-						);
-					}
-				)->wait;
-			}
-			else {
-				$self->render(
-					'departures',
-					user             => $user,
-					dbris            => $dbris_service,
-					efa              => $efa_service,
-					hafas            => $hafas_service,
-					motis            => $motis_service,
-					eva              => $status->{station_eva},
-					datetime         => $timestamp,
-					now_in_range     => $now_within_range,
-					results          => \@results,
-					station          => $status->{station_name},
-					related_stations => $status->{related_stations},
-					user_status      => $user_status,
-					can_check_out    => $can_check_out,
-					suggestions      => \@suggestions,
-					title            => "travelynx: $status->{station_name}",
-				);
-			}
+			$self->render(
+				'departures',
+				user             => $user,
+				dbris            => $dbris_service,
+				efa              => $efa_service,
+				hafas            => $hafas_service,
+				motis            => $motis_service,
+				eva              => $status->{station_eva},
+				datetime         => $timestamp,
+				now_in_range     => $now_within_range,
+				results          => \@results,
+				station          => $status->{station_name},
+				related_stations => $status->{related_stations},
+				user_status      => $user_status,
+				can_check_out    => $can_check_out,
+				suggestions      => \@suggestions,
+				title            => "travelynx: $status->{station_name}",
+			);
 		}
 	)->catch(
 		sub {
diff --git a/templates/_cancelled_departure.html.ep b/templates/_cancelled_departure.html.ep
index db6cc5c..d47385a 100644
--- a/templates/_cancelled_departure.html.ep
+++ b/templates/_cancelled_departure.html.ep
@@ -5,9 +5,5 @@
 			in <a href="/s/<%= $journey->{dep_eva} %>"><%= $journey->{dep_name} %></a>
 			entfällt. Der Ausfall der Fahrt nach <%= $journey->{arr_name} %> wurde bereits dokumentiert.
 		</p>
-		% if (my @connections = @{stash('connections_iris') // []}) {
-			<p>Alternative Reisemöglichkeiten:</p>
-			%= include '_connections', connections => \@connections, checkin_from => $journey->{dep_eva};
-		% }
 	</div>
 </div>
diff --git a/templates/_checked_in.html.ep b/templates/_checked_in.html.ep
index 69754e3..f057a0a 100644
--- a/templates/_checked_in.html.ep
+++ b/templates/_checked_in.html.ep
@@ -221,18 +221,6 @@
 					</ul>
 				</p>
 			% }
-			% if (@{stash('connections_iris') // [] } or @{stash('connections_hafas') // []}) {
-				<span class="card-title" style="margin-top: 2ex;">Verbindungen</span>
-				% if ($journey->{arrival_countdown} < 0) {
-					<p>Fahrt auswählen zum Einchecken mit Zielwahl.</p>
-				% }
-				% if (@{stash('connections_iris') // [] }) {
-					%= include '_connections', connections => stash('connections_iris'), checkin_from => $journey->{arrival_countdown} < 0 ? $journey->{arr_eva} : undef;
-				% }
-				% if (@{stash('connections_hafas') // [] }) {
-					%= include '_connections_hafas', connections => stash('connections_hafas'), checkin_from => $journey->{arrival_countdown} < 0 ? $journey->{arr_eva} : undef;
-				% }
-			% }
 			% if (defined $journey->{arrival_countdown} and $journey->{arrival_countdown} <= 0) {
 				<p style="margin-top: 2ex;">
 					%= L('status.delayed-auto-checkout')
diff --git a/templates/_checked_out.html.ep b/templates/_checked_out.html.ep
index 21db335..fcac6f8 100644
--- a/templates/_checked_out.html.ep
+++ b/templates/_checked_out.html.ep
@@ -4,16 +4,6 @@
 		<p>Aus
 			%= include '_format_train', journey => $journey
 			bis <a href="/s/<%= $journey->{arr_eva} %>?hafas=<%= $journey->{is_hafas} ? $journey->{backend_name} : q{} %>"><%= $journey->{arr_name} %></a></p>
-		% if (@{stash('connections_iris') // [] } or @{stash('connections_hafas') // []}) {
-			<span class="card-title" style="margin-top: 2ex;">Verbindungen</span>
-			<p>Fahrt auswählen zum Einchecken mit Zielwahl.</p>
-			% if (@{stash('connections_iris') // [] }) {
-				%= include '_connections', connections => stash('connections_iris'), checkin_from => $journey->{arr_eva};
-			% }
-			% if (@{stash('connections_hafas') // [] }) {
-				%= include '_connections_hafas', connections => stash('connections_hafas'), checkin_from => $journey->{arr_eva};
-			% }
-		% }
 	</div>
 	<div class="card-action">
 		<a class="action-undo" data-id="<%= $journey->{journey_id} %>">
diff --git a/templates/_connections.html.ep b/templates/_connections.html.ep
deleted file mode 100644
index 1dd2718..0000000
--- a/templates/_connections.html.ep
+++ /dev/null
@@ -1,76 +0,0 @@
-<ul class="collection departures connections">
-	% for my $res (@{$connections}) {
-		% my ($train, $via, $via_arr, $load) = @{$res};
-		% $via_arr = $via_arr ? $via_arr->strftime('%H:%M') : q{};
-		% my $row_class = '';
-		% my $link_class = 'action-checkin';
-		% if ($train->is_cancelled) {
-			% $row_class = 'cancelled';
-			% $link_class = 'action-cancelled-from';
-		% }
-		% if ($checkin_from) {
-			<li class="collection-item <%= $row_class %> <%= $link_class %>"
-			data-station="<%= $train->station_uic %>"
-			data-train="<%= $train->train_id %>"
-			data-ts="<%= ($train->sched_departure // $train->departure)->epoch %>"
-			data-dest="<%= $via->{name} %>">
-		% }
-		% else {
-			<li class="collection-item <%= $row_class %>">
-		% }
-			<a class="dep-time" href="#">
-				% if ($train->departure_is_cancelled) {
-					%= $train->sched_departure->strftime('%H:%M')
-				% }
-				% else {
-					%= $train->departure->strftime('%H:%M')
-				% }
-				% if ($via_arr) {
-					→ <%= $via_arr %>
-				% }
-				% if ($train->departure_delay) {
-					%= sprintf('(%+d)', $train->departure_delay)
-				% }
-			</a>
-			<span class="connect-platform-wrapper">
-				% if ($train->platform) {
-					<span>Gleis <%= $train->platform %></span>
-				% }
-				<span class="dep-line <%= $train->type // q{} %>">
-					%= $train->line
-				</span>
-			</span>
-			<span class="dep-dest">
-				% if ($train->is_cancelled) {
-					Fahrt nach <%= $via->{name} %> entfällt
-				% }
-				% else {
-					%= $via->{name}
-				% }
-				<br/>
-				% if ($load) {
-					% my ($first, $second) = load_icon($load);
-					<i class="material-icons tiny" aria-hidden="true"><%= $first %></i> <i class="material-icons tiny" aria-hidden="true"><%= $second %></i>
-				% }
-				% if ($train->{interchange_icon}) {
-					<i class="material-icons tiny" aria-label="<%= $train->{interchange_text} %>"><%= $train->{interchange_icon} %></i>
-				% }
-				% if ($train->{message_id}{96} or $train->{message_id}{97}) {
-					<i class="material-icons tiny" aria-label="Zug ist überbesetzt">warning</i>
-				% }
-				% if ($train->{message_id}{82} or $train->{message_id}{85}) {
-					<i class="material-icons tiny" aria-label="Fehlende Wagen">remove</i>
-				% }
-				% if (($train->{message_id}{73} or $train->{message_id}{74} or $train->{message_id}{75} or $train->{message_id}{76} or $train->{message_id}{80}) and not $train->{message_id}{84}) {
-					<i class="material-icons tiny" aria-label="Abweichende Wagenreihung">compare_arrows</i>
-				% }
-				% if ($train->{message_id}{83} or $train->{message_id}{93} or $train->{message_id}{95}) {
-					<i class="material-icons tiny" aria-label="Eingeschränkte Barrierefreiheit">info_outline</i>
-				% }
-				% if ($train->{message_id}{70} or $train->{message_id}{71}) {
-					<i class="material-icons tiny" aria-label="Ohne WLAN">portable_wifi_off</i>
-				% }
-			</span>
-		</li>
-	% }
-</ul>
diff --git a/templates/_connections_hafas.html.ep b/templates/_connections_hafas.html.ep
deleted file mode 100644
index 3b995b5..0000000
--- a/templates/_connections_hafas.html.ep
+++ /dev/null
@@ -1,57 +0,0 @@
-<ul class="collection departures connections">
-	% for my $res (@{$connections}) {
-		% my ($train, $via, $via_arr, $hafas_service) = @{$res};
-		% $via_arr = $via_arr ? $via_arr->strftime('%H:%M') : q{};
-		% my $row_class = '';
-		% my $link_class = 'action-checkin';
-		% if ($train->is_cancelled) {
-			% $row_class = 'cancelled';
-			% $link_class = 'action-cancelled-from';
-		% }
-		% if ($checkin_from) {
-			<li class="collection-item <%= $row_class %> <%= $link_class %>"
-			data-hafas="<%= $hafas_service %>"
-			data-station="<%= $train->station_eva %>"
-			data-train="<%= $train->id %>"
-			data-ts="<%= ($train->sched_datetime // $train->datetime)->epoch %>"
-			data-dest="<%= $via->{name} %>">
-		% }
-		% else {
-			<li class="collection-item <%= $row_class %>">
-		% }
-			<a class="dep-time" href="#">
-				% if ($train->is_cancelled) {
-					%= $train->sched_datetime->strftime('%H:%M')
-				% }
-				% else {
-					%= $train->datetime->strftime('%H:%M')
-				% }
-				% if ($via_arr) {
-					→ <%= $via_arr %>
-				% }
-				% if ($train->delay) {
-					%= sprintf('(%+d)', $train->delay)
-				% }
-			</a>
-			<span class="connect-platform-wrapper">
-				% if ($train->platform) {
-					<span>
-						% if (($train->type // q{}) =~ m{ ast | bus | ruf }ix) {
-							Steig
-						% }
-						% else {
-							Gleis
-						% }
-						%= $train->platform
-					</span>
-				% }
-				<span class="dep-line <%= $train->type // q{} %>">
-					%= $train->line
-				</span>
-			</span>
-			<span class="dep-dest">
-				%= $via->{name}
-			</span>
-		</li>
-	% }
-</ul>
diff --git a/templates/_suggestions_iris.html.ep b/templates/_suggestions_iris.html.ep
new file mode 100644
index 0000000..8aea570
--- /dev/null
+++ b/templates/_suggestions_iris.html.ep
@@ -0,0 +1,44 @@
+<ul class="collection departures connections">
+	% for my $res (@{$suggestions}) {
+		% my ($train, $dest) = @{$res};
+		% my $row_class = '';
+		% my $link_class = 'action-checkin';
+		% if ($train->departure_is_cancelled) {
+			% $row_class = 'cancelled';
+			% $link_class = 'action-cancelled-from';
+		% }
+		% if ($checkin_from) {
+			<li class="collection-item <%= $row_class %> <%= $link_class %>"
+			data-station="<%= $train->station_uic %>"
+			data-train="<%= $train->train_id %>"
+			data-ts="<%= ($train->sched_departure // $train->departure)->epoch %>"
+			data-dest="<%= $dest->{name} %>">
+		% }
+		% else {
+			<li class="collection-item <%= $row_class %>">
+		% }
+			<a class="dep-time" href="#">
+				% if ($train->departure_is_cancelled) {
+					%= $train->sched_departure->strftime('%H:%M')
+				% }
+				% else {
+					%= $train->departure->strftime('%H:%M')
+				% }
+				% if ($train->departure_delay) {
+					%= sprintf('(%+d)', $train->departure_delay)
+				% }
+			</a>
+			<span class="connect-platform-wrapper">
+				% if ($train->platform) {
+					<span>Gleis <%= $train->platform %></span>
+				% }
+				<span class="dep-line <%= $train->type // q{} %>">
+					%= $train->line
+				</span>
+			</span>
+			<span class="dep-dest">
+				%= $dest->{name}
+			</span>
+		</li>
+	% }
+</ul>
diff --git a/templates/departures.html.ep b/templates/departures.html.ep
index 0d57039..b1390b3 100644
--- a/templates/departures.html.ep
+++ b/templates/departures.html.ep
@@ -81,24 +81,19 @@
 		</div>
 	</div>
 % }
-% elsif (not param('train') and (@{stash('connections_iris') // []} or @{stash('connections_hafas') // []} or @{stash('suggestions') // []}) ) {
+% elsif (not param('train') and @{stash('suggestions') // []} ) {
 	% $have_connections = 1;
 	<div class="row">
 		<div class="col s12">
 			<p>Häufig genutzte Verbindungen – Fahrt auswählen zum Einchecken mit Zielwahl</p>
-			% if (@{stash('connections_iris') // []}) {
-				%= include '_connections', connections => stash('connections_iris'), checkin_from => $eva;
+			% if ($dbris) {
+				%= include '_suggestions_dbris', suggestions => stash('suggestions'), checkin_from => $eva;
 			% }
-			% if (@{stash('connections_hafas') // []}) {
-				%= include '_connections_hafas', connections => stash('connections_hafas'), checkin_from => $eva;
+			% elsif ($efa) {
+				%= include '_suggestions_efa', suggestions => stash('suggestions'), checkin_from => $eva;
 			% }
-			% if (@{stash('suggestions') // []}) {
-				% if ($dbris) {
-					%= include '_suggestions_dbris', suggestions => stash('suggestions'), checkin_from => $eva;
-				% }
-				% elsif ($efa) {
-					%= include '_suggestions_efa', suggestions => stash('suggestions'), checkin_from => $eva;
-				% }
+			% else {
+				%= include '_suggestions_iris', suggestions => stash('suggestions'), checkin_from => $eva;
 			% }
 		</div>
 	</div>