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

move station -> location map to generic helper

Browse source
This commit is contained in:
Daniel Friesel 2019-11-16 15:24:16 +01:00
parent 45f747961e
commit 77e4998708
2 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/Travelynx.pm
View file

@ -168,6 +168,21 @@ sub startup {
} }
); );
$self->attr(
coordinates_by_station => sub {
my %location;
for
my $station ( Travel::Status::DE::IRIS::Stations::get_stations() )
{
if ( $station->[3] ) {
$location{ $station->[1] }
= [ $station->[4], $station->[3] ];
}
}
return \%location;
}
);
$self->helper( $self->helper(
sendmail => sub { sendmail => sub {
state $sendmail = Travelynx::Helper::Sendmail->new( state $sendmail = Travelynx::Helper::Sendmail->new(

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

@ -416,13 +416,7 @@ sub history {
sub map_history { sub map_history {
my ($self) = @_; my ($self) = @_;
my %location; my $location = $self->app->coordinates_by_station;
for my $station ( Travel::Status::DE::IRIS::Stations::get_stations() ) {
if ( $station->[3] ) {
$location{ $station->[1] } = [ $station->[4], $station->[3] ];
}
}
# TODO create map-specific get_user_travels function returning EVA/DS100 station codes? # TODO create map-specific get_user_travels function returning EVA/DS100 station codes?
my @journeys = $self->get_user_travels; my @journeys = $self->get_user_travels;
@ -430,8 +424,8 @@ sub map_history {
my @stations = uniq map { $_->{to_name} } @journeys; my @stations = uniq map { $_->{to_name} } @journeys;
push( @stations, uniq map { $_->{from_name} } @journeys ); push( @stations, uniq map { $_->{from_name} } @journeys );
@stations = uniq @stations; @stations = uniq @stations;
my @station_coordinates my @station_coordinates = map { [ $location->{$_}, $_ ] }
= map { [ $location{$_}, $_ ] } grep { exists $location{$_} } @stations; grep { exists $location->{$_} } @stations;
my @uniq_by_route = uniq_by { my @uniq_by_route = uniq_by {
join( '|', map { $_->[0] } @{ $_->{route} } ) join( '|', map { $_->[0] } @{ $_->{route} } )
@ -459,10 +453,11 @@ sub map_history {
@station_pairs = uniq_by { $_->[0] . '|' . $_->[1] } @station_pairs; @station_pairs = uniq_by { $_->[0] . '|' . $_->[1] } @station_pairs;
@station_pairs @station_pairs
= grep { exists $location{ $_->[0] } and exists $location{ $_->[1] } } = grep { exists $location->{ $_->[0] } and exists $location->{ $_->[1] } }
@station_pairs; @station_pairs;
@station_pairs @station_pairs
= map { [ $location{ $_->[0] }, $location{ $_->[1] } ] } @station_pairs; = map { [ $location->{ $_->[0] }, $location->{ $_->[1] } ] }
@station_pairs;
my @routes; my @routes;