From b0ca8bbeed169df5643d0cb303e71779deadae73 Mon Sep 17 00:00:00 2001 From: Rich Birch Date: Tue, 10 Dec 2024 13:36:25 +0000 Subject: [PATCH 1/3] DRTII-1700 Update drt-lib to cope with ACL SEN terminal --- project/Settings.scala | 2 +- .../src/main/scala/drt/server/feeds/acl/AclFeed.scala | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/project/Settings.scala b/project/Settings.scala index bc89280cdb..b2f7670652 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -25,7 +25,7 @@ object Settings { /** Declare global dependency versions here to avoid mismatches in multi part dependencies */ //noinspection ScalaStyle object versions { - val drtLib = "v981" + val drtLib = "v991" val scala = "2.13.12" val scalaDom = "2.8.0" diff --git a/server/src/main/scala/drt/server/feeds/acl/AclFeed.scala b/server/src/main/scala/drt/server/feeds/acl/AclFeed.scala index abccf3071f..e0e03a5695 100644 --- a/server/src/main/scala/drt/server/feeds/acl/AclFeed.scala +++ b/server/src/main/scala/drt/server/feeds/acl/AclFeed.scala @@ -248,20 +248,20 @@ object AclFeed { val ArrDep: Int = allFields("ArrDep") } - def aclToPortMapping(portCode: PortCode): Terminal => Terminal = portCode match { - case PortCode("LGW") => (tIn: Terminal) => + def aclToPortMapping(portCode: PortCode): Terminal => Terminal = portCode.iata match { + case "LGW" => (tIn: Terminal) => Map[Terminal, Terminal]( T1 -> S, T2 -> N, ).getOrElse(tIn, tIn) - case PortCode("EDI") => (tIn: Terminal) => + case "EDI" => (tIn: Terminal) => Map[Terminal, Terminal](T1 -> A2).getOrElse(tIn, tIn) - case PortCode("LCY") => (tIn: Terminal) => + case "LCY" => (tIn: Terminal) => Map[Terminal, Terminal]( ACLTER -> T1, MainApron -> T1, ).getOrElse(tIn, tIn) - case PortCode("STN") => + case "STN" => (tIn: Terminal) => Map[Terminal, Terminal](CTA -> T1).getOrElse(tIn, tIn) case _ => (tIn: Terminal) => tIn } From d304be551d012bfa3d8ea25c67d2176b5313a137 Mon Sep 17 00:00:00 2001 From: Rich Birch Date: Tue, 10 Dec 2024 14:49:06 +0000 Subject: [PATCH 2/3] DRTII-1700 Update drt-lib to add ACL to feed sources --- project/Settings.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Settings.scala b/project/Settings.scala index b2f7670652..37ad22307b 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -25,7 +25,7 @@ object Settings { /** Declare global dependency versions here to avoid mismatches in multi part dependencies */ //noinspection ScalaStyle object versions { - val drtLib = "v991" + val drtLib = "v992" val scala = "2.13.12" val scalaDom = "2.8.0" From ab8de2e4df6b42b5d046512f2bb207a0c9cd2d92 Mon Sep 17 00:00:00 2001 From: Rich Birch Date: Wed, 11 Dec 2024 08:21:49 +0000 Subject: [PATCH 3/3] DRTII-1700 Update drt-lib to master build --- project/Settings.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Settings.scala b/project/Settings.scala index 37ad22307b..27dda2c332 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -25,7 +25,7 @@ object Settings { /** Declare global dependency versions here to avoid mismatches in multi part dependencies */ //noinspection ScalaStyle object versions { - val drtLib = "v992" + val drtLib = "v993" val scala = "2.13.12" val scalaDom = "2.8.0"