feat(a380x/mfd): basic FIX INFO functionality and lat rev menu fixes

fbw-a32nx/src/systems/fmgc/src/NavigationDatabase.ts

@@ -48,7 +48,7 @@ export class NavigationDatabase {
     return this.backendDatabase.getWaypoints([ident]);
   }
 
-  async searchAllFix(ident: string): Promise<(Waypoint | VhfNavaid | NdbNavaid)[]> {
+  async searchAllFix(ident: string): Promise<Fix[]> {
     return [
       ...(await this.backendDatabase.getWaypoints([ident])),
       ...(await this.backendDatabase.getNavaids([ident])),

fbw-a32nx/src/systems/fmgc/src/efis/EfisSymbols.ts

@@ -813,8 +813,8 @@ export class EfisSymbols<T extends number> {
           ident: fixInfo.fix.ident,
           location: fixInfo.fix.location,
           type: NdSymbolTypeFlags.FixInfo,
-          radials: fixInfo.radials.map((it) => it.trueBearing),
-          radii: fixInfo.radii.map((it) => it.radius),
+          radials: fixInfo?.radials.map((it) => it.trueBearing),
+          radii: fixInfo?.radii.map((it) => it.radius),
         });
       }
     }

fbw-a32nx/src/systems/fmgc/src/flightplanning/DataManager.ts

@@ -4,7 +4,7 @@
 
 import { Fix, NXDataStore, Waypoint } from '@flybywiresim/fbw-sdk';
 import { FmsError, FmsErrorType } from '@fmgc/FmsError';
-import { DisplayInterface } from '@fmgc/flightplanning/interface/DisplayInterface';
+import { FmsDisplayInterface } from '@fmgc/flightplanning/interface/FmsDisplayInterface';
 import { WaypointFactory } from '@fmgc/flightplanning/waypoints/WaypointFactory';
 import { Coordinates } from 'msfs-geo';
 
@@ -61,7 +61,7 @@ export class DataManager {
 
   private latLonExtendedFormat = false;
 
-  constructor(private fmc: DisplayInterface) {
+  constructor(private fmc: FmsDisplayInterface) {
     // we keep these in localStorage so they live for the same length of time as the flightplan (that they could appear in)
     // if the f-pln is not stored there anymore we can delete this
     const stored = localStorage.getItem(DataManager.STORED_WP_KEY);

fbw-a32nx/src/systems/fmgc/src/flightplanning/ObservableFlightPlanManager.ts

@@ -0,0 +1,32 @@
+import { EventBus, Subject, Subscribable, Subscription } from '@microsoft/msfs-sdk';
+import { FlightPlanEvents } from '@fmgc/flightplanning/sync/FlightPlanEvents';
+import { FlightPlanInterface } from '@fmgc/flightplanning/FlightPlanInterface';
+import { FlightPlanIndex } from '@fmgc/flightplanning/FlightPlanManager';
+
+export class ObservableFlightPlanManager {
+  private readonly subscriptions: Subscription[] = [];
+
+  private readonly flightPlanEventsSubscriber = this.bus.getSubscriber<FlightPlanEvents>();
+
+  constructor(
+    private readonly bus: EventBus,
+    private readonly flightPlanInterface: FlightPlanInterface,
+  ) {
+    this.initialize();
+  }
+
+  private initialize(): void {
+    this._temporaryPlanExists.set(this.flightPlanInterface.hasTemporary);
+
+    this.subscriptions.push(
+      this.flightPlanEventsSubscriber.on('flightPlanManager.create').handle((event) => {
+        if (event.planIndex === FlightPlanIndex.Temporary) {
+          this._temporaryPlanExists.set(true);
+        }
+      }),
+    );
+  }
+
+  private readonly _temporaryPlanExists = Subject.create(false);
+  public readonly temporaryPlanExists: Subscribable<boolean> = this._temporaryPlanExists;
+}

fbw-a32nx/src/systems/fmgc/src/flightplanning/WaypointEntryUtils.spec.ts

@@ -7,16 +7,16 @@ import { jest } from '@jest/globals';
 import { FlightPlanService } from '@fmgc/flightplanning/FlightPlanService';
 import { setupNavigraphDatabase } from '@fmgc/flightplanning/test/Database';
 import { WaypointEntryUtils } from '@fmgc/flightplanning/WaypointEntryUtils';
-import { DisplayInterface } from '@fmgc/flightplanning/interface/DisplayInterface';
+import { FmsDisplayInterface } from '@fmgc/flightplanning/interface/FmsDisplayInterface';
 import { DatabaseItem, Waypoint } from '@flybywiresim/fbw-sdk';
 import { FmsErrorType } from '@fmgc/FmsError';
 import { Coordinates, placeBearingDistance, placeBearingIntersection } from 'msfs-geo';
 import { WaypointFactory } from '@fmgc/flightplanning/waypoints/WaypointFactory';
-import { DataInterface } from './interface/DataInterface';
+import { FmsDataInterface } from './interface/FmsDataInterface';
 
 jest.setTimeout(120_000);
 
-const fms: DisplayInterface & DataInterface = {
+const fms: FmsDisplayInterface & FmsDataInterface = {
     showFmsErrorMessage(errorType: FmsErrorType) {
         console.error(FmsErrorType[errorType]);
     },

fbw-a32nx/src/systems/fmgc/src/flightplanning/WaypointEntryUtils.ts

@@ -6,9 +6,9 @@
 import { Fix, NdbNavaid, VhfNavaid, Waypoint } from '@flybywiresim/fbw-sdk';
 import { NavigationDatabaseService } from '@fmgc/flightplanning/NavigationDatabaseService';
 import { WaypointFactory } from '@fmgc/flightplanning/waypoints/WaypointFactory';
-import { DisplayInterface } from '@fmgc/flightplanning/interface/DisplayInterface';
+import { FmsDisplayInterface } from '@fmgc/flightplanning/interface/FmsDisplayInterface';
 import { Coordinates } from 'msfs-geo';
-import { DataInterface } from '@fmgc/flightplanning/interface/DataInterface';
+import { FmsDataInterface } from '@fmgc/flightplanning/interface/FmsDataInterface';
 import { FmsError, FmsErrorType } from '@fmgc/FmsError';
 
 export class WaypointEntryUtils {
@@ -22,7 +22,7 @@ export class WaypointEntryUtils {
    * @returns a waypoint, or `undefined` if the operation is cancelled
    */
   static async getOrCreateWaypoint(
-    fms: DataInterface & DisplayInterface,
+    fms: FmsDataInterface & FmsDisplayInterface,
     place: string,
     stored: boolean,
     ident?: string,
@@ -53,7 +53,7 @@ export class WaypointEntryUtils {
   /**
    * Parse a place string into a position
    */
-  static async parsePlace(fms: DisplayInterface & DataInterface, place: string): Promise<Fix> {
+  static async parsePlace(fms: FmsDisplayInterface & FmsDataInterface, place: string): Promise<Fix> {
     if (WaypointEntryUtils.isRunwayFormat(place)) {
       return WaypointEntryUtils.parseRunway(place);
     }
@@ -157,7 +157,7 @@ export class WaypointEntryUtils {
    *
    * @returns place and magnetic bearing
    */
-  static async parsePbx(fms: DisplayInterface & DataInterface, str: string): Promise<[Fix, number, Fix, number]> {
+  static async parsePbx(fms: FmsDisplayInterface & FmsDataInterface, str: string): Promise<[Fix, number, Fix, number]> {
     const pbx = str.match(/^([^\-/]+)-([0-9]{1,3})\/([^\-/]+)-([0-9]{1,3})$/);
 
     if (pbx === null) {
@@ -183,7 +183,7 @@ export class WaypointEntryUtils {
    * @param {string} s
    */
   static async parsePbd(
-    fms: DataInterface & DisplayInterface,
+    fms: FmsDataInterface & FmsDisplayInterface,
     s: string,
   ): Promise<[wp: Fix, trueBearing: number, dist: number]> {
     const [place, brg, dist] = WaypointEntryUtils.splitPbd(s);

fbw-a32nx/src/systems/fmgc/src/flightplanning/interface/DataInterface.ts → fbw-a32nx/src/systems/fmgc/src/flightplanning/interface/FmsDataInterface.ts

@@ -7,7 +7,7 @@ import { Coordinates, DegreesMagnetic } from 'msfs-geo';
 import { Fix } from '@flybywiresim/fbw-sdk';
 import { PilotWaypoint } from '@fmgc/flightplanning/DataManager';
 
-export interface DataInterface {
+export interface FmsDataInterface {
   createLatLonWaypoint(coordinates: Coordinates, stored: boolean, ident?: string): PilotWaypoint;
 
   createPlaceBearingPlaceBearingWaypoint(

fbw-a32nx/src/systems/fmgc/src/flightplanning/interface/DisplayInterface.ts → fbw-a32nx/src/systems/fmgc/src/flightplanning/interface/FmsDisplayInterface.ts

@@ -6,7 +6,7 @@
 import { DatabaseItem, Waypoint } from '@flybywiresim/fbw-sdk';
 import { FmsErrorType } from '@fmgc/FmsError';
 
-export interface DisplayInterface {
+export interface FmsDisplayInterface {
   /**
    * Called when a flight plan uplink is in progress
    */

fbw-a32nx/src/systems/fmgc/src/flightplanning/plans/FixInfo.ts

@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: GPL-3.0
 
-import { NdbNavaid, VhfNavaid, Waypoint } from '@flybywiresim/fbw-sdk';
+import { AnyFix } from '@flybywiresim/fbw-sdk';
 
 export interface FixInfoRadial {
   trueBearing: DegreesTrue;
@@ -25,15 +25,15 @@ export interface FixInfoRadius {
  */
 export class FixInfoEntry implements FixInfoData {
   /** The fix concerned by the fix info */
-  public readonly fix: Waypoint | VhfNavaid | NdbNavaid;
+  public fix: AnyFix;
 
   /** The radii contained in the fix info */
-  public readonly radii?: FixInfoRadius[];
+  public radii?: FixInfoRadius[];
 
   /** The radials contained in the fix ino */
-  public readonly radials?: FixInfoRadial[];
+  public radials?: FixInfoRadial[];
 
-  constructor(fix: Waypoint | VhfNavaid | NdbNavaid, radii?: FixInfoRadius[], radials?: FixInfoRadial[]) {
+  constructor(fix: AnyFix, radii?: FixInfoRadius[], radials?: FixInfoRadial[]) {
     this.fix = fix;
     this.radii = radii;
     this.radials = radials;
@@ -50,7 +50,7 @@ export class FixInfoEntry implements FixInfoData {
 
 export interface FixInfoData {
   /** The fix concerned by the fix info */
-  fix: Waypoint | VhfNavaid | NdbNavaid;
+  fix: AnyFix;
 
   /** The radii contained in the fix info */
   radii?: FixInfoRadius[];

fbw-a32nx/src/systems/fmgc/src/flightplanning/plans/FlightPlan.ts

@@ -343,7 +343,7 @@ export class FlightPlan<P extends FlightPlanPerformanceData = FlightPlanPerforma
   setFixInfoEntry(index: 1 | 2 | 3 | 4, fixInfo: FixInfoData | null, notify = true): void {
     const planFixInfo = this.fixInfos as FixInfoEntry[];
 
-    planFixInfo[index] = fixInfo ? new FixInfoEntry(fixInfo.fix, fixInfo.radii, fixInfo.radials) : undefined;
+    planFixInfo[index] = fixInfo ? new FixInfoEntry(fixInfo.fix, fixInfo?.radii, fixInfo?.radials) : undefined;
 
     if (notify) {
       this.sendEvent('flightPlan.setFixInfoEntry', { planIndex: this.index, forAlternate: false, index, fixInfo });
@@ -362,7 +362,12 @@ export class FlightPlan<P extends FlightPlanPerformanceData = FlightPlanPerforma
     }
 
     if (notify) {
-      this.sendEvent('flightPlan.setFixInfoEntry', { planIndex: this.index, forAlternate: false, index, fixInfo: res });
+      this.sendEvent('flightPlan.setFixInfoEntry', {
+        planIndex: this.index,
+        forAlternate: false,
+        index,
+        fixInfo: res.clone(),
+      });
     }
 
     this.incrementVersion();

fbw-a32nx/src/systems/fmgc/src/flightplanning/plans/ObservableFlightPlan.ts

@@ -0,0 +1,98 @@
+import { EventBus, Subject, Subscribable, Subscription } from '@microsoft/msfs-sdk';
+
+import { BaseFlightPlan } from './BaseFlightPlan';
+import { FlightPlanInterface } from '../FlightPlanInterface';
+import { FixInfoData } from './FixInfo';
+import { FlightPlan } from './FlightPlan';
+import { FlightPlanEvents } from '@fmgc/flightplanning/sync/FlightPlanEvents';
+
+/**
+ * A flight plan wrapper which exposes subcribable elements and properties.
+ *
+ * **Note:** Add flight plan elements here as you need them reactively in MFD/ND UI.
+ */
+export class ObservableFlightPlan {
+  private readonly subscriptions: Subscription[] = [];
+
+  private readonly flightPlanEventsSubscriber = this.bus.getSubscriber<FlightPlanEvents>();
+
+  constructor(
+    private readonly bus: EventBus,
+    private readonly flightPlanInterface: FlightPlanInterface,
+    private readonly index: number,
+  ) {
+    const plan = flightPlanInterface.get(index);
+
+    this.initializeFromPlan(plan);
+  }
+
+  public destroy(): void {
+    for (const subscription of this.subscriptions) {
+      subscription.destroy();
+    }
+  }
+
+  private initializeFromPlan(plan: BaseFlightPlan): void {
+    if (plan instanceof FlightPlan) {
+      for (let i = 1; i < plan.fixInfos.length; i++) {
+        const fix = plan.fixInfos[i] ?? null;
+
+        this._fixInfos[i].set(fix);
+      }
+    }
+
+    this.subscriptions.push(
+      this.flightPlanEventsSubscriber.on('flightPlan.setFixInfoEntry').handle((event) => {
+        if (event.planIndex !== plan.index) {
+          return;
+        }
+
+        const subject = this._fixInfos[event.index];
+
+        subject.set(event.fixInfo ?? null);
+      }),
+    );
+  }
+
+  private readonly _fixInfos: Record<1 | 2 | 3 | 4, Subject<FixInfoData | null>> = {
+    1: this.createFixInfoSubject(),
+    2: this.createFixInfoSubject(),
+    3: this.createFixInfoSubject(),
+    4: this.createFixInfoSubject(),
+  } as const;
+  public readonly fixInfos: Record<1 | 2 | 3 | 4, Subscribable<FixInfoData | null>> = this._fixInfos;
+
+  private createFixInfoSubject(): Subject<FixInfoData | null> {
+    const equalityFunc = (a: FixInfoData | null, b: FixInfoData | null): boolean => {
+      if ((a === null) !== (b === null)) {
+        return false;
+      }
+
+      if (a?.fix.databaseId !== b?.fix.databaseId) {
+        return false;
+      }
+
+      for (let i = 0; i < a?.radials.length; i++) {
+        const aRadial = a?.radials[i];
+        const bRadial = b?.radials[i];
+
+        if (aRadial !== bRadial) {
+          return false;
+        }
+      }
+
+      for (let i = 0; i < a?.radii.length; i++) {
+        const aRadius = a?.radii[i];
+        const bRadius = b?.radii[i];
+
+        if (aRadius !== bRadius) {
+          return false;
+        }
+      }
+
+      return true;
+    };
+
+    return Subject.create<FixInfoData | null>(null, equalityFunc);
+  }
+}

fbw-a32nx/src/systems/fmgc/src/flightplanning/plans/ReadonlyFlightPlan.ts

@@ -28,11 +28,11 @@ export interface ReadonlyFlightPlan {
 
   get version(): number;
 
-  get originLeg(): ReadonlyFlightPlanElement;
+  get originLeg(): ReadonlyFlightPlanElement | undefined;
 
   get originLegIndex(): number;
 
-  get destinationLeg(): ReadonlyFlightPlanElement;
+  get destinationLeg(): ReadonlyFlightPlanElement | undefined;
 
   get destinationLegIndex(): number;
 
@@ -58,11 +58,14 @@ export interface ReadonlyFlightPlan {
 
   get arrivalEnrouteTransition(): ProcedureTransition | undefined;
 
-  get arrival(): Arrival | undefined;
+  /**
+   * The arrival procedure. If it's `undefined`, it means that no arrival is set. If it's `null`, it means that the "NO STAR" is explicitly selected.
+   */
+  get arrival(): Arrival | undefined | null;
 
   get arrivalRunwayTransition(): ProcedureTransition | undefined;
 
-  get approachVia(): ProcedureTransition | undefined;
+  get approachVia(): ProcedureTransition | undefined | null;
 
   get approach(): Approach | undefined;
 

fbw-a32nx/src/systems/fmgc/src/flightplanning/uplink/CoRouteUplinkAdapter.ts

@@ -10,9 +10,9 @@ import { FlightPlanIndex } from '@fmgc/flightplanning/FlightPlanManager';
 import { NavigationDatabaseService } from '@fmgc/flightplanning/NavigationDatabaseService';
 import { Fix, Airway } from '@flybywiresim/fbw-sdk';
 import { Coordinates, distanceTo } from 'msfs-geo';
-import { DisplayInterface } from '@fmgc/flightplanning/interface/DisplayInterface';
+import { FmsDisplayInterface } from '@fmgc/flightplanning/interface/FmsDisplayInterface';
 import type { Fix as CoRouteFix } from '@simbridge/Coroute/Fix';
-import { DataInterface } from '../interface/DataInterface';
+import { FmsDataInterface } from '../interface/FmsDataInterface';
 import { FmsErrorType } from '@fmgc/FmsError';
 
 export interface OfpRoute {
@@ -104,7 +104,7 @@ type CoRoute = {
 
 export class CoRouteUplinkAdapter {
   static async uplinkFlightPlanFromCoRoute(
-    fms: DataInterface & DisplayInterface,
+    fms: FmsDataInterface & FmsDisplayInterface,
     flightPlanService: FlightPlanService,
     ofp: CoRoute,
   ) {

fbw-a32nx/src/systems/fmgc/src/flightplanning/uplink/SimBriefUplinkAdapter.ts

@@ -10,14 +10,14 @@ import { FlightPlanIndex } from '@fmgc/flightplanning/FlightPlanManager';
 import { NavigationDatabaseService } from '@fmgc/flightplanning/NavigationDatabaseService';
 import { Airway, Fix } from '@flybywiresim/fbw-sdk';
 import { Coordinates, distanceTo } from 'msfs-geo';
-import { DisplayInterface } from '@fmgc/flightplanning/interface/DisplayInterface';
+import { FmsDisplayInterface } from '@fmgc/flightplanning/interface/FmsDisplayInterface';
 import { FlightPlanPerformanceData } from '@fmgc/flightplanning/plans/performance/FlightPlanPerformanceData';
 import { FmsErrorType } from '@fmgc/FmsError';
 import {
   ISimbriefData,
   simbriefDataParser,
 } from '../../../../../../../fbw-common/src/systems/instruments/src/EFB/Apis/Simbrief';
-import { DataInterface } from '../interface/DataInterface';
+import { FmsDataInterface } from '../interface/FmsDataInterface';
 
 const SIMBRIEF_API_URL = 'https://www.simbrief.com/api/xml.fetcher.php?json=1';
 
@@ -114,7 +114,7 @@ export interface SimBriefUplinkOptions {
 
 export class SimBriefUplinkAdapter {
   static async uplinkFlightPlanFromSimbrief<P extends FlightPlanPerformanceData>(
-    fms: DataInterface & DisplayInterface,
+    fms: FmsDataInterface & FmsDisplayInterface,
     flightPlanService: FlightPlanService<P>,
     ofp: ISimbriefData,
     options: SimBriefUplinkOptions,