feat(BelowGlideSlopeWarningAlert): trigger when below minimums and deviation is >2.5

Signed-off-by: Octol1ttle <[email protected]>

Author: Octol1ttle

src/main/kotlin/ru/octol1ttle/flightassistant/api/computer/Computer.kt

@@ -3,7 +3,7 @@ package ru.octol1ttle.flightassistant.api.computer
 /**
  * A class responsible for computing data and providing it to [ru.octol1ttle.flightassistant.api.display.Display]s and [ru.octol1ttle.flightassistant.api.alert.Alert]s
  */
-abstract class Computer(val computers: ComputerBus) {
+abstract class Computer(protected val computers: ComputerBus) {
     /**
      * Whether or not this computer is enabled. Disabled computers do not tick.
      */

src/main/kotlin/ru/octol1ttle/flightassistant/impl/alert/gpws/BelowGlideSlopeAlert.kt

@@ -27,7 +27,7 @@ class BelowGlideSlopeAlert(computers: ComputerBus) : Alert(computers), CenteredA
         }
 
         val glideSlopeDeviation = computers.plan.getVerticalDeviation(computers.data.position)!!
-        return glideSlopeDeviation > 5
+        return glideSlopeDeviation > 5.0
     }
 
     override fun render(guiGraphics: GuiGraphics, y: Int): Boolean {

src/main/kotlin/ru/octol1ttle/flightassistant/impl/alert/gpws/BelowGlideSlopeWarningAlert.kt

@@ -26,8 +26,13 @@ class BelowGlideSlopeWarningAlert(computers: ComputerBus) : Alert(computers), Ce
             return false
         }
 
-        val altitudeAboveGround = computers.data.altitude - computers.gpws.groundOrVoidY
         val glideSlopeDeviation = computers.plan.getVerticalDeviation(computers.data.position)!!
+        val minimums = computers.plan.getMinimums()
+        if (minimums != null && computers.data.altitude < minimums && glideSlopeDeviation > 2.5) {
+            return true
+        }
+
+        val altitudeAboveGround = computers.data.altitude - computers.gpws.groundOrVoidY
         return altitudeAboveGround < glideSlopeDeviation
     }
 

src/main/kotlin/ru/octol1ttle/flightassistant/impl/alert/gpws/MinimumsReachedAlert.kt

@@ -8,7 +8,6 @@ import ru.octol1ttle.flightassistant.api.alert.ECAMAlert
 import ru.octol1ttle.flightassistant.api.computer.ComputerBus
 import ru.octol1ttle.flightassistant.api.util.extensions.cautionColor
 import ru.octol1ttle.flightassistant.api.util.extensions.drawString
-import ru.octol1ttle.flightassistant.impl.computer.autoflight.FlightPlanComputer
 import ru.octol1ttle.flightassistant.impl.computer.autoflight.FlightPlanComputer.FlightPhase
 
 class MinimumsReachedAlert(computers: ComputerBus) : Alert(computers), ECAMAlert {
@@ -25,10 +24,8 @@ class MinimumsReachedAlert(computers: ComputerBus) : Alert(computers), ECAMAlert
             return true
         }
 
-        val minimums =
-            if (computers.plan.arrivalData.minimumsType == FlightPlanComputer.ArrivalData.MinimumsType.ABSOLUTE) computers.plan.arrivalData.minimums.toDouble()
-            else computers.plan.computers.gpws.groundOrVoidY + computers.plan.arrivalData.minimums
-        reached = computers.plan.computers.data.altitude <= minimums
+        val minimums = computers.plan.getMinimums() ?: return false
+        reached = computers.data.altitude <= minimums
         return reached
     }
 

src/main/kotlin/ru/octol1ttle/flightassistant/impl/computer/autoflight/FlightPlanComputer.kt

@@ -28,14 +28,14 @@ import ru.octol1ttle.flightassistant.impl.display.StatusDisplay
 class FlightPlanComputer(computers: ComputerBus) : Computer(computers) {
     var currentPhase: FlightPhase = FlightPhase.UNKNOWN
         private set
+    var groundSpeeds: LimitedFIFOQueue<Double> = LimitedFIFOQueue(SharedConstants.TICKS_PER_SECOND * 5)
+        private set
 
     var departureData: DepartureData = DepartureData.DEFAULT
     var enrouteData: MutableList<EnrouteWaypoint> = ArrayList()
         private set
     var arrivalData: ArrivalData = ArrivalData.DEFAULT
 
-    var groundSpeeds: LimitedFIFOQueue<Double> = LimitedFIFOQueue(SharedConstants.TICKS_PER_SECOND * 5)
-
     override fun tick() {
         updateEnrouteData()
         currentPhase = updateFlightPhase()
@@ -128,6 +128,15 @@ class FlightPlanComputer(computers: ComputerBus) : Computer(computers) {
         return getDistanceToTarget(target) < computers.data.velocityPerSecond.horizontalDistance() * 3.0
     }
 
+    fun getMinimums(): Double? {
+        if (computers.plan.arrivalData.isDefault()) {
+            return null
+        }
+
+        return if (computers.plan.arrivalData.minimumsType == ArrivalData.MinimumsType.ABSOLUTE) computers.plan.arrivalData.minimums.toDouble()
+        else computers.gpws.groundOrVoidY + computers.plan.arrivalData.minimums
+    }
+
     fun getCruiseAltitude(): Int? {
         return enrouteData.maxOfOrNull { it.altitude }
     }