airframesio · makrsmark · Oct 11, 2024 · Oct 11, 2024 · Oct 11, 2024
diff --git a/lib/plugins/Label_10_LDR.ts b/lib/plugins/Label_10_LDR.ts
@@ -20,7 +20,7 @@ export class Label_10_LDR extends DecoderPlugin { // eslint-disable-line camelca
 
     const parts = message.text.split(',');
     if (parts.length < 17) {
-      if (options?.debug) {
+      if (options.debug) {
         console.log(`Decoder: Unknown 10 message: ${message.text}`);
       }
       decodeResult.remaining.text = message.text;

diff --git a/lib/plugins/Label_10_POS.ts b/lib/plugins/Label_10_POS.ts
@@ -20,7 +20,7 @@ export class Label_10_POS extends DecoderPlugin { // eslint-disable-line camelca
 
     const parts = message.text.split(',');
     if (parts.length !== 12) {
-      if (options?.debug) {
+      if (options.debug) {
         console.log(`Decoder: Unknown 10 message: ${message.text}`);
       }
       decodeResult.remaining.text = message.text;

diff --git a/lib/plugins/Label_10_Slash.ts b/lib/plugins/Label_10_Slash.ts
@@ -23,7 +23,7 @@ export class Label_10_Slash extends DecoderPlugin { // eslint-disable-line camel
 
     const parts = message.text.split('/');
     if (parts.length < 17) {
-      if (options?.debug) {
+      if (options.debug) {
         console.log(`Decoder: Unknown 10 message: ${message.text}`);
       }
       decodeResult.remaining.text = message.text;

diff --git a/lib/plugins/Label_12_N_Space.test.ts b/lib/plugins/Label_12_N_Space.test.ts
@@ -15,8 +15,7 @@ test('decodes Label 12 variant 1', () => {
 
   const text = 'N 42.150,W121.187,39000,161859, 109,.C-GWSO,1742';
   const decodeResult = decoderPlugin.decode({ text: text });
-  console.log(JSON.stringify(decodeResult, null, 2));
-
+
   expect(decodeResult.decoded).toBe(true);
   expect(decodeResult.decoder.decodeLevel).toBe('partial');
   expect(decodeResult.decoder.name).toBe('label-12-n-space');
@@ -50,8 +49,7 @@ test('decodes Label 12 variant 2', () => {
 
   const text = 'N 28.371,W 80.458,38000,170546, 100,.C-GVWJ,1736';
   const decodeResult = decoderPlugin.decode({ text: text });
-  console.log(JSON.stringify(decodeResult, null, 2));
-
+
   expect(decodeResult.decoded).toBe(true);
   expect(decodeResult.decoder.decodeLevel).toBe('partial');
   expect(decodeResult.decoder.name).toBe('label-12-n-space');
@@ -85,8 +83,7 @@ test('decodes Label 12 variant <invalid>', () => {
 
   const text = 'N Bogus message';
   const decodeResult = decoderPlugin.decode({ text: text });
-  console.log(JSON.stringify(decodeResult, null, 2));
-
+
   expect(decodeResult.decoded).toBe(false);
   expect(decodeResult.decoder.decodeLevel).toBe('none');
   expect(decodeResult.decoder.name).toBe('label-12-n-space');

diff --git a/lib/plugins/Label_15_FST.test.ts b/lib/plugins/Label_15_FST.test.ts
@@ -23,8 +23,7 @@ describe('Label_15_FST', () => {
     test('decodes Label 15 Preamble FST variant 1', () => {
         const text = 'FST01EGKKKMCON373488W0756927380 156 495 M53C 4427422721045313002518521710'
         const decodeResult = plugin.decode({ text: text });
-        console.log(JSON.stringify(decodeResult, null, 2));
-
+
         expect(decodeResult.decoded).toBe(true);
         expect(decodeResult.decoder.decodeLevel).toBe('partial');
         expect(decodeResult.formatted.items.length).toBe(4);

diff --git a/lib/plugins/Label_16_N_Space.test.ts b/lib/plugins/Label_16_N_Space.test.ts
@@ -15,8 +15,7 @@ test('decodes Label 16 variant 1', () => {
 
   const text = 'N 44.203,W 86.546,31965,6, 290';
   const decodeResult = decoderPlugin.decode({ text: text });
-  console.log(JSON.stringify(decodeResult, null, 2));
-
+
   expect(decodeResult.decoded).toBe(true);
   expect(decodeResult.decoder.decodeLevel).toBe('partial');
   expect(decodeResult.decoder.name).toBe('label-16-n-space');
@@ -50,8 +49,7 @@ test('decodes Label 16 variant 2', () => {
 
   const text = 'N 28.177/W 96.055';
   const decodeResult = decoderPlugin.decode({ text: text });
-  console.log(JSON.stringify(decodeResult, null, 2));
-
+
   expect(decodeResult.decoded).toBe(true);
   expect(decodeResult.decoder.decodeLevel).toBe('full');
   expect(decodeResult.decoder.name).toBe('label-16-n-space');
@@ -80,8 +78,7 @@ test('decodes Label 16 variant 3', () => {
 
   const text = 'N 44.988,W121.644,35940,6, 170';
   const decodeResult = decoderPlugin.decode({ text: text });
-  console.log(JSON.stringify(decodeResult, null, 2));
-
+
   expect(decodeResult.decoded).toBe(true);
   expect(decodeResult.decoder.decodeLevel).toBe('partial');
   expect(decodeResult.decoder.name).toBe('label-16-n-space');
@@ -115,8 +112,7 @@ test('decodes Label 16 variant <invalid>', () => {
 
   const text = 'N Bogus message';
   const decodeResult = decoderPlugin.decode({ text: text });
-  console.log(JSON.stringify(decodeResult, null, 2));
-
+
   expect(decodeResult.decoded).toBe(false);
   expect(decodeResult.decoder.decodeLevel).toBe('none');
   expect(decodeResult.decoder.name).toBe('label-16-n-space');

diff --git a/lib/plugins/Label_1M_Slash.test.ts b/lib/plugins/Label_1M_Slash.test.ts
@@ -15,8 +15,7 @@ test('decodes Label 8E sample 1', () => {
 
   const text = '/BA0843/ETA01/230822/LDSP/EGLL/EGSS/2JK0\n1940/EGLL27L/10';
   const decodeResult = decoderPlugin.decode({ text: text });
-  console.log(JSON.stringify(decodeResult, null, 2));
-
+
   expect(decodeResult.decoded).toBe(true);
   expect(decodeResult.decoder.decodeLevel).toBe('partial');
   expect(decodeResult.decoder.name).toBe('label-1m-slash');

diff --git a/lib/plugins/Label_20_POS.ts b/lib/plugins/Label_20_POS.ts
@@ -22,15 +22,13 @@ export class Label_20_POS extends DecoderPlugin {
     decodeResult.raw.preamble = message.text.substring(0, 3);
 
     const content = message.text.substring(3);
-    console.log('Content: ' + content);
-
     const fields = content.split(',');
-    console.log('Field Count: ' + fields.length);
 
     if (fields.length == 11) {
       // N38160W077075,,211733,360,OTT,212041,,N42,19689,40,544
-      console.log(`DEBUG: ${this.name}: Variation 1 detected`);
-
+      if(options.debug) {
+        console.log(`DEBUG: ${this.name}: Variation 1 detected`);
+      }
       // Field 1: Coordinates
       const rawCoords = fields[0];
       decodeResult.raw.position = CoordinateUtils.decodeStringCoordinates(rawCoords);
@@ -47,8 +45,9 @@ export class Label_20_POS extends DecoderPlugin {
       decodeResult.decoder.decodeLevel = 'full';
     } else if (fields.length == 5) {
       // N38160W077075,,211733,360,OTT
-      console.log(`DEBUG: ${this.name}: Variation 2 detected`);
-
+      if(options.debug) {
+        console.log(`DEBUG: ${this.name}: Variation 2 detected`);
+      }
       // Field 1: Coordinates
       const rawCoords = fields[0];
       decodeResult.raw.position = CoordinateUtils.decodeStringCoordinates(rawCoords);
@@ -64,7 +63,9 @@ export class Label_20_POS extends DecoderPlugin {
       decodeResult.decoder.decodeLevel = 'full';
     } else {
       // Unknown!
-      console.log(`DEBUG: ${this.name}: Unknown variation. Field count: ${fields.length}, content: ${content}`);
+      if(options.debug) {
+        console.log(`DEBUG: ${this.name}: Unknown variation. Field count: ${fields.length}, content: ${content}`);
+      }
       decodeResult.decoded = false;
       decodeResult.decoder.decodeLevel = 'none';
     }

diff --git a/lib/plugins/Label_21_POS.test.ts b/lib/plugins/Label_21_POS.test.ts
@@ -49,8 +49,7 @@ describe('Label_21_POS', () => {
 
         const text = 'POS Bogus message';
         const decodeResult = plugin.decode({ text: text });
-        console.log(JSON.stringify(decodeResult, null, 2));
-
+
         expect(decodeResult.decoded).toBe(false);
         expect(decodeResult.decoder.decodeLevel).toBe('none');
         expect(decodeResult.decoder.name).toBe('label-21-pos');

diff --git a/lib/plugins/Label_21_POS.ts b/lib/plugins/Label_21_POS.ts
@@ -22,10 +22,7 @@ export class Label_21_POS extends DecoderPlugin {
     decodeResult.raw.preamble = message.text.substring(0, 3);
 
     const content = message.text.substring(3);
-    console.log('Content: ' + content);
-
     const fields = content.split(',');
-    console.log('Field Count: ' + fields.length);
 
     if (fields.length == 9) {
       // POSN 37.550W 76.436,  98,110800,23961,25820,  65,-23,114212,KRDU
@@ -46,7 +43,9 @@ export class Label_21_POS extends DecoderPlugin {
       decodeResult.decoder.decodeLevel = 'partial';
     } else {
       // Unknown!
-      console.log(`DEBUG: ${this.name}: Unknown variation. Field count: ${fields.length}, content: ${content}`);
+      if(options.debug) {
+        console.log(`DEBUG: ${this.name}: Unknown variation. Field count: ${fields.length}, content: ${content}`);
+      }
       decodeResult.decoded = false;
       decodeResult.decoder.decodeLevel = 'none';
     }

diff --git a/lib/plugins/Label_30_Slash_EA.test.ts b/lib/plugins/Label_30_Slash_EA.test.ts
@@ -15,8 +15,7 @@ test('decodes Label 30 sample 1', () => {
 
   const text = '/EA1719/DSKSFO/SK23';
   const decodeResult = decoderPlugin.decode({ text: text });
-  console.log(JSON.stringify(decodeResult, null, 2));
-
+
   expect(decodeResult.decoded).toBe(true);
   expect(decodeResult.decoder.decodeLevel).toBe('partial');
   expect(decodeResult.decoder.name).toBe('label-30-slash-ea');

diff --git a/lib/plugins/Label_44_POS.test.ts b/lib/plugins/Label_44_POS.test.ts
@@ -20,8 +20,7 @@ test('decodes Label 44 Preamble POS02 variant 1', () => {
   // https://app.airframes.io/messages/3389060301
   const text = 'POS02,N38171W077507,319,KJFK,KUZA,0926,0245,0327,004.6';
   const decodeResult = decoderPlugin.decode({ text: text });
-  console.log(JSON.stringify(decodeResult, null, 2));
-
+
   expect(decodeResult.decoded).toBe(true);
   expect(decodeResult.decoder.decodeLevel).toBe('full');
   expect(decodeResult.decoder.name).toBe('label-44-pos');
@@ -61,8 +60,7 @@ xtest('decodes Label 44 Preamble POS02 <invalid>', () => {
 
   const text = 'POS02 Bogus message';
   const decodeResult = decoderPlugin.decode({ text: text });
-  console.log(JSON.stringify(decodeResult, null, 2));
-
+
   expect(decodeResult.decoded).toBe(false);
   expect(decodeResult.decoder.decodeLevel).toBe('none');
   expect(decodeResult.decoder.name).toBe('label-44-pos');

diff --git a/lib/plugins/Label_80.test.ts b/lib/plugins/Label_80.test.ts
@@ -21,8 +21,7 @@ test('decodes Label 80 variant 1', () => {
   // https://app.airframes.io/messages/377573108
   const text = '3N01 POSRPT 5891/04 KIAH/MMGL .XA-VOI\r\n/POS N29395W095133/ALT +15608/MCH 558/FOB 0100/ETA 0410';
   const decodeResult = decoderPlugin.decode({ text: text });
-  console.log(JSON.stringify(decodeResult, null, 2));
-
+
   expect(decodeResult.decoded).toBe(true);
   expect(decodeResult.decoder.decodeLevel).toBe('none'); //FIXME: full
   expect(decodeResult.decoder.name).toBe('label-80');
@@ -70,8 +69,7 @@ test('decodes Label 80 variant 2', () => {
   // https://app.airframes.io/messages/2416917371
   const text = '3N01 POSRPT 0581/27 KIAD/MSLP .N962AV/04H 11:02\r\n/NWYP CIGAR /HDG 233/MCH 782\r\n/POS N3539.2W07937.2/FL 360/TAS 445/SAT -060\r\n/SWND 110/DWND 306/FOB N009414/ETA 14:26.0 ';
   const decodeResult = decoderPlugin.decode({ text: text });
-  console.log(JSON.stringify(decodeResult, null, 2));
-
+
   expect(decodeResult.decoded).toBe(true);
   expect(decodeResult.decoder.decodeLevel).toBe('none'); //FIXME: full
   expect(decodeResult.decoder.name).toBe('label-80');
@@ -150,8 +148,7 @@ test('decodes Label 80 <invalid>', () => {
 
   const text = '3N01 POSRPT Bogus message';
   const decodeResult = decoderPlugin.decode({ text: text });
-  console.log(JSON.stringify(decodeResult, null, 2));
-
+
   expect(decodeResult.decoded).toBe(false);
   expect(decodeResult.decoder.decodeLevel).toBe('none');
   expect(decodeResult.decoder.name).toBe('label-80');

diff --git a/lib/plugins/Label_8E.test.ts b/lib/plugins/Label_8E.test.ts
@@ -13,8 +13,7 @@ test('decodes Label 8E sample 1', () => {
   });
 
   const decodeResult = decoderPlugin.decode({ text: 'EGSS,1618' });
-  console.log(JSON.stringify(decodeResult, null, 2));
-
+
   expect(decodeResult.decoded).toBe(true);
   expect(decodeResult.decoder.name).toBe('label-8e');
   expect(decodeResult.formatted.description).toBe('ETA Report');

diff --git a/lib/plugins/Label_H1_FLR.test.ts b/lib/plugins/Label_H1_FLR.test.ts
@@ -21,8 +21,7 @@ test('decodes Label H1 Preamble FLR FWC2', () => {
   // https://app.airframes.io/messages/2436863787
   const text = 'FLR/FR24030411230034583106FWC2 :NO DATA FROM GPS1 /IDECAM 2 ,ECAM 1 ';
   const decodeResult = decoderPlugin.decode({ text: text });
-  console.log(JSON.stringify(decodeResult, null, 2));
-
+
   expect(decodeResult.decoded).toBe(true);
   expect(decodeResult.decoder.decodeLevel).toBe('partial');
   expect(decodeResult.decoder.name).toBe('label-h1-flr');
@@ -44,8 +43,7 @@ test('decodes Label H1 Preamble FLR CDSU', () => {
   // https://app.airframes.io/messages/2436949441
   const text = 'FLR/PNRC12860AA07/FR24030411040023723406CDSU(9RA)/DU SD(4WT2) /IDEIS 1 ';
   const decodeResult = decoderPlugin.decode({ text: text });
-  console.log(JSON.stringify(decodeResult, null, 2));
-
+
   expect(decodeResult.decoded).toBe(true);
   expect(decodeResult.decoder.decodeLevel).toBe('partial');
   expect(decodeResult.decoder.name).toBe('label-h1-flr');
@@ -67,8 +65,7 @@ test('decodes Label H1 Preamble FLR RA1', () => {
   // https://app.airframes.io/messages/2436701901
   const text = 'FLR/FR24030409560034423306RA1/IDEFCS 1 ,EFCS 2 ';
   const decodeResult = decoderPlugin.decode({ text: text });
-  console.log(JSON.stringify(decodeResult, null, 2));
-
+
   expect(decodeResult.decoded).toBe(true);
   expect(decodeResult.decoder.decodeLevel).toBe('partial');
   expect(decodeResult.decoder.name).toBe('label-h1-flr');
@@ -90,8 +87,7 @@ test('decodes Label H1 Preamble FLR LQD', () => {
   // https://app.airframes.io/messages/2436740709
   const text = 'FLR/FR24030410030038316206LIQD LVL XMTR (40MG)/IDTOILET ';
   const decodeResult = decoderPlugin.decode({ text: text });
-  console.log(JSON.stringify(decodeResult, null, 2));
-
+
   expect(decodeResult.decoded).toBe(true);
   expect(decodeResult.decoder.decodeLevel).toBe('partial');
   expect(decodeResult.decoder.name).toBe('label-h1-flr');
@@ -113,8 +109,7 @@ test('decodes Label H1 Preamble FLR LQD', () => {
   // https://app.airframes.io/messages/2437260976
   const text = '#CFBFLR/FR24030412400034723406ATC1(1SH1)/TCAS(1000SG) /IDTCAS ';
   const decodeResult = decoderPlugin.decode({ text: text });
-  console.log(JSON.stringify(decodeResult, null, 2));
-
+
   expect(decodeResult.decoded).toBe(true);
   expect(decodeResult.decoder.decodeLevel).toBe('partial');
   expect(decodeResult.decoder.name).toBe('label-h1-flr');
@@ -135,8 +130,7 @@ test('decodes Label H1 Preamble FLR invalid', () => {
 
   const text = 'FLR <Invalid text>';
   const decodeResult = decoderPlugin.decode({ text: text });
-  console.log(JSON.stringify(decodeResult, null, 2));
-
+
   expect(decodeResult.decoded).toBe(false);
   expect(decodeResult.decoder.decodeLevel).toBe('none');
   expect(decodeResult.decoder.name).toBe('label-h1-flr');