Use train_no / line_no accessors provided by DBRIS 0.10

3 files changed, 7 insertions, 7 deletions

diff --git a/cpanfile b/cpanfile
index ccf9451..85ef852 100644
--- a/cpanfile
+++ b/cpanfile
@@ -17,7 +17,7 @@ requires 'Mojolicious::Plugin::OAuth2';
 requires 'Mojo::Pg';
 requires 'Text::CSV';
 requires 'Text::Markdown';
-requires 'Travel::Status::DE::DBRIS', '>= 0.08';
+requires 'Travel::Status::DE::DBRIS', '>= 0.10';
 requires 'Travel::Status::DE::HAFAS', '>= 6.20';
 requires 'Travel::Status::DE::IRIS';
 requires 'UUID::Tiny';
diff --git a/lib/Travelynx.pm b/lib/Travelynx.pm
index c1992b6..0eee5dc 100755
--- a/lib/Travelynx.pm
+++ b/lib/Travelynx.pm
@@ -678,7 +678,7 @@ sub startup {
 							eva          => $found->eva,
 							datetime     => $found->sched_dep,
 							train_type   => $journey->type,
-							train_no     => $journey->number
+							train_no     => $journey->train_no,
 						);
 						$self->add_stationinfo( $uid, 1, $train_id,
 							$found->eva );
diff --git a/lib/Travelynx/Model/InTransit.pm b/lib/Travelynx/Model/InTransit.pm
index 0215cb8..9f9dd9b 100644
--- a/lib/Travelynx/Model/InTransit.pm
+++ b/lib/Travelynx/Model/InTransit.pm
@@ -197,10 +197,10 @@ sub add {
 
 		# DBRIS
 		my $line;
-		if (    $train_suffix
-			and $journey->number
-			and $train_suffix ne $journey->number )
-		{
+		if ( $journey->line_no ne $journey->train_no ) {
+			$line = $journey->line_no;
+		}
+		elsif ( $train_suffix ne $journey->train_no ) {
 			$line = $train_suffix;
 		}
 
@@ -254,7 +254,7 @@ sub add {
 				dep_platform => $stop->platform,
 				train_type   => $journey->type // q{},
 				train_line   => $line,
-				train_no     => $journey->number,
+				train_no     => $journey->train_no,
 				train_id     => $data->{trip_id},
 				sched_departure => $stop->sched_dep,
 				real_departure  => $stop->rt_dep // $stop->sched_dep,