Journey#get_travel_distance: Only query (sched|rt)_(arr|dep) if defined

1 files changed, 10 insertions, 4 deletions

diff --git a/lib/Travelynx/Model/Journeys.pm b/lib/Travelynx/Model/Journeys.pm
index 5e6195f..3a3ba30 100755
--- a/lib/Travelynx/Model/Journeys.pm
+++ b/lib/Travelynx/Model/Journeys.pm
@@ -1246,11 +1246,17 @@ sub get_travel_distance {
 	my $geo                   = GIS::Distance->new();
 	my $distance_beeline
 	  = $geo->distance_metal( @{$from_latlon}, @{$to_latlon} );
-	my @route
-	  = after_incl { ( $_->[1] and $_->[1] == $from_eva ) or $_->[0] eq $from }
+	my @route = after_incl {
+		(         ( $_->[1] and $_->[1] == $from_eva or $_->[0] eq $from )
+			  and ( defined $_->[2]{sched_dep} or defined $_->[2]{rt_dep} )
+			  and ( $_->[2]{sched_dep} // $_->[2]{rt_dep} )->epoch == $from_ts )
+	}
 	@{$route_ref};
-	@route
-	  = before_incl { ( $_->[1] and $_->[1] == $to_eva ) or $_->[0] eq $to }
+	@route = before_incl {
+		(         ( $_->[1] and $_->[1] == $to_eva or $_->[0] eq $to )
+			  and ( defined $_->[2]{sched_arr} or defined $_->[2]{rt_arr} )
+			  and ( $_->[2]{sched_arr} // $_->[2]{rt_arr} )->epoch == $to_ts )
+	}
 	@route;
 
 	if (