PrivateCoffee/travelynx
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

get_travel_distance: always return beeline distance

Browse source
This commit is contained in:
Birte Kristina Friesel 2024-08-14 22:00:15 +02:00
parent 43fc820e0c
commit 655f69c2e9
No known key found for this signature in database
GPG key ID: 19E6E524EBB177BA
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/Travelynx/Model/Journeys.pm
View file

@ -1128,16 +1128,16 @@ sub get_travel_distance {
my $distance_polyline = 0; my $distance_polyline = 0;
my $distance_intermediate = 0; my $distance_intermediate = 0;
my $distance_beeline = 0;
my $skipped = 0;
my $geo = GIS::Distance->new(); my $geo = GIS::Distance->new();
my @route = after_incl { $_->[0] eq $from } @{$route_ref}; my $distance_beeline
= $geo->distance_metal( @{$from_latlon}, @{$to_latlon} );
my @route = after_incl { $_->[0] eq $from } @{$route_ref};
@route = before_incl { $_->[0] eq $to } @route; @route = before_incl { $_->[0] eq $to } @route;
if ( @route < 2 ) { if ( @route < 2 ) {
# I AM ERROR # I AM ERROR
return ( 0, 0, 0 ); return ( 0, 0, $distance_beeline );
} }
my @polyline = after_incl { $_->[2] and $_->[2] == $from_eva } my @polyline = after_incl { $_->[2] and $_->[2] == $from_eva }
@ -1155,7 +1155,7 @@ sub get_travel_distance {
} }
if ( not( defined $route[0][2]{lat} and defined $route[0][2]{lon} ) ) { if ( not( defined $route[0][2]{lat} and defined $route[0][2]{lon} ) ) {
return ( $distance_polyline, 0, 0 ); return ( $distance_polyline, 0, $distance_beeline );
} }
$prev_station = shift @route; $prev_station = shift @route;
@ -1169,10 +1169,7 @@ sub get_travel_distance {
} }
} }
$distance_beeline = $geo->distance_metal( @{$from_latlon}, @{$to_latlon} ); return ( $distance_polyline, $distance_intermediate, $distance_beeline );
return ( $distance_polyline, $distance_intermediate,
$distance_beeline, $skipped );
} }
sub grep_single { sub grep_single {