fix: type fixes, part 1

fbw-a32nx/mach.config.js

@@ -5,6 +5,8 @@ const postCssColorFunctionalNotation = require('postcss-color-functional-notatio
 const postCssInset = require('postcss-inset');
 const { typecheckingPlugin } = require("#build-utils");
 
+// process.env.FBW_TYPECHECK = "1";
+
 /** @type { import('@synaptic-simulations/mach').MachConfig } */
 module.exports = {
     packageName: 'A32NX',

fbw-a32nx/src/systems/atsu/common/build.js

@@ -13,4 +13,4 @@ const outFile = 'fbw-a32nx/out/flybywire-aircraft-a320-neo/html_ui/JS/fbw-a32nx/
 
 const srcDir = '../fbw-common/src/systems/datalink/common';
 
-esbuild.build(createModuleBuild('fbw-a32nx', 'AtsuCommon', path.join(rootDir, srcDir, '/src/index.ts'), outFile, srcDir));
+esbuild.build(createModuleBuild('fbw-a32nx', 'AtsuCommon', path.join(rootDir, srcDir, '/src/index.ts'), outFile, 'fbw-common/src/systems/datalink/common'));

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

@@ -3,19 +3,19 @@
 //
 // SPDX-License-Identifier: GPL-3.0
 
+import { GenericDataListenerSync, LegType, RunwaySurface, TurnDirection, VorType } from '@flybywiresim/fbw-sdk';
+
 import { FlightPlanManager, WaypointConstraintType } from '@fmgc/flightplanning/FlightPlanManager';
 import { EfisOption, EfisNdMode, NdSymbol, NdSymbolTypeFlags, EfisNdRangeValue, rangeSettings } from '@shared/NavigationDisplay';
 import { GuidanceManager } from '@fmgc/guidance/GuidanceManager';
 import { Coordinates } from '@fmgc/flightplanning/data/geo';
 import { GuidanceController } from '@fmgc/guidance/GuidanceController';
 import { SegmentType } from '@fmgc/wtsdk';
-import { GenericDataListenerSync } from '@flybywiresim/fbw-sdk';
 import { LnavConfig } from '@fmgc/guidance/LnavConfig';
 import { NearbyFacilities } from '@fmgc/navigation/NearbyFacilities';
 import { NavaidTuner } from '@fmgc/navigation/NavaidTuner';
 import { getFlightPhaseManager } from '@fmgc/flightphase';
 import { FmgcFlightPhase } from '@shared/flightphase';
-import { LegType, RunwaySurface, TurnDirection, VorType } from '../types/fstypes/FSEnums';
 
 export class EfisSymbols {
     /** these types of legs are current not integrated into the normal symbol drawing routines */

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

@@ -24,7 +24,7 @@
  */
 
 import { NXDataStore } from '@flybywiresim/fbw-sdk';
-import { LegType } from '@fmgc/types/fstypes/FSEnums';
+import { LegType } from '@flybywiresim/fbw-sdk';
 import { LnavConfig } from '@fmgc/guidance/LnavConfig';
 import { ApproachStats, HoldData } from '@fmgc/flightplanning/data/flightplan';
 import { SegmentType } from '@fmgc/wtsdk';
@@ -197,8 +197,6 @@ export class FlightPlanManager {
      * Loads the flight plans from data storage.
      */
     public _loadFlightPlans(): void {
-        this._getFlightPlan();
-
         if (this._flightPlans.length === 0) {
             const newFpln = new ManagedFlightPlan();
             newFpln.setParentInstrument(this._parentInstrument);
@@ -593,7 +591,7 @@ export class FlightPlanManager {
     /**
      * Gets the currently selected departure information for the current flight plan.
      */
-    public getDeparture(flightPlanIndex = NaN): WayPoint | undefined {
+    public getDeparture(flightPlanIndex = NaN): RawDeparture | undefined {
         const origin = this.getOrigin();
         if (Number.isNaN(flightPlanIndex)) {
             flightPlanIndex = this._currentFlightPlanIndex;
@@ -1771,32 +1769,6 @@ export class FlightPlanManager {
         return null;
     }
 
-    /**
-     * Gets the current stored flight plan
-     */
-    public _getFlightPlan(): void {
-        if (!LnavConfig.DEBUG_SAVE_FPLN_LOCAL_STORAGE) {
-            return;
-        }
-        const fpln = window.localStorage.getItem(FlightPlanManager.FlightPlanKey);
-        if (fpln === null || fpln === '') {
-            this._flightPlans = [];
-            const initFpln = new ManagedFlightPlan();
-            initFpln.setParentInstrument(this._parentInstrument);
-            this._flightPlans.push(initFpln);
-        } else if (window.localStorage.getItem(FlightPlanManager.FlightPlanCompressedKey) === '1') {
-            this._flightPlans = JSON.parse(LZUTF8.decompress(fpln, { inputEncoding: 'StorageBinaryString' }));
-        } else {
-            try {
-                this._flightPlans = JSON.parse(fpln);
-            } catch (e) {
-                // Assume we failed because compression status did not match up. Try to decompress anyway.
-
-                this._flightPlans = JSON.parse(LZUTF8.decompress(fpln, { inputEncoding: 'StorageBinaryString' }));
-            }
-        }
-    }
-
     public getCurrentFlightPlan(): ManagedFlightPlan {
         return this._flightPlans[this._currentFlightPlanIndex];
     }
@@ -1813,16 +1785,6 @@ export class FlightPlanManager {
             return;
         }
 
-        if (LnavConfig.DEBUG_SAVE_FPLN_LOCAL_STORAGE) {
-            let fpJson = JSON.stringify(this._flightPlans.map((fp) => fp.serialize()));
-            if (fpJson.length > 2500000) {
-                fpJson = LZUTF8.compress(fpJson, { outputEncoding: 'StorageBinaryString' });
-                window.localStorage.setItem(FlightPlanManager.FlightPlanCompressedKey, '1');
-            } else {
-                window.localStorage.setItem(FlightPlanManager.FlightPlanCompressedKey, '0');
-            }
-            window.localStorage.setItem(FlightPlanManager.FlightPlanKey, fpJson);
-        }
         SimVar.SetSimVarValue(FlightPlanManager.FlightPlanVersionKey, 'number', ++this._currentFlightPlanVersion);
         if (NXDataStore.get('FP_SYNC', 'LOAD') === 'SAVE') {
             FlightPlanAsoboSync.SaveToGame(this).catch(console.error);

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

@@ -64,5 +64,8 @@ export enum SegmentType {
   Missed,
 
   /** The destination airfield segment. */
-  Destination
+  Destination,
+
+  /** An empty segment */
+  Empty = -1,
 }

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

@@ -25,7 +25,7 @@
 
 import { HoldData, HoldType } from '@fmgc/flightplanning/data/flightplan';
 import { firstSmallCircleIntersection } from 'msfs-geo';
-import { AltitudeDescriptor, FixTypeFlags, LegType } from '../types/fstypes/FSEnums';
+import { AltitudeDescriptor, FixTypeFlags, LegType } from '@flybywiresim/fbw-sdk';
 import { FixNamingScheme } from './FixNamingScheme';
 import { GeoMath } from './GeoMath';
 import { RawDataMapper } from './RawDataMapper';

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

@@ -24,9 +24,8 @@
  */
 
 import { HoldData, WaypointStats } from '@fmgc/flightplanning/data/flightplan';
-import { NXDataStore } from '@flybywiresim/fbw-sdk';
+import { NXDataStore, AltitudeDescriptor, FixTypeFlags, LegType } from '@flybywiresim/fbw-sdk';
 import { CruiseStepEntry } from '@fmgc/flightplanning/CruiseStep';
-import { AltitudeDescriptor, FixTypeFlags, LegType } from '../types/fstypes/FSEnums';
 import { FlightPlanSegment, SegmentType } from './FlightPlanSegment';
 import { LegsProcedure } from './LegsProcedure';
 import { RawDataMapper } from './RawDataMapper';
@@ -35,6 +34,7 @@ import { ProcedureDetails } from './ProcedureDetails';
 import { DirectTo } from './DirectTo';
 import { GeoMath } from './GeoMath';
 import { WaypointBuilder } from './WaypointBuilder';
+import { WaypointConstraintType } from "./FlightPlanManager";
 
 /**
  * A flight plan managed by the FlightPlanManager.

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

@@ -22,8 +22,7 @@
  * SOFTWARE.
  */
 
-import { FixTypeFlags, LegType } from '@fmgc/types/fstypes/FSEnums';
-import { ApproachUtils } from '@flybywiresim/fbw-sdk';
+import { FixTypeFlags, LegType, ApproachUtils } from '@flybywiresim/fbw-sdk';
 
 /**
  * A class for mapping raw facility data to WayPoints.

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

@@ -22,10 +22,10 @@
  * SOFTWARE.
  */
 
-import { LegType, TurnDirection } from '@fmgc/types/fstypes/FSEnums';
 import { Minutes } from 'msfs-geo';
 import { FlightPlanManager } from './FlightPlanManager';
 import { GeoMath } from './GeoMath';
+import { LegType, TurnDirection } from "@flybywiresim/fbw-sdk";
 
 /**
  * Creating a new waypoint to be added to a flight plan.

fbw-a32nx/src/systems/fmgc/src/flightplanning/data/flightplan.ts

@@ -1,7 +1,7 @@
 //  Copyright (c) 2021 FlyByWire Simulations
 //  SPDX-License-Identifier: GPL-3.0
 
-import { TurnDirection } from '@fmgc/types/fstypes/FSEnums';
+import { TurnDirection } from '@flybywiresim/fbw-sdk';
 
 export interface WaypointStats {
     /**

fbw-a32nx/src/systems/fmgc/src/guidance/GuidanceManager.ts

@@ -12,7 +12,7 @@ import { Transition } from '@fmgc/guidance/lnav/Transition';
 import { SegmentType } from '@fmgc/wtsdk';
 import { Leg } from '@fmgc/guidance/lnav/legs/Leg';
 import { CALeg } from '@fmgc/guidance/lnav/legs/CA';
-import { LegType } from '@fmgc/types/fstypes/FSEnums';
+import { LegType } from '@flybywiresim/fbw-sdk';
 import { TransitionPicker } from '@fmgc/guidance/lnav/TransitionPicker';
 import { IFLeg } from '@fmgc/guidance/lnav/legs/IF';
 import { DFLeg } from '@fmgc/guidance/lnav/legs/DF';

fbw-a32nx/src/systems/fmgc/src/guidance/lnav/LnavDriver.ts

@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: GPL-3.0
 
 import { ControlLaw, LateralMode, VerticalMode } from '@shared/autopilot';
-import { MathUtils } from '@flybywiresim/fbw-sdk';
+import { MathUtils, TurnDirection } from '@flybywiresim/fbw-sdk';
 import { Geometry } from '@fmgc/guidance/Geometry';
 import { Leg } from '@fmgc/guidance/lnav/legs/Leg';
 import { LnavConfig } from '@fmgc/guidance/LnavConfig';
@@ -13,7 +13,6 @@ import { Transition } from '@fmgc/guidance/lnav/Transition';
 import { FixedRadiusTransition } from '@fmgc/guidance/lnav/transitions/FixedRadiusTransition';
 import { PathCaptureTransition } from '@fmgc/guidance/lnav/transitions/PathCaptureTransition';
 import { CourseCaptureTransition } from '@fmgc/guidance/lnav/transitions/CourseCaptureTransition';
-import { TurnDirection } from '@fmgc/types/fstypes/FSEnums';
 import { GuidanceConstants } from '@fmgc/guidance/GuidanceConstants';
 import { VMLeg } from '@fmgc/guidance/lnav/legs/VM';
 import { XFLeg } from '@fmgc/guidance/lnav/legs/XF';

fbw-a32nx/src/systems/fmgc/src/guidance/lnav/TransitionPicker.ts

@@ -10,7 +10,7 @@ import { HALeg, HFLeg, HMLeg } from '@fmgc/guidance/lnav/legs/HX';
 import { RFLeg } from '@fmgc/guidance/lnav/legs/RF';
 import { TFLeg } from '@fmgc/guidance/lnav/legs/TF';
 import { VMLeg } from '@fmgc/guidance/lnav/legs/VM';
-import { Transition } from '@fmgc/guidance/lnav/transition';
+import { Transition } from '@fmgc/guidance/lnav/Transition';
 import { FixedRadiusTransition } from '@fmgc/guidance/lnav/transitions/FixedRadiusTransition';
 import { PathCaptureTransition } from '@fmgc/guidance/lnav/transitions/PathCaptureTransition';
 import { CourseCaptureTransition } from '@fmgc/guidance/lnav/transitions/CourseCaptureTransition';

fbw-a32nx/src/systems/fmgc/src/guidance/lnav/legs/AF.ts

@@ -9,8 +9,7 @@ import { arcDistanceToGo, arcGuidance } from '@fmgc/guidance/lnav/CommonGeometry
 import { Coordinates } from '@fmgc/flightplanning/data/geo';
 import { GuidanceParameters } from '@fmgc/guidance/ControlLaws';
 import { DmeArcTransition } from '@fmgc/guidance/lnav/transitions/DmeArcTransition';
-import { MathUtils } from '@flybywiresim/fbw-sdk';
-import { TurnDirection } from '@fmgc/types/fstypes/FSEnums';
+import { MathUtils, TurnDirection } from '@flybywiresim/fbw-sdk';
 import { LnavConfig } from '@fmgc/guidance/LnavConfig';
 import { bearingTo, distanceTo, placeBearingDistance } from 'msfs-geo';
 import { PathCaptureTransition } from '@fmgc/guidance/lnav/transitions/PathCaptureTransition';

fbw-a32nx/src/systems/fmgc/src/guidance/lnav/legs/HX.ts

@@ -6,8 +6,8 @@
 
 import { Coordinates } from '@fmgc/flightplanning/data/geo';
 import { GuidanceParameters, LateralPathGuidance } from '@fmgc/guidance/ControlLaws';
+import { AltitudeDescriptor, TurnDirection } from '@flybywiresim/fbw-sdk';
 import { Geometry } from '@fmgc/guidance/Geometry';
-import { AltitudeDescriptor, TurnDirection } from '@fmgc/types/fstypes/FSEnums';
 import { SegmentType } from '@fmgc/wtsdk';
 import { arcDistanceToGo, arcGuidance, courseToFixDistanceToGo, courseToFixGuidance, maxBank, reciprocal } from '@fmgc/guidance/lnav/CommonGeometry';
 import { XFLeg } from '@fmgc/guidance/lnav/legs/XF';

fbw-a32nx/src/systems/fmgc/src/guidance/lnav/legs/Leg.ts

@@ -7,7 +7,7 @@ import { SegmentType } from '@fmgc/flightplanning/FlightPlanSegment';
 import { Coordinates } from '@fmgc/flightplanning/data/geo';
 import { Guidable } from '@fmgc/guidance/Guidable';
 import { distanceTo } from 'msfs-geo';
-import { TurnDirection } from '@fmgc/types/fstypes/FSEnums';
+import { TurnDirection } from '@flybywiresim/fbw-sdk';
 import { LegMetadata } from '@fmgc/guidance/lnav/legs/index';
 
 export abstract class Leg extends Guidable {

fbw-a32nx/src/systems/fmgc/src/guidance/lnav/legs/PI.ts

@@ -10,7 +10,7 @@ import { CFLeg } from '@fmgc/guidance/lnav/legs/CF';
 import { Leg } from '@fmgc/guidance/lnav/legs/Leg';
 import { DebugPointColour, PathVector, PathVectorType } from '@fmgc/guidance/lnav/PathVector';
 import { LnavConfig } from '@fmgc/guidance/LnavConfig';
-import { TurnDirection } from '@fmgc/types/fstypes/FSEnums';
+import { TurnDirection } from '@flybywiresim/fbw-sdk';
 import { SegmentType } from '@fmgc/wtsdk';
 import { bearingTo, distanceTo, smallCircleGreatCircleIntersection } from 'msfs-geo';
 

fbw-a32nx/src/systems/fmgc/src/guidance/lnav/legs/index.ts

@@ -6,7 +6,7 @@
 import { HALeg, HFLeg, HMLeg } from '@fmgc/guidance/lnav/legs/HX';
 import { Leg } from '@fmgc/guidance/lnav/legs/Leg';
 import { PILeg } from '@fmgc/guidance/lnav/legs/PI';
-import { TurnDirection } from '@fmgc/types/fstypes/FSEnums';
+import { TurnDirection } from '@flybywiresim/fbw-sdk';
 
 export enum AltitudeConstraintType {
     at,

fbw-a32nx/src/systems/fmgc/src/guidance/lnav/transitions/CourseCaptureTransition.ts

@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: GPL-3.0
 
-import { MathUtils, Constants } from '@flybywiresim/fbw-sdk';
+import { MathUtils, Constants, TurnDirection } from '@flybywiresim/fbw-sdk';
 import { CALeg } from '@fmgc/guidance/lnav/legs/CA';
 import { DFLeg } from '@fmgc/guidance/lnav/legs/DF';
 import { HALeg, HFLeg, HMLeg } from '@fmgc/guidance/lnav/legs/HX';
@@ -15,7 +15,6 @@ import { GuidanceParameters } from '@fmgc/guidance/ControlLaws';
 import { Coordinates } from '@fmgc/flightplanning/data/geo';
 import { Geo } from '@fmgc/utils/Geo';
 import { PathVector, PathVectorType } from '@fmgc/guidance/lnav/PathVector';
-import { TurnDirection } from '@fmgc/types/fstypes/FSEnums';
 import { LnavConfig } from '@fmgc/guidance/LnavConfig';
 import { AFLeg } from '@fmgc/guidance/lnav/legs/AF';
 import { ControlLaw } from '@shared/autopilot';

fbw-a32nx/src/systems/fmgc/src/guidance/lnav/transitions/DirectToFixTransition.ts

@@ -16,7 +16,7 @@ import { Coordinates } from '@fmgc/flightplanning/data/geo';
 import { Geometry } from '@fmgc/guidance/Geometry';
 import { PathVector, PathVectorType } from '@fmgc/guidance/lnav/PathVector';
 import { LnavConfig } from '@fmgc/guidance/LnavConfig';
-import { TurnDirection } from '@fmgc/types/fstypes/FSEnums';
+import { TurnDirection } from '@flybywiresim/fbw-sdk';
 import { bearingTo, distanceTo, placeBearingDistance } from 'msfs-geo';
 import { CILeg } from '../legs/CI';
 import {

fbw-a32nx/src/systems/fmgc/src/guidance/lnav/transitions/FixedRadiusTransition.ts

@@ -13,7 +13,7 @@ import { GuidanceParameters } from '@fmgc/guidance/ControlLaws';
 import { Coordinates } from '@fmgc/flightplanning/data/geo';
 import { CILeg } from '@fmgc/guidance/lnav/legs/CI';
 import { arcDistanceToGo, arcGuidance, arcLength, maxBank, minBank } from '@fmgc/guidance/lnav/CommonGeometry';
-import { TurnDirection } from '@fmgc/types/fstypes/FSEnums';
+import { TurnDirection } from '@flybywiresim/fbw-sdk';
 import { LnavConfig } from '@fmgc/guidance/LnavConfig';
 import { Geo } from '@fmgc/utils/Geo';
 import { XFLeg } from '@fmgc/guidance/lnav/legs/XF';

fbw-a32nx/src/systems/fmgc/src/guidance/lnav/transitions/HoldEntryTransition.ts

@@ -9,7 +9,7 @@ import { HALeg, HFLeg, HMLeg, HxLegGuidanceState } from '@fmgc/guidance/lnav/leg
 import { RFLeg } from '@fmgc/guidance/lnav/legs/RF';
 import { TFLeg } from '@fmgc/guidance/lnav/legs/TF';
 import { Coordinates } from '@fmgc/flightplanning/data/geo';
-import { TurnDirection } from '@fmgc/types/fstypes/FSEnums';
+import { TurnDirection } from '@flybywiresim/fbw-sdk';
 import { GuidanceParameters, LateralPathGuidance } from '@fmgc/guidance/ControlLaws';
 import { ControlLaw } from '@shared/autopilot';
 import { Geometry } from '@fmgc/guidance/Geometry';

fbw-a32nx/src/systems/fmgc/src/guidance/lnav/transitions/PathCaptureTransition.ts

@@ -16,7 +16,7 @@ import { Geo } from '@fmgc/utils/Geo';
 import { PathVector, pathVectorLength, PathVectorType } from '@fmgc/guidance/lnav/PathVector';
 import { CourseChange } from '@fmgc/guidance/lnav/transitions/utilss/CourseChange';
 import { LnavConfig } from '@fmgc/guidance/LnavConfig';
-import { TurnDirection } from '@fmgc/types/fstypes/FSEnums';
+import { TurnDirection } from '@flybywiresim/fbw-sdk';
 import {
     arcLength,
     getIntermediatePoint,

fbw-a32nx/src/systems/fmgc/src/guidance/vnav/ConstraintReader.ts

@@ -11,8 +11,7 @@ import { VMLeg } from '@fmgc/guidance/lnav/legs/VM';
 import { PathCaptureTransition } from '@fmgc/guidance/lnav/transitions/PathCaptureTransition';
 import { FixedRadiusTransition } from '@fmgc/guidance/lnav/transitions/FixedRadiusTransition';
 import { GuidanceController } from '@fmgc/guidance/GuidanceController';
-import { MathUtils } from '@flybywiresim/fbw-sdk';
-import { FixTypeFlags } from '@fmgc/types/fstypes/FSEnums';
+import { MathUtils, FixTypeFlags } from '@flybywiresim/fbw-sdk';
 import { VnavConfig } from '@fmgc/guidance/vnav/VnavConfig';
 import { CruiseStepEntry } from '@fmgc/flightplanning/CruiseStep';
 

fbw-a32nx/src/systems/fmgc/src/navigation/LandingSystemSelectionManager.ts

@@ -6,10 +6,10 @@
 import { FlightPhaseManager, getFlightPhaseManager } from '@fmgc/flightphase';
 import { FlightPlans } from '@fmgc/flightplanning/FlightPlanManager';
 import { NavigationProvider } from '@fmgc/navigation/NavigationProvider';
-import { LegType } from '@fmgc/types/fstypes/FSEnums';
 import { FlightPlanManager } from '@fmgc/wtsdk';
 import { FmgcFlightPhase } from '@shared/flightphase';
 import { bearingTo, distanceTo } from 'msfs-geo';
+import { LegType } from "@flybywiresim/fbw-sdk";
 
 interface IlsCourseSlopeData {
     course: number | null,

fbw-a32nx/src/systems/fmgc/src/navigation/NavaidSelectionManager.ts

@@ -4,8 +4,7 @@
 import { FlightPlans } from '@fmgc/flightplanning/FlightPlanManager';
 import { NavigationProvider } from '@fmgc/navigation/NavigationProvider';
 import { NearbyFacilities } from '@fmgc/navigation/NearbyFacilities';
-import { VorClass, VorType } from '@fmgc/types/fstypes/FSEnums';
-import { arrayFlat } from '@flybywiresim/fbw-sdk';
+import { arrayFlat, VorClass, VorType } from '@flybywiresim/fbw-sdk';
 import { FlightPlanManager } from '@shared/flightplan';
 import { bearingTo, diffAngle, distanceTo, EARTH_RADIUS } from 'msfs-geo';
 

fbw-a32nx/src/systems/fmgc/src/navigation/NavaidTuner.ts

@@ -6,8 +6,7 @@ import { LandingSystemSelectionManager } from '@fmgc/navigation/LandingSystemSel
 import { NavaidSelectionManager, VorSelectionReason } from '@fmgc/navigation/NavaidSelectionManager';
 import { NavigationProvider } from '@fmgc/navigation/NavigationProvider';
 import { NavRadioUtils } from '@fmgc/navigation/NavRadioUtils';
-import { VorType } from '@fmgc/types/fstypes/FSEnums';
-import { Arinc429SignStatusMatrix, Arinc429Word } from '@flybywiresim/fbw-sdk';
+import { Arinc429SignStatusMatrix, Arinc429Word, VorType } from '@flybywiresim/fbw-sdk';
 import { FmgcFlightPhase } from '@shared/flightphase';
 
 interface NavRadioTuningStatus {

fbw-a32nx/src/systems/fmgc/src/navigation/Navigation.ts

@@ -8,9 +8,9 @@ import { NavaidTuner } from '@fmgc/navigation/NavaidTuner';
 import { NavigationProvider } from '@fmgc/navigation/NavigationProvider';
 import { NearbyFacilities } from '@fmgc/navigation/NearbyFacilities';
 import { RequiredPerformance } from '@fmgc/navigation/RequiredPerformance';
-import { VorType } from '@fmgc/types/fstypes/FSEnums';
 import { Arinc429Register } from '@flybywiresim/fbw-sdk';
 import { Coordinates } from 'msfs-geo';
+import { VorType } from "@microsoft/msfs-sdk";
 
 export enum SelectedNavaidType {
     None,

fbw-a32nx/src/systems/fmgc/src/navigation/NearbyFacilities.ts

@@ -1,8 +1,8 @@
 // Copyright (c) 2021 FlyByWire Simulations
 // SPDX-License-Identifier: GPL-3.0
 
+import { NearestSearchType } from '@flybywiresim/fbw-sdk';
 import { Coordinates } from 'msfs-geo';
-import { NearestSearchType } from '../types/fstypes/FSEnums';
 
 // WARNING: this is a temporary implementation until the new nav database is complete
 // Do not write any code which depends on it