Fix single waypoint SID imports again

flybywiresim · Mar 10, 2024 · 5caf2b6 · 5caf2b6
1 parent 3677241
commit 5caf2b6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/fbw-a32nx/src/systems/fmgc/src/flightplanning/new/uplink/CoRouteUplinkAdapter.ts b/fbw-a32nx/src/systems/fmgc/src/flightplanning/new/uplink/CoRouteUplinkAdapter.ts
@@ -316,7 +316,7 @@ export class CoRouteUplinkAdapter {
                 instructions.push(
                     { instruction: 'sidEnrouteTransition', ident: fix.ident.toString(), locationHint: { lat: parseFloat(fix.pos_lat.toString()), long: parseFloat(fix.pos_long.toString()) } },
                 );
-            } else if (fix.via_airway === 'DCT' || fix.via_airway === 'DCT*' || fix.via_airway.match(/^NAT[A-Z]$/) || i === 0) {
+            } else if (fix.via_airway === 'DCT' || fix.via_airway === 'DCT*' || fix.via_airway.match(/^NAT[A-Z]$/) || instructions.length === 0) {
                 if (fix.type === 'ltlg') {
                     // LAT/LONG Waypoint
                     instructions.push({ instruction: 'latlong', lat: parseFloat(fix.pos_lat.toString()), long: parseFloat(fix.pos_long.toString()) });

diff --git a/fbw-a32nx/src/systems/fmgc/src/flightplanning/new/uplink/SimBriefUplinkAdapter.ts b/fbw-a32nx/src/systems/fmgc/src/flightplanning/new/uplink/SimBriefUplinkAdapter.ts
@@ -409,7 +409,7 @@ export class SimBriefUplinkAdapter {
             } else if (lastInstruction?.instruction === 'procedure' && lastInstruction.ident === fix.via_airway) {
                 // SID TRANS
                 instructions.push({ instruction: 'sidEnrouteTransition', ident: fix.ident, locationHint: { lat: parseFloat(fix.pos_lat), long: parseFloat(fix.pos_long) } });
-            } else if (fix.via_airway === 'DCT' || fix.via_airway === 'DCT*' || fix.via_airway.match(/^NAT[A-Z]$/) || i === 0) {
+            } else if (fix.via_airway === 'DCT' || fix.via_airway === 'DCT*' || fix.via_airway.match(/^NAT[A-Z]$/) || instructions.length === 0) {
                 // Last SID fix - if this is the very first fix in the route (to deal with procedures
                 // that only have an exit fix, which won't be caught when filtering)
                 if (fix.type === 'ltlg') {