port getOrSelectNavaidsByIdent

flybywiresim · Mar 26, 2023 · 5c980df · 5c980df
1 parent 9c462b3
commit 5c980df
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/...ml_ui/Pages/VCockpit/Instruments/Airliners/FlyByWire_A320_Neo/FMC/A32NX_FMCMainDisplay.js b/...ml_ui/Pages/VCockpit/Instruments/Airliners/FlyByWire_A320_Neo/FMC/A32NX_FMCMainDisplay.js
@@ -2506,7 +2506,7 @@ class FMCMainDisplay extends BaseAirliners {
         this._getOrSelectWaypoints(this.navigationDatabase.searchNdb.bind(this.navigationDatabase), ident, callback);
     }
     getOrSelectNavaidsByIdent(ident, callback) {
-        this._getOrSelectWaypoints(this.dataManager.GetNavaidsByIdent.bind(this.dataManager), ident, callback);
+        this._getOrSelectWaypoints(this.navigationDatabase.searchAllNavaid.bind(this.navigationDatabase), ident, callback);
     }
 
     getOrSelectWaypointByIdent(ident, callback) {

diff --git a/fbw-a32nx/src/systems/fmgc/src/NavigationDatabase.ts b/fbw-a32nx/src/systems/fmgc/src/NavigationDatabase.ts
@@ -68,6 +68,13 @@ export class NavigationDatabase {
         return this.backendDatabase.getNDBs([ident]);
     }
 
+    async searchAllNavaid(ident: string): Promise<(VhfNavaid | NdbNavaid)[]> {
+        return [
+            ...(await this.backendDatabase.getNavaids([ident])),
+            ...(await this.backendDatabase.getNDBs([ident])),
+        ];
+    }
+
     async searchAirway(ident: string, fromFix: Fix): Promise<Airway[]> {
         if (fromFix) {
             const airways = await this.backendDatabase.getAirwaysByFix(fromFix);