fix(a380x/mfd): Remove deduplication dialog when starting airways (#9140

) * some proper MD * remove debug output * the previous solution was really braindead (cherry picked from commit 5b581ed)
flybywiresim · Oct 25, 2024 · 4123965 · 4123965
1 parent 9dc7d1a
commit 4123965
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 17 deletions.
diff --git a/fbw-a380x/src/systems/instruments/src/MFD/FMC/FmcAircraftInterface.ts b/fbw-a380x/src/systems/instruments/src/MFD/FMC/FmcAircraftInterface.ts
@@ -133,7 +133,6 @@ export class FmcAircraftInterface {
     );
 
     this.fmc.fmgc.data.zeroFuelWeight.sub((zfw) => {
-      console.log(zfw);
       this.arincZeroFuelWeight.setBnrValue(
         zfw ? zfw : 0,
         zfw ? Arinc429SignStatusMatrix.NormalOperation : Arinc429SignStatusMatrix.NoComputedData,
@@ -1217,7 +1216,6 @@ export class FmcAircraftInterface {
     ) {
       const initZfw = SimVar.GetSimVarValue('L:A32NX_AIRFRAME_ZFW', 'number');
       const initZfwCg = SimVar.GetSimVarValue('L:A32NX_AIRFRAME_ZFW_CG_PERCENT_MAC', 'number');
-      console.log(initZfw, initZfwCg);
 
       // Update FMS ZFW and ZFWCG from SimVars, e.g. when spawning on a runway
       this.fmc.fmgc.data.zeroFuelWeight.set(initZfw);

diff --git a/fbw-a380x/src/systems/instruments/src/MFD/pages/FMS/F-PLN/MfdFmsFplnAirways.tsx b/fbw-a380x/src/systems/instruments/src/MFD/pages/FMS/F-PLN/MfdFmsFplnAirways.tsx
@@ -204,20 +204,7 @@ class AirwayLine extends DisplayComponent<AirwayLineProps> {
                 return true;
               }
 
-              const fixes = await NavigationDatabaseService.activeDatabase.searchAllFix(this.props.fromFix.ident);
-              if (fixes.length === 0) {
-                this.props.fmc.showFmsErrorMessage(FmsErrorType.NotInDatabase);
-                return false;
-              }
-              let chosenFix = fixes[0];
-              if (fixes.length > 1) {
-                const dedup = await this.props.fmc.deduplicateFacilities(fixes);
-                if (dedup !== undefined) {
-                  chosenFix = dedup;
-                }
-              }
-
-              const airways = await NavigationDatabaseService.activeDatabase.searchAirway(v, chosenFix);
+              const airways = await NavigationDatabaseService.activeDatabase.searchAirway(v, this.props.fromFix);
               if (airways.length === 0) {
                 this.props.fmc.showFmsErrorMessage(FmsErrorType.NotInDatabase);
                 return false;

diff --git a/fbw-a380x/src/systems/instruments/src/MFD/pages/common/README.md b/fbw-a380x/src/systems/instruments/src/MFD/pages/common/README.md
@@ -3,12 +3,12 @@
 This directory contains common user interface elements for building the A380's MFD.
 
 ## Status and description of components
+
 Status legend:
 ✅ MVP complete
 🟨 In progress
 🟥 Not yet started
 
-
 | Status      | Component class name | Description |
 | ------------- | ------------- | ------------- |
 | ✅ | ActivePageTitleBar | Display title of currently active page at the top of the screen |
@@ -34,4 +34,5 @@ Status legend:
 ## Known issues / improvements
 
 ### IconButton
+
 Not all icons added yet (will evolve over time, until all pages are complete)