Do not store train colours in database. They're only supported by MOTIS.

4 files changed, 5 insertions, 12 deletions

diff --git a/lib/Travelynx.pm b/lib/Travelynx.pm
index 2f8e981..0f7a573 100755
--- a/lib/Travelynx.pm
+++ b/lib/Travelynx.pm
@@ -2192,7 +2192,6 @@ sub startup {
 					train_line      => $latest->{train_line},
 					train_no        => $latest->{train_no},
 					train_id        => $latest->{train_id},
-					train_color     => $latest->{train_color},
 					sched_departure => epoch_to_dt( $latest->{sched_dep_ts} ),
 					real_departure  => epoch_to_dt( $latest->{real_dep_ts} ),
 					dep_ds100       => $latest->{dep_ds100},
@@ -2287,7 +2286,6 @@ sub startup {
 					line    => $status->{train_line},
 					no      => $status->{train_no},
 					id      => $status->{train_id},
-					color   => $status->{train_color},
 					hafasId => $status->{extra_data}{trip_id},
 				},
 				intermediateStops => [],
diff --git a/lib/Travelynx/Command/database.pm b/lib/Travelynx/Command/database.pm
index 4908480..1537684 100644
--- a/lib/Travelynx/Command/database.pm
+++ b/lib/Travelynx/Command/database.pm
@@ -2894,9 +2894,6 @@ qq{select distinct checkout_station_id from in_transit where backend_id = 0;}
 						stations.source = stations_external_ids.backend_id
 					;
 
-				alter table in_transit add column train_color varchar(6);
-				alter table journeys add column train_color varchar(6);
-
 				drop view in_transit_str;
 				drop view journeys_str;
 				drop view users_with_backend;
@@ -2908,7 +2905,7 @@ qq{select distinct checkout_station_id from in_transit where backend_id = 0;}
 					backend.efa as is_efa, backend.dbris as is_dbris,
 					backend.motis as is_motis,
 					backend.name as backend_name, in_transit.backend_id as backend_id,
-					train_type, train_line, train_no, train_id, train_color,
+					train_type, train_line, train_no, train_id,
 					extract(epoch from checkin_time) as checkin_ts,
 					extract(epoch from sched_departure) as sched_dep_ts,
 					extract(epoch from real_departure) as real_dep_ts,
@@ -2948,7 +2945,7 @@ qq{select distinct checkout_station_id from in_transit where backend_id = 0;}
 					backend.efa as is_efa, backend.dbris as is_dbris,
 					backend.motis as is_motis,
 					backend.name as backend_name, journeys.backend_id as backend_id,
-					train_type, train_line, train_no, train_id, train_color,
+					train_type, train_line, train_no, train_id,
 					extract(epoch from checkin_time) as checkin_ts,
 					extract(epoch from sched_departure) as sched_dep_ts,
 					extract(epoch from real_departure) as real_dep_ts,
@@ -2993,7 +2990,7 @@ qq{select distinct checkout_station_id from in_transit where backend_id = 0;}
 				create view follows_in_transit as select
 					r1.subject_id as follower_id, user_id as followee_id,
 					users.name as followee_name,
-					train_type, train_line, train_no, train_id, train_color,
+					train_type, train_line, train_no, train_id,
 					backend.iris as is_iris, backend.hafas as is_hafas,
 					backend.efa as is_efa, backend.dbris as is_dbris,
 					backend.motis as is_motis,
diff --git a/lib/Travelynx/Model/InTransit.pm b/lib/Travelynx/Model/InTransit.pm
index 8af00d6..19ae52c 100644
--- a/lib/Travelynx/Model/InTransit.pm
+++ b/lib/Travelynx/Model/InTransit.pm
@@ -309,7 +309,6 @@ sub add {
 				train_no     => q{},
 				train_id     => $journey->id,
 				train_line   => $journey->route_name,
-				train_color  => $journey->route_color,
 				sched_departure => $stopover->scheduled_departure,
 				real_departure  => $stopover->departure,
 				route           => $json->encode( \@route ),
@@ -547,7 +546,7 @@ sub get_timeline {
 		return $db->select(
 			'follows_in_transit',
 			[
-				qw(followee_name train_type train_line train_no train_id train_color dep_eva dep_name arr_eva arr_name)
+				qw(followee_name train_type train_line train_no train_id dep_eva dep_name arr_eva arr_name)
 			],
 			$where
 		)->hashes->each;
diff --git a/lib/Travelynx/Model/Journeys.pm b/lib/Travelynx/Model/Journeys.pm
index c61ac36..fff59f9 100755
--- a/lib/Travelynx/Model/Journeys.pm
+++ b/lib/Travelynx/Model/Journeys.pm
@@ -549,7 +549,7 @@ sub get {
 
 	my @select
 	  = (
-		qw(journey_id is_dbris is_iris is_hafas is_motis backend_name backend_id train_type train_line train_no train_color checkin_ts sched_dep_ts real_dep_ts dep_eva dep_ds100 dep_name dep_lat dep_lon checkout_ts sched_arr_ts real_arr_ts arr_eva arr_ds100 arr_name arr_lat arr_lon cancelled edited route messages user_data visibility effective_visibility)
+		qw(journey_id is_dbris is_iris is_hafas is_motis backend_name backend_id train_type train_line train_no checkin_ts sched_dep_ts real_dep_ts dep_eva dep_ds100 dep_name dep_lat dep_lon checkout_ts sched_arr_ts real_arr_ts arr_eva arr_ds100 arr_name arr_lat arr_lon cancelled edited route messages user_data visibility effective_visibility)
 	  );
 	my %where = (
 		user_id   => $uid,
@@ -616,7 +616,6 @@ sub get {
 			type                 => $entry->{train_type},
 			line                 => $entry->{train_line},
 			no                   => $entry->{train_no},
-			color                => $entry->{train_color},
 			from_eva             => $entry->{dep_eva},
 			from_ds100           => $entry->{dep_ds100},
 			from_name            => $entry->{dep_name},