Commit 3e9807b3 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

map, journey view: handle renamed stations

parent 1028e47a

lib/Travelynx.pm

+15 −2
Original line number Diff line number Diff line
@@ -197,8 +197,7 @@ sub startup { 


	$self->attr(

		coordinates_by_station => sub {

			my $legacy_names = JSON->new->utf8->decode(

				scalar read_file('share/old_station_names.json') );

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

			my %location;

			for

			  my $station ( Travel::Status::DE::IRIS::Stations::get_stations() )
@@ -225,6 +224,14 @@ sub startup { 
		}

	);



	$self->attr(

		renamed_station => sub {

			my $legacy_to_new = JSON->new->utf8->decode(

				scalar read_file('share/old_station_names.json') );

			return $legacy_to_new;

		}

	);



	$self->attr(

		station_by_eva => sub {

			my %map;
@@ -2710,6 +2717,12 @@ sub startup { 
				}



				if ( $opt{verbose} ) {

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

					for my $stop ( @{ $ref->{route} } ) {

						if ( $rename->{ $stop->[0] } ) {

							$stop->[0] = $rename->{ $stop->[0] };

						}

					}

					$ref->{cancelled} = $entry->{cancelled};

					my @parsed_messages;

					for my $message ( @{ $ref->{messages} // [] } ) {

lib/Travelynx/Controller/Traveling.pm

+15 −1
Original line number Diff line number Diff line
@@ -471,9 +471,23 @@ sub map_history { 
	for my $journey (@journeys) {



		my @route = map { $_->[0] } @{ $journey->{route} };



		my $from_index = first_index { $_ eq $journey->{from_name} } @route;

		my $to_index   = first_index { $_ eq $journey->{to_name} } @route;



		if ( $from_index == -1 ) {

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

			$from_index

			  = first_index { ( $rename->{$_} // $_ ) eq $journey->{from_name} }

			@route;

		}

		if ( $to_index == -1 ) {

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

			$to_index

			  = first_index { ( $rename->{$_} // $_ ) eq $journey->{to_name} }

			@route;

		}



		if (   $from_index == -1

			or $to_index == -1 )

		{