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

IRIS: Fix sorting of cancelled arrival-only/departure-only entries

parent d31499c2

lib/DBInfoscreen/Controller/Stationboard.pm

+8 −4
Original line number Original line Diff line number Diff line
@@ -2284,8 +2284,10 @@ sub render_board_hafas { 
			  sort { $a->[0] <=> $b->[0] }

			  sort { $a->[0] <=> $b->[0] }

			  map {

			  map {

				[

				[

					$_->arrival_is_cancelled

					(

					? ( $_->sched_arrival // $_->sched_departure )

						  $_->sched_arrival ? $_->arrival_is_cancelled

						: $_->is_cancelled

					) ? ( $_->sched_arrival // $_->sched_departure )

					: ( $_->arrival // $_->departure ),

					: ( $_->arrival // $_->departure ),

					$_

					$_

				]

				]
@@ -2296,8 +2298,10 @@ sub render_board_hafas { 
			  sort { $a->[0] <=> $b->[0] }

			  sort { $a->[0] <=> $b->[0] }

			  map {

			  map {

				[

				[

					$_->departure_is_cancelled

					(

					? ( $_->sched_departure // $_->sched_arrival )

						  $_->sched_departure ? $_->departure_is_cancelled

						: $_->is_cancelled

					) ? ( $_->sched_departure // $_->sched_arrival )

					: ( $_->departure // $_->arrival ),

					: ( $_->departure // $_->arrival ),

					$_

					$_

				]

				]