Suggest backends based on coverage and latest checkout coordinates (520e6456) · Commits · derf / travelynx

cpanfile

+1 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,7 @@ requires 'Email::Sender::Simple';
		requires 'GIS::Distance';
		requires 'GIS::Distance::Fast';
		requires 'List::UtilsBy';
		requires 'Math::Polygon';
		requires 'MIME::Entity';
		requires 'Mojolicious';
		requires 'Mojolicious::Plugin::Authentication';

lib/Travelynx/Controller/Account.pm

+34 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ package Travelynx::Controller::Account;
		use Mojo::Base 'Mojolicious::Controller';

		use JSON;
		use Math::Polygon;
		use Mojo::Util qw(xml_escape);
		use Text::Markdown;
		use UUID::Tiny qw(:std);
		@@ -1004,6 +1005,7 @@ sub backend_form {
		my $user = $self->current_user;

		my @backends = $self->stations->get_backends;
		my @suggested_backends;

		my %place_map = (
		AT => 'Österreich',
		@@ -1035,6 +1037,10 @@ sub backend_form {
		'US-TX' => 'Texas',
		);

		my ( $user_lat, $user_lon )
		= $self->journeys->get_latest_checkout_latlon( uid => $user->{id} );
		say $user_lat . ' ' . $user_lon;

		for my $backend (@backends) {
		my $type = 'UNKNOWN';
		if ( $backend->{iris} ) {
		@@ -1051,6 +1057,33 @@ sub backend_form {
		$backend->{regions} = [ map { $place_map{$_} // $_ }
		@{ $s->{coverage}{regions} // [] } ];
		$backend->{has_area} = $s->{coverage}{area} ? 1 : 0;

		if ( $s->{coverage}{area}
		and $s->{coverage}{area}{type} eq 'Polygon' )
		{
		# [0] == outer polygon, [1:] == holes within polygon
		my $poly = Math::Polygon->new(
		@{ $s->{coverage}{area}{coordinates}[0] } );
		say $backend->{name} . ' ' . $poly->area;
		if ( $poly->contains( [ $user_lon, $user_lat ] ) ) {
		push( @suggested_backends, $backend );
		}
		}
		elsif ( $s->{coverage}{area}
		and $s->{coverage}{area}{type} eq 'MultiPolygon' )
		{
		for my $s_poly (
		@{ $s->{coverage}{area}{coordinates} // [] } )
		{
		my $poly
		= Math::Polygon->new( @{ $s_poly->[0] // [] } );
		say $backend->{name} . ' ' . $poly->area;
		if ( $poly->contains( [ $user_lon, $user_lat ] ) ) {
		push( @suggested_backends, $backend );
		last;
		}
		}
		}
		}
		else {
		$type = undef;
		@@ -1072,6 +1105,7 @@ sub backend_form {

		$self->render(
		'select_backend',
		suggestions => \@suggested_backends,
		backends => \@backends,
		user => $user,
		redirect_to => $self->req->param('redirect_to') // '/',

lib/Travelynx/Model/Journeys.pm

+26 −0

Original line number	Diff line number	Diff line
		@@ -807,6 +807,32 @@ sub get_oldest_ts {
		return undef;
		}

		sub get_latest_checkout_latlon {
		my ( $self, %opt ) = @_;
		my $uid = $opt{uid};
		my $db = $opt{db} // $self->{pg}->db;

		my $res_h = $db->select(
		'journeys_str',
		[ 'arr_lat', 'arr_lon', ],
		{
		user_id => $uid,
		cancelled => 0
		},
		{
		limit => 1,
		order_by => { -desc => 'journey_id' }
		}
		)->hash;

		if ( not $res_h ) {
		return;
		}

		return $res_h->{arr_lat}, $res_h->{arr_lon};

		}

		sub get_latest_checkout_ids {
		my ( $self, %opt ) = @_;
		my $uid = $opt{uid};

templates/select_backend.html.ep

+39 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,45 @@
		% if (stash('redirect_to')) {
		%= hidden_field 'redirect_to' => stash('redirect_to')
		% }
		% if (@{stash('suggestions') // []}) {
		<div class="row">
		<div class="col s12">
		<h3>Vorschläge</h3>
		</div>
		</div>
		% for my $backend (@{ stash('suggestions') // [] }) {
		<div class="row">
		<div class="col s8 m6 l6 right-align">
		%= $backend->{longname}
		% if ($backend->{id} == $user->{backend_id}) {
		(aktuell ausgewählt)
		% }
		% if ($backend->{has_area}) {
		<br/>
		<a href="https://dbf.finalrewind.org/coverage/HAFAS/<%= $backend->{name} %>"><%= join(q{, }, @{$backend->{regions} // []}) \|\| '[Karte]' %></a>
		% }
		% elsif ($backend->{regions}) {
		<br/>
		%= join(q{, }, @{$backend->{regions} // []})
		% }
		% if ($backend->{homepage}) {
		<br/>
		<a href="<%= $backend->{homepage} %>"><%= $backend->{homepage} =~ s{ ^ http s? :// (?: www[.] )? (.*?) (?: / )? $ }{$1}xr %></a>
		% }
		</div>
		<div class="col s4 m6 l6 left-align">
		<button class="btn waves-effect waves-light <%= $backend->{id} == $user->{backend_id} ? 'disabled' : q{} %>" style="min-width: 6em;" type="submit" name="backend" value="<%= $backend->{id} %>">
		<%= $backend->{name} %>
		</button>
		</div>
		</div>
		% }
		% }
		<div class="row">
		<div class="col s12">
		<h3>Alle Backends</h3>
		</div>
		</div>
		% for my $backend (@{ stash('backends') // [] }) {
		<div class="row">
		<div class="col s8 m6 l6 right-align">

Admin message