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

Switch from Geo::Distance (deprecated) to GIS::Distance

Browse source
This commit is contained in:
Daniel Friesel 2021-10-23 22:20:41 +02:00
parent 70c3a5d9c8
commit 3dc5575d5a
No known key found for this signature in database
GPG key ID: 100D5BFB5166E005
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cpanfile
View file

@ -4,7 +4,8 @@ requires 'Crypt::Eksblowfish';
requires 'DateTime';
requires 'DateTime::Format::Strptime';
requires 'Email::Sender::Simple';
requires 'Geo::Distance';
requires 'GIS::Distance';
requires 'GIS::Distance::Fast';
requires 'List::UtilsBy';
requires 'MIME::Entity';
requires 'Mojolicious';

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

@ -4,7 +4,7 @@ package Travelynx::Model::Journeys;
#
# SPDX-License-Identifier: AGPL-3.0-or-later
use Geo::Distance;
use GIS::Distance;
use List::MoreUtils qw(after_incl before_incl);
use Travel::Status::DE::IRIS::Stations;
@ -955,7 +955,7 @@ sub get_travel_distance {
my $distance_intermediate = 0;
my $distance_beeline = 0;
my $skipped = 0;
my $geo = Geo::Distance->new();
my $geo = GIS::Distance->new();
my @stations = map { $_->[0] } @{$route_ref};
my @route = after_incl { $_ eq $from } @stations;
@route = before_incl { $_ eq $to } @route;
@ -976,8 +976,8 @@ sub get_travel_distance {
#lonlatlonlat
$distance_polyline
+= $geo->distance( 'kilometer', $prev_station->[0],
$prev_station->[1], $station->[0], $station->[1] );
+= $geo->distance_metal( $prev_station->[1],
$prev_station->[0], $station->[1], $station->[0] );
$prev_station = $station;
}
@ -1005,8 +1005,8 @@ sub get_travel_distance {
}
if ( $#{$prev_station} >= 4 and $#{$station} >= 4 ) {
$distance_intermediate
+= $geo->distance( 'kilometer', $prev_station->[3],
$prev_station->[4], $station->[3], $station->[4] );
+= $geo->distance_metal( $prev_station->[4],
$prev_station->[3], $station->[4], $station->[3] );
}
else {
$skipped++;
@ -1016,10 +1016,10 @@ sub get_travel_distance {
}
if ( $from_station_beeline and $to_station_beeline ) {
$distance_beeline = $geo->distance(
'kilometer', $from_station_beeline->[3],
$from_station_beeline->[4], $to_station_beeline->[3],
$to_station_beeline->[4]
$distance_beeline = $geo->distance_metal(
$from_station_beeline->[4],
$from_station_beeline->[3], $to_station_beeline->[4],
$to_station_beeline->[3]
);
}