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

calculate journey distance using polyline, if available

Browse source
This commit is contained in:
Daniel Friesel 2020-02-21 23:31:50 +01:00
parent cb53a18898
commit a15dc1791c
2 changed files with 35 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
lib/Travelynx.pm
View file

@ -2985,11 +2985,10 @@ sub startup {
= defined $ref->{rt_arr_ts} = defined $ref->{rt_arr_ts}
? $ref->{rt_arr_ts} - $ref->{rt_dep_ts} ? $ref->{rt_arr_ts} - $ref->{rt_dep_ts}
: undef; : undef;
my ( $km_route, $km_beeline, $skip ) my ( $km_polyline, $km_route, $km_beeline, $skip )
= $self->get_travel_distance( $ref->{from_name}, = $self->get_travel_distance($ref);
$ref->{to_name}, $ref->{route} ); $ref->{km_route} = $km_polyline || $km_route;
$ref->{km_route} = $km_route; $ref->{skip_route} = $km_polyline ? 0 : $skip;
$ref->{skip_route} = $skip;
$ref->{km_beeline} = $km_beeline; $ref->{km_beeline} = $km_beeline;
$ref->{skip_beeline} = $skip; $ref->{skip_beeline} = $skip;
my $kmh_divisor my $kmh_divisor
@ -3557,8 +3556,16 @@ sub startup {
$self->helper( $self->helper(
'get_travel_distance' => sub { 'get_travel_distance' => sub {
my ( $self, $from, $to, $route_ref ) = @_; my ( $self, $journey ) = @_;
my $from = $journey->{from_name};
my $from_eva = $journey->{from_eva};
my $to = $journey->{to_name};
my $to_eva = $journey->{to_eva};
my $route_ref = $journey->{route};
my $polyline_ref = $journey->{polyline};
my $distance_polyline = 0;
my $distance_intermediate = 0; my $distance_intermediate = 0;
my $distance_beeline = 0; my $distance_beeline = 0;
my $skipped = 0; my $skipped = 0;
@ -3570,12 +3577,27 @@ sub startup {
if ( @route < 2 ) { if ( @route < 2 ) {
# I AM ERROR # I AM ERROR
return ( 0, 0 ); return ( 0, 0, 0 );
} }
my $prev_station = get_station( shift @route ); my @polyline = after_incl { $_->[2] and $_->[2] == $from_eva }
@{ $polyline_ref // [] };
@polyline
= before_incl { $_->[2] and $_->[2] == $to_eva } @polyline;
my $prev_station = shift @polyline;
for my $station (@polyline) {
#lonlatlonlat
$distance_polyline
+= $geo->distance( 'kilometer', $prev_station->[0],
$prev_station->[1], $station->[0], $station->[1] );
$prev_station = $station;
}
$prev_station = get_station( shift @route );
if ( not $prev_station ) { if ( not $prev_station ) {
return ( 0, 0 ); return ( $distance_polyline, 0, 0 );
} }
# Geo-coordinates for stations outside Germany are not available # Geo-coordinates for stations outside Germany are not available
@ -3586,6 +3608,7 @@ sub startup {
my $from_station_beeline; my $from_station_beeline;
my $to_station_beeline; my $to_station_beeline;
# $#{$station} >= 4 iff $station has geocoordinates
for my $station_name (@route) { for my $station_name (@route) {
if ( my $station = get_station($station_name) ) { if ( my $station = get_station($station_name) ) {
if ( not $from_station_beeline and $#{$prev_station} >= 4 ) if ( not $from_station_beeline and $#{$prev_station} >= 4 )
@ -3615,7 +3638,8 @@ sub startup {
); );
} }
return ( $distance_intermediate, $distance_beeline, $skipped ); return ( $distance_polyline, $distance_intermediate,
$distance_beeline, $skipped );
} }
); );

1
lib/Travelynx/Controller/Traveling.pm
View file

@ -817,6 +817,7 @@ sub journey_details {
journey_id => $journey_id, journey_id => $journey_id,
verbose => 1, verbose => 1,
with_datetime => 1, with_datetime => 1,
with_polyline => 1,
); );
if ($journey) { if ($journey) {