From f055eb02dc0af32441f8b2873f58e8316d7ca638 Mon Sep 17 00:00:00 2001
From: Saschl <sascharudolf46@gmail.com>
Date: Fri, 3 Nov 2023 18:33:42 +0100
Subject: [PATCH] Revert "fix(pfd): show ils frequency when loc not received
 (#8271)"

This reverts commit 19843be7c00ff30dc1e60573ca3f32feb7aa08f2.
---
 .github/CHANGELOG.md                          |  13 -
 .../src/PFD/LandingSystemIndicator.tsx        | 331 +++++++-----------
 .../instruments/src/PFD/instrument.tsx        |  13 -
 .../src/PFD/shared/PFDSimvarPublisher.tsx     |   2 +-
 4 files changed, 131 insertions(+), 228 deletions(-)

diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
index 5e13d2f11b1..bd63a6a8b00 100644
--- a/.github/CHANGELOG.md
+++ b/.github/CHANGELOG.md
@@ -5,19 +5,6 @@
 <!-- Use the following format below -->
 <!--  1. [Changed Area] Title of changes - @github username (Name)  -->
 
-
-## 0.12.0
-
-1. [EFB/ATSU] Added NOAA (aviationweather.gov) as a METAR source - @tracernz (Mike)
-1. [EFB] Fixed the main page and landing calculator to use the selected METAR source - @tracernz (Mike)
-1. [FMS] Improve layout of PERF CLB, PERF CRZ and PERF DES pages according to H3 - @BlueberryKing (BlueberryKing)
-1. [FMS] Implement CHECK SPEED MODE message - @BlueberryKing (BlueberryKing)
-
-
-## 0.11.1
-1. [PFD] The ILS frequency is now visible even when a LOC is not received - @tracernz (Mike)
-
-
 ## 0.11.0
 
 1. [FMS] Implement vertical navigation functions - @BlueberryKing (BlueberryKing)
diff --git a/fbw-a32nx/src/systems/instruments/src/PFD/LandingSystemIndicator.tsx b/fbw-a32nx/src/systems/instruments/src/PFD/LandingSystemIndicator.tsx
index 18c57578511..7e8fa3a766e 100644
--- a/fbw-a32nx/src/systems/instruments/src/PFD/LandingSystemIndicator.tsx
+++ b/fbw-a32nx/src/systems/instruments/src/PFD/LandingSystemIndicator.tsx
@@ -2,71 +2,92 @@
 //
 // SPDX-License-Identifier: GPL-3.0
 
-import { ConsumerSubject, DisplayComponent, FSComponent, HEvent, MappedSubject, MathUtils, Subject, Subscribable, SubscribableMapFunctions, Subscription, VNode } from '@microsoft/msfs-sdk';
+import { DisplayComponent, FSComponent, HEvent, Subject, VNode } from '@microsoft/msfs-sdk';
 import { getDisplayIndex } from 'instruments/src/PFD/PFD';
-import { Arinc429RegisterSubject } from 'instruments/src/MsfsAvionicsCommon/Arinc429RegisterSubject';
+import { Arinc429Register, Arinc429Word } from '@flybywiresim/fbw-sdk';
 import { Arinc429Values } from './shared/ArincValueProvider';
 import { PFDSimvars } from './shared/PFDSimvarPublisher';
 import { LagFilter } from './PFDUtils';
 import { ArincEventBus } from '../MsfsAvionicsCommon/ArincEventBus';
 
-// FIXME true ref
+// TODO true ref
 export class LandingSystem extends DisplayComponent<{ bus: ArincEventBus, instrument: BaseInstrument }> {
-    private readonly lsVisible = ConsumerSubject.create(null, false);
+    private lsButtonPressedVisibility = false;
 
-    private readonly lsHidden = this.lsVisible.map(SubscribableMapFunctions.not());
+    private xtkValid = Subject.create(false);
 
-    private readonly xtk = ConsumerSubject.create(null, 0);
+    private ldevRequest = false;
 
-    // FIXME this seems like a dubious test...
-    private readonly xtkValid = this.xtk.map((v) => Math.abs(v) > 0);
+    private lsGroupRef = FSComponent.createRef<SVGGElement>();
 
-    private readonly ldevRequest = ConsumerSubject.create(null, false);
+    private gsReferenceLine = FSComponent.createRef<SVGPathElement>();
 
-    private readonly altitude2 = Arinc429RegisterSubject.createEmpty();
+    private deviationGroup = FSComponent.createRef<SVGGElement>();
 
-    private readonly isGsReferenceLineHidden = MappedSubject.create(
-        ([lsVisible, altitude]) => !lsVisible && !altitude.isNormalOperation(),
-        this.lsVisible,
-        this.altitude2,
-    );
+    private ldevRef = FSComponent.createRef<SVGGElement>();
 
-    private readonly isLDevHidden = MappedSubject.create(
-        ([request, xtkValid]) => !request || !xtkValid,
-        this.ldevRequest,
-        this.xtkValid,
-    );
+    private vdevRef = FSComponent.createRef<SVGGElement>();
 
-    private readonly isVDevHidden = Subject.create(true);
+    private altitude = Arinc429Word.empty();
+
+    private handleGsReferenceLine() {
+        if (this.lsButtonPressedVisibility || (this.altitude.isNormalOperation())) {
+            this.gsReferenceLine.instance.style.display = 'inline';
+        } else if (!this.lsButtonPressedVisibility) {
+            this.gsReferenceLine.instance.style.display = 'none';
+        }
+    }
 
     onAfterRender(node: VNode): void {
         super.onAfterRender(node);
 
         const sub = this.props.bus.getSubscriber<PFDSimvars & HEvent & Arinc429Values>();
 
-        // FIXME clean this up.. should be handled by an IE in the XML
         sub.on('hEvent').handle((eventName) => {
             if (eventName === `A320_Neo_PFD_BTN_LS_${getDisplayIndex()}`) {
-                SimVar.SetSimVarValue(`L:BTN_LS_${getDisplayIndex()}_FILTER_ACTIVE`, 'Bool', !this.lsVisible.get());
+                this.lsButtonPressedVisibility = !this.lsButtonPressedVisibility;
+                SimVar.SetSimVarValue(`L:BTN_LS_${getDisplayIndex()}_FILTER_ACTIVE`, 'Bool', this.lsButtonPressedVisibility);
+
+                this.lsGroupRef.instance.style.display = this.lsButtonPressedVisibility ? 'inline' : 'none';
+                this.handleGsReferenceLine();
             }
         });
 
-        this.lsVisible.setConsumer(sub.on(getDisplayIndex() === 1 ? 'ls1Button' : 'ls2Button'));
+        sub.on(getDisplayIndex() === 1 ? 'ls1Button' : 'ls2Button').whenChanged().handle((lsButton) => {
+            this.lsButtonPressedVisibility = lsButton;
+            this.lsGroupRef.instance.style.display = this.lsButtonPressedVisibility ? 'inline' : 'none';
+            this.deviationGroup.instance.style.display = this.lsButtonPressedVisibility ? 'none' : 'inline';
+            this.handleGsReferenceLine();
+        });
 
-        sub.on('baroCorrectedAltitude').handle((altitude) => {
-            this.altitude2.setWord(altitude);
+        sub.on('altitudeAr').handle((altitude) => {
+            this.altitude = altitude;
+            this.handleGsReferenceLine();
         });
 
-        this.ldevRequest.setConsumer(sub.on(getDisplayIndex() === 1 ? 'ldevRequestLeft' : 'ldevRequestRight'));
+        sub.on(getDisplayIndex() === 1 ? 'ldevRequestLeft' : 'ldevRequestRight').whenChanged().handle((ldevRequest) => {
+            this.ldevRequest = ldevRequest;
+            this.updateLdevVisibility();
+        });
 
-        this.xtk.setConsumer(sub.on('xtk'));
+        sub.on('xtk').whenChanged().handle((xtk) => {
+            this.xtkValid.set(Math.abs(xtk) > 0);
+        });
+
+        this.xtkValid.sub(() => {
+            this.updateLdevVisibility();
+        });
+    }
+
+    updateLdevVisibility() {
+        this.ldevRef.instance.style.display = this.ldevRequest && this.xtkValid ? 'inline' : 'none';
     }
 
     render(): VNode {
         return (
             <>
-                <g id="LSGroup" class={{ HiddenElement: this.lsHidden }}>
-                    <LandingSystemInfo bus={this.props.bus} isVisible={this.lsVisible} />
+                <g id="LSGroup" ref={this.lsGroupRef} style="display: none">
+                    <LandingSystemInfo bus={this.props.bus} />
 
                     <g id="LSGroup">
                         <LocalizerIndicator bus={this.props.bus} instrument={this.props.instrument} />
@@ -74,220 +95,128 @@ export class LandingSystem extends DisplayComponent<{ bus: ArincEventBus, instru
                         <MarkerBeaconIndicator bus={this.props.bus} />
                     </g>
 
-                    <path
-                        class={{
-                            Yellow: true,
-                            Fill: true,
-                            HiddenElement: this.isGsReferenceLineHidden,
-                        }}
-                        d="m 114.84887,80.06669 v 1.51188 h -8.43284 v -1.51188 z"
-                    />
+                    <path ref={this.gsReferenceLine} class="Yellow Fill" d="m 114.84887,80.06669 v 1.51188 h -8.43284 v -1.51188 z" />
                 </g>
-                <g id="DeviationGroup" class={{ HiddenElement: this.lsVisible }}>
-                    <g id="LateralDeviationGroup" class={{ HiddenElement: this.isLDevHidden }}>
+                <g id="DeviationGroup" ref={this.deviationGroup} style="display: none">
+                    <g id="LateralDeviationGroup" ref={this.ldevRef} style="display: none">
                         <LDevIndicator bus={this.props.bus} />
                     </g>
-                    <g id="VerticalDeviationGroup" class={{ HiddenElement: this.isVDevHidden }}>
+                    <g id="VerticalDeviationGroup" ref={this.vdevRef} style="display: none">
                         <VDevIndicator bus={this.props.bus} />
                     </g>
                 </g>
-                <path
-                    class={{
-                        Yellow: true,
-                        Fill: true,
-                        HiddenElement: this.isGsReferenceLineHidden,
-                    }}
-                    d="m 114.84887,80.06669 v 1.51188 h -8.43284 v -1.51188 z"
-                />
+                <path ref={this.gsReferenceLine} class="Yellow Fill" d="m 114.84887,80.06669 v 1.51188 h -8.43284 v -1.51188 z" />
             </>
         );
     }
 }
 
-interface LandingSystemInfoProps {
-    bus: ArincEventBus,
-    isVisible: Subscribable<boolean>,
-}
-
-class LandingSystemInfo extends DisplayComponent<LandingSystemInfoProps> {
-    // source data
-
-    private readonly lsAlive = ConsumerSubject.create(null, false);
-
-    private readonly lsFrequency = ConsumerSubject.create(null, 0);
-
-    private readonly lsIdent = ConsumerSubject.create(null, '');
-
-    private readonly dmeAlive = ConsumerSubject.create(null, false);
-
-    private readonly dmeDistance = ConsumerSubject.create(null, 0);
+class LandingSystemInfo extends DisplayComponent<{ bus: ArincEventBus }> {
+    private hasDme = false;
 
-    private readonly fm1NavDiscrete = Arinc429RegisterSubject.createEmpty();
+    private identText = Subject.create('');
 
-    // derived subjects
+    private freqTextLeading = Subject.create('');
 
-    private readonly lsIdentText = Subject.create('');
+    private freqTextTrailing = Subject.create('');
 
-    private readonly lsIdentPipe = this.lsIdent.pipe(this.lsIdentText, true);
+    private navFreq = 0;
 
-    private readonly freqTextLeading = this.lsFrequency.map((v) => Math.trunc(v).toString()).pause();
+    private dme = 0;
 
-    private readonly freqTextTrailing = this.lsFrequency.map((v) => `.${Math.round((v - Math.trunc(v)) * 100).toString().padStart(2, '0')}`).pause();
+    private fm1NavDiscrete = Arinc429Register.empty();
 
-    private readonly isLsIdentHidden = MappedSubject.create(
-        ([ident, isAlive]) => ident.length === 0 || !isAlive,
-        this.lsIdent,
-        this.lsAlive,
-    );
+    private dmeAvailable = false;
 
-    private readonly isLsFreqHidden = this.lsFrequency.map((v) => v < 108 || v > 112);
+    private dmeVisibilitySub = Subject.create('hidden');
 
-    // FIXME major hack: when the FM is not tuning the VORs and MMRs, the DME receiver is not tuned (goes into standby)
-    // Since we use the sim radios at the moment we can't tell that... instead we look at the FM tuning state
-    private isDmeAvailable = MappedSubject.create(
-        ([dmeAlive, fmNavDiscrete]) => dmeAlive && fmNavDiscrete.isNormalOperation(),
-        this.dmeAlive,
-        this.fm1NavDiscrete,
-    );
+    private destRef = FSComponent.createRef<SVGTextElement>();
 
-    private readonly dmeDistanceRounded = this.dmeDistance.map((v) => MathUtils.round(v, 0.1));
-
-    private readonly dmeTextLeading = this.dmeDistanceRounded.map((v) => (v < 20 ? Math.trunc(v).toString() : Math.round(v).toString())).pause();
-
-    private readonly dmeTextTrailing = this.dmeDistanceRounded.map((v) => (v < 20 ? `.${Math.round((v - Math.trunc(v)) * 10).toString()}` : '')).pause();
-
-    private readonly pausable: (ConsumerSubject<unknown> | Subscription)[] = [
-        this.lsAlive,
-        this.lsFrequency,
-        this.lsIdent,
-        this.dmeAlive,
-        this.dmeDistance,
-    ];
+    private lsInfoGroup = FSComponent.createRef<SVGGElement>();
 
     onAfterRender(node: VNode): void {
         super.onAfterRender(node);
 
         const sub = this.props.bus.getSubscriber<PFDSimvars>();
 
-        this.lsAlive.setConsumer(sub.on('hasLoc'));
-
-        this.lsIdent.setConsumer(sub.on('navIdent'));
-
-        this.lsFrequency.setConsumer(sub.on('navFreq'));
-
-        this.dmeAlive.setConsumer(sub.on('hasDme'));
-
-        this.dmeDistance.setConsumer(sub.on('dme'));
-
-        this.pausable.push(sub.on('fm1NavDiscrete').whenChanged().handle((fm1NavDiscrete) => {
-            this.fm1NavDiscrete.setWord(fm1NavDiscrete);
-        }));
-
-        this.isLsFreqHidden.sub((hidden) => {
-            console.log('isLsFreqHidden', hidden, this.lsFrequency.get());
-            if (hidden) {
-                this.freqTextLeading.pause();
-                this.freqTextTrailing.pause();
+        // normally the ident and freq should be always displayed when an ILS freq is set, but currently it only show when we have a signal
+        sub.on('hasLoc').whenChanged().handle((hasLoc) => {
+            if (hasLoc) {
+                this.lsInfoGroup.instance.style.display = 'inline';
             } else {
-                this.freqTextLeading.resume();
-                this.freqTextTrailing.resume();
+                this.lsInfoGroup.instance.style.display = 'none';
             }
-        }, true);
+        });
 
-        this.isLsIdentHidden.sub((hidden) => {
-            if (hidden) {
-                this.lsIdentPipe.pause();
-            } else {
-                this.lsIdentPipe.resume(true);
-            }
+        sub.on('hasDme').whenChanged().handle((hasDme) => {
+            this.hasDme = hasDme;
+            this.updateContents();
         });
 
-        this.isDmeAvailable.sub((available) => {
-            if (available) {
-                this.dmeTextLeading.resume();
-                this.dmeTextTrailing.resume();
-            } else {
-                this.dmeTextLeading.pause();
-                this.dmeTextTrailing.pause();
-            }
-        }, true);
+        sub.on('navIdent').whenChanged().handle((navIdent) => {
+            this.identText.set(navIdent);
+            this.updateContents();
+        });
 
-        this.props.isVisible.sub((v) => {
-            if (v) {
-                this.resume();
-            } else {
-                this.pause();
-            }
+        sub.on('navFreq').whenChanged().handle((navFreq) => {
+            this.navFreq = navFreq;
+            this.updateContents();
+        });
+
+        sub.on('dme').whenChanged().handle((dme) => {
+            this.dme = dme;
+            this.updateContents();
+        });
+
+        // FIXME major hack: when the FM is not tuning the VORs and MMRs, the DME receiver is not tuned (goes into standby)
+        // Since we use the sim radios at the moment we can't tell that... instead we look at the FM tuning state
+        sub.on('fm1NavDiscrete').whenChanged().handle((fm1NavDiscrete) => {
+            this.fm1NavDiscrete.set(fm1NavDiscrete);
+            this.dmeAvailable = this.fm1NavDiscrete.isNormalOperation();
+            this.updateContents();
         });
     }
 
-    public pause(): void {
-        for (const sub of this.pausable) {
-            sub.pause();
+    private updateContents() {
+        const freqTextSplit = (Math.round(this.navFreq * 1000) / 1000).toString().split('.');
+        this.freqTextLeading.set(freqTextSplit[0] === '0' ? '' : freqTextSplit[0]);
+        if (freqTextSplit[1]) {
+            this.freqTextTrailing.set(`.${freqTextSplit[1].padEnd(2, '0')}`);
+        } else {
+            this.freqTextTrailing.set('');
         }
-    }
 
-    public resume(): void {
-        for (const sub of this.pausable) {
-            sub.resume(true);
+        let distLeading = '';
+        let distTrailing = '';
+        if (this.hasDme && this.dmeAvailable) {
+            this.dmeVisibilitySub.set('display: inline');
+            const dist = Math.round(this.dme * 10) / 10;
+
+            if (dist < 20) {
+                const distSplit = dist.toString().split('.');
+
+                distLeading = distSplit[0];
+                distTrailing = `.${distSplit.length > 1 ? distSplit[1] : '0'}`;
+            } else {
+                distLeading = Math.round(dist).toString();
+                distTrailing = '';
+            }
+            // eslint-disable-next-line max-len
+            this.destRef.instance.innerHTML = `<tspan id="ILSDistLeading" class="FontLarge StartAlign">${distLeading}</tspan><tspan id="ILSDistTrailing" class="FontSmallest StartAlign">${distTrailing}</tspan>`;
+        } else {
+            this.dmeVisibilitySub.set('display: none');
         }
     }
 
     render(): VNode {
         return (
-            <g
-                id="LSInfoGroup"
-                class={{ HiddenElement: this.props.isVisible.map((v) => !v) }}
-            >
-                <text
-                    id="ILSIdent"
-                    class={{
-                        Magenta: true,
-                        FontLarge: true,
-                        AlignLeft: true,
-                        HiddenElement: this.isLsIdentHidden,
-                    }}
-                    x="1.184"
-                    y="145.11522"
-                >
-                    {this.lsIdentText}
-                </text>
-                <text
-                    id="ILSFreqLeading"
-                    class={{
-                        Magenta: true,
-                        FontLarge: true,
-                        AlignLeft: true,
-                        HiddenElement: this.isLsFreqHidden,
-                    }}
-                    x="1.3610243"
-                    y="151.11575"
-                >
-                    {this.freqTextLeading}
-                </text>
-                <text
-                    id="ILSFreqTrailing"
-                    class={{
-                        Magenta: true,
-                        FontSmallest: true,
-                        AlignLeft: true,
-                        HiddenElement: this.isLsFreqHidden,
-                    }}
-                    x="12.964463"
-                    y="151.24084"
-                >
-                    {this.freqTextTrailing}
-                </text>
-
-                <g id="ILSDistGroup" class={{ HiddenElement: this.isDmeAvailable.map((v) => !v) }}>
-                    <text class="Magenta AlignLeft" x="1.3685881" y="157.26602">
-                        <tspan id="ILSDistLeading" class="FontLarge StartAlign">
-                            {this.dmeTextLeading}
-                        </tspan>
-                        <tspan id="ILSDistTrailing" class="FontSmallest StartAlign">
-                            {this.dmeTextTrailing}
-                        </tspan>
-                    </text>
+            <g id="LSInfoGroup" ref={this.lsInfoGroup}>
+                <text id="ILSIdent" class="Magenta FontLarge AlignLeft" x="1.184" y="145.11522">{this.identText}</text>
+                <text id="ILSFreqLeading" class="Magenta FontLarge AlignLeft" x="1.3610243" y="151.11575">{this.freqTextLeading}</text>
+                <text id="ILSFreqTrailing" class="Magenta FontSmallest AlignLeft" x="12.964463" y="151.24084">{this.freqTextTrailing}</text>
+
+                <g id="ILSDistGroup" style={this.dmeVisibilitySub}>
+                    <text ref={this.destRef} class="Magenta AlignLeft" x="1.3685881" y="157.26602" />
                     <text class="Cyan FontSmallest AlignLeft" x="17.159119" y="157.22606">NM</text>
                 </g>
 
diff --git a/fbw-a32nx/src/systems/instruments/src/PFD/instrument.tsx b/fbw-a32nx/src/systems/instruments/src/PFD/instrument.tsx
index bec2c2124b7..edc6e9822c5 100644
--- a/fbw-a32nx/src/systems/instruments/src/PFD/instrument.tsx
+++ b/fbw-a32nx/src/systems/instruments/src/PFD/instrument.tsx
@@ -104,17 +104,4 @@ class A32NX_PFD extends BaseInstrument {
     }
 }
 
-// Hack to support tspan SVG elements, which FSComponent does not recognise as SVG
-
-const original = document.createElement.bind(document);
-
-const extraSvgTags = ['tspan'];
-
-document.createElement = ((tagName, options) => {
-    if (extraSvgTags.includes(tagName)) {
-        return document.createElementNS('http://www.w3.org/2000/svg', tagName, options);
-    }
-    return original(tagName, options);
-}) as any;
-
 registerInstrument('a32nx-pfd', A32NX_PFD);
diff --git a/fbw-a32nx/src/systems/instruments/src/PFD/shared/PFDSimvarPublisher.tsx b/fbw-a32nx/src/systems/instruments/src/PFD/shared/PFDSimvarPublisher.tsx
index 38c7f06c712..2178cf7be86 100644
--- a/fbw-a32nx/src/systems/instruments/src/PFD/shared/PFDSimvarPublisher.tsx
+++ b/fbw-a32nx/src/systems/instruments/src/PFD/shared/PFDSimvarPublisher.tsx
@@ -207,7 +207,7 @@ export enum PFDVars {
     hasLoc = 'L:A32NX_RADIO_RECEIVER_LOC_IS_VALID',
     hasDme = 'NAV HAS DME:3',
     navIdent = 'NAV IDENT:3',
-    navFreq = 'NAV ACTIVE FREQUENCY:3',
+    navFreq = 'NAV FREQUENCY:3',
     dme = 'NAV DME:3',
     navRadialError = 'L:A32NX_RADIO_RECEIVER_LOC_DEVIATION',
     hasGlideslope = 'L:A32NX_RADIO_RECEIVER_GS_IS_VALID',