Unverified Commit f8542fff authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

map, get_travel_distance: Prefer EVA ID over name for route matches 

Station names frequently change, so the EVA ID is more robust

Closes #160
parent 4b6049cd

lib/Travelynx.pm

+10 −4
Original line number Diff line number Diff line
@@ -2208,10 +2208,16 @@ sub startup { 


				my @route = @{ $journey->{route} };



				my $from_index

				  = first_index { $_->[0] eq $journey->{from_name} } @route;

				my $to_index

				  = first_index { $_->[0] eq $journey->{to_name} } @route;

				my $from_index = first_index {

					( $_->[1] and $_->[1] == $journey->{from_eva} )

					  or $_->[0] eq $journey->{from_name}

				}

				@route;

				my $to_index = first_index {

					( $_->[1] and $_->[1] == $journey->{to_eva} )

					  or $_->[0] eq $journey->{to_name}

				}

				@route;



				if ( $from_index == -1 ) {

					my $rename = $self->app->renamed_station;

lib/Travelynx/Model/Journeys.pm

+6 −2
Original line number Diff line number Diff line
@@ -1192,8 +1192,12 @@ sub get_travel_distance { 
	my $geo                   = GIS::Distance->new();

	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;

	my @route

	  = after_incl { ( $_->[1] and $_->[1] == $from_eva ) or $_->[0] eq $from }

	@{$route_ref};

	@route

	  = before_incl { ( $_->[1] and $_->[1] == $to_eva ) or $_->[0] eq $to }

	@route;



	if ( @route < 2 or $route[-1][0] ne $to ) {