feat(A380X/FMS+MFD): Lateral Offset Functionality + FPLN OFFSET Page

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

@@ -4,7 +4,7 @@
 
 import { Fix, Waypoint } from '@flybywiresim/fbw-sdk';
 import { Coordinates, Degrees } from 'msfs-geo';
-import { HoldData } from '@fmgc/flightplanning/data/flightplan';
+import { HoldData, OffsetData } from '@fmgc/flightplanning/data/flightplan';
 import { FlightPlanLegDefinition } from '@fmgc/flightplanning/legs/FlightPlanLegDefinition';
 import { FixInfoEntry } from '@fmgc/flightplanning/plans/FixInfo';
 import { FlightPlan } from '@fmgc/flightplanning/plans/FlightPlan';
@@ -253,6 +253,23 @@ export interface FlightPlanInterface<P extends FlightPlanPerformanceData = Fligh
     alternate?: boolean,
   ): Promise<number>;
 
+  /**
+   * OFFSET revision. Inserts or eidts an offset with a defined start and end point.
+   *
+   * @param startIndex the index of the leg to start the offset at
+   * @param endIndex the index of the leg to end the offset at
+   * @param desiredOffset the desired offset
+   * @param planIndex the flight plan to make the change on
+   * @param alternate whether to edit the plan's alternate flight plan
+   */
+  setOffsetParams(
+    startIndex: number,
+    endIndex: number,
+    desiredOffset: OffsetData,
+    planIndex: FlightPlanIndex,
+    alternate?: boolean,
+  ): Promise<void>;
+
   /**
    * Reverts a hold parented to a leg to a computed hold.
    *

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

@@ -11,7 +11,7 @@ import { NavigationDatabase } from '@fmgc/NavigationDatabase';
 import { Coordinates, Degrees } from 'msfs-geo';
 import { BitFlags, EventBus } from '@microsoft/msfs-sdk';
 import { FixInfoEntry } from '@fmgc/flightplanning/plans/FixInfo';
-import { HoldData } from '@fmgc/flightplanning/data/flightplan';
+import { HoldData, OffsetData } from '@fmgc/flightplanning/data/flightplan';
 import { FlightPlanLegDefinition } from '@fmgc/flightplanning/legs/FlightPlanLegDefinition';
 import { FlightPlanInterface } from '@fmgc/flightplanning/FlightPlanInterface';
 import { AltitudeConstraint } from '@fmgc/flightplanning/data/constraint';
@@ -461,6 +461,22 @@ export class FlightPlanService<P extends FlightPlanPerformanceData = FlightPlanP
     await plan.enableAltn(atIndexInAlternate, cruiseLevel);
   }
 
+  async setOffsetParams(
+    startIndex: number,
+    endIndex: number,
+    desiredOffset: OffsetData,
+    planIndex: FlightPlanIndex,
+    alternate?: boolean,
+  ): Promise<void> {
+    const finalIndex = this.prepareDestructiveModification(planIndex);
+
+    const plan = alternate
+      ? this.flightPlanManager.get(finalIndex).alternateFlightPlan
+      : this.flightPlanManager.get(finalIndex);
+
+    plan.setOffsetParams(startIndex, endIndex, desiredOffset);
+  }
+
   async setPilotEnteredAltitudeConstraintAt(
     atIndex: number,
     isDescentConstraint: boolean,

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

@@ -74,3 +74,18 @@ export interface StepData {
 
   ident: string;
 }
+
+export interface OffsetData {
+  interceptAngle?: number;
+
+  offsetDistance?: NauticalMiles;
+
+  offsetDirection?: TurnDirection;
+
+  offsetFlags: offsetFlags;
+}
+
+export enum offsetFlags {
+  Start = 0,
+  End = 1,
+}

fbw-a32nx/src/systems/fmgc/src/flightplanning/legs/FlightPlanLeg.ts

@@ -19,7 +19,7 @@ import { procedureLegIdentAndAnnotation } from '@fmgc/flightplanning/legs/Flight
 import { WaypointFactory } from '@fmgc/flightplanning/waypoints/WaypointFactory';
 import { FlightPlanSegment } from '@fmgc/flightplanning/segments/FlightPlanSegment';
 import { EnrouteSegment } from '@fmgc/flightplanning/segments/EnrouteSegment';
-import { HoldData } from '@fmgc/flightplanning/data/flightplan';
+import { HoldData, OffsetData } from '@fmgc/flightplanning/data/flightplan';
 import { CruiseStepEntry } from '@fmgc/flightplanning/CruiseStep';
 import { WaypointConstraintType, AltitudeConstraint, SpeedConstraint } from '@fmgc/flightplanning/data/constraint';
 import { HoldUtils } from '@fmgc/flightplanning/data/hold';
@@ -42,6 +42,7 @@ export interface SerializedFlightPlanLeg {
   cruiseStep: CruiseStepEntry | undefined;
   pilotEnteredAltitudeConstraint: AltitudeConstraint | undefined;
   pilotEnteredSpeedConstraint: SpeedConstraint | undefined;
+  lateralOffset: OffsetData | undefined;
 }
 
 export enum FlightPlanLegFlags {
@@ -105,6 +106,8 @@ export class FlightPlanLeg implements ReadonlyFlightPlanLeg {
 
   calculated: LegCalculations | undefined;
 
+  lateralOffset: OffsetData | undefined = undefined;
+
   serialize(): SerializedFlightPlanLeg {
     return {
       ident: this.ident,
@@ -123,6 +126,7 @@ export class FlightPlanLeg implements ReadonlyFlightPlanLeg {
       pilotEnteredSpeedConstraint: this.pilotEnteredSpeedConstraint
         ? JSON.parse(JSON.stringify(this.pilotEnteredSpeedConstraint))
         : undefined,
+      lateralOffset: this.lateralOffset ? JSON.parse(JSON.stringify(this.lateralOffset)) : undefined,
     };
   }
 
@@ -143,6 +147,7 @@ export class FlightPlanLeg implements ReadonlyFlightPlanLeg {
     leg.cruiseStep = serialized.cruiseStep;
     leg.pilotEnteredAltitudeConstraint = serialized.pilotEnteredAltitudeConstraint;
     leg.pilotEnteredSpeedConstraint = serialized.pilotEnteredSpeedConstraint;
+    leg.lateralOffset = serialized.lateralOffset;
 
     return leg;
   }
@@ -288,6 +293,7 @@ export class FlightPlanLeg implements ReadonlyFlightPlanLeg {
     this.pilotEnteredSpeedConstraint = from.pilotEnteredSpeedConstraint;
     this.constraintType = from.constraintType;
     this.cruiseStep = from.cruiseStep;
+    this.lateralOffset = from.lateralOffset;
     /**
      * Don't copy holds. When we string the arrival to the upstream plan, the upstream plan may have a hold
      * and the downstream leg doesn't, but the upstream leg is the one that's kept. In this case, we don't want to remove the hold

fbw-a32nx/src/systems/fmgc/src/flightplanning/legs/ReadonlyFlightPlanLeg.ts

@@ -5,7 +5,7 @@
 import { LegType } from '@flybywiresim/fbw-sdk';
 import { FlightPlanSegment } from '@fmgc/flightplanning/segments/FlightPlanSegment';
 import { FlightPlanLegDefinition } from '@fmgc/flightplanning/legs/FlightPlanLegDefinition';
-import { HoldData } from '@fmgc/flightplanning/data/flightplan';
+import { HoldData, OffsetData } from '@fmgc/flightplanning/data/flightplan';
 import { WaypointConstraintType, AltitudeConstraint, SpeedConstraint } from '@fmgc/flightplanning/data/constraint';
 import { CruiseStepEntry } from '@fmgc/flightplanning/CruiseStep';
 
@@ -39,6 +39,8 @@ export interface ReadonlyFlightPlanLeg {
   readonly pilotEnteredAltitudeConstraint: AltitudeConstraint | undefined;
 
   readonly pilotEnteredSpeedConstraint: SpeedConstraint | undefined;
+
+  readonly lateralOffset: OffsetData | undefined;
 }
 
 export interface ReadonlyDiscontinuity {

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

@@ -33,7 +33,7 @@ import { MissedApproachSegment } from '@fmgc/flightplanning/segments/MissedAppro
 import { ArrivalRunwayTransitionSegment } from '@fmgc/flightplanning/segments/ArrivalRunwayTransitionSegment';
 import { ApproachViaSegment } from '@fmgc/flightplanning/segments/ApproachViaSegment';
 import { SegmentClass } from '@fmgc/flightplanning/segments/SegmentClass';
-import { HoldData, WaypointStats } from '@fmgc/flightplanning/data/flightplan';
+import { HoldData, OffsetData, offsetFlags, WaypointStats } from '@fmgc/flightplanning/data/flightplan';
 import { procedureLegIdentAndAnnotation } from '@fmgc/flightplanning/legs/FlightPlanLegNaming';
 import {
   FlightPlanEvents,
@@ -1451,6 +1451,22 @@ export abstract class BaseFlightPlan<P extends FlightPlanPerformanceData = Fligh
     this.syncLegDefinitionChange(index);
   }
 
+  setOffsetParams(startIndex, endIndex, offsetData: OffsetData) {
+    const startElement = this.legElementAt(startIndex);
+    const endElement = this.legElementAt(endIndex);
+
+    startElement.lateralOffset = offsetData;
+    endElement.lateralOffset = offsetData;
+
+    startElement.lateralOffset.offsetFlags = offsetFlags.Start;
+    endElement.lateralOffset.offsetFlags = offsetFlags.End;
+
+    this.syncLegDefinitionChange(startIndex);
+    this.syncLegDefinitionChange(endIndex);
+
+    this.incrementVersion();
+  }
+
   setPilotEnteredAltitudeConstraintAt(index: number, isDescentConstraint: boolean, constraint?: AltitudeConstraint) {
     const element = this.elementAt(index);
 

fbw-a32nx/src/systems/fmgc/src/flightplanning/rpc/FlightPlanRpcClient.ts

@@ -7,7 +7,7 @@ import { Fix, Waypoint } from '@flybywiresim/fbw-sdk';
 import { FlightPlanIndex, FlightPlanManager } from '@fmgc/flightplanning/FlightPlanManager';
 import { EventBus, EventSubscriber, Publisher, Subscription } from '@microsoft/msfs-sdk';
 import { v4 } from 'uuid';
-import { HoldData } from '@fmgc/flightplanning/data/flightplan';
+import { HoldData, OffsetData } from '@fmgc/flightplanning/data/flightplan';
 import { Coordinates } from '@fmgc/flightplanning/data/geo';
 import { AltitudeConstraint } from '@fmgc/flightplanning/data/constraint';
 import { FlightPlanPerformanceData } from '@fmgc/flightplanning/plans/performance/FlightPlanPerformanceData';
@@ -293,6 +293,16 @@ export class FlightPlanRpcClient<P extends FlightPlanPerformanceData> implements
     return this.callFunctionViaRpc('enableAltn', atIndexInAlternate, cruiseLevel, planIndex);
   }
 
+  setOffsetParams(
+    startIndex: number,
+    endIndex: number,
+    desiredOffset: OffsetData,
+    planIndex: FlightPlanIndex,
+    alternate?: boolean,
+  ): Promise<void> {
+    return this.callFunctionViaRpc('setOffsetParams', startIndex, endIndex, desiredOffset, planIndex, alternate);
+  }
+
   setPilotEnteredAltitudeConstraintAt(
     atIndex: number,
     isDescentConstraint: boolean,

fbw-a380x/src/systems/instruments/src/MFD/MfdPageDirectory.tsx

@@ -32,6 +32,7 @@ import { MfdFmsDataDebug } from 'instruments/src/MFD/pages/FMS/DATA/MfdFmsDataDe
 import { MfdSurvControls } from 'instruments/src/MFD/pages/SURV/MfdSurvControls';
 import { MfdSurvStatusSwitching } from 'instruments/src/MFD/pages/SURV/MfdSurvStatusSwitching';
 import { MfdFmsDataAirport } from 'instruments/src/MFD/pages/FMS/DATA/MfdFmsDataAirport';
+import { MfdFmsFplnOffset } from 'instruments/src/MFD/pages/FMS/F-PLN/MfdFmsFplnOffset';
 
 export function pageForUrl(
   url: string,
@@ -87,6 +88,11 @@ export function pageForUrl(
     case 'fms/sec2/f-pln-hold':
     case 'fms/sec3/f-pln-hold':
       return <MfdFmsFplnHold pageTitle="F-PLN/HOLD" bus={bus} mfd={mfd} fmcService={fmcService} />;
+    case 'fms/active/f-pln-offset':
+    case 'fms/sec1/f-pln-offset':
+    case 'fms/sec2/f-pln-offset':
+    case 'fms/sec3/f-pln-offset':
+      return <MfdFmsFplnOffset pageTitle="F-PLN/OFFSET" bus={bus} mfd={mfd} fmcService={fmcService} />;
     case 'fms/position/irs':
       return <MfdFmsPositionIrs pageTitle="IRS" bus={bus} mfd={mfd} fmcService={fmcService} />;
     case 'fms/position/navaids':

fbw-a380x/src/systems/instruments/src/MFD/pages/FMS/F-PLN/FplnRevisionsMenu.tsx

@@ -81,8 +81,8 @@ export function getRevisionsMenu(fpln: MfdFmsFpln, type: FplnRevisionsMenuType):
         fpln.props.mfd.uiService.navigateTo(`fms/${fpln.props.mfd.uiService.activeUri.get().category}/f-pln-arrival`),
     },
     {
-      name: '(N/A) OFFSET',
-      disabled: true,
+      name: 'OFFSET',
+      disabled: !fpln.loadedFlightPlan?.legElementAt(legIndex).isXF,
       onPressed: () =>
         fpln.props.mfd.uiService.navigateTo(`fms/${fpln.props.mfd.uiService.activeUri.get().category}/f-pln-offset`),
     },

fbw-a380x/src/systems/instruments/src/MFD/pages/FMS/F-PLN/MfdFmsFplnOffset.scss

@@ -0,0 +1,27 @@
+@import "../../../../MsfsAvionicsCommon/definitions";
+
+.mfd-fms-fpln-offset-waypoint-text-grid {
+  padding-top: 20px;
+  display: grid;
+  grid-template-columns: 200px 200px 30px 200px;
+  padding-left: 5px;
+  margin-top: 10px;
+  padding-bottom: 15px;
+}
+
+.mfd-offset-dist-angle-input-grid {
+  display: grid;
+  grid-template-columns: auto;
+}
+
+.mfd-offset-dist-input-grid {
+  display: grid;
+  grid-template-columns: 150px 150px;
+}
+
+.mfd-offset-ret-canc-tmpy-grid {
+  padding-top: 440px;
+  grid-column: span 4;
+  display: grid;
+  grid-template-columns: 251px 256px 248px;
+}