1 files changed, 73 insertions, 14 deletions

diff --git a/lib/Travelynx/Controller/Traveling.pm b/lib/Travelynx/Controller/Traveling.pm
index de1a547..9826211 100755
--- a/lib/Travelynx/Controller/Traveling.pm
+++ b/lib/Travelynx/Controller/Traveling.pm
@@ -562,11 +562,14 @@ sub geolocation {
 		return;
 	}
 
-	my ( $dbris_service, $hafas_service, $motis_service );
+	my ( $dbris_service, $efa_service, $hafas_service, $motis_service );
 	my $backend = $self->stations->get_backend( backend_id => $backend_id );
 	if ( $backend->{dbris} ) {
 		$dbris_service = $backend->{name};
 	}
+	if ( $backend->{efa} ) {
+		$efa_service = $backend->{name};
+	}
 	elsif ( $backend->{hafas} ) {
 		$hafas_service = $backend->{name};
 	}
@@ -617,6 +620,50 @@ sub geolocation {
 		)->wait;
 		return;
 	}
+	elsif ($efa_service) {
+		$self->render_later;
+
+		Travel::Status::DE::EFA->new_p(
+			promise    => 'Mojo::Promise',
+			user_agent => Mojo::UserAgent->new,
+			service    => $efa_service,
+			coord      => {
+				lat => $lat,
+				lon => $lon
+			}
+		)->then(
+			sub {
+				my ($efa) = @_;
+				my @results = map {
+					{
+						name     => $_->full_name,
+						eva      => $_->id_code,
+						distance => 0,
+						efa      => $efa_service,
+					}
+				} $efa->results;
+				if ( @results > 10 ) {
+					@results = @results[ 0 .. 9 ];
+				}
+				$self->render(
+					json => {
+						candidates => [@results],
+					}
+				);
+			}
+		)->catch(
+			sub {
+				my ($err) = @_;
+				$self->render(
+					json => {
+						candidates => [],
+						warning    => $err,
+					}
+				);
+			}
+		)->wait;
+		return;
+	}
 	elsif ($hafas_service) {
 		$self->render_later;
 
@@ -726,8 +773,6 @@ sub geolocation {
 			lon      => $_->[0][3],
 			lat      => $_->[0][4],
 			distance => $_->[1],
-			dbris    => 0,
-			hafas    => 0,
 		}
 	} Travel::Status::DE::IRIS::Stations::get_station_by_location( $lon,
 		$lat, 10 );
@@ -796,6 +841,7 @@ sub travel_action {
 			sub {
 				return $self->checkin_p(
 					dbris        => $params->{dbris},
+					efa          => $params->{efa},
 					hafas        => $params->{hafas},
 					motis        => $params->{motis},
 					station      => $params->{station},
@@ -832,6 +878,9 @@ sub travel_action {
 					if ( $status->{is_dbris} ) {
 						$station_link .= '?dbris=' . $status->{backend_name};
 					}
+					elsif ( $status->{is_efa} ) {
+						$station_link .= '?efa=' . $status->{backend_name};
+					}
 					elsif ( $status->{is_hafas} ) {
 						$station_link .= '?hafas=' . $status->{backend_name};
 					}
@@ -871,6 +920,9 @@ sub travel_action {
 				if ( $status->{is_dbris} ) {
 					$station_link .= '?dbris=' . $status->{backend_name};
 				}
+				elsif ( $status->{is_efa} ) {
+					$station_link .= '?efa=' . $status->{backend_name};
+				}
 				elsif ( $status->{is_hafas} ) {
 					$station_link .= '?hafas=' . $status->{backend_name};
 				}
@@ -929,6 +981,12 @@ sub travel_action {
 					  . '?dbris='
 					  . $status->{backend_name};
 				}
+				elsif ( $status->{is_efa} ) {
+					$redir
+					  = '/s/'
+					  . $status->{dep_eva} . '?efa='
+					  . $status->{backend_name};
+				}
 				elsif ( $status->{is_hafas} ) {
 					$redir
 					  = '/s/'
@@ -959,6 +1017,7 @@ sub travel_action {
 		$self->render_later;
 		$self->checkin_p(
 			dbris    => $params->{dbris},
+			efa      => $params->{efa},
 			hafas    => $params->{hafas},
 			motis    => $params->{motis},
 			station  => $params->{station},
@@ -1120,19 +1179,19 @@ sub station {
 			lookbehind => 30,
 		);
 	}
-	elsif ($hafas_service) {
-		$promise = $self->hafas->get_departures_p(
-			service    => $hafas_service,
-			eva        => $station,
+	elsif ($efa_service) {
+		$promise = $self->efa->get_departures_p(
+			service    => $efa_service,
+			name       => $station,
 			timestamp  => $timestamp,
 			lookbehind => 30,
 			lookahead  => 30,
 		);
 	}
-	elsif ($efa_service) {
-		$promise = $self->efa->get_departures_p(
-			service    => $efa_service,
-			name       => $station,
+	elsif ($hafas_service) {
+		$promise = $self->hafas->get_departures_p(
+			service    => $hafas_service,
+			eva        => $station,
 			timestamp  => $timestamp,
 			lookbehind => 30,
 			lookahead  => 30,
@@ -1225,8 +1284,8 @@ sub station {
 				  sort { $b->[1] <=> $a->[1] }
 				  map { [ $_, $_->datetime->epoch ] } $status->results;
 				$status = {
-					station_eva => $status->stop->id,
-					station_name => $status->stop->full_name,
+					station_eva      => $status->stop->id_num,
+					station_name     => $status->stop->full_name,
 					related_stations => [],
 				};
 			}
@@ -1310,7 +1369,7 @@ sub station {
 							'departures',
 							user              => $user,
 							dbris             => $dbris_service,
-							efa              => $efa_service,
+							efa               => $efa_service,
 							hafas             => $hafas_service,
 							motis             => $motis_service,
 							eva               => $status->{station_eva},