DRTII-1247 Updated tnx times as per latest from Lucy

shared/src/main/scala/uk/gov/homeoffice/drt/ports/PaxTypeAndQueue.scala

@@ -17,7 +17,9 @@ object PaxTypesAndQueues {
  val b5jsskChildToDesk: PaxTypeAndQueue = PaxTypeAndQueue(PaxTypes.B5JPlusNationalBelowEGateAge, Queues.EeaDesk)
  val b5jsskToEGate: PaxTypeAndQueue = PaxTypeAndQueue(PaxTypes.B5JPlusNational, Queues.EGate)
  val visaNationalToDesk: PaxTypeAndQueue = PaxTypeAndQueue(PaxTypes.VisaNational, Queues.NonEeaDesk)
+ val visaNationalToEGate: PaxTypeAndQueue = PaxTypeAndQueue(PaxTypes.VisaNational, Queues.EGate)
  val nonVisaNationalToDesk: PaxTypeAndQueue = PaxTypeAndQueue(PaxTypes.NonVisaNational, Queues.NonEeaDesk)
+ val nonVisaNationalToEGate: PaxTypeAndQueue = PaxTypeAndQueue(PaxTypes.NonVisaNational, Queues.EGate)
  val visaNationalToFastTrack: PaxTypeAndQueue = PaxTypeAndQueue(PaxTypes.VisaNational, Queues.FastTrack)
  val nonVisaNationalToFastTrack: PaxTypeAndQueue = PaxTypeAndQueue(PaxTypes.NonVisaNational, Queues.FastTrack)
  val transitToTransfer: PaxTypeAndQueue = PaxTypeAndQueue(PaxTypes.Transit, Queues.Transfer)

shared/src/main/scala/uk/gov/homeoffice/drt/ports/config/AirportConfigDefaults.scala

@@ -32,36 +32,44 @@ object AirportConfigDefaults {
 
  val defaultQueueRatios: Map[PaxType, Seq[(Queue, Double)]] = Map(
  GBRNational -> List(Queues.EGate -> 0.8, Queues.EeaDesk -> 0.2),
- GBRNationalBelowEgateAge -> List(Queues.EeaDesk -> 1.0),
  EeaMachineReadable -> List(Queues.EGate -> 0.8, Queues.EeaDesk -> 0.2),
+ B5JPlusNational -> List(Queues.EGate -> 0.7, Queues.EeaDesk -> 0.3),
+ NonVisaNational -> List(Queues.NonEeaDesk -> 0.98, Queues.EGate -> 0.02),
+ VisaNational -> List(Queues.NonEeaDesk -> 0.98, Queues.EGate -> 0.02),
+ GBRNationalBelowEgateAge -> List(Queues.EeaDesk -> 1.0),
  EeaBelowEGateAge -> List(Queues.EeaDesk -> 1.0),
  EeaNonMachineReadable -> List(Queues.EeaDesk -> 1.0),
- NonVisaNational -> List(Queues.NonEeaDesk -> 1.0),
- VisaNational -> List(Queues.NonEeaDesk -> 1.0),
- B5JPlusNational -> List(Queues.EGate -> 0.7, Queues.EeaDesk -> 0.3),
- B5JPlusNationalBelowEGateAge -> List(Queues.EeaDesk -> 1),
+ B5JPlusNationalBelowEGateAge -> List(Queues.EeaDesk -> 1.0),
  PaxTypes.Transit -> List(),
  )
 
  val defaultQueueRatiosWithoutEgates: Map[PaxType, Seq[(Queue, Double)]] = defaultQueueRatios ++ Map(
  GBRNational -> List(EeaDesk -> 1.0),
  EeaMachineReadable -> List(EeaDesk -> 1.0),
  B5JPlusNational -> List(EeaDesk -> 1.0),
+ NonVisaNational -> List(Queues.NonEeaDesk -> 1.0),
+ VisaNational -> List(Queues.NonEeaDesk -> 1.0),
+ GBRNationalBelowEgateAge -> List(Queues.EeaDesk -> 1.0),
+ EeaBelowEGateAge -> List(Queues.EeaDesk -> 1.0),
+ EeaNonMachineReadable -> List(Queues.EeaDesk -> 1.0),
+ B5JPlusNationalBelowEGateAge -> List(Queues.EeaDesk -> 1.0),
  )
 
  val defaultProcessingTimes: Map[PaxTypeAndQueue, Double] = Map(
- b5jsskToDesk -> (54d / 60),
- b5jsskChildToDesk -> (54d / 60),
- eeaChildToDesk -> 31d / 60,
- eeaMachineReadableToDesk -> 31d / 60,
- eeaNonMachineReadableToDesk -> 31d / 60,
- gbrNationalToDesk -> 24d / 60,
- gbrNationalChildToDesk -> 24d / 60,
- b5jsskToEGate -> (46d / 60),
- eeaMachineReadableToEGate -> 46d / 60,
+ b5jsskToDesk -> (62d / 60),
+ b5jsskChildToDesk -> (62d / 60),
+ eeaChildToDesk -> 35d / 60,
+ eeaMachineReadableToDesk -> 35d / 60,
+ eeaNonMachineReadableToDesk -> 35d / 60,
+ gbrNationalToDesk -> 25d / 60,
+ gbrNationalChildToDesk -> 25d / 60,
+ visaNationalToDesk -> 122d / 60,
+ nonVisaNationalToDesk -> 109d / 60,
  gbrNationalToEgate -> 46d / 60,
- visaNationalToDesk -> 119d / 60,
- nonVisaNationalToDesk -> 101d / 60
+ eeaMachineReadableToEGate -> 46d / 60,
+ b5jsskToEGate -> (46d / 60),
+ nonVisaNationalToEGate -> (44d / 60),
+ visaNationalToEGate -> (43d / 60),
  )
 
  val fallbackProcessingTime: Double = defaultProcessingTimes.values.sum / defaultProcessingTimes.size

shared/src/main/scala/uk/gov/homeoffice/drt/ports/config/Bhx.scala

@@ -38,33 +38,35 @@ object Bhx extends AirportConfigLike {
  SplitRatio(visaNationalToDesk, 0.04),
  SplitRatio(nonVisaNationalToDesk, 0.04)
  )),
- terminalProcessingTimes = Map(T1 -> Map(
- b5jsskToDesk -> 62d / 60,
- b5jsskChildToDesk -> 62d / 60,
- eeaMachineReadableToDesk -> 41d / 60,
- eeaNonMachineReadableToDesk -> 41d / 60,
- eeaChildToDesk -> 41d / 60,
- gbrNationalToDesk -> 29d / 60,
- gbrNationalChildToDesk -> 29d / 60,
- b5jsskToEGate -> 48d / 60,
- eeaMachineReadableToEGate -> 48d / 60,
- gbrNationalToEgate -> 48d / 60,
- visaNationalToDesk -> 100d / 60,
- nonVisaNationalToDesk -> 98d / 60
- ), T2 -> Map(
- b5jsskToDesk -> 62d / 60,
- b5jsskChildToDesk -> 62d / 60,
- eeaMachineReadableToDesk -> 41d / 60,
- eeaNonMachineReadableToDesk -> 41d / 60,
- eeaChildToDesk -> 41d / 60,
- gbrNationalToDesk -> 29d / 60,
- gbrNationalChildToDesk -> 29d / 60,
- b5jsskToEGate -> 48d / 60,
- eeaMachineReadableToEGate -> 48d / 60,
- gbrNationalToEgate -> 48d / 60,
- visaNationalToDesk -> 100d / 60,
- nonVisaNationalToDesk -> 98d / 60
- )),
+ terminalProcessingTimes = Map(
+ T1 -> Map(
+ b5jsskToDesk -> 70d / 60,
+ b5jsskChildToDesk -> 70d / 60,
+ eeaMachineReadableToDesk -> 44d / 60,
+ eeaNonMachineReadableToDesk -> 44d / 60,
+ eeaChildToDesk -> 44d / 60,
+ gbrNationalToDesk -> 31d / 60,
+ gbrNationalChildToDesk -> 31d / 60,
+ b5jsskToEGate -> 48d / 60,
+ eeaMachineReadableToEGate -> 48d / 60,
+ gbrNationalToEgate -> 48d / 60,
+ visaNationalToDesk -> 104d / 60,
+ nonVisaNationalToDesk -> 108d / 60
+ ),
+ T2 -> Map(
+ b5jsskToDesk -> 70d / 60,
+ b5jsskChildToDesk -> 70d / 60,
+ eeaMachineReadableToDesk -> 44d / 60,
+ eeaNonMachineReadableToDesk -> 44d / 60,
+ eeaChildToDesk -> 44d / 60,
+ gbrNationalToDesk -> 31d / 60,
+ gbrNationalChildToDesk -> 31d / 60,
+ b5jsskToEGate -> 48d / 60,
+ eeaMachineReadableToEGate -> 48d / 60,
+ gbrNationalToEgate -> 48d / 60,
+ visaNationalToDesk -> 104d / 60,
+ nonVisaNationalToDesk -> 108d / 60
+ )),
  minMaxDesksByTerminalQueue24Hrs = Map(
  T1 -> Map(
  Queues.EGate -> (List(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1),
@@ -86,9 +88,12 @@ object Bhx extends AirportConfigLike {
  role = BHX,
  terminalPaxTypeQueueAllocation = Map(
  T1 -> (
- defaultQueueRatios +
- (EeaMachineReadable -> List(EGate -> 0.7968, EeaDesk -> (1.0 - 0.7968))),
- ),
+ GBRNational -> List(Queues.EGate -> 0.65, Queues.EeaDesk -> 0.35),
+ EeaMachineReadable -> List(Queues.EGate -> 0.72, Queues.EeaDesk -> 0.28),
+ B5JPlusNational -> List(Queues.EGate -> 0.69, Queues.EeaDesk -> 0.31),
+ NonVisaNational -> List(Queues.EGate -> 0.02, Queues.NonEeaDesk -> 0.98),
+ VisaNational -> List(Queues.EGate -> 0.02, Queues.NonEeaDesk -> 0.98),
+ ),
  T2 -> defaultQueueRatiosWithoutEgates
  ),
  feedSources = Seq(ApiFeedSource, LiveBaseFeedSource, LiveFeedSource, ForecastFeedSource, AclFeedSource),

shared/src/main/scala/uk/gov/homeoffice/drt/ports/config/Edi.scala

@@ -31,11 +31,13 @@ object Edi extends AirportConfigLike {
  eeaChildToDesk -> 32d / 60,
  gbrNationalToDesk -> 25d / 60,
  gbrNationalChildToDesk -> 25d / 60,
- b5jsskToEGate -> 47d / 60,
- eeaMachineReadableToEGate -> 47d / 60,
- gbrNationalToEgate -> 47d / 60,
+ b5jsskToEGate -> 41d / 60,
+ eeaMachineReadableToEGate -> 41d / 60,
+ gbrNationalToEgate -> 40d / 60,
  visaNationalToDesk -> 101d / 60,
- nonVisaNationalToDesk -> 70d / 60
+ nonVisaNationalToDesk -> 70d / 60,
+ visaNationalToEGate -> 48d / 60,
+ nonVisaNationalToEGate -> 49d / 60,
  ),
  A2 -> Map(
  b5jsskToDesk -> 51d / 60,
@@ -45,11 +47,13 @@ object Edi extends AirportConfigLike {
  eeaChildToDesk -> 38d / 60,
  gbrNationalToDesk -> 31d / 60,
  gbrNationalChildToDesk -> 31d / 60,
- b5jsskToEGate -> 47d / 60,
- eeaMachineReadableToEGate -> 47d / 60,
- gbrNationalToEgate -> 47d / 60,
+ b5jsskToEGate -> 41d / 60,
+ eeaMachineReadableToEGate -> 41d / 60,
+ gbrNationalToEgate -> 40d / 60,
  visaNationalToDesk -> 115d / 60,
  nonVisaNationalToDesk -> 88d / 60,
+ visaNationalToEGate -> 48d / 60,
+ nonVisaNationalToEGate -> 49d / 60,
  )),
  minMaxDesksByTerminalQueue24Hrs = Map(
  A1 -> Map(
@@ -66,14 +70,20 @@ object Edi extends AirportConfigLike {
  eGateBankSizes = Map(A1 -> Iterable(5), A2 -> Iterable(10)),
  role = EDI,
  terminalPaxTypeQueueAllocation = Map(
- A1 -> (defaultQueueRatios + (EeaMachineReadable -> List(
- EGate -> 0.8140,
- EeaDesk -> (1.0 - 0.8140)
- ))),
- A2 -> (defaultQueueRatios + (EeaMachineReadable -> List(
- EGate -> 0.7894,
- EeaDesk -> (1.0 - 0.7894)
- )))
+ A1 -> (defaultQueueRatios + (
+ GBRNational -> List(Queues.EGate -> 0.58, Queues.EeaDesk -> 0.42),
+ EeaMachineReadable -> List(Queues.EGate -> 0.64, Queues.EeaDesk -> 0.36),
+ B5JPlusNational -> List(Queues.EGate -> 0.62, Queues.EeaDesk -> 0.38),
+ NonVisaNational -> List(Queues.EGate -> 0.04, Queues.NonEeaDesk -> 0.96),
+ VisaNational -> List(Queues.EGate -> 0.04, Queues.NonEeaDesk -> 0.96),
+ )),
+ A2 -> (defaultQueueRatios + (
+ GBRNational -> List(Queues.EGate -> 0.58, Queues.EeaDesk -> 0.42),
+ EeaMachineReadable -> List(Queues.EGate -> 0.64, Queues.EeaDesk -> 0.36),
+ B5JPlusNational -> List(Queues.EGate -> 0.62, Queues.EeaDesk -> 0.38),
+ NonVisaNational -> List(Queues.EGate -> 0.04, Queues.NonEeaDesk -> 0.96),
+ VisaNational -> List(Queues.EGate -> 0.04, Queues.NonEeaDesk -> 0.96),
+ ))
  ),
  flexedQueues = Set(EeaDesk, NonEeaDesk),
  desksByTerminal = Map[Terminal, Int](A1 -> 11, A2 -> 9),

shared/src/main/scala/uk/gov/homeoffice/drt/ports/config/Lgw.scala

@@ -36,32 +36,36 @@ object Lgw extends AirportConfigLike {
  ))).toMap,
  terminalProcessingTimes = Map(
  N -> Map(
- b5jsskToDesk -> 61d / 60,
- b5jsskChildToDesk -> 61d / 60,
+ b5jsskToDesk -> 68d / 60,
+ b5jsskChildToDesk -> 68d / 60,
  eeaMachineReadableToDesk -> 45d / 60,
  eeaNonMachineReadableToDesk -> 45d / 60,
  eeaChildToDesk -> 45d / 60,
- gbrNationalToDesk -> 34d / 60,
- gbrNationalChildToDesk -> 34d / 60,
- b5jsskToEGate -> 47d / 60,
- eeaMachineReadableToEGate -> 47d / 60,
- gbrNationalToEgate -> 47d / 60,
- visaNationalToDesk -> 127d / 60,
- nonVisaNationalToDesk -> 110d / 60
+ gbrNationalToDesk -> 35d / 60,
+ gbrNationalChildToDesk -> 35d / 60,
+ b5jsskToEGate -> 42d / 60,
+ eeaMachineReadableToEGate -> 41d / 60,
+ gbrNationalToEgate -> 40d / 60,
+ visaNationalToDesk -> 126d / 60,
+ nonVisaNationalToDesk -> 115d / 60,
+ visaNationalToEGate -> 50d / 60,
+ nonVisaNationalToEGate -> 49d / 60,
  ),
  S -> Map(
- b5jsskToDesk -> 56d / 60,
- b5jsskChildToDesk -> 56d / 60,
- eeaMachineReadableToDesk -> 41d / 60,
- eeaNonMachineReadableToDesk -> 41d / 60,
- eeaChildToDesk -> 41d / 60,
- gbrNationalToDesk -> 32d / 60,
- gbrNationalChildToDesk -> 32d / 60,
- b5jsskToEGate -> 47d / 60,
- eeaMachineReadableToEGate -> 47d / 60,
- gbrNationalToEgate -> 47d / 60,
- visaNationalToDesk -> 120d / 60,
- nonVisaNationalToDesk -> 88d / 60,
+ b5jsskToDesk -> 70d / 60,
+ b5jsskChildToDesk -> 70d / 60,
+ eeaMachineReadableToDesk -> 45d / 60,
+ eeaNonMachineReadableToDesk -> 45d / 60,
+ eeaChildToDesk -> 45d / 60,
+ gbrNationalToDesk -> 35d / 60,
+ gbrNationalChildToDesk -> 35d / 60,
+ b5jsskToEGate -> 40d / 60,
+ eeaMachineReadableToEGate -> 41d / 60,
+ gbrNationalToEgate -> 40d / 60,
+ visaNationalToDesk -> 128d / 60,
+ nonVisaNationalToDesk -> 112d / 60,
+ visaNationalToEGate -> 50d / 60,
+ nonVisaNationalToEGate -> 50d / 60,
  )),
  minMaxDesksByTerminalQueue24Hrs = Map(
  N -> Map(
@@ -81,14 +85,20 @@ object Lgw extends AirportConfigLike {
  ),
  role = LGW,
  terminalPaxTypeQueueAllocation = Map(
- N -> (defaultQueueRatios + (EeaMachineReadable -> List(
- EGate -> 0.8244,
- EeaDesk -> (1.0 - 0.8244)
+ N -> (defaultQueueRatios + (
+ GBRNational -> List(Queues.EGate -> 0.71, Queues.EeaDesk -> 0.29),
+ EeaMachineReadable -> List(Queues.EGate -> 0.75, Queues.EeaDesk -> 0.25),
+ B5JPlusNational -> List(Queues.EGate -> 0.78, Queues.EeaDesk -> 0.22),
+ NonVisaNational -> List(Queues.EGate -> 0.02, Queues.NonEeaDesk -> 0.98),
+ VisaNational -> List(Queues.EGate -> 0.02, Queues.NonEeaDesk -> 0.98),
+ )),
+ S -> (defaultQueueRatios + (
+ GBRNational -> List(Queues.EGate -> 0.69, Queues.EeaDesk -> 0.31),
+ EeaMachineReadable -> List(Queues.EGate -> 0.78, Queues.EeaDesk -> 0.22),
+ B5JPlusNational -> List(Queues.EGate -> 0.79, Queues.EeaDesk -> 0.21),
+ NonVisaNational -> List(Queues.EGate -> 0.02, Queues.NonEeaDesk -> 0.98),
+ VisaNational -> List(Queues.EGate -> 0.02, Queues.NonEeaDesk -> 0.98),
  ))),
- S -> (defaultQueueRatios + (EeaMachineReadable -> List(
- EGate -> 0.8375,
- EeaDesk -> (1.0 - 0.8375)
- )))),
  feedSources = Seq(ApiFeedSource, LiveBaseFeedSource, LiveFeedSource, ForecastFeedSource, AclFeedSource),
  flexedQueues = Set(EeaDesk, NonEeaDesk),
  desksByTerminal = Map[Terminal, Int](N -> 31, S -> 28)