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

show train route on map

parent d8d8d53e

lib/DBInfoscreen.pm

+2 −0
Original line number Diff line number Diff line
@@ -281,6 +281,8 @@ sub startup { 


	$r->get('/_wr/:train/:departure')->to('wagenreihung#wagenreihung');



	$r->get('/map/:tripid/:lineno')->to('map#route');



	$self->defaults( layout => 'app' );

	$self->sessions->default_expiration( 3600 * 24 * 28 );

lib/DBInfoscreen/Controller/Map.pm

0 → 100644
+93 −0
Original line number Diff line number Diff line 
package DBInfoscreen::Controller::Map;

use Mojo::Base 'Mojolicious::Controller';

use Mojo::JSON qw(decode_json);



my $dbf_version = qx{git describe --dirty} || 'experimental';



chomp $dbf_version;



sub get_hafas_polyline {

	my ( $ua, $cache, $trip_id, $line ) = @_;



	$ua->request_timeout(2);

	#say "https://2.db.transport.rest/trips/${trip_id}?lineName=${line}&polyline=true";

	my $res

	  = $ua->get(

"https://2.db.transport.rest/trips/${trip_id}?lineName=${line}&polyline=true"

		  => { 'User-Agent' => "dbf.finalrewind.org/${dbf_version}" } )->result;

	if ( $res->is_error ) {

		return;

	}



	my $json = decode_json( $res->body );

	my @coordinate_list;



	for my $feature ( @{ $json->{polyline}{features} } ) {

		if ( exists $feature->{geometry}{coordinates} ) {

			push( @coordinate_list, $feature->{geometry}{coordinates} );

		}



		#if ($feature->{type} eq 'Feature') {

		#	say "Feature " . $feature->{properties}{name};

		#}

	}



	return {

		name      => $json->{line}{name} // '?',

		polyline  => [@coordinate_list],

		stopovers => $json->{stopovers},

	};

}



sub route {

	my ($self)  = @_;

	my $trip_id = $self->stash('tripid');

	my $line_no = $self->stash('lineno');



	my $pl = get_hafas_polyline( $self->ua, $self->app->cache_iris_main,

		$trip_id, $line_no );

	my @polyline = @{ $pl->{polyline} };

	my @line_pairs;

	my @station_coordinates;



	for my $i ( 1 .. $#polyline ) {

		push(

			@line_pairs,

			[

				[ $polyline[ $i - 1 ][1], $polyline[ $i - 1 ][0] ],

				[ $polyline[$i][1],       $polyline[$i][0] ]

			]

		);

	}



	for my $stop ( @{ $pl->{stopovers} // [] } ) {

		push(

			@station_coordinates,

			[

				[

					$stop->{stop}{location}{latitude},

					$stop->{stop}{location}{longitude}

				],

				$stop->{stop}{name}

			]

		);

	}



	$self->render(

		'route_map',

		title           => $pl->{name},

		hide_opts       => 1,

		with_map        => 1,

		polyline_groups => [

			{

				polylines  => \@line_pairs,

				color      => '#00838f',

				opacity    => 0.6,

				fit_bounds => 1,

			}

		],

		station_coordinates => [@station_coordinates],

	);

}



1;

lib/DBInfoscreen/Controller/Stationboard.pm

+44 −0
Original line number Diff line number Diff line
@@ -117,6 +117,46 @@ sub check_wagonorder_with_wings { 
	return;

}



sub get_hafas_trip_id {

	my ( $ua, $cache, $train ) = @_;



	my $eva    = $train->station_uic;

	my $dep_ts = DateTime->now( time_zone => 'Europe/Berlin' );

	if ( $train->sched_departure ) {

		$dep_ts = $train->sched_departure->epoch;

	}

	elsif ( $train->sched_arrival ) {

		$dep_ts = $train->sched_arrival->epoch;

	}



	$ua->request_timeout(2);

	my $res

	  = $ua->get(

"https://2.db.transport.rest/stations/${eva}/departures?duration=5&when=$dep_ts"

	)->result;

	if ( $res->is_error ) {

		return;

	}



	my $json = decode_json( $res->body );



	#say "looking for " . $train->train_no;

	for my $result ( @{$json} ) {

		my $trip_id = $result->{tripId};

		my $fahrt   = $result->{line}{fahrtNr};

		#say "checking $fahrt";

		if ( $result->{line} and $result->{line}{fahrtNr} == $train->train_no )

		{

			#say "Trip ID is $trip_id";

			return $trip_id;

		}

		else {

			#say "unmatched Trip ID $trip_id";

		}

	}

	return;

}



sub check_wagonorder {

	my ( $ua, $cache, $train_no, $wr_link ) = @_;
@@ -985,6 +1025,10 @@ sub handle_request { 
					)

				];



				$departures[-1]{trip_id}

				  = get_hafas_trip_id( $self->ua, $self->app->cache_iris_main,

					$result );



				if (

					$departures[-1]{wr_link}

					and not check_wagonorder_with_wings(

public/static/leaflet/images/layers-2x.png

0 → 100644
+1.23 KiB
Loading image diff...

public/static/leaflet/images/layers.png

0 → 100644
+696 B
Loading image diff...