@airframes/acars-decoder 1.6.11 → 1.6.13

package/dist/index.mjs

@@ -12,6 +12,74 @@ var IcaoDecoder = class {
   }
 };
 
+// lib/DateTimeUtils.ts
+var DateTimeUtils = class {
+  // Expects a four digit UTC time string (HHMM)
+  static UTCToString(UTCString) {
+    let utcDate = /* @__PURE__ */ new Date();
+    utcDate.setUTCHours(+UTCString.substr(0, 2), +UTCString.substr(2, 2), 0);
+    return utcDate.toTimeString();
+  }
+  // Expects a six digit date string and a four digit UTC time string
+  // (DDMMYY) (HHMM)
+  static UTCDateTimeToString(dateString, timeString) {
+    let utcDate = /* @__PURE__ */ new Date();
+    utcDate.setUTCDate(+dateString.substr(0, 2));
+    utcDate.setUTCMonth(+dateString.substr(2, 2));
+    if (dateString.length === 6) {
+      utcDate.setUTCFullYear(2e3 + +dateString.substr(4, 2));
+    }
+    if (timeString.length === 6) {
+      utcDate.setUTCHours(+timeString.substr(0, 2), +timeString.substr(2, 2), +timeString.substr(4, 2));
+    } else {
+      utcDate.setUTCHours(+timeString.substr(0, 2), +timeString.substr(2, 2), 0);
+    }
+    return utcDate.toUTCString();
+  }
+  /**
+   * 
+   * @param time HHMMSS
+   * @returns seconds since midnight
+   */
+  static convertHHMMSSToTod(time) {
+    const h = Number(time.substring(0, 2));
+    const m = Number(time.substring(2, 4));
+    const s = Number(time.substring(4, 6));
+    const tod = h * 3600 + m * 60 + s;
+    return tod;
+  }
+  /**
+   * 
+   * @param time HHMMSS
+   * @param date MMDDYY or MMDDYYYY
+   * @returns seconds since epoch
+   */
+  static convertDateTimeToEpoch(time, date) {
+    if (date.length === 6) {
+      date = date.substring(0, 4) + `20${date.substring(4, 6)}`;
+    }
+    const timestamp = `${date.substring(4, 8)}-${date.substring(0, 2)}-${date.substring(2, 4)}T${time.substring(0, 2)}:${time.substring(2, 4)}:${time.substring(4, 6)}.000Z`;
+    const millis = Date.parse(timestamp);
+    return millis / 1e3;
+  }
+  /**
+   * Converts a timestamp to a string
+   * 
+   * ISO-8601 format for 'epoch'
+   * HH:MM:SS for 'tod'
+   * @param time 
+   * @param format 
+   * @returns 
+   */
+  static timestampToString(time, format) {
+    const date = new Date(time * 1e3);
+    if (format == "tod") {
+      return date.toISOString().slice(11, 19);
+    }
+    return date.toISOString().slice(0, -5) + "Z";
+  }
+};
+
 // lib/DecoderPlugin.ts
 var DecoderPlugin = class {
   decoder;
@@ -61,7 +129,7 @@ var DecoderPlugin = class {
 };
 
 // lib/utils/coordinate_utils.ts
-var CoordinateUtils = class {
+var CoordinateUtils = class _CoordinateUtils {
   /**
    * Decode a string of coordinates into an object with latitude and longitude in millidegrees
    * @param stringCoords - The string of coordinates to decode
@@ -78,8 +146,8 @@ var CoordinateUtils = class {
       longitudeChars = stringCoords.substring(8, 14);
     }
     if ((firstChar === "N" || firstChar === "S") && (middleChar === "W" || middleChar === "E")) {
-      results.latitude = Number(stringCoords.substring(1, 6)) / 1e3 * (firstChar === "S" ? -1 : 1);
-      results.longitude = Number(longitudeChars) / 1e3 * (middleChar === "W" ? -1 : 1);
+      results.latitude = Number(stringCoords.substring(1, 6)) / 1e3 * _CoordinateUtils.getDirection(firstChar);
+      results.longitude = Number(longitudeChars) / 1e3 * _CoordinateUtils.getDirection(middleChar);
     } else {
       return;
     }
@@ -105,8 +173,8 @@ var CoordinateUtils = class {
     const lonDeg = Math.trunc(Number(longitudeChars) / 1e3);
     const lonMin = Number(longitudeChars) % 1e3 / 10;
     if ((firstChar === "N" || firstChar === "S") && (middleChar === "W" || middleChar === "E")) {
-      results.latitude = (latDeg + latMin / 60) * (firstChar === "S" ? -1 : 1);
-      results.longitude = (lonDeg + lonMin / 60) * (middleChar === "W" ? -1 : 1);
+      results.latitude = (latDeg + latMin / 60) * _CoordinateUtils.getDirection(firstChar);
+      results.longitude = (lonDeg + lonMin / 60) * _CoordinateUtils.getDirection(middleChar);
     } else {
       return;
     }
@@ -130,9 +198,137 @@ var CoordinateUtils = class {
   }
 };
 
+// lib/utils/route_utils.ts
+var RouteUtils = class _RouteUtils {
+  static formatFlightState(state) {
+    switch (state) {
+      case "TO":
+        return "Takeoff";
+      case "IC":
+        return "Initial Climb";
+      case "CL":
+        return "Climb";
+      case "ER":
+        return "En Route";
+      case "DC":
+        return "Descent";
+      case "AP":
+        return "Approach";
+      default:
+        return `Unknown ${state}`;
+    }
+  }
+  static routeToString(route) {
+    let str = "";
+    if (route.name) {
+      str += route.name;
+    }
+    if (route.runway) {
+      str += `(${route.runway})`;
+    }
+    if (str.length !== 0 && route.waypoints && route.waypoints.length === 1) {
+      str += " starting at ";
+    } else if (str.length !== 0 && route.waypoints) {
+      str += ": ";
+    }
+    if (route.waypoints) {
+      str += _RouteUtils.waypointsToString(route.waypoints);
+    }
+    return str;
+  }
+  static waypointToString(waypoint) {
+    let s = waypoint.name;
+    if (waypoint.latitude && waypoint.longitude) {
+      s += `(${CoordinateUtils.coordinateString({ latitude: waypoint.latitude, longitude: waypoint.longitude })})`;
+    }
+    if (waypoint.offset) {
+      s += `[${waypoint.offset.bearing}\xB0 ${waypoint.offset.distance}nm]`;
+    }
+    if (waypoint.time && waypoint.timeFormat) {
+      s += `@${DateTimeUtils.timestampToString(waypoint.time, waypoint.timeFormat)}`;
+    }
+    return s;
+  }
+  static getWaypoint(leg) {
+    const regex = leg.match(/^([A-Z]+)(\d{3})-(\d{4})$/);
+    if (regex?.length == 4) {
+      return { name: regex[1], offset: { bearing: parseInt(regex[2]), distance: parseInt(regex[3]) / 10 } };
+    }
+    const waypoint = leg.split(",");
+    if (waypoint.length == 2) {
+      const position = CoordinateUtils.decodeStringCoordinatesDecimalMinutes(waypoint[1]);
+      if (position) {
+        return { name: waypoint[0], latitude: position.latitude, longitude: position.longitude };
+      }
+    }
+    if (leg.length == 13 || leg.length == 14) {
+      const position = CoordinateUtils.decodeStringCoordinatesDecimalMinutes(leg);
+      const name = waypoint.length == 2 ? waypoint[0] : "";
+      if (position) {
+        return { name, latitude: position.latitude, longitude: position.longitude };
+      }
+    }
+    return { name: leg };
+  }
+  static waypointsToString(waypoints) {
+    let str = waypoints.map((x) => _RouteUtils.waypointToString(x)).join(" > ").replaceAll(">  >", ">>");
+    if (str.startsWith(" > ")) {
+      str = ">>" + str.slice(2);
+    }
+    return str;
+  }
+};
+
 // lib/utils/result_formatter.ts
 var ResultFormatter = class {
+  static route(decodeResult, route) {
+    decodeResult.raw.route = route;
+    decodeResult.formatted.items.push({
+      type: "aircraft_route",
+      code: "ROUTE",
+      label: "Aircraft Route",
+      value: RouteUtils.routeToString(route)
+    });
+  }
+  static state_change(decodeResult, from, to) {
+    decodeResult.raw.state_change = {
+      from,
+      to
+    };
+    from = RouteUtils.formatFlightState(from);
+    to = RouteUtils.formatFlightState(to);
+    decodeResult.formatted.items.push({
+      type: "state_change",
+      code: "STATE_CHANGE",
+      label: "State Change",
+      value: `${from} -> ${to}`
+    });
+  }
+  static freetext(decodeResult, value) {
+    decodeResult.raw.freetext = value;
+    decodeResult.formatted.items.push({
+      type: "freetext",
+      code: "FREE_TEXT",
+      label: "Free Text",
+      value
+    });
+  }
+  static door_event(decodeResult, name, state) {
+    decodeResult.raw.door_event = {
+      door: name,
+      state
+    };
+    decodeResult.formatted.items.push({
+      type: "door_event",
+      code: "DOOR",
+      label: "Door Event",
+      value: `${name} ${state}`
+    });
+  }
   static position(decodeResult, value) {
+    if (!value || isNaN(value.latitude) || isNaN(value.longitude)) {
+      return;
+    }
     decodeResult.raw.position = value;
     decodeResult.formatted.items.push({
       type: "aircraft_position",
@@ -152,16 +348,41 @@ var ResultFormatter = class {
   }
   static flightNumber(decodeResult, value) {
     decodeResult.raw.flight_number = value;
+    decodeResult.formatted.items.push({
+      type: "flight_number",
+      code: "FLIGHT",
+      label: "Flight Number",
+      value: decodeResult.raw.flight_number
+    });
   }
-  static departureAirport(decodeResult, value) {
-    decodeResult.raw.departure_icao = value;
+  static callsign(decodeResult, value) {
+    decodeResult.raw.callsign = value;
     decodeResult.formatted.items.push({
-      type: "origin",
-      code: "ORG",
-      label: "Origin",
-      value: decodeResult.raw.departure_icao
+      type: "callsign",
+      code: "CALLSIGN",
+      label: "Callsign",
+      value: decodeResult.raw.callsign
     });
   }
+  static departureAirport(decodeResult, value, type = "ICAO") {
+    if (type === "ICAO") {
+      decodeResult.raw.departure_icao = value;
+      decodeResult.formatted.items.push({
+        type: "icao",
+        code: "ORG",
+        label: "Origin",
+        value
+      });
+    } else {
+      decodeResult.raw.departure_iata = value;
+      decodeResult.formatted.items.push({
+        type: "iata",
+        code: "ORG",
+        label: "Origin",
+        value
+      });
+    }
+  }
   static departureRunway(decodeResult, value) {
     decodeResult.raw.departure_runway = value;
     decodeResult.formatted.items.push({
@@ -171,33 +392,52 @@ var ResultFormatter = class {
       value: decodeResult.raw.departure_runway
     });
   }
-  static arrivalAirport(decodeResult, value) {
-    decodeResult.raw.arrival_icao = value;
-    decodeResult.formatted.items.push({
-      type: "destination",
-      code: "DST",
-      label: "Destination",
-      value: decodeResult.raw.arrival_icao
-    });
+  static arrivalAirport(decodeResult, value, type = "ICAO") {
+    if (type === "ICAO") {
+      decodeResult.raw.arrival_icao = value;
+      decodeResult.formatted.items.push({
+        type: "icao",
+        code: "DST",
+        label: "Destination",
+        value
+      });
+    } else {
+      decodeResult.raw.arrival_iata = value;
+      decodeResult.formatted.items.push({
+        type: "iata",
+        code: "DST",
+        label: "Destination",
+        value
+      });
+    }
   }
   static alternateAirport(decodeResult, value) {
     decodeResult.raw.alternate_icao = value;
     decodeResult.formatted.items.push({
-      type: "destination",
+      type: "icao",
       code: "ALT_DST",
       label: "Alternate Destination",
       value: decodeResult.raw.alternate_icao
     });
   }
-  // FIXME - make seconds since midnight for time of day
-  static eta(decodeResult, value) {
-    decodeResult.raw.eta_time = value;
-    decodeResult.formatted.items.push({
-      type: "eta",
-      code: "ETA",
-      label: "Estimated Time of Arrival",
-      value: value.substring(0, 2) + ":" + value.substring(2, 4) + ":" + value.substring(4, 6)
-    });
+  static eta(decodeResult, time, type = "tod") {
+    if (type === "tod") {
+      decodeResult.raw.eta_time = time;
+      decodeResult.formatted.items.push({
+        type: "time_of_day",
+        code: "ETA",
+        label: "Estimated Time of Arrival",
+        value: DateTimeUtils.timestampToString(time, "tod")
+      });
+    } else {
+      decodeResult.raw.eta_date = time;
+      decodeResult.formatted.items.push({
+        type: "epoch",
+        code: "ETA",
+        label: "Estimated Time of Arrival",
+        value: DateTimeUtils.timestampToString(time, "epoch")
+      });
+    }
   }
   static arrivalRunway(decodeResult, value) {
     decodeResult.raw.arrival_runway = value;
@@ -254,12 +494,12 @@ var ResultFormatter = class {
     });
   }
   static temperature(decodeResult, value) {
-    decodeResult.raw.outside_air_temperature = Number(value.substring(1)) * (value.charAt(0) === "M" ? -1 : 1);
+    decodeResult.raw.outside_air_temperature = Number(value.replace("M", "-").replace("P", "+"));
     decodeResult.formatted.items.push({
       type: "outside_air_temperature",
       code: "OATEMP",
       label: "Outside Air Temperature (C)",
-      value: `${decodeResult.raw.outside_air_temperature}`
+      value: `${decodeResult.raw.outside_air_temperature} degrees`
     });
   }
   static heading(decodeResult, value) {
@@ -282,52 +522,99 @@ var ResultFormatter = class {
   }
   static out(decodeResult, time) {
     decodeResult.raw.out_time = time;
-    const date = new Date(time * 1e3);
     decodeResult.formatted.items.push({
       type: "time_of_day",
       code: "OUT",
       label: "Out of Gate Time",
-      value: date.toISOString().slice(11, 19)
+      value: DateTimeUtils.timestampToString(time, "tod")
     });
   }
   static off(decodeResult, time) {
     decodeResult.raw.off_time = time;
-    const date = new Date(time * 1e3);
     decodeResult.formatted.items.push({
       type: "time_of_day",
       code: "OFF",
       label: "Takeoff Time",
-      value: date.toISOString().slice(11, 19)
+      value: DateTimeUtils.timestampToString(time, "tod")
     });
   }
   static on(decodeResult, time) {
     decodeResult.raw.on_time = time;
-    const date = new Date(time * 1e3);
     decodeResult.formatted.items.push({
       type: "time_of_day",
       code: "ON",
       label: "Landing Time",
-      value: date.toISOString().slice(11, 19)
+      value: DateTimeUtils.timestampToString(time, "tod")
     });
   }
   static in(decodeResult, time) {
     decodeResult.raw.in_time = time;
-    const date = new Date(time * 1e3);
     decodeResult.formatted.items.push({
       type: "time_of_day",
       code: "IN",
       label: "In Gate Time",
-      value: date.toISOString().slice(11, 19)
+      value: DateTimeUtils.timestampToString(time, "tod")
+    });
+  }
+  static time_of_day(decodeResult, time) {
+    decodeResult.raw.time_of_day = time;
+    decodeResult.formatted.items.push({
+      type: "time_of_day",
+      code: "MSG_TOD",
+      label: "Message Timestamp",
+      value: DateTimeUtils.timestampToString(time, "tod")
+    });
+  }
+  static day(decodeResult, day) {
+    decodeResult.raw.day_of_month = day;
+    decodeResult.formatted.items.push({
+      type: "day_of_month",
+      code: "MSG_DAY",
+      label: "Day of Month",
+      value: `${day}`
+    });
+  }
+  static departureDay(decodeResult, day) {
+    decodeResult.raw.departure_day_of_month = day;
+    decodeResult.formatted.items.push({
+      type: "day_of_month",
+      code: "DEP_DAY",
+      label: "Departure Day",
+      value: `${day}`
+    });
+  }
+  static arrivalDay(decodeResult, day) {
+    decodeResult.raw.arrival_day_of_month = day;
+    decodeResult.formatted.items.push({
+      type: "day_of_month",
+      code: "ARR_DAY",
+      label: "Arrival Day",
+      value: `${day}`
+    });
+  }
+  static text(decodeResult, text) {
+    decodeResult.raw.text = text;
+    decodeResult.formatted.items.push({
+      type: "text",
+      code: "TEXT",
+      label: "Text Message",
+      value: text
     });
   }
-  static unknown(decodeResult, value) {
-    decodeResult.remaining.text += "," + value;
+  static unknown(decodeResult, value, sep = ",") {
+    if (!decodeResult.remaining.text)
+      decodeResult.remaining.text = value;
+    else
+      decodeResult.remaining.text += sep + value;
+  }
+  static unknownArr(decodeResult, value, sep = ",") {
+    this.unknown(decodeResult, value.join(sep), sep);
   }
 };
 
-// lib/plugins/Label_5Z.ts
-var Label_5Z = class extends DecoderPlugin {
-  name = "label-5z";
+// lib/plugins/Label_5Z_Slash.ts
+var Label_5Z_Slash = class extends DecoderPlugin {
+  name = "label-5z-slash";
   descriptions = {
     B1: "Request Weight and Balance",
     B3: "Request Departure Clearance",
@@ -345,6 +632,7 @@ var Label_5Z = class extends DecoderPlugin {
     D6: "From-To + Date",
     D7: "From-To + Alternate + Time",
     EO: "In Range",
+    ET: "Expected Time",
     PW: "Position Weather",
     RL: "Request Release",
     R3: "Request HOWGOZIT Message",
@@ -355,53 +643,87 @@ var Label_5Z = class extends DecoderPlugin {
   };
   qualifiers() {
     return {
-      labels: ["5Z"]
+      labels: ["5Z"],
+      preambles: ["/"]
     };
   }
   decode(message, options = {}) {
     const decodeResult = this.defaultResult();
     decodeResult.decoder.name = this.name;
     decodeResult.formatted.description = "Airline Designated Downlink";
-    const uaRegex = /^\/(?<type>\w+) (?<remainder>.+)/;
-    let results = message.text.match(uaRegex);
-    if (results && results.length >= 2) {
-      const type = results.groups.type.split("/")[0];
-      const { remainder } = results.groups;
-      const typeDescription = this.descriptions[type] ? this.descriptions[type] : "Unknown";
+    const lines = message.text.split("\r\n");
+    if (lines[0] === "/TXT") {
+      ResultFormatter.text(decodeResult, lines.slice(1).join("\r\n"));
+      decodeResult.decoded = true;
+      decodeResult.decoder.decodeLevel = "full";
+      return decodeResult;
+    }
+    const data = lines[0].split("/");
+    const header = data[1].split(" ");
+    const type = header[0];
+    const typeDescription = this.descriptions[type];
+    if (typeDescription) {
       decodeResult.raw.airline = "United Airlines";
       decodeResult.formatted.items.push({
         type: "airline",
+        code: "AIRLINE",
         label: "Airline",
         value: "United Airlines"
       });
       decodeResult.raw.message_type = type;
       decodeResult.formatted.items.push({
         type: "message_type",
+        code: "MSG_TYPE",
         label: "Message Type",
         value: `${typeDescription} (${type})`
       });
-      if (type === "B3") {
-        const rdcRegex = /^(?<from>\w\w\w)(?<to>\w\w\w) (?<unknown1>\d\d) R(?<runway>.+) G(?<unknown2>.+)$/;
-        results = remainder.match(rdcRegex);
-        if (results) {
-          ResultFormatter.departureAirport(decodeResult, results.groups.from);
-          ResultFormatter.arrivalAirport(decodeResult, results.groups.to);
-          ResultFormatter.arrivalRunway(decodeResult, results.groups.runway);
-        } else {
-          if (options.debug) {
-            console.log(`Decoder: Unkown 5Z RDC format: ${remainder}`);
-          }
+      if (type === "B3" && data[1] === "B3 TO DATA REQ    ") {
+        const info = data[2].split(" ");
+        ResultFormatter.departureAirport(decodeResult, info[1]);
+        ResultFormatter.arrivalAirport(decodeResult, info[2]);
+        decodeResult.raw.day_of_month = Number(info[3]);
+        ResultFormatter.time_of_day(decodeResult, DateTimeUtils.convertHHMMSSToTod(info[4]));
+        ResultFormatter.arrivalRunway(decodeResult, info[5].slice(1));
+        ResultFormatter.unknownArr(decodeResult, data.slice(3), "/");
+      } else if (type === "B3") {
+        ResultFormatter.departureAirport(decodeResult, header[1].substring(0, 3), "IATA");
+        ResultFormatter.arrivalAirport(decodeResult, header[1].substring(3), "IATA");
+        decodeResult.raw.day_of_month = Number(header[2]);
+        ResultFormatter.arrivalRunway(decodeResult, header[3].slice(1));
+        if (header.length > 4) {
+          ResultFormatter.unknownArr(decodeResult, header.slice(4), "/");
         }
+      } else if (type === "C3" && data[1] === "C3 GATE REQ       ") {
+        const info = data[2].split(" ");
+        ResultFormatter.departureAirport(decodeResult, info[1]);
+        ResultFormatter.arrivalAirport(decodeResult, info[2]);
+        decodeResult.raw.day_of_month = Number(info[3]);
+        ResultFormatter.time_of_day(decodeResult, DateTimeUtils.convertHHMMSSToTod(info[4]));
+        ResultFormatter.unknownArr(decodeResult, info.slice(5), " ");
+      } else if (type === "C3") {
+        ResultFormatter.departureAirport(decodeResult, header[1].substring(0, 3), "IATA");
+        ResultFormatter.arrivalAirport(decodeResult, header[1].substring(3), "IATA");
+      } else if (type === "ET") {
+        const airports = data[2].split(" ");
+        ResultFormatter.departureAirport(decodeResult, airports[1]);
+        ResultFormatter.arrivalAirport(decodeResult, airports[2]);
+        decodeResult.raw.day_of_month = Number(airports[3]);
+        ResultFormatter.time_of_day(decodeResult, DateTimeUtils.convertHHMMSSToTod(airports[4]));
+        const estimates = data[3].split(" ");
+        ResultFormatter.eta(decodeResult, DateTimeUtils.convertHHMMSSToTod(estimates[1] + "00"));
+        ResultFormatter.unknown(decodeResult, estimates[2]);
       } else {
-        decodeResult.remaining.text = remainder;
+        if (options.debug) {
+          console.log(`Decoder: Unkown 5Z RDC format: ${message.text}`);
+        }
       }
       decodeResult.decoded = true;
-      decodeResult.decoder.decodeLevel = "partial";
+      decodeResult.decoder.decodeLevel = decodeResult.remaining.text ? "partial" : "full";
     } else {
       if (options.debug) {
         console.log(`Decoder: Unknown 5Z message: ${message.text}`);
       }
-      decodeResult.remaining.text = message.text;
+      ResultFormatter.unknown(decodeResult, message.text);
       decodeResult.decoded = false;
       decodeResult.decoder.decodeLevel = "none";
     }
@@ -429,7 +751,7 @@ var Label_10_LDR = class extends DecoderPlugin {
       if (options.debug) {
         console.log(`Decoder: Unknown 10 message: ${message.text}`);
       }
-      decodeResult.remaining.text = message.text;
+      ResultFormatter.unknown(decodeResult, message.text);
       decodeResult.decoded = false;
       decodeResult.decoder.decodeLevel = "none";
       return decodeResult;
@@ -450,7 +772,7 @@ var Label_10_LDR = class extends DecoderPlugin {
     if (altRwy != "") {
       ResultFormatter.alternateRunway(decodeResult, altRwy);
     }
-    decodeResult.remaining.text = [...parts.slice(0, 5), ...parts.slice(15)].join(",");
+    ResultFormatter.unknownArr(decodeResult, [...parts.slice(0, 5), ...parts.slice(15)]);
     decodeResult.decoded = true;
     decodeResult.decoder.decodeLevel = "partial";
     return decodeResult;
@@ -477,7 +799,7 @@ var Label_10_POS = class extends DecoderPlugin {
       if (options.debug) {
         console.log(`Decoder: Unknown 10 message: ${message.text}`);
       }
-      decodeResult.remaining.text = message.text;
+      ResultFormatter.unknown(decodeResult, message.text);
       decodeResult.decoded = false;
       decodeResult.decoder.decodeLevel = "none";
       return decodeResult;
@@ -490,160 +812,37 @@ var Label_10_POS = class extends DecoderPlugin {
     };
     ResultFormatter.position(decodeResult, position);
     ResultFormatter.altitude(decodeResult, Number(parts[7]));
-    decodeResult.remaining.text = [parts[0], ...parts.slice(3, 7), ...parts.slice(8)].join(",");
+    ResultFormatter.unknownArr(decodeResult, [parts[0], ...parts.slice(3, 7), ...parts.slice(8)]);
     decodeResult.decoded = true;
     decodeResult.decoder.decodeLevel = "partial";
     return decodeResult;
   }
 };
 
-// lib/DateTimeUtils.ts
-var DateTimeUtils = class {
-  // Expects a four digit UTC time string (HHMM)
-  static UTCToString(UTCString) {
-    let utcDate = /* @__PURE__ */ new Date();
-    utcDate.setUTCHours(+UTCString.substr(0, 2), +UTCString.substr(2, 2), 0);
-    return utcDate.toTimeString();
+// lib/plugins/Label_10_Slash.ts
+var Label_10_Slash = class extends DecoderPlugin {
+  // eslint-disable-line camelcase
+  name = "label-10-slash";
+  qualifiers() {
+    return {
+      labels: ["10"],
+      preambles: ["/"]
+    };
   }
-  // Expects a six digit date string and a four digit UTC time string
-  // (DDMMYY) (HHMM)
-  static UTCDateTimeToString(dateString, timeString) {
-    let utcDate = /* @__PURE__ */ new Date();
-    utcDate.setUTCDate(+dateString.substr(0, 2));
-    utcDate.setUTCMonth(+dateString.substr(2, 2));
-    if (dateString.length === 6) {
-      utcDate.setUTCFullYear(2e3 + +dateString.substr(4, 2));
-    }
-    if (timeString.length === 6) {
-      utcDate.setUTCHours(+timeString.substr(0, 2), +timeString.substr(2, 2), +timeString.substr(4, 2));
-    } else {
-      utcDate.setUTCHours(+timeString.substr(0, 2), +timeString.substr(2, 2), 0);
-    }
-    return utcDate.toUTCString();
-  }
-  /**
-   * 
-   * @param time HHMMSS
-   * @returns seconds since midnight
-   */
-  static convertHHMMSSToTod(time) {
-    const h = Number(time.substring(0, 2));
-    const m = Number(time.substring(2, 4));
-    const s = Number(time.substring(4, 6));
-    const tod = h * 3600 + m * 60 + s;
-    return tod;
-  }
-  /**
-   * 
-   * @param time HHMMSS
-   * @param date MMDDYY or MMDDYYYY
-   * @returns seconds since epoch
-   */
-  static convertDateTimeToEpoch(time, date) {
-    if (date.length === 6) {
-      date = date.substring(0, 4) + `20${date.substring(4, 6)}`;
-    }
-    const timestamp = `${date.substring(4, 8)}-${date.substring(0, 2)}-${date.substring(2, 4)}T${time.substring(0, 2)}:${time.substring(2, 4)}:${time.substring(4, 6)}.000Z`;
-    const millis = Date.parse(timestamp);
-    return millis / 1e3;
-  }
-};
-
-// lib/utils/route_utils.ts
-var RouteUtils = class _RouteUtils {
-  static routeToString(route) {
-    let str = "";
-    if (route.name) {
-      str += route.name;
-    }
-    if (route.runway) {
-      str += `(${route.runway})`;
-    }
-    if (str.length !== 0 && route.waypoints && route.waypoints.length === 1) {
-      str += " starting at ";
-    } else if (str.length !== 0 && route.waypoints) {
-      str += ": ";
-    }
-    if (route.waypoints) {
-      str += _RouteUtils.waypointsToString(route.waypoints);
-    }
-    return str;
-  }
-  static waypointToString(waypoint) {
-    let s = waypoint.name;
-    if (waypoint.latitude && waypoint.longitude) {
-      s += `(${CoordinateUtils.coordinateString({ latitude: waypoint.latitude, longitude: waypoint.longitude })})`;
-    }
-    if (waypoint.offset) {
-      s += `[${waypoint.offset.bearing}\xB0 ${waypoint.offset.distance}nm]`;
-    }
-    if (waypoint.time && waypoint.timeFormat) {
-      s += `@${_RouteUtils.timestampToString(waypoint.time, waypoint.timeFormat)}`;
-    }
-    return s;
-  }
-  static getWaypoint(leg) {
-    const regex = leg.match(/^([A-Z]+)(\d{3})-(\d{4})$/);
-    if (regex?.length == 4) {
-      return { name: regex[1], offset: { bearing: parseInt(regex[2]), distance: parseInt(regex[3]) / 10 } };
-    }
-    const waypoint = leg.split(",");
-    if (waypoint.length == 2) {
-      const position = CoordinateUtils.decodeStringCoordinatesDecimalMinutes(waypoint[1]);
-      if (position) {
-        return { name: waypoint[0], latitude: position.latitude, longitude: position.longitude };
-      }
-    }
-    if (leg.length == 13 || leg.length == 14) {
-      const position = CoordinateUtils.decodeStringCoordinatesDecimalMinutes(leg);
-      const name = waypoint.length == 2 ? waypoint[0] : "";
-      if (position) {
-        return { name, latitude: position.latitude, longitude: position.longitude };
-      }
-    }
-    return { name: leg };
-  }
-  // move out if we want public
-  static timestampToString(time, format) {
-    const date = new Date(time * 1e3);
-    if (format == "tod") {
-      return date.toISOString().slice(11, 19);
-    }
-    return date.toISOString().slice(0, -5) + "Z";
-  }
-  static waypointsToString(waypoints) {
-    let str = waypoints.map((x) => _RouteUtils.waypointToString(x)).join(" > ").replaceAll(">  >", ">>");
-    if (str.startsWith(" > ")) {
-      str = ">>" + str.slice(2);
-    }
-    return str;
-  }
-};
-
-// lib/plugins/Label_10_Slash.ts
-var Label_10_Slash = class extends DecoderPlugin {
-  // eslint-disable-line camelcase
-  name = "label-10-slash";
-  qualifiers() {
-    return {
-      labels: ["10"],
-      preambles: ["/"]
-    };
-  }
-  decode(message, options = {}) {
-    const decodeResult = this.defaultResult();
-    decodeResult.decoder.name = this.name;
-    decodeResult.formatted.description = "Position Report";
-    decodeResult.message = message;
-    const parts = message.text.split("/");
-    if (parts.length < 17) {
-      if (options.debug) {
-        console.log(`Decoder: Unknown 10 message: ${message.text}`);
-      }
-      decodeResult.remaining.text = message.text;
-      decodeResult.decoded = false;
-      decodeResult.decoder.decodeLevel = "none";
-      return decodeResult;
+  decode(message, options = {}) {
+    const decodeResult = this.defaultResult();
+    decodeResult.decoder.name = this.name;
+    decodeResult.formatted.description = "Position Report";
+    decodeResult.message = message;
+    const parts = message.text.split("/");
+    if (parts.length < 17) {
+      if (options.debug) {
+        console.log(`Decoder: Unknown 10 message: ${message.text}`);
+      }
+      ResultFormatter.unknown(decodeResult, message.text);
+      decodeResult.decoded = false;
+      decodeResult.decoder.decodeLevel = "none";
+      return decodeResult;
     }
     const lat = parts[1];
     const lon = parts[2];
@@ -655,7 +854,7 @@ var Label_10_Slash = class extends DecoderPlugin {
     ResultFormatter.heading(decodeResult, Number(parts[5]));
     ResultFormatter.altitude(decodeResult, 100 * Number(parts[6]));
     ResultFormatter.arrivalAirport(decodeResult, parts[7]);
-    ResultFormatter.eta(decodeResult, parts[8] + "00");
+    ResultFormatter.eta(decodeResult, DateTimeUtils.convertHHMMSSToTod(parts[8] + "00"));
     const waypoints = [{
       name: parts[11]
     }, {
@@ -667,17 +866,11 @@ var Label_10_Slash = class extends DecoderPlugin {
       time: DateTimeUtils.convertHHMMSSToTod(parts[15] + "00"),
       timeFormat: "tod"
     }];
-    decodeResult.raw.route = { waypoints };
-    decodeResult.formatted.items.push({
-      type: "aircraft_route",
-      code: "ROUTE",
-      label: "Aircraft Route",
-      value: RouteUtils.routeToString(decodeResult.raw.route)
-    });
+    ResultFormatter.route(decodeResult, { waypoints });
     if (parts[16]) {
       ResultFormatter.departureAirport(decodeResult, parts[16]);
     }
-    decodeResult.remaining.text = [parts[3], parts[4], ...parts.slice(9, 11), ...parts.slice(17)].join("/");
+    ResultFormatter.unknownArr(decodeResult, [parts[3], parts[4], ...parts.slice(9, 11), ...parts.slice(17)], "/");
     decodeResult.decoded = true;
     decodeResult.decoder.decodeLevel = "partial";
     return decodeResult;
@@ -699,35 +892,29 @@ var Label_12_N_Space = class extends DecoderPlugin {
     decodeResult.formatted.description = "Position Report";
     decodeResult.message = message;
     const variant1Regex = /^(?<lat>[NS])\s(?<lat_coord>.*),(?<long>[EW])\s*(?<long_coord>.*),(?<alt>.*),(?<unkwn1>.*),\s*(?<unkwn2>.*),.(?<airframe>.*),(?<unkwn3>.*)$/;
-    let results;
-    if (results = message.text.match(variant1Regex)) {
+    let results = message.text.match(variant1Regex);
+    if (results?.groups) {
       if (options.debug) {
         console.log(`Label 12 N : results`);
         console.log(results);
       }
-      decodeResult.raw.position = {
+      ResultFormatter.position(decodeResult, {
         latitude: Number(results.groups.lat_coord) * (results.groups.lat == "N" ? 1 : -1),
         longitude: Number(results.groups.long_coord) * (results.groups.long == "E" ? 1 : -1)
-      };
-      const altitude = results.groups.alt == "GRD" || results.groups.alt == "***" ? 0 : Number(results.groups.alt);
-      decodeResult.formatted.items.push({
-        type: "aircraft_position",
-        code: "POS",
-        label: "Aircraft Position",
-        value: CoordinateUtils.coordinateString(decodeResult.raw.position)
       });
+      const altitude = results.groups.alt == "GRD" || results.groups.alt == "***" ? 0 : Number(results.groups.alt);
       ResultFormatter.altitude(decodeResult, altitude);
-      decodeResult.remaining.text = `,${results.groups.unkwn1} ,${results.groups.unkwn2}, ${results.groups.unkwn3}`;
+      ResultFormatter.unknownArr(decodeResult, [results.groups.unkwn1, results.groups.unkwn2, results.groups.unkwn3]);
       decodeResult.decoded = true;
       decodeResult.decoder.decodeLevel = "partial";
-    } else {
-      if (options.debug) {
-        console.log(`Decoder: Unknown 12 message: ${message.text}`);
-      }
-      decodeResult.remaining.text = message.text;
-      decodeResult.decoded = false;
-      decodeResult.decoder.decodeLevel = "none";
+      return decodeResult;
     }
+    if (options.debug) {
+      console.log(`Decoder: Unknown 12 message: ${message.text}`);
+    }
+    ResultFormatter.unknown(decodeResult, message.text);
+    decodeResult.decoded = false;
+    decodeResult.decoder.decodeLevel = "none";
     return decodeResult;
   }
 };
@@ -754,12 +941,11 @@ var Label_13Through18_Slash = class extends DecoderPlugin {
       if (options?.debug) {
         console.log(`Decoder: Unknown OOOI message: ${message.text}`);
       }
-      decodeResult.remaining.text = message.text;
+      ResultFormatter.unknown(decodeResult, message.text);
       decodeResult.decoded = false;
       decodeResult.decoder.decodeLevel = "none";
       return decodeResult;
     }
-    decodeResult.remaining.text = "";
     const data = parts[2].split(" ");
     ResultFormatter.departureAirport(decodeResult, data[1]);
     ResultFormatter.arrivalAirport(decodeResult, data[2]);
@@ -775,7 +961,7 @@ var Label_13Through18_Slash = class extends DecoderPlugin {
       ResultFormatter.in(decodeResult, time);
     }
     if (parts.length === 7) {
-      decodeResult.remaining.text += parts.slice(4).join("/");
+      ResultFormatter.unknownArr(decodeResult, parts.slice(4), "/");
     }
     for (let i = 1; i < lines.length; i++) {
       if (lines[i].startsWith("/LOC")) {
@@ -789,11 +975,9 @@ var Label_13Through18_Slash = class extends DecoderPlugin {
             longitude: CoordinateUtils.getDirection(location[1][0]) * CoordinateUtils.dmsToDecimalDegrees(Number(location[1].substring(1, 4)), Number(location[1].substring(4, 6)), Number(location[1].substring(6, 8)))
           };
         }
-        if (!isNaN(position.latitude) && !isNaN(position.longitude)) {
-          ResultFormatter.position(decodeResult, position);
-        }
+        ResultFormatter.position(decodeResult, position);
       } else {
-        decodeResult.remaining.text += "\r\n" + lines[i];
+        ResultFormatter.unknown(decodeResult, lines[i], "\r\n");
       }
     }
     decodeResult.decoded = true;
@@ -838,16 +1022,8 @@ var Label_15 = class extends DecoderPlugin {
     decodeResult.formatted.description = "Position Report";
     const twoZeeRegex = /^\(2(?<between>.+)\(Z$/;
     const results = message.text.match(twoZeeRegex);
-    if (results) {
-      decodeResult.raw.position = CoordinateUtils.decodeStringCoordinates(results.groups.between.substr(0, 13));
-      if (decodeResult.raw.position) {
-        decodeResult.formatted.items.push({
-          type: "position",
-          code: "POS",
-          label: "Position",
-          value: CoordinateUtils.coordinateString(decodeResult.raw.position)
-        });
-      }
+    if (results?.groups) {
+      ResultFormatter.position(decodeResult, CoordinateUtils.decodeStringCoordinates(results.groups.between.substr(0, 13)));
     }
     decodeResult.decoded = true;
     decodeResult.decoder.decodeLevel = "partial";
@@ -871,31 +1047,23 @@ var Label_15_FST = class extends DecoderPlugin {
     decodeResult.message = message;
     const parts = message.text.split(" ");
     const header = parts[0];
-    decodeResult.raw.departure_icao = header.substring(5, 9);
-    decodeResult.raw.arrival_icao = header.substring(9, 13);
     const stringCoords = header.substring(13);
     const firstChar = stringCoords.substring(0, 1);
     const middleChar = stringCoords.substring(7, 8);
     decodeResult.raw.position = {};
     if ((firstChar === "N" || firstChar === "S") && (middleChar === "W" || middleChar === "E")) {
-      decodeResult.raw.position.latitude = Number(stringCoords.substring(1, 7)) / 1e4 * (firstChar === "S" ? -1 : 1);
-      decodeResult.raw.position.longitude = Number(stringCoords.substring(8, 15)) / 1e4 * (middleChar === "W" ? -1 : 1);
-      decodeResult.raw.altitude = Number(stringCoords.substring(15)) * 100;
+      const lat = Number(stringCoords.substring(1, 7)) / 1e4 * (firstChar === "S" ? -1 : 1);
+      const lon = Number(stringCoords.substring(8, 15)) / 1e4 * (middleChar === "W" ? -1 : 1);
+      ResultFormatter.position(decodeResult, { latitude: lat, longitude: lon });
+      ResultFormatter.altitude(decodeResult, Number(stringCoords.substring(15)) * 100);
     } else {
       decodeResult.decoded = false;
       decodeResult.decoder.decodeLevel = "none";
       return decodeResult;
     }
-    decodeResult.formatted.items.push({
-      type: "aircraft_position",
-      code: "POS",
-      label: "Aircraft Position",
-      value: CoordinateUtils.coordinateString(decodeResult.raw.position)
-    });
-    ResultFormatter.altitude(decodeResult, decodeResult.raw.altitude);
-    ResultFormatter.departureAirport(decodeResult, decodeResult.raw.departure_icao);
-    ResultFormatter.arrivalAirport(decodeResult, decodeResult.raw.arrival_icao);
-    decodeResult.remaining.text = parts.slice(1).join(" ");
+    ResultFormatter.departureAirport(decodeResult, header.substring(5, 9));
+    ResultFormatter.arrivalAirport(decodeResult, header.substring(9, 13));
+    ResultFormatter.unknownArr(decodeResult, parts.slice(1), " ");
     decodeResult.decoded = true;
     decodeResult.decoder.decodeLevel = "partial";
     return decodeResult;
@@ -918,52 +1086,45 @@ var Label_16_N_Space = class extends DecoderPlugin {
     decodeResult.message = message;
     let variant1Regex = /^(?<lat>[NS])\s(?<lat_coord>.*),(?<long>[EW])\s*(?<long_coord>.*),(?<alt>.*),(?<unkwn1>.*),\s*(?<unkwn2>.*)$/;
     let variant2Regex = /^(?<lat>[NS])\s(?<lat_coord>.*)\/(?<long>[EW])\s*(?<long_coord>.*)$/;
-    let results;
-    if (results = message.text.match(variant1Regex)) {
+    let results = message.text.match(variant1Regex);
+    if (results?.groups) {
       if (options.debug) {
         console.log(`Label 16 N : results`);
         console.log(results);
       }
-      decodeResult.raw.position = {
+      let pos = {
         latitude: Number(results.groups.lat_coord) * (results.groups.lat == "N" ? 1 : -1),
         longitude: Number(results.groups.long_coord) * (results.groups.long == "E" ? 1 : -1)
       };
       const altitude = results.groups.alt == "GRD" || results.groups.alt == "***" ? 0 : Number(results.groups.alt);
-      decodeResult.formatted.items.push({
-        type: "aircraft_position",
-        code: "POS",
-        label: "Aircraft Position",
-        value: CoordinateUtils.coordinateString(decodeResult.raw.position)
-      });
+      ResultFormatter.position(decodeResult, pos);
       ResultFormatter.altitude(decodeResult, altitude);
-      decodeResult.remaining.text = `,${results.groups.unkwn1} ,${results.groups.unkwn2}`;
+      ResultFormatter.unknownArr(decodeResult, [results.groups.unkwn1, results.groups.unkwn2]);
       decodeResult.decoded = true;
       decodeResult.decoder.decodeLevel = "partial";
-    } else if (results = message.text.match(variant2Regex)) {
+      return decodeResult;
+    }
+    results = message.text.match(variant2Regex);
+    if (results?.groups) {
       if (options.debug) {
         console.log(`Label 16 N : results`);
         console.log(results);
       }
-      decodeResult.raw.position = {
+      let pos = {
         latitude: Number(results.groups.lat_coord) * (results.groups.lat == "N" ? 1 : -1),
         longitude: Number(results.groups.long_coord) * (results.groups.long == "E" ? 1 : -1)
       };
-      decodeResult.formatted.items.push({
-        type: "aircraft_position",
-        code: "POS",
-        label: "Aircraft Position",
-        value: CoordinateUtils.coordinateString(decodeResult.raw.position)
-      });
+      ResultFormatter.position(decodeResult, pos);
       decodeResult.decoded = true;
       decodeResult.decoder.decodeLevel = "full";
-    } else {
-      if (options.debug) {
-        console.log(`Decoder: Unknown 16 message: ${message.text}`);
-      }
-      decodeResult.remaining.text = message.text;
-      decodeResult.decoded = false;
-      decodeResult.decoder.decodeLevel = "none";
+      return decodeResult;
+    }
+    if (options.debug) {
+      console.log(`Decoder: Unknown 16 message: ${message.text}`);
     }
+    ResultFormatter.unknown(decodeResult, message.text);
+    decodeResult.decoded = false;
+    decodeResult.decoder.decodeLevel = "none";
     return decodeResult;
   }
 };
@@ -989,28 +1150,12 @@ var Label_1M_Slash = class extends DecoderPlugin {
         console.log(results);
       }
       decodeResult.raw.flight_number = results[0];
-      decodeResult.raw.departure_icao = results[3];
-      decodeResult.raw.arrival_icao = results[4];
-      decodeResult.raw.alternate_icao = results[5];
-      decodeResult.raw.arrival_runway = results[8].replace(decodeResult.raw.arrival_icao, "");
-      decodeResult.formatted.items.push({
-        type: "eta",
-        code: "ETA",
-        label: "Estimated Time of Arrival",
-        value: DateTimeUtils.UTCDateTimeToString(results[2], results[7])
-      });
-      decodeResult.formatted.items.push({
-        type: "destination",
-        code: "DST",
-        label: "Destination",
-        value: decodeResult.raw.arrival_icao
-      });
-      decodeResult.formatted.items.push({
-        type: "origin",
-        code: "ORG",
-        label: "Origin",
-        value: decodeResult.raw.departure_icao
-      });
+      ResultFormatter.departureAirport(decodeResult, results[3]);
+      ResultFormatter.arrivalAirport(decodeResult, results[4]);
+      ResultFormatter.alternateAirport(decodeResult, results[5]);
+      ResultFormatter.arrivalRunway(decodeResult, results[8].replace(results[4], ""));
+      const yymmdd = results[2];
+      ResultFormatter.eta(decodeResult, DateTimeUtils.convertDateTimeToEpoch(results[7] + "00", yymmdd.substring(2, 4) + yymmdd.substring(4, 6) + yymmdd.substring(0, 2)), "epoch");
     }
     decodeResult.decoded = true;
     decodeResult.decoder.decodeLevel = "partial";
@@ -1018,13 +1163,13 @@ var Label_1M_Slash = class extends DecoderPlugin {
   }
 };
 
-// lib/plugins/Label_20_POS.ts
-var Label_20_POS = class extends DecoderPlugin {
-  name = "label-20-pos";
+// lib/plugins/Label_1L_3-line.ts
+var Label_1L_3Line = class extends DecoderPlugin {
+  // eslint-disable-line camelcase
+  name = "label-1l-3-line";
   qualifiers() {
     return {
-      labels: ["20"],
-      preambles: ["POS"]
+      labels: ["1L"]
     };
   }
   decode(message, options = {}) {
@@ -1032,59 +1177,88 @@ var Label_20_POS = class extends DecoderPlugin {
     decodeResult.decoder.name = this.name;
     decodeResult.formatted.description = "Position Report";
     decodeResult.message = message;
-    decodeResult.raw.preamble = message.text.substring(0, 3);
-    const content = message.text.substring(3);
-    const fields = content.split(",");
-    if (fields.length == 11) {
-      if (options.debug) {
-        console.log(`DEBUG: ${this.name}: Variation 1 detected`);
-      }
-      const rawCoords = fields[0];
-      decodeResult.raw.position = CoordinateUtils.decodeStringCoordinates(rawCoords);
-      if (decodeResult.raw.position) {
-        decodeResult.formatted.items.push({
-          type: "position",
-          code: "POS",
-          label: "Position",
-          value: CoordinateUtils.coordinateString(decodeResult.raw.position)
-        });
-      }
-      decodeResult.decoded = true;
-      decodeResult.decoder.decodeLevel = "full";
-    } else if (fields.length == 5) {
-      if (options.debug) {
-        console.log(`DEBUG: ${this.name}: Variation 2 detected`);
-      }
-      const rawCoords = fields[0];
-      decodeResult.raw.position = CoordinateUtils.decodeStringCoordinates(rawCoords);
-      if (decodeResult.raw.position) {
-        decodeResult.formatted.items.push({
-          type: "position",
-          code: "POS",
-          label: "Position",
-          value: CoordinateUtils.coordinateString(decodeResult.raw.position)
-        });
-      }
-      decodeResult.decoded = true;
-      decodeResult.decoder.decodeLevel = "full";
-    } else {
+    const lines = message.text.split("\r\n");
+    if (lines.length !== 3) {
       if (options.debug) {
-        console.log(`DEBUG: ${this.name}: Unknown variation. Field count: ${fields.length}, content: ${content}`);
+        console.log(`Decoder: Unknown 1L message: ${message.text}`);
       }
+      decodeResult.remaining.text = message.text;
       decodeResult.decoded = false;
       decodeResult.decoder.decodeLevel = "none";
+      return decodeResult;
+    }
+    const parts = message.text.replaceAll("\r\n", "/").split("/");
+    const data = /* @__PURE__ */ new Map();
+    data.set("", parts[0]);
+    for (let i = 1; i < parts.length; i++) {
+      const part = parts[i].split(" ");
+      data.set(part[0], part.slice(1).join(" "));
+    }
+    const dep = data.get("DEP");
+    if (dep) {
+      ResultFormatter.departureAirport(decodeResult, dep);
+      data.delete("DEP");
+    }
+    const des = data.get("DES");
+    if (des) {
+      ResultFormatter.arrivalAirport(decodeResult, des);
+      data.delete("DES");
+    }
+    const eta = data.get("ETA");
+    if (eta) {
+      ResultFormatter.eta(decodeResult, DateTimeUtils.convertHHMMSSToTod(eta + "00"));
+      data.delete("ETA");
+    }
+    const alt = data.get("ALT");
+    if (alt) {
+      ResultFormatter.altitude(decodeResult, Number(alt));
+      data.delete("ALT");
+    }
+    const fn = data.get("FN");
+    if (fn) {
+      ResultFormatter.flightNumber(decodeResult, fn);
+      data.delete("FN");
     }
+    const day = data.get("DAY");
+    const utc = data.get("UTC");
+    if (day && utc) {
+      decodeResult.raw.message_timestamp = Date.parse(day + " GMT+0000") / 1e3 + DateTimeUtils.convertHHMMSSToTod(utc);
+      data.delete("DAY");
+      data.delete("UTC");
+    }
+    const lat = data.get("LAT");
+    const lon = data.get("LON");
+    if (lat && lon) {
+      ResultFormatter.position(decodeResult, {
+        latitude: CoordinateUtils.getDirection(lat[0]) * Number(lat.substring(1)),
+        longitude: CoordinateUtils.getDirection(lon[0]) * Number(lon.substring(1))
+      });
+      data.delete("LAT");
+      data.delete("LON");
+    }
+    let remaining = "";
+    for (const [key, value] of data.entries()) {
+      if (key === "") {
+        remaining += value;
+      } else {
+        remaining += `/${key} ${value}`;
+      }
+    }
+    decodeResult.remaining.text = remaining;
+    decodeResult.decoded = true;
+    decodeResult.decoder.decodeLevel = "partial";
     return decodeResult;
   }
 };
 
-// lib/plugins/Label_21_POS.ts
-var Label_21_POS = class extends DecoderPlugin {
-  name = "label-21-pos";
+// lib/plugins/Label_1L_070.ts
+var Label_1L_070 = class extends DecoderPlugin {
+  // eslint-disable-line camelcase
+  name = "label-1l-070";
   qualifiers() {
     return {
-      labels: ["21"],
-      preambles: ["POS"]
+      labels: ["1L"],
+      preambles: ["000000070"]
     };
   }
   decode(message, options = {}) {
@@ -1092,81 +1266,416 @@ var Label_21_POS = class extends DecoderPlugin {
     decodeResult.decoder.name = this.name;
     decodeResult.formatted.description = "Position Report";
     decodeResult.message = message;
-    decodeResult.raw.preamble = message.text.substring(0, 3);
-    const content = message.text.substring(3);
-    const fields = content.split(",");
-    if (fields.length == 9) {
-      processPosition(decodeResult, fields[0].trim());
-      processAlt(decodeResult, fields[3]);
-      processTemp(decodeResult, fields[6]);
-      processArrvApt(decodeResult, fields[8]);
-      decodeResult.remaining.text = [
-        fields[1],
-        fields[2],
-        fields[4],
-        fields[5],
-        fields[7]
-      ].join(",");
-      decodeResult.decoded = true;
-      decodeResult.decoder.decodeLevel = "partial";
-    } else {
+    if (!message.text.startsWith("000000070")) {
       if (options.debug) {
-        console.log(`DEBUG: ${this.name}: Unknown variation. Field count: ${fields.length}, content: ${content}`);
+        console.log(`Decoder: Unknown 1L message: ${message.text}`);
       }
+      decodeResult.remaining.text = message.text;
       decodeResult.decoded = false;
       decodeResult.decoder.decodeLevel = "none";
+      return decodeResult;
     }
-    return decodeResult;
-  }
-};
-function processPosition(decodeResult, value) {
-  if (value.length !== 16 && value[0] !== "N" && value[0] !== "S" && value[8] !== "W" && value[8] !== "E") {
-    return false;
-  }
-  const latDir = value[0] === "N" ? 1 : -1;
+    const parts = message.text.substring(9).split(",");
+    if (parts.length !== 7) {
+      if (options.debug) {
+        console.log(`Decoder: Unknown 1L message: ${message.text}`);
+      }
+      decodeResult.remaining.text = message.text;
+      decodeResult.decoded = false;
+      decodeResult.decoder.decodeLevel = "none";
+      return decodeResult;
+    }
+    ResultFormatter.departureAirport(decodeResult, parts[0]);
+    ResultFormatter.arrivalAirport(decodeResult, parts[1]);
+    ResultFormatter.time_of_day(decodeResult, DateTimeUtils.convertHHMMSSToTod(parts[2] + "00"));
+    ResultFormatter.eta(decodeResult, DateTimeUtils.convertHHMMSSToTod(parts[3] + "00"));
+    ResultFormatter.position(decodeResult, {
+      latitude: CoordinateUtils.getDirection(parts[4][0]) * Number(parts[4].substring(1)),
+      longitude: CoordinateUtils.getDirection(parts[5][0]) * Number(parts[5].substring(1))
+    });
+    decodeResult.remaining.text = parts[6];
+    decodeResult.decoded = true;
+    decodeResult.decoder.decodeLevel = "partial";
+    return decodeResult;
+  }
+};
+
+// lib/plugins/Label_1L_660.ts
+var Label_1L_660 = class extends DecoderPlugin {
+  // eslint-disable-line camelcase
+  name = "label-1l-660";
+  qualifiers() {
+    return {
+      labels: ["1L"],
+      preambles: ["000000660"]
+    };
+  }
+  decode(message, options = {}) {
+    const decodeResult = this.defaultResult();
+    decodeResult.decoder.name = this.name;
+    decodeResult.formatted.description = "Position Report";
+    decodeResult.message = message;
+    if (!message.text.startsWith("000000660")) {
+      if (options.debug) {
+        console.log(`Decoder: Unknown 1L message: ${message.text}`);
+      }
+      decodeResult.remaining.text = message.text;
+      decodeResult.decoded = false;
+      decodeResult.decoder.decodeLevel = "none";
+      return decodeResult;
+    }
+    const parts = message.text.substring(9).split(",");
+    if (parts.length !== 5) {
+      if (options.debug) {
+        console.log(`Decoder: Unknown 1L message: ${message.text}`);
+      }
+      decodeResult.remaining.text = message.text;
+      decodeResult.decoded = false;
+      decodeResult.decoder.decodeLevel = "none";
+      return decodeResult;
+    }
+    const position = CoordinateUtils.decodeStringCoordinatesDecimalMinutes(parts[0]);
+    if (position) {
+      ResultFormatter.position(decodeResult, position);
+    }
+    const hhmmss = parts[1].substring(0, 6);
+    ResultFormatter.time_of_day(decodeResult, DateTimeUtils.convertHHMMSSToTod(hhmmss));
+    const fl = parts[1].substring(6, 9);
+    ResultFormatter.altitude(decodeResult, Number(fl) * 100);
+    const next = parts[1].substring(9);
+    ResultFormatter.route(decodeResult, { waypoints: [{ name: next.trim() }] });
+    decodeResult.remaining.text = parts.slice(2).join(",");
+    decodeResult.decoded = true;
+    decodeResult.decoder.decodeLevel = "partial";
+    return decodeResult;
+  }
+};
+
+// lib/plugins/Label_1L_Slash.ts
+var Label_1L_Slash = class extends DecoderPlugin {
+  // eslint-disable-line camelcase
+  name = "label-1l-1-line";
+  qualifiers() {
+    return {
+      labels: ["1L"],
+      preambles: ["+", "-"]
+    };
+  }
+  decode(message, options = {}) {
+    const decodeResult = this.defaultResult();
+    decodeResult.decoder.name = this.name;
+    decodeResult.formatted.description = "Position Report";
+    decodeResult.message = message;
+    const parts = message.text.split("/");
+    if (parts.length !== 7) {
+      if (options.debug) {
+        console.log(`Decoder: Unknown 1L message: ${message.text}`);
+      }
+      decodeResult.remaining.text = message.text;
+      decodeResult.decoded = false;
+      decodeResult.decoder.decodeLevel = "none";
+      return decodeResult;
+    }
+    const data = /* @__PURE__ */ new Map();
+    data.set("LAT", parts[0].replaceAll(" ", ""));
+    data.set("LON", parts[1].replaceAll(" ", ""));
+    for (let i = 2; i < parts.length; i++) {
+      const part = parts[i].split(" ");
+      data.set(part[0], part.slice(1).join(" "));
+    }
+    console.log(data);
+    const position = {
+      latitude: Number(data.get("LAT")),
+      longitude: Number(data.get("LON"))
+    };
+    data.delete("LAT");
+    data.delete("LON");
+    ResultFormatter.position(decodeResult, position);
+    const utc = data.get("UTC");
+    if (utc) {
+      ResultFormatter.time_of_day(decodeResult, DateTimeUtils.convertHHMMSSToTod(utc));
+      data.delete("UTC");
+    }
+    const alt = data.get("ALT");
+    if (alt) {
+      ResultFormatter.altitude(decodeResult, Number(alt));
+      data.delete("ALT");
+    }
+    const fob = data.get("FOB");
+    if (fob) {
+      ResultFormatter.currentFuel(decodeResult, Number(fob));
+      data.delete("FOB");
+    }
+    const eta = data.get("ETA");
+    if (eta) {
+      ResultFormatter.eta(decodeResult, DateTimeUtils.convertHHMMSSToTod(eta + "00"));
+      data.delete("ETA");
+    }
+    let remaining = "";
+    for (const [key, value] of data.entries()) {
+      remaining += `/${key} ${value}`;
+    }
+    decodeResult.remaining.text = remaining;
+    decodeResult.decoded = true;
+    decodeResult.decoder.decodeLevel = "partial";
+    return decodeResult;
+  }
+};
+
+// lib/plugins/Label_20_POS.ts
+var Label_20_POS = class extends DecoderPlugin {
+  name = "label-20-pos";
+  qualifiers() {
+    return {
+      labels: ["20"],
+      preambles: ["POS"]
+    };
+  }
+  decode(message, options = {}) {
+    const decodeResult = this.defaultResult();
+    decodeResult.decoder.name = this.name;
+    decodeResult.formatted.description = "Position Report";
+    decodeResult.message = message;
+    decodeResult.raw.preamble = message.text.substring(0, 3);
+    const content = message.text.substring(3);
+    const fields = content.split(",");
+    if (fields.length == 11) {
+      if (options.debug) {
+        console.log(`DEBUG: ${this.name}: Variation 1 detected`);
+      }
+      const rawCoords = fields[0];
+      ResultFormatter.position(decodeResult, CoordinateUtils.decodeStringCoordinates(rawCoords));
+      decodeResult.decoded = true;
+      decodeResult.decoder.decodeLevel = "full";
+    } else if (fields.length == 5) {
+      if (options.debug) {
+        console.log(`DEBUG: ${this.name}: Variation 2 detected`);
+      }
+      const position = CoordinateUtils.decodeStringCoordinates(fields[0]);
+      if (position) {
+        ResultFormatter.position(decodeResult, position);
+      }
+      decodeResult.decoded = true;
+      decodeResult.decoder.decodeLevel = "full";
+    } else {
+      if (options.debug) {
+        console.log(`DEBUG: ${this.name}: Unknown variation. Field count: ${fields.length}, content: ${content}`);
+      }
+      decodeResult.decoded = false;
+      decodeResult.decoder.decodeLevel = "none";
+    }
+    return decodeResult;
+  }
+};
+
+// lib/plugins/Label_21_POS.ts
+var Label_21_POS = class extends DecoderPlugin {
+  name = "label-21-pos";
+  qualifiers() {
+    return {
+      labels: ["21"],
+      preambles: ["POS"]
+    };
+  }
+  decode(message, options = {}) {
+    const decodeResult = this.defaultResult();
+    decodeResult.decoder.name = this.name;
+    decodeResult.formatted.description = "Position Report";
+    decodeResult.message = message;
+    decodeResult.raw.preamble = message.text.substring(0, 3);
+    const content = message.text.substring(3);
+    const fields = content.split(",");
+    if (fields.length == 9) {
+      processPosition(decodeResult, fields[0].trim());
+      ResultFormatter.time_of_day(decodeResult, DateTimeUtils.convertHHMMSSToTod(fields[2]));
+      ResultFormatter.altitude(decodeResult, Number(fields[3]));
+      ResultFormatter.temperature(decodeResult, fields[6].replace(/ /g, ""));
+      ResultFormatter.eta(decodeResult, DateTimeUtils.convertHHMMSSToTod(fields[7]));
+      ResultFormatter.arrivalAirport(decodeResult, fields[8]);
+      ResultFormatter.unknownArr(decodeResult, [fields[1], fields[4], fields[5]]);
+      decodeResult.decoded = true;
+      decodeResult.decoder.decodeLevel = "partial";
+    } else {
+      if (options.debug) {
+        console.log(`DEBUG: ${this.name}: Unknown variation. Field count: ${fields.length}, content: ${content}`);
+      }
+      decodeResult.decoded = false;
+      decodeResult.decoder.decodeLevel = "none";
+    }
+    return decodeResult;
+  }
+};
+function processPosition(decodeResult, value) {
+  if (value.length !== 16 && value[0] !== "N" && value[0] !== "S" && value[8] !== "W" && value[8] !== "E") {
+    return;
+  }
+  const latDir = value[0] === "N" ? 1 : -1;
   const lonDir = value[8] === "E" ? 1 : -1;
   const position = {
     latitude: latDir * Number(value.substring(1, 7)),
     longitude: lonDir * Number(value.substring(9, 15))
   };
-  if (position) {
-    decodeResult.raw.position = position;
-    decodeResult.formatted.items.push({
-      type: "aircraft_position",
-      code: "POS",
-      label: "Aircraft Position",
-      value: CoordinateUtils.coordinateString(position)
+  ResultFormatter.position(decodeResult, position);
+}
+
+// lib/plugins/Label_22_OFF.ts
+var Label_22_OFF = class extends DecoderPlugin {
+  name = "label-22-off";
+  qualifiers() {
+    return {
+      labels: ["22"],
+      preambles: ["OFF"]
+    };
+  }
+  decode(message, options = {}) {
+    const decodeResult = this.defaultResult();
+    decodeResult.decoder.name = this.name;
+    decodeResult.formatted.description = "Takeoff Report";
+    decodeResult.message = message;
+    if (message.text.startsWith("OFF01")) {
+      const fields = message.text.substring(5).split("/");
+      if (fields.length != 2) {
+        decodeResult.decoded = false;
+        decodeResult.decoder.decodeLevel = "none";
+        return decodeResult;
+      }
+      ResultFormatter.flightNumber(decodeResult, fields[0]);
+      ResultFormatter.departureDay(decodeResult, Number(fields[1].substring(0, 2)));
+      ResultFormatter.arrivalDay(decodeResult, Number(fields[1].substring(2, 4)));
+      ResultFormatter.time_of_day(decodeResult, DateTimeUtils.convertHHMMSSToTod(fields[1].substring(4, 8) + "00"));
+      ResultFormatter.departureAirport(decodeResult, fields[1].substring(8, 12));
+      ResultFormatter.arrivalAirport(decodeResult, fields[1].substring(12, 16));
+      ResultFormatter.off(decodeResult, DateTimeUtils.convertHHMMSSToTod(fields[1].substring(16, 22)));
+      ResultFormatter.unknown(decodeResult, fields[1].substring(22));
+      decodeResult.decoded = true;
+      decodeResult.decoder.decodeLevel = "partial";
+    } else if (message.text.startsWith("OFF02\r\n")) {
+      const fields = message.text.substring(7).split(",");
+      if (fields.length != 4) {
+        decodeResult.decoded = false;
+        decodeResult.decoder.decodeLevel = "none";
+        return decodeResult;
+      }
+      ResultFormatter.departureAirport(decodeResult, fields[0]);
+      ResultFormatter.arrivalAirport(decodeResult, fields[1]);
+      ResultFormatter.off(decodeResult, DateTimeUtils.convertHHMMSSToTod(fields[2] + "00"));
+      ResultFormatter.unknown(decodeResult, fields[3]);
+      decodeResult.decoded = true;
+      decodeResult.decoder.decodeLevel = "partial";
+    } else if (message.text.startsWith("OFF02")) {
+      const fields = message.text.substring(5).split("/");
+      if (fields.length != 2) {
+        decodeResult.decoded = false;
+        decodeResult.decoder.decodeLevel = "none";
+        return decodeResult;
+      }
+      ResultFormatter.flightNumber(decodeResult, fields[0]);
+      const position = CoordinateUtils.decodeStringCoordinatesDecimalMinutes(fields[1].substring(0, 14));
+      if (position) {
+        ResultFormatter.position(decodeResult, position);
+      }
+      ResultFormatter.day(decodeResult, Number(fields[1].substring(14, 16)));
+      ResultFormatter.time_of_day(decodeResult, DateTimeUtils.convertHHMMSSToTod(fields[1].substring(16, 20) + "00"));
+      ResultFormatter.departureAirport(decodeResult, fields[1].substring(20, 24));
+      ResultFormatter.arrivalAirport(decodeResult, fields[1].substring(24, 28));
+      ResultFormatter.off(decodeResult, DateTimeUtils.convertHHMMSSToTod(fields[1].substring(28, 32) + "00"));
+      ResultFormatter.unknown(decodeResult, fields[1].substring(32, 36));
+      ResultFormatter.eta(decodeResult, DateTimeUtils.convertHHMMSSToTod(fields[1].substring(36, 40) + "00"));
+      decodeResult.decoded = true;
+      decodeResult.decoder.decodeLevel = "partial";
+    } else {
+      if (options.debug) {
+        console.log(`DEBUG: ${this.name}: Unknown variation.`);
+      }
+      decodeResult.decoded = false;
+      decodeResult.decoder.decodeLevel = "none";
+    }
+    return decodeResult;
+  }
+};
+
+// lib/plugins/Label_22_POS.ts
+var Label_22_POS = class extends DecoderPlugin {
+  name = "label-22-pos";
+  qualifiers() {
+    return {
+      labels: ["22"],
+      preambles: ["N", "S"]
+    };
+  }
+  decode(message, options = {}) {
+    const decodeResult = this.defaultResult();
+    decodeResult.decoder.name = this.name;
+    decodeResult.formatted.description = "Position Report";
+    decodeResult.message = message;
+    const fields = message.text.split(",");
+    if (fields.length !== 11) {
+      if (options.debug) {
+        console.log(`DEBUG: ${this.name}: Unknown variation. Field count: ${fields.length}, content: ${fields.join(",")}`);
+      }
+      decodeResult.decoded = false;
+      decodeResult.decoder.decodeLevel = "none";
+      return decodeResult;
+    }
+    const latStr = fields[0].substring(1, 8);
+    const lonStr = fields[0].substring(9);
+    const lat = Number(latStr) / 1e4;
+    const lon = Number(lonStr) / 1e4;
+    ResultFormatter.position(decodeResult, {
+      latitude: CoordinateUtils.getDirection(fields[0][0]) * lat,
+      longitude: CoordinateUtils.getDirection(fields[0][8]) * lon
     });
+    ResultFormatter.time_of_day(decodeResult, DateTimeUtils.convertHHMMSSToTod(fields[2]));
+    ResultFormatter.altitude(decodeResult, Number(fields[3]));
+    ResultFormatter.unknownArr(decodeResult, [fields[1], ...fields.slice(4)]);
+    decodeResult.decoded = true;
+    decodeResult.decoder.decodeLevel = "partial";
+    return decodeResult;
   }
-  return !!position;
-}
-function processAlt(decodeResult, value) {
-  decodeResult.raw.altitude = Number(value);
-  decodeResult.formatted.items.push({
-    type: "altitude",
-    code: "ALT",
-    label: "Altitude",
-    value: `${decodeResult.raw.altitude} feet`
-  });
-}
-function processTemp(decodeResult, value) {
-  decodeResult.raw.outside_air_temperature = Number(value.substring(1)) * (value.charAt(0) === "M" ? -1 : 1);
-  decodeResult.formatted.items.push({
-    type: "outside_air_temperature",
-    code: "OATEMP",
-    label: "Outside Air Temperature (C)",
-    value: `${decodeResult.raw.outside_air_temperature}`
-  });
-}
-function processArrvApt(decodeResult, value) {
-  decodeResult.raw.arrival_icao = value;
-  decodeResult.formatted.items.push({
-    type: "destination",
-    code: "DST",
-    label: "Destination",
-    value: decodeResult.raw.arrival_icao
-  });
-}
+};
+
+// lib/plugins/Label_24_Slash.ts
+var Label_24_Slash = class extends DecoderPlugin {
+  name = "label-24-slash";
+  qualifiers() {
+    return {
+      labels: ["24"],
+      preambles: ["/"]
+    };
+  }
+  decode(message, options = {}) {
+    const decodeResult = this.defaultResult();
+    decodeResult.decoder.name = this.name;
+    decodeResult.formatted.description = "Position Report";
+    decodeResult.message = message;
+    const fields = message.text.split("/");
+    if (fields.length == 10 && fields[0] == "" && fields[9] == "") {
+      const mmddyy = fields[1].substring(4, 6) + fields[1].substring(2, 4) + fields[1].substring(0, 2);
+      const hhmmss = fields[2] + "00";
+      decodeResult.raw.message_timestamp = DateTimeUtils.convertDateTimeToEpoch(hhmmss, mmddyy);
+      ResultFormatter.flightNumber(decodeResult, fields[3]);
+      ResultFormatter.altitude(decodeResult, Number(fields[4]));
+      const lat = fields[5];
+      const lon = fields[6];
+      const position = {
+        latitude: (lat[0] === "N" ? 1 : -1) * Number(lat.substring(1)),
+        longitude: (lon[0] === "E" ? 1 : -1) * Number(lon.substring(1))
+      };
+      ResultFormatter.position(decodeResult, position);
+      ResultFormatter.eta(decodeResult, DateTimeUtils.convertHHMMSSToTod(fields[8] + "00"));
+      ResultFormatter.unknown(decodeResult, fields[7]);
+      decodeResult.decoded = true;
+      decodeResult.decoder.decodeLevel = "partial";
+    } else {
+      if (options.debug) {
+        console.log(`DEBUG: ${this.name}: Unknown variation. Field count: ${fields.length}. Message: ${message.text}`);
+      }
+      decodeResult.decoded = false;
+      decodeResult.decoder.decodeLevel = "none";
+    }
+    return decodeResult;
+  }
+};
 
 // lib/plugins/Label_30_Slash_EA.ts
 var Label_30_Slash_EA = class extends DecoderPlugin {
@@ -1189,23 +1698,12 @@ var Label_30_Slash_EA = class extends DecoderPlugin {
         console.log(results);
       }
     }
-    decodeResult.formatted.items.push({
-      type: "eta",
-      code: "ETA",
-      label: "Estimated Time of Arrival",
-      value: DateTimeUtils.UTCToString(results[0].substr(2, 4))
-    });
-    if (results[1].substr(0, 2) === "DS") {
-      decodeResult.raw.arrival_icao = results[1].substr(2, 4);
-      decodeResult.formatted.items.push({
-        type: "destination",
-        code: "DST",
-        label: "Destination",
-        value: decodeResult.raw.arrival_icao
-      });
-      decodeResult.remaining.text = "/".concat(results[2]);
+    ResultFormatter.eta(decodeResult, DateTimeUtils.convertHHMMSSToTod(results[0].substr(2, 4) + "00"));
+    if (results[1].substring(0, 2) === "DS") {
+      ResultFormatter.arrivalAirport(decodeResult, results[1].substring(2, 6));
+      ResultFormatter.unknown(decodeResult, "/".concat(results[2]));
     } else {
-      decodeResult.remaining.text = "/".concat(results[1], "/", results[2]);
+      ResultFormatter.unknown(decodeResult, "/".concat(results[1], "/", results[2]));
     }
     decodeResult.decoded = true;
     decodeResult.decoder.decodeLevel = "partial";
@@ -1229,40 +1727,20 @@ var Label_44_ETA = class extends DecoderPlugin {
     decodeResult.message = message;
     const regex = /^.*,(?<unsplit_coords>.*),(?<departure_icao>.*),(?<arrival_icao>.*),(?<current_date>.*),(?<current_time>.*),(?<fuel_in_tons>.*)$/;
     const results = message.text.match(regex);
-    if (results) {
+    if (results?.groups) {
       if (options.debug) {
         console.log(`Label 44 ETA Report: groups`);
         console.log(results.groups);
       }
-      decodeResult.raw.position = CoordinateUtils.decodeStringCoordinates(results.groups.unsplit_coords);
-      decodeResult.raw.departure_icao = results.groups.departure_icao;
-      decodeResult.raw.arrival_icao = results.groups.arrival_icao;
+      ResultFormatter.position(decodeResult, CoordinateUtils.decodeStringCoordinates(results.groups.unsplit_coords));
+      ResultFormatter.departureAirport(decodeResult, results.groups.departure_icao);
+      ResultFormatter.arrivalAirport(decodeResult, results.groups.arrival_icao);
       decodeResult.raw.current_time = Date.parse(
         (/* @__PURE__ */ new Date()).getFullYear() + "-" + results.groups.current_date.substr(0, 2) + "-" + results.groups.current_date.substr(2, 2) + "T" + results.groups.current_time.substr(0, 2) + ":" + results.groups.current_time.substr(2, 2) + ":00Z"
       );
       if (results.groups.fuel_in_tons != "***" && results.groups.fuel_in_tons != "****") {
-        decodeResult.raw.fuel_in_tons = Number(results.groups.fuel_in_tons);
-      }
-      if (decodeResult.raw.position) {
-        decodeResult.formatted.items.push({
-          type: "position",
-          code: "POS",
-          label: "Position",
-          value: CoordinateUtils.coordinateString(decodeResult.raw.position)
-        });
+        ResultFormatter.remainingFuel(decodeResult, Number(results.groups.fuel_in_tons));
       }
-      decodeResult.formatted.items.push({
-        type: "origin",
-        code: "ORG",
-        label: "Origin",
-        value: decodeResult.raw.departure_icao
-      });
-      decodeResult.formatted.items.push({
-        type: "destination",
-        code: "DST",
-        label: "Destination",
-        value: decodeResult.raw.arrival_icao
-      });
     }
     decodeResult.decoded = true;
     decodeResult.decoder.decodeLevel = "full";
@@ -1286,40 +1764,20 @@ var Label_44_IN = class extends DecoderPlugin {
     decodeResult.message = message;
     const regex = /^.*,(?<unsplit_coords>.*),(?<departure_icao>.*),(?<arrival_icao>.*),(?<current_date>.*),(?<current_time>.*),(?<fuel_in_tons>.*)$/;
     const results = message.text.match(regex);
-    if (results) {
+    if (results?.groups) {
       if (options.debug) {
         console.log(`Label 44 In Air Report: groups`);
         console.log(results.groups);
       }
-      decodeResult.raw.position = CoordinateUtils.decodeStringCoordinates(results.groups.unsplit_coords);
-      decodeResult.raw.departure_icao = results.groups.departure_icao;
-      decodeResult.raw.arrival_icao = results.groups.arrival_icao;
+      ResultFormatter.position(decodeResult, CoordinateUtils.decodeStringCoordinates(results.groups.unsplit_coords));
+      ResultFormatter.departureAirport(decodeResult, results.groups.departure_icao);
+      ResultFormatter.arrivalAirport(decodeResult, results.groups.arrival_icao);
       decodeResult.raw.current_time = Date.parse(
         (/* @__PURE__ */ new Date()).getFullYear() + "-" + results.groups.current_date.substr(0, 2) + "-" + results.groups.current_date.substr(2, 2) + "T" + results.groups.current_time.substr(0, 2) + ":" + results.groups.current_time.substr(2, 2) + ":00Z"
       );
       if (results.groups.fuel_in_tons != "***" && results.groups.fuel_in_tons != "****") {
         decodeResult.raw.fuel_in_tons = Number(results.groups.fuel_in_tons);
       }
-      if (decodeResult.raw.position) {
-        decodeResult.formatted.items.push({
-          type: "position",
-          code: "POS",
-          label: "Position",
-          value: CoordinateUtils.coordinateString(decodeResult.raw.position)
-        });
-      }
-      decodeResult.formatted.items.push({
-        type: "origin",
-        code: "ORG",
-        label: "Origin",
-        value: decodeResult.raw.departure_icao
-      });
-      decodeResult.formatted.items.push({
-        type: "destination",
-        code: "DST",
-        label: "Destination",
-        value: decodeResult.raw.arrival_icao
-      });
     }
     decodeResult.decoded = true;
     decodeResult.decoder.decodeLevel = "full";
@@ -1343,13 +1801,14 @@ var Label_44_OFF = class extends DecoderPlugin {
     decodeResult.message = message;
     const regex = /^.*,(?<unsplit_coords>.*),(?<departure_icao>.*),(?<arrival_icao>.*),(?<current_date>.*),(?<current_time>.*),(?<eta_time>.*),(?<fuel_in_tons>.*)$/;
     const results = message.text.match(regex);
-    if (results) {
+    if (results?.groups) {
       if (options.debug) {
         console.log(`Label 44 Off Runway Report: groups`);
         console.log(results.groups);
       }
-      decodeResult.raw.departure_icao = results.groups.departure_icao;
-      decodeResult.raw.arrival_icao = results.groups.arrival_icao;
+      ResultFormatter.position(decodeResult, CoordinateUtils.decodeStringCoordinates(results.groups.unsplit_coords));
+      ResultFormatter.departureAirport(decodeResult, results.groups.departure_icao);
+      ResultFormatter.arrivalAirport(decodeResult, results.groups.arrival_icao);
       decodeResult.raw.current_time = Date.parse(
         (/* @__PURE__ */ new Date()).getFullYear() + "-" + results.groups.current_date.substr(0, 2) + "-" + results.groups.current_date.substr(2, 2) + "T" + results.groups.current_time.substr(0, 2) + ":" + results.groups.current_time.substr(2, 2) + ":00Z"
       );
@@ -1359,27 +1818,6 @@ var Label_44_OFF = class extends DecoderPlugin {
       if (results.groups.fuel_in_tons != "***" && results.groups.fuel_in_tons != "****") {
         decodeResult.raw.fuel_in_tons = Number(results.groups.fuel_in_tons);
       }
-      decodeResult.raw.position = CoordinateUtils.decodeStringCoordinates(results.groups.unsplit_coords);
-      if (decodeResult.raw.position) {
-        decodeResult.formatted.items.push({
-          type: "position",
-          code: "POS",
-          label: "Position",
-          value: CoordinateUtils.coordinateString(decodeResult.raw.position)
-        });
-      }
-      decodeResult.formatted.items.push({
-        type: "origin",
-        code: "ORG",
-        label: "Origin",
-        value: decodeResult.raw.departure_icao
-      });
-      decodeResult.formatted.items.push({
-        type: "destination",
-        code: "DST",
-        label: "Destination",
-        value: decodeResult.raw.arrival_icao
-      });
     }
     decodeResult.decoded = true;
     decodeResult.decoder.decodeLevel = "full";
@@ -1403,40 +1841,20 @@ var Label_44_ON = class extends DecoderPlugin {
     decodeResult.message = message;
     const regex = /^.*,(?<unsplit_coords>.*),(?<departure_icao>.*),(?<arrival_icao>.*),(?<current_date>.*),(?<current_time>.*),(?<fuel_in_tons>.*)$/;
     const results = message.text.match(regex);
-    if (results) {
+    if (results?.groups) {
       if (options.debug) {
         console.log(`Label 44 On Runway Report: groups`);
         console.log(results.groups);
       }
-      decodeResult.raw.position = CoordinateUtils.decodeStringCoordinates(results.groups.unsplit_coords);
-      decodeResult.raw.departure_icao = results.groups.departure_icao;
-      decodeResult.raw.arrival_icao = results.groups.arrival_icao;
+      ResultFormatter.position(decodeResult, CoordinateUtils.decodeStringCoordinates(results.groups.unsplit_coords));
+      ResultFormatter.departureAirport(decodeResult, results.groups.departure_icao);
+      ResultFormatter.arrivalAirport(decodeResult, results.groups.arrival_icao);
       decodeResult.raw.current_time = Date.parse(
         (/* @__PURE__ */ new Date()).getFullYear() + "-" + results.groups.current_date.substr(0, 2) + "-" + results.groups.current_date.substr(2, 2) + "T" + results.groups.current_time.substr(0, 2) + ":" + results.groups.current_time.substr(2, 2) + ":00Z"
       );
       if (results.groups.fuel_in_tons != "***" && results.groups.fuel_in_tons != "****") {
-        decodeResult.raw.fuel_in_tons = Number(results.groups.fuel_in_tons);
+        ResultFormatter.remainingFuel(decodeResult, Number(results.groups.fuel_in_tons));
       }
-      if (decodeResult.raw.position) {
-        decodeResult.formatted.items.push({
-          type: "position",
-          code: "POS",
-          label: "Position",
-          value: CoordinateUtils.coordinateString(decodeResult.raw.position)
-        });
-      }
-      decodeResult.formatted.items.push({
-        type: "origin",
-        code: "ORG",
-        label: "Origin",
-        value: decodeResult.raw.departure_icao
-      });
-      decodeResult.formatted.items.push({
-        type: "destination",
-        code: "DST",
-        label: "Destination",
-        value: decodeResult.raw.arrival_icao
-      });
     }
     decodeResult.decoded = true;
     decodeResult.decoder.decodeLevel = "full";
@@ -1460,12 +1878,12 @@ var Label_44_POS = class extends DecoderPlugin {
     decodeResult.message = message;
     const regex = /^.*,(?<unsplit_coords>.*),(?<flight_level_or_ground>.*),(?<departure_icao>.*),(?<arrival_icao>.*),(?<current_date>.*),(?<current_time>.*),(?<eta_time>.*),(?<fuel_in_tons>.*)$/;
     const results = message.text.match(regex);
-    if (results) {
+    if (results?.groups) {
       if (options.debug) {
         console.log(`Label 44 Position Report: groups`);
         console.log(results.groups);
       }
-      decodeResult.raw.position = CoordinateUtils.decodeStringCoordinatesDecimalMinutes(results.groups.unsplit_coords);
+      ResultFormatter.position(decodeResult, CoordinateUtils.decodeStringCoordinatesDecimalMinutes(results.groups.unsplit_coords));
       const flight_level = results.groups.flight_level_or_ground == "GRD" || results.groups.flight_level_or_ground == "***" ? 0 : Number(results.groups.flight_level_or_ground);
       decodeResult.raw.current_time = Date.parse(
         (/* @__PURE__ */ new Date()).getFullYear() + "-" + results.groups.current_date.substr(0, 2) + "-" + results.groups.current_date.substr(2, 2) + "T" + results.groups.current_time.substr(0, 2) + ":" + results.groups.current_time.substr(2, 2) + ":00Z"
@@ -1476,20 +1894,221 @@ var Label_44_POS = class extends DecoderPlugin {
       if (results.groups.fuel_in_tons != "***" && results.groups.fuel_in_tons != "****") {
         decodeResult.raw.fuel_in_tons = Number(results.groups.fuel_in_tons);
       }
-      if (decodeResult.raw.position) {
-        decodeResult.formatted.items.push({
-          type: "aircraft_position",
-          code: "POS",
-          label: "Aircraft Position",
-          value: CoordinateUtils.coordinateString(decodeResult.raw.position)
-        });
-      }
       ResultFormatter.departureAirport(decodeResult, results.groups.departure_icao);
       ResultFormatter.arrivalAirport(decodeResult, results.groups.arrival_icao);
       ResultFormatter.altitude(decodeResult, flight_level * 100);
     }
     decodeResult.decoded = true;
-    decodeResult.decoder.decodeLevel = "full";
+    decodeResult.decoder.decodeLevel = "full";
+    return decodeResult;
+  }
+};
+
+// lib/plugins/Label_4A.ts
+var Label_4A = class extends DecoderPlugin {
+  name = "label-4a";
+  qualifiers() {
+    return {
+      labels: ["4A"]
+    };
+  }
+  decode(message, options = {}) {
+    const decodeResult = this.defaultResult();
+    decodeResult.decoder.name = this.name;
+    decodeResult.message = message;
+    decodeResult.formatted.description = "Latest New Format";
+    let text = message.text;
+    if (text.match(/^M\d{2}A\w{6}/)) {
+      ResultFormatter.flightNumber(decodeResult, message.text.substring(4, 10).replace(/^([A-Z]+)0*/g, "$1"));
+      text = text.substring(10);
+    }
+    decodeResult.decoded = true;
+    const fields = text.split(",");
+    if (fields.length === 11) {
+      ResultFormatter.time_of_day(decodeResult, DateTimeUtils.convertHHMMSSToTod(fields[0]));
+      ResultFormatter.tail(decodeResult, fields[2].replace(".", ""));
+      if (fields[3])
+        ResultFormatter.callsign(decodeResult, fields[3]);
+      ResultFormatter.departureAirport(decodeResult, fields[4]);
+      ResultFormatter.arrivalAirport(decodeResult, fields[5]);
+      ResultFormatter.altitude(decodeResult, Number(text.substring(48, 51)) * 100);
+      ResultFormatter.unknownArr(decodeResult, fields.slice(8));
+    } else if (fields.length === 6) {
+      if (fields[0].match(/^[NS]/)) {
+        ResultFormatter.position(decodeResult, CoordinateUtils.decodeStringCoordinates(fields[0].substring(0, 13)));
+        let wp1 = {
+          name: fields[0].substring(13).trim(),
+          time: DateTimeUtils.convertHHMMSSToTod(fields[1].substring(0, 6)),
+          timeFormat: "tod"
+        };
+        ResultFormatter.altitude(decodeResult, Number(fields[1].substring(6, 9)) * 100);
+        let wp2 = {
+          name: fields[1].substring(9).trim(),
+          time: DateTimeUtils.convertHHMMSSToTod(fields[2]),
+          timeFormat: "tod"
+        };
+        ResultFormatter.route(decodeResult, { waypoints: [wp1, wp2] });
+        ResultFormatter.temperature(decodeResult, fields[3]);
+        ResultFormatter.unknownArr(decodeResult, fields.slice(4));
+      } else {
+        ResultFormatter.time_of_day(decodeResult, DateTimeUtils.convertHHMMSSToTod(fields[0]));
+        ResultFormatter.eta(decodeResult, DateTimeUtils.convertHHMMSSToTod(fields[1]));
+        ResultFormatter.unknown(decodeResult, fields[2]);
+        ResultFormatter.altitude(decodeResult, Number(fields[3]));
+        ResultFormatter.position(decodeResult, CoordinateUtils.decodeStringCoordinates((fields[4] + fields[5]).replace(/[ \.]/g, "")));
+      }
+    } else {
+      decodeResult.decoded = false;
+      ResultFormatter.unknown(decodeResult, text);
+    }
+    if (decodeResult.decoded) {
+      if (!decodeResult.remaining.text)
+        decodeResult.decoder.decodeLevel = "full";
+      else
+        decodeResult.decoder.decodeLevel = "partial";
+    } else {
+      decodeResult.decoder.decodeLevel = "none";
+    }
+    return decodeResult;
+  }
+};
+
+// lib/plugins/Label_4A_01.ts
+var Label_4A_01 = class extends DecoderPlugin {
+  name = "label-4a-01";
+  qualifiers() {
+    return {
+      labels: ["4A"],
+      preambles: ["01"]
+    };
+  }
+  decode(message, options = {}) {
+    const decodeResult = this.defaultResult();
+    decodeResult.decoder.name = this.name;
+    decodeResult.message = message;
+    decodeResult.formatted.description = "Latest New Format";
+    decodeResult.decoded = true;
+    let rgx = message.text.match(/^01([A-Z]{2})([A-Z]{2})\s*(\w+)\/(\d{6})([A-Z]{4})([A-Z]{4})\r\n([+-]\s*\d+)(\d{3}\.\d)([+-]\s*\d+\.\d)/);
+    if (rgx) {
+      ResultFormatter.state_change(decodeResult, rgx[1], rgx[2]);
+      ResultFormatter.callsign(decodeResult, rgx[3]);
+      ResultFormatter.time_of_day(decodeResult, DateTimeUtils.convertHHMMSSToTod(rgx[4] + "00"));
+      ResultFormatter.departureAirport(decodeResult, rgx[5]);
+      ResultFormatter.arrivalAirport(decodeResult, rgx[6]);
+      ResultFormatter.altitude(decodeResult, Number(rgx[7].replace(/ /g, "")));
+      ResultFormatter.unknown(decodeResult, rgx[8]);
+      ResultFormatter.temperature(decodeResult, rgx[9].replace(/ /g, ""));
+    } else {
+      decodeResult.decoded = false;
+      ResultFormatter.unknown(decodeResult, message.text);
+    }
+    if (decodeResult.decoded) {
+      if (!decodeResult.remaining.text)
+        decodeResult.decoder.decodeLevel = "full";
+      else
+        decodeResult.decoder.decodeLevel = "partial";
+    } else {
+      decodeResult.decoder.decodeLevel = "none";
+    }
+    return decodeResult;
+  }
+};
+
+// lib/plugins/Label_4A_DIS.ts
+var Label_4A_DIS = class extends DecoderPlugin {
+  name = "label-4a-dis";
+  qualifiers() {
+    return {
+      labels: ["4A"],
+      preambles: ["DIS"]
+    };
+  }
+  decode(message, options = {}) {
+    const decodeResult = this.defaultResult();
+    decodeResult.decoder.name = this.name;
+    decodeResult.message = message;
+    decodeResult.formatted.description = "Latest New Format";
+    decodeResult.decoded = true;
+    const fields = message.text.split(",");
+    ResultFormatter.time_of_day(decodeResult, DateTimeUtils.convertHHMMSSToTod(fields[1].substring(2) + "00"));
+    ResultFormatter.callsign(decodeResult, fields[2]);
+    ResultFormatter.freetext(decodeResult, fields.slice(3).join(""));
+    if (decodeResult.decoded) {
+      if (!decodeResult.remaining.text)
+        decodeResult.decoder.decodeLevel = "full";
+      else
+        decodeResult.decoder.decodeLevel = "partial";
+    } else {
+      decodeResult.decoder.decodeLevel = "none";
+    }
+    return decodeResult;
+  }
+};
+
+// lib/plugins/Label_4A_DOOR.ts
+var Label_4A_DOOR = class extends DecoderPlugin {
+  name = "label-4a-door";
+  qualifiers() {
+    return {
+      labels: ["4A"],
+      preambles: ["DOOR"]
+    };
+  }
+  decode(message, options = {}) {
+    const decodeResult = this.defaultResult();
+    decodeResult.decoder.name = this.name;
+    decodeResult.message = message;
+    decodeResult.formatted.description = "Latest New Format";
+    decodeResult.decoded = true;
+    const fields = message.text.split(" ");
+    if (fields.length === 3) {
+      ResultFormatter.door_event(decodeResult, fields[0].split("/")[1], fields[1]);
+      ResultFormatter.time_of_day(decodeResult, DateTimeUtils.convertHHMMSSToTod(fields[2] + "00"));
+    } else {
+      decodeResult.decoded = false;
+      ResultFormatter.unknown(decodeResult, message.text);
+    }
+    if (decodeResult.decoded) {
+      if (!decodeResult.remaining.text)
+        decodeResult.decoder.decodeLevel = "full";
+      else
+        decodeResult.decoder.decodeLevel = "partial";
+    } else {
+      decodeResult.decoder.decodeLevel = "none";
+    }
+    return decodeResult;
+  }
+};
+
+// lib/plugins/Label_4A_Slash_01.ts
+var Label_4A_Slash_01 = class extends DecoderPlugin {
+  name = "label-4a-slash-01";
+  qualifiers() {
+    return {
+      labels: ["4A"],
+      preambles: ["/01"]
+    };
+  }
+  decode(message, options = {}) {
+    const decodeResult = this.defaultResult();
+    decodeResult.decoder.name = this.name;
+    decodeResult.message = message;
+    decodeResult.formatted.description = "Latest New Format";
+    decodeResult.decoded = true;
+    if (message.text.length === 5 && message.text.substring(0, 4) === "/01-") {
+      ResultFormatter.unknown(decodeResult, message.text.substring(4));
+    } else {
+      decodeResult.decoded = false;
+      ResultFormatter.unknown(decodeResult, message.text);
+    }
+    if (decodeResult.decoded) {
+      if (!decodeResult.remaining.text)
+        decodeResult.decoder.decodeLevel = "full";
+      else
+        decodeResult.decoder.decodeLevel = "partial";
+    } else {
+      decodeResult.decoder.decodeLevel = "none";
+    }
     return decodeResult;
   }
 };
@@ -1519,13 +2138,13 @@ var Label_4N = class extends DecoderPlugin {
       ResultFormatter.departureAirport(decodeResult, text.substring(8, 11));
       ResultFormatter.arrivalAirport(decodeResult, text.substring(13, 16));
       ResultFormatter.position(decodeResult, CoordinateUtils.decodeStringCoordinatesDecimalMinutes(text.substring(30, 45).replace(/^(.)0/, "$1")));
-      ResultFormatter.altitude(decodeResult, text.substring(48, 51) * 100);
-      decodeResult.remaining.text = [text.substring(2, 4), text.substring(19, 29)].join(" ");
+      ResultFormatter.altitude(decodeResult, Number(text.substring(48, 51)) * 100);
+      ResultFormatter.unknownArr(decodeResult, [text.substring(2, 4), text.substring(19, 29)], " ");
     } else if (fields.length === 33) {
       decodeResult.raw.date = fields[3];
       if (fields[1] === "B") {
         ResultFormatter.position(decodeResult, { latitude: Number(fields[4]), longitude: Number(fields[5]) });
-        ResultFormatter.altitude(decodeResult, fields[6]);
+        ResultFormatter.altitude(decodeResult, Number(fields[6]));
       }
       ResultFormatter.departureAirport(decodeResult, fields[8]);
       ResultFormatter.arrivalAirport(decodeResult, fields[9]);
@@ -1535,13 +2154,13 @@ var Label_4N = class extends DecoderPlugin {
         ResultFormatter.alternateRunway(decodeResult, fields[12].split("/")[0]);
       }
       ResultFormatter.checksum(decodeResult, fields[32]);
-      decodeResult.remaining.text = [...fields.slice(1, 3), fields[7], ...fields.slice(13, 32)].filter((f) => f != "").join(",");
+      ResultFormatter.unknownArr(decodeResult, [...fields.slice(1, 3), fields[7], ...fields.slice(13, 32)].filter((f) => f != ""));
     } else {
       decodeResult.decoded = false;
-      decodeResult.remaining.text = text;
+      ResultFormatter.unknown(decodeResult, text);
     }
     if (decodeResult.decoded) {
-      if (decodeResult.remaining.text === "")
+      if (!decodeResult.remaining.text)
         decodeResult.decoder.decodeLevel = "full";
       else
         decodeResult.decoder.decodeLevel = "partial";
@@ -1634,23 +2253,14 @@ var Label_80 = class extends DecoderPlugin {
               break;
             }
             case "FOB": {
-              decodeResult.raw.fuel_on_board = match.groups.value;
-              decodeResult.formatted.items.push({
-                type: "fuel_on_board",
-                code: "FOB",
-                label: this.descriptions[match.groups.field],
-                value: decodeResult.raw.fuel_on_board
-              });
+              const fob = Number(match.groups.value);
+              if (!isNaN(fob)) {
+                ResultFormatter.currentFuel(decodeResult, fob);
+              }
               break;
             }
             case "HDG": {
-              decodeResult.raw.heading = Number(match.groups.value);
-              decodeResult.formatted.items.push({
-                type: "heading",
-                code: "HDG",
-                label: this.descriptions[match.groups.field],
-                value: decodeResult.raw.heading
-              });
+              ResultFormatter.heading(decodeResult, Number(match.groups.value));
               break;
             }
             case "MCH": {
@@ -1740,17 +2350,20 @@ var Label_83 = class extends DecoderPlugin {
       if (fields[2].length > 5) {
         decodeResult.raw.day_of_month = fields[2].substring(5);
       }
-      decodeResult.remaining.text = fields[2].substring(0, 4);
+      ResultFormatter.unknown(decodeResult, fields[2].substring(0, 4));
       const subfields = fields[3].split("/");
       ResultFormatter.departureAirport(decodeResult, subfields[0]);
       ResultFormatter.arrivalAirport(decodeResult, subfields[1]);
       ResultFormatter.tail(decodeResult, fields[4].replace(/\./g, ""));
-      ResultFormatter.eta(decodeResult, fields[6] + "00");
+      ResultFormatter.eta(decodeResult, DateTimeUtils.convertHHMMSSToTod(fields[6] + "00"));
     } else if (text.substring(0, 5) === "001PR") {
       decodeResult.raw.day_of_month = text.substring(5, 7);
-      ResultFormatter.position(decodeResult, CoordinateUtils.decodeStringCoordinatesDecimalMinutes(text.substring(13, 28).replace(/\./g, "")));
+      const position = CoordinateUtils.decodeStringCoordinatesDecimalMinutes(text.substring(13, 28).replace(/\./g, ""));
+      if (position) {
+        ResultFormatter.position(decodeResult, position);
+      }
       ResultFormatter.altitude(decodeResult, Number(text.substring(28, 33)));
-      decodeResult.remaining.text = text.substring(33);
+      ResultFormatter.unknown(decodeResult, text.substring(33));
     } else {
       const fields = text.replace(/\s/g, "").split(",");
       if (fields.length === 9) {
@@ -1765,17 +2378,17 @@ var Label_83 = class extends DecoderPlugin {
             longitude: Number(fields[4].replace(/\s/g, ""))
           }
         );
-        ResultFormatter.altitude(decodeResult, fields[5]);
-        ResultFormatter.groundspeed(decodeResult, fields[6]);
-        ResultFormatter.heading(decodeResult, fields[7]);
-        decodeResult.remaining.text = fields[8];
+        ResultFormatter.altitude(decodeResult, Number(fields[5]));
+        ResultFormatter.groundspeed(decodeResult, Number(fields[6]));
+        ResultFormatter.heading(decodeResult, Number(fields[7]));
+        ResultFormatter.unknown(decodeResult, fields[8]);
       } else {
         decodeResult.decoded = false;
-        decodeResult.remaining.text = message.text;
+        ResultFormatter.unknown(decodeResult, message.text);
       }
     }
     if (decodeResult.decoded) {
-      if (decodeResult.remaining.text === "")
+      if (!decodeResult.remaining.text)
         decodeResult.decoder.decodeLevel = "full";
       else
         decodeResult.decoder.decodeLevel = "partial";
@@ -1801,24 +2414,13 @@ var Label_8E = class extends DecoderPlugin {
     decodeResult.message = message;
     const regex = /^(?<arrival_icao>\w{4}),(?<arrival_eta>\d{4})$/;
     const results = message.text.match(regex);
-    if (results) {
+    if (results?.groups) {
       if (options.debug) {
         console.log(`Label 8E ETA: groups`);
         console.log(results.groups);
       }
-      decodeResult.formatted.items.push({
-        type: "eta",
-        code: "ETA",
-        label: "Estimated Time of Arrival",
-        value: DateTimeUtils.UTCToString(results.groups.arrival_eta)
-      });
-      decodeResult.raw.arrival_icao = results.groups.arrival_icao;
-      decodeResult.formatted.items.push({
-        type: "destination",
-        code: "DST",
-        label: "Destination",
-        value: decodeResult.raw.arrival_icao
-      });
+      ResultFormatter.eta(decodeResult, DateTimeUtils.convertHHMMSSToTod(results.groups.arrival_eta + "00"));
+      ResultFormatter.arrivalAirport(decodeResult, results.groups.arrival_icao);
     }
     decodeResult.decoded = true;
     decodeResult.decoder.decodeLevel = "full";
@@ -1863,7 +2465,8 @@ var Label_ColonComma = class extends DecoderPlugin {
     decodeResult.formatted.items.push({
       type: "frequency",
       label: "Frequency",
-      value: `${decodeResult.raw.frequency} MHz`
+      value: `${decodeResult.raw.frequency} MHz`,
+      code: "FREQ"
     });
     decodeResult.decoded = true;
     decodeResult.decoder.decodeLevel = "full";
@@ -1871,62 +2474,6 @@ var Label_ColonComma = class extends DecoderPlugin {
   }
 };
 
-// lib/plugins/Label_H1_FLR.ts
-var Label_H1_FLR = class extends DecoderPlugin {
-  name = "label-h1-flr";
-  qualifiers() {
-    return {
-      labels: ["H1"],
-      preambles: ["FLR", "#CFBFLR"]
-    };
-  }
-  decode(message, options = {}) {
-    let decodeResult = this.defaultResult();
-    decodeResult.decoder.name = this.name;
-    decodeResult.formatted.description = "Fault Log Report";
-    decodeResult.message = message;
-    const parts = message.text.split("/FR");
-    if (parts.length > 1) {
-      decodeResult.remaining.text = "";
-      const fields = parts[0].split("/");
-      for (let i = 1; i < fields.length; i++) {
-        const field = fields[i];
-        if (field.startsWith("PN")) {
-          processUnknown(decodeResult, "/" + field);
-        } else {
-          processUnknown(decodeResult, "/" + field);
-        }
-      }
-      const data = parts[1].substring(0, 20);
-      const msg = parts[1].substring(20);
-      const datetime = data.substring(0, 12);
-      const date = datetime.substring(4, 6) + datetime.substring(2, 4) + datetime.substring(0, 2);
-      processUnknown(decodeResult, data.substring(12));
-      decodeResult.raw.message_timestamp = DateTimeUtils.convertDateTimeToEpoch(datetime.substring(6), date);
-      decodeResult.raw.fault_message = msg;
-      decodeResult.formatted.items.push({
-        type: "fault",
-        code: "FR",
-        label: "Fault Report",
-        value: decodeResult.raw.fault_message
-      });
-      decodeResult.decoded = true;
-      decodeResult.decoder.decodeLevel = "partial";
-    } else {
-      if (options.debug) {
-        console.log(`Decoder: Unknown H1 message: ${message.text}`);
-      }
-      decodeResult.remaining.text = message.text;
-      decodeResult.decoded = false;
-      decodeResult.decoder.decodeLevel = "none";
-    }
-    return decodeResult;
-  }
-};
-function processUnknown(decodeResult, value) {
-  decodeResult.remaining.text += value;
-}
-
 // lib/utils/flight_plan_utils.ts
 var FlightPlanUtils = class _FlightPlanUtils {
   /**
@@ -1968,6 +2515,8 @@ var FlightPlanUtils = class _FlightPlanUtils {
         case "R":
           addRunway(decodeResult, value);
           break;
+        // case 'WS': // something about routes, has altitude, so current parsing won't work
+        // break;
         default:
           if (allKnownFields) {
             decodeResult.remaining.text = "";
@@ -2030,13 +2579,7 @@ function addRunway(decodeResult, value) {
 }
 function addRoute(decodeResult, value) {
   const route = value.split(".");
-  decodeResult.raw.route = { waypoints: route.map((leg) => RouteUtils.getWaypoint(leg)) };
-  decodeResult.formatted.items.push({
-    type: "aircraft_route",
-    code: "ROUTE",
-    label: "Aircraft Route",
-    value: RouteUtils.routeToString(decodeResult.raw.route)
-  });
+  ResultFormatter.route(decodeResult, { waypoints: route.map((leg) => RouteUtils.getWaypoint(leg)) });
 }
 function addProcedure(decodeResult, value, type) {
   if (decodeResult.raw.procedures === void 0) {
@@ -2089,11 +2632,10 @@ function addCompanyRoute(decodeResult, value) {
 // lib/utils/h1_helper.ts
 var H1Helper = class {
   static decodeH1Message(decodeResult, message) {
-    let allKnownFields = true;
     const checksum = message.slice(-4);
     const data = message.slice(0, message.length - 4);
     const fields = data.split("/");
-    allKnownFields = allKnownFields && parseMessageType(decodeResult, fields[0]);
+    parseMessageType(decodeResult, fields[0]);
     for (let i = 1; i < fields.length; ++i) {
       if (fields[i].startsWith("FN")) {
         decodeResult.raw.flight_number = fields[i].substring(2);
@@ -2112,59 +2654,49 @@ var H1Helper = class {
         decodeResult.raw.message_timestamp = time;
       } else if (fields[i].startsWith("PS")) {
         const pos = processPS(decodeResult, fields[i].substring(2).split(","));
-        allKnownFields == allKnownFields && pos;
       } else if (fields[i].startsWith("DT")) {
         const data2 = fields[i].substring(2).split(",");
-        const dt = processDT(decodeResult, data2);
-        allKnownFields = allKnownFields && dt;
+        processDT(decodeResult, data2);
       } else if (fields[i].startsWith("ID")) {
         processIdentification(decodeResult, fields[i].substring(2).split(","));
       } else if (fields[i].startsWith("LR")) {
         const data2 = fields[i].substring(2).split(",");
-        const lr = processLR(decodeResult, data2);
-        allKnownFields = allKnownFields && lr;
+        processLR(decodeResult, data2);
       } else if (fields[i].startsWith("RI") || fields[i].startsWith("RF") || fields[i].startsWith("RP")) {
-        const fp = FlightPlanUtils.processFlightPlan(decodeResult, fields[i].split(":"));
-        allKnownFields = allKnownFields && fp;
+        FlightPlanUtils.processFlightPlan(decodeResult, fields[i].split(":"));
       } else if (fields[i].startsWith("PR")) {
-        allKnownFields = false;
-        decodeResult.remaining.text += "/" + fields[i];
-      } else if (fields[i].startsWith("PS")) {
-        allKnownFields = false;
-        decodeResult.remaining.text += fields[i];
+        ResultFormatter.unknown(decodeResult, fields[i], "/");
       } else if (fields[i].startsWith("AF")) {
-        const af = processAirField(decodeResult, fields[i].substring(2).split(","));
-        allKnownFields = allKnownFields && af;
+        processAirField(decodeResult, fields[i].substring(2).split(","));
       } else if (fields[i].startsWith("TD")) {
-        const td = processTimeOfDeparture(decodeResult, fields[i].substring(2).split(","));
-        allKnownFields = allKnownFields && td;
+        processTimeOfDeparture(decodeResult, fields[i].substring(2).split(","));
       } else if (fields[i].startsWith("FX")) {
-        decodeResult.raw.free_text = fields[i].substring(2);
-        decodeResult.formatted.items.push({
-          type: "text",
-          code: "TEXT",
-          label: "Free Text",
-          value: decodeResult.raw.free_text
-        });
+        ResultFormatter.freetext(decodeResult, fields[i].substring(2));
+      } else if (fields[i].startsWith("ET")) {
+        if (fields[i].length === 7) {
+          ResultFormatter.eta(decodeResult, DateTimeUtils.convertHHMMSSToTod(fields[i].substring(3) + "00"));
+        } else if (fields[i].length === 8) {
+          ResultFormatter.eta(decodeResult, DateTimeUtils.convertHHMMSSToTod(fields[i].substring(4) + "00"));
+        } else {
+          ResultFormatter.unknown(decodeResult, fields[i], "/");
+        }
       } else {
-        decodeResult.remaining.text += "/" + fields[i];
-        allKnownFields = false;
+        ResultFormatter.unknown(decodeResult, fields[i], "/");
       }
     }
     if (decodeResult.formatted.items.length > 0) {
       ResultFormatter.checksum(decodeResult, checksum);
     }
-    return allKnownFields;
+    return true;
   }
 };
 function processAirField(decodeResult, data) {
   if (data.length === 2) {
     ResultFormatter.departureAirport(decodeResult, data[0]);
     ResultFormatter.arrivalAirport(decodeResult, data[1]);
-    return true;
+  } else {
+    ResultFormatter.unknown(decodeResult, data.join(","), "AF/");
   }
-  decodeResult.remaining.text += "AF/" + data.join(",");
-  return false;
 }
 function processTimeOfDeparture(decodeResult, data) {
   if (data.length === 2) {
@@ -2182,10 +2714,9 @@ function processTimeOfDeparture(decodeResult, data) {
       label: "Estimated Departure Time",
       value: `${data[1].substring(0, 2)}:${data[1].substring(2)}`
     });
-    return true;
+  } else {
+    ResultFormatter.unknown(decodeResult, data.join(","), "/TD");
   }
-  decodeResult.remaining.text += "/TD" + data.join(",");
-  return false;
 }
 function processIdentification(decodeResult, data) {
   ResultFormatter.tail(decodeResult, data[0]);
@@ -2197,11 +2728,10 @@ function processIdentification(decodeResult, data) {
   }
 }
 function processDT(decodeResult, data) {
-  let allKnownFields = true;
   if (!decodeResult.raw.arrival_icao) {
     ResultFormatter.arrivalAirport(decodeResult, data[0]);
   } else if (decodeResult.raw.arrival_icao != data[0]) {
-    decodeResult.remaining.text += "/" + data;
+    ResultFormatter.unknownArr(decodeResult, data);
   }
   if (data.length > 1) {
     ResultFormatter.arrivalRunway(decodeResult, data[1]);
@@ -2210,19 +2740,16 @@ function processDT(decodeResult, data) {
     ResultFormatter.currentFuel(decodeResult, Number(data[2]));
   }
   if (data.length > 3) {
-    ResultFormatter.eta(decodeResult, data[3]);
+    ResultFormatter.eta(decodeResult, DateTimeUtils.convertHHMMSSToTod(data[3]));
   }
   if (data.length > 4) {
     ResultFormatter.remainingFuel(decodeResult, Number(data[4]));
   }
   if (data.length > 5) {
-    allKnownFields = false;
-    decodeResult.remaining.text += "," + data.slice(5).join(",");
+    ResultFormatter.unknownArr(decodeResult, data);
   }
-  return allKnownFields;
 }
 function processLR(decodeResult, data) {
-  let allKnownFields = true;
   if (data.length === 19) {
     ResultFormatter.unknown(decodeResult, data[1]);
     ResultFormatter.flightNumber(decodeResult, data[2]);
@@ -2230,34 +2757,47 @@ function processLR(decodeResult, data) {
     ResultFormatter.arrivalAirport(decodeResult, data[4]);
     ResultFormatter.arrivalRunway(decodeResult, data[5]);
     ResultFormatter.unknown(decodeResult, data.slice(6, 19).join(","));
-    allKnownFields = false;
   } else {
-    allKnownFields = false;
+    ResultFormatter.unknown(decodeResult, data.join(","));
   }
-  return allKnownFields;
 }
 function parseMessageType(decodeResult, messageType) {
-  let decoded = true;
   const parts = messageType.split("#");
   if (parts.length == 1) {
-    if (parts[0].startsWith("POS") && parts[0].length !== 3 && !parts[0].startsWith("POS/")) {
-      decoded = processPosition2(decodeResult, parts[0].substring(3).split(","));
+    const type = parts[0].substring(0, 3);
+    if (type === "POS" && parts[0].length !== 3) {
+      processPosition2(decodeResult, parts[0].substring(3).split(","));
     }
-    return decoded;
+    return processMessageType(decodeResult, type);
   } else if (parts.length == 2) {
     if (parts[0].length > 0) {
-      decodeResult.remaining.text += parts[0].substring(0, 3);
+      ResultFormatter.unknown(decodeResult, parts[0].substring(0, 3));
       decodeResult.raw.flight_number = parts[0].substring(3);
-      decodeResult.remaining.text += "#" + parts[1].substring(0, 3);
+      ResultFormatter.unknown(decodeResult, parts[1].length == 5 ? parts[1].substring(0, 2) : parts[1].substring(0, 3), "#");
     }
-    if (parts[1].substring(3, 6) === "POS" && parts[1].length !== 6 && parts[1].substring(3, 7) !== "POS/") {
-      decoded = processPosition2(decodeResult, parts[1].substring(6).split(","));
+    const type = parts[1].length == 5 ? parts[1].substring(2, 5) : parts[1].substring(3, 6);
+    if (parts[1].substring(3, 6) === "POS" && parts[1].length > 6) {
+      processPosition2(decodeResult, parts[1].substring(6).split(","));
     }
-    decodeResult.raw.message_type = messageType;
-    return decoded;
+    processMessageType(decodeResult, type);
+  } else {
+    ResultFormatter.unknown(decodeResult, messageType);
+  }
+}
+function processMessageType(decodeResult, type) {
+  if (type === "FPN") {
+    decodeResult.formatted.description = "Flight Plan";
+  } else if (type === "FTX") {
+    decodeResult.formatted.description = "Free Text";
+  } else if (type === "INI") {
+    decodeResult.formatted.description = "Flight Plan Initial Report";
+  } else if (type === "POS") {
+    decodeResult.formatted.description = "Position Report";
+  } else if (type === "PRG") {
+    decodeResult.formatted.description = "Progress Report";
+  } else {
+    decodeResult.formatted.description = "Unknown H1 Message";
   }
-  decodeResult.remaining.text += messageType;
-  return false;
 }
 function processDC(decodeResult, data) {
   decodeResult.raw.message_date = data[0];
@@ -2266,13 +2806,9 @@ function processDC(decodeResult, data) {
     const date = data[0].substring(2, 4) + data[0].substring(0, 2) + data[0].substring(4, 6);
     const time = DateTimeUtils.convertDateTimeToEpoch(data[1], data[0]);
     decodeResult.raw.message_timestamp = time;
-  } else {
-    return false;
   }
-  return true;
 }
 function processPS(decodeResult, data) {
-  let allKnownFields = true;
   const position = CoordinateUtils.decodeStringCoordinatesDecimalMinutes(data[0]);
   if (position) {
     decodeResult.raw.position = position;
@@ -2282,8 +2818,6 @@ function processPS(decodeResult, data) {
       label: "Aircraft Position",
       value: CoordinateUtils.coordinateString(position)
     });
-  } else {
-    allKnownFields = false;
   }
   if (data.length === 9) {
     processRoute(decodeResult, data[3], data[1], data[5], data[4], void 0);
@@ -2302,11 +2836,8 @@ function processPS(decodeResult, data) {
     ResultFormatter.unknown(decodeResult, data[9]);
     ResultFormatter.unknown(decodeResult, data.slice(11).join(","));
   }
-  allKnownFields = false;
-  return allKnownFields;
 }
 function processPosition2(decodeResult, data) {
-  let allKnownFields = true;
   const position = CoordinateUtils.decodeStringCoordinatesDecimalMinutes(data[0]);
   if (position) {
     decodeResult.raw.position = position;
@@ -2316,8 +2847,6 @@ function processPosition2(decodeResult, data) {
       label: "Aircraft Position",
       value: CoordinateUtils.coordinateString(position)
     });
-  } else {
-    allKnownFields = false;
   }
   if (data.length >= 10) {
     ResultFormatter.altitude(decodeResult, Number(data[3]) * 100);
@@ -2332,8 +2861,6 @@ function processPosition2(decodeResult, data) {
     ResultFormatter.unknown(decodeResult, data[12]);
     ResultFormatter.unknown(decodeResult, data[13]);
   }
-  allKnownFields = false;
-  return allKnownFields;
 }
 function processRoute(decodeResult, last, time, next, eta, then, date) {
   const lastTime = date ? DateTimeUtils.convertDateTimeToEpoch(time, date) : DateTimeUtils.convertHHMMSSToTod(time);
@@ -2356,30 +2883,27 @@ function processRoute(decodeResult, last, time, next, eta, then, date) {
   });
 }
 
-// lib/plugins/Label_H1_FPN.ts
-var Label_H1_FPN = class extends DecoderPlugin {
-  name = "label-h1-fpn";
+// lib/plugins/Label_H1.ts
+var Label_H1 = class extends DecoderPlugin {
+  name = "label-h1";
   qualifiers() {
     return {
-      labels: ["H1"],
-      preambles: ["FPN", "#M1BFPN"]
+      labels: ["H1"]
     };
   }
   decode(message, options = {}) {
     let decodeResult = this.defaultResult();
     decodeResult.decoder.name = this.name;
-    decodeResult.formatted.description = "Flight Plan";
     decodeResult.message = message;
-    decodeResult.remaining.text = "";
     const msg = message.text.replace(/\n|\r/g, "");
-    const fulllyDecoded = H1Helper.decodeH1Message(decodeResult, msg);
-    decodeResult.decoded = true;
-    decodeResult.decoder.decodeLevel = fulllyDecoded ? "full" : "partial";
+    const decoded = H1Helper.decodeH1Message(decodeResult, msg);
+    decodeResult.decoded = decoded;
+    decodeResult.decoder.decodeLevel = !decodeResult.remaining.text ? "full" : "partial";
     if (decodeResult.formatted.items.length === 0) {
       if (options.debug) {
         console.log(`Decoder: Unknown H1 message: ${message.text}`);
       }
-      decodeResult.remaining.text = message.text;
+      ResultFormatter.unknown(decodeResult, message.text);
       decodeResult.decoded = false;
       decodeResult.decoder.decodeLevel = "none";
     }
@@ -2387,60 +2911,47 @@ var Label_H1_FPN = class extends DecoderPlugin {
   }
 };
 
-// lib/plugins/Label_H1_FTX.ts
-var Label_H1_FTX = class extends DecoderPlugin {
-  name = "label-h1-ftx";
+// lib/plugins/Label_H1_FLR.ts
+var Label_H1_FLR = class extends DecoderPlugin {
+  name = "label-h1-flr";
   qualifiers() {
     return {
       labels: ["H1"],
-      preambles: ["FTX", "- #MDFTX"]
+      preambles: ["FLR", "#CFBFLR"]
     };
   }
   decode(message, options = {}) {
     let decodeResult = this.defaultResult();
     decodeResult.decoder.name = this.name;
-    decodeResult.formatted.description = "Free Text";
+    decodeResult.formatted.description = "Fault Log Report";
     decodeResult.message = message;
-    decodeResult.remaining.text = "";
-    const fulllyDecoded = H1Helper.decodeH1Message(decodeResult, message.text);
-    decodeResult.decoded = true;
-    decodeResult.decoder.decodeLevel = fulllyDecoded ? "full" : "partial";
-    if (decodeResult.formatted.items.length === 0) {
-      if (options.debug) {
-        console.log(`Decoder: Unknown H1 message: ${message.text}`);
+    const parts = message.text.split("/FR");
+    if (parts.length > 1) {
+      const fields = parts[0].split("/");
+      for (let i = 1; i < fields.length; i++) {
+        const field = fields[i];
+        ResultFormatter.unknown(decodeResult, field, "/");
       }
-      decodeResult.remaining.text = message.text;
-      decodeResult.decoded = false;
-      decodeResult.decoder.decodeLevel = "none";
-    }
-    return decodeResult;
-  }
-};
-
-// lib/plugins/Label_H1_INI.ts
-var Label_H1_INI = class extends DecoderPlugin {
-  // eslint-disable-line camelcase
-  name = "label-h1-ini";
-  qualifiers() {
-    return {
-      labels: ["H1"],
-      preambles: ["INI", "- #MDINI"]
-    };
-  }
-  decode(message, options = {}) {
-    const decodeResult = this.defaultResult();
-    decodeResult.decoder.name = this.name;
-    decodeResult.formatted.description = "Flight Plan Initial Report";
-    decodeResult.message = message;
-    decodeResult.remaining.text = "";
-    const fulllyDecoded = H1Helper.decodeH1Message(decodeResult, message.text);
-    decodeResult.decoded = true;
-    decodeResult.decoder.decodeLevel = fulllyDecoded ? "full" : "partial";
-    if (decodeResult.formatted.items.length === 0) {
+      const data = parts[1].substring(0, 20);
+      const msg = parts[1].substring(20);
+      const datetime = data.substring(0, 12);
+      const date = datetime.substring(4, 6) + datetime.substring(2, 4) + datetime.substring(0, 2);
+      ResultFormatter.unknown(decodeResult, data.substring(12), "/");
+      decodeResult.raw.message_timestamp = DateTimeUtils.convertDateTimeToEpoch(datetime.substring(6), date);
+      decodeResult.raw.fault_message = msg;
+      decodeResult.formatted.items.push({
+        type: "fault",
+        code: "FR",
+        label: "Fault Report",
+        value: decodeResult.raw.fault_message
+      });
+      decodeResult.decoded = true;
+      decodeResult.decoder.decodeLevel = "partial";
+    } else {
       if (options.debug) {
         console.log(`Decoder: Unknown H1 message: ${message.text}`);
       }
-      decodeResult.remaining.text = message.text;
+      ResultFormatter.unknown(decodeResult, message.text);
       decodeResult.decoded = false;
       decodeResult.decoder.decodeLevel = "none";
     }
@@ -2463,7 +2974,6 @@ var Label_H1_OHMA = class extends DecoderPlugin {
     decodeResult.decoder.name = this.name;
     decodeResult.formatted.description = "OHMA Message";
     decodeResult.message = message;
-    decodeResult.remaining.text = "";
     const data = message.text.split("OHMA")[1];
     try {
       const compressedBuffer = Buffer.from(data, "base64");
@@ -2498,7 +3008,7 @@ var Label_H1_OHMA = class extends DecoderPlugin {
       if (options.debug) {
         console.log(`Decoder: Unknown H1 OHMA message: ${message.text}`, e);
       }
-      decodeResult.remaining.text += message.text;
+      ResultFormatter.unknown(decodeResult, message.text);
       decodeResult.decoded = false;
       decodeResult.decoder.decodeLevel = "none";
     }
@@ -2506,14 +3016,13 @@ var Label_H1_OHMA = class extends DecoderPlugin {
   }
 };
 
-// lib/plugins/Label_H1_POS.ts
-var Label_H1_POS = class extends DecoderPlugin {
-  name = "label-h1-pos";
+// lib/plugins/Label_H1_StarPOS.ts
+var Label_H1_StarPOS = class extends DecoderPlugin {
+  name = "label-h1-star-pos";
   qualifiers() {
     return {
-      labels: ["H1", "4J"],
-      preambles: ["POS", "#M1BPOS", "/.POS"]
-      //TODO - support data before #
+      labels: ["H1"],
+      preambles: ["*POS"]
     };
   }
   decode(message, options = {}) {
@@ -2521,18 +3030,28 @@ var Label_H1_POS = class extends DecoderPlugin {
     decodeResult.decoder.name = this.name;
     decodeResult.formatted.description = "Position Report";
     decodeResult.message = message;
-    decodeResult.remaining.text = "";
-    const fulllyDecoded = H1Helper.decodeH1Message(decodeResult, message.text);
-    decodeResult.decoded = true;
-    decodeResult.decoder.decodeLevel = fulllyDecoded ? "full" : "partial";
-    if (decodeResult.formatted.items.length === 0) {
+    const msg = message.text;
+    if (msg.length !== 43 || !msg.startsWith("*POS")) {
       if (options.debug) {
-        console.log(`Decoder: Unknown H1 message: ${message.text}`);
+        console.log(`Decoder: Unknown H1 message: ${msg}`);
       }
-      decodeResult.remaining.text = message.text;
+      ResultFormatter.unknown(decodeResult, msg);
       decodeResult.decoded = false;
       decodeResult.decoder.decodeLevel = "none";
+      return decodeResult;
     }
+    decodeResult.raw.month = Number(msg.substring(4, 6));
+    decodeResult.raw.day_of_month = Number(msg.substring(6, 8));
+    ResultFormatter.time_of_day(decodeResult, DateTimeUtils.convertHHMMSSToTod(msg.substring(8, 12) + "00"));
+    ResultFormatter.position(decodeResult, {
+      // Deg Min, no sec
+      latitude: CoordinateUtils.getDirection(msg.substring(12, 13)) * (Number(msg.substring(13, 15)) + Number(msg.substring(15, 17)) / 60),
+      longitude: CoordinateUtils.getDirection(msg.substring(17, 18)) * (Number(msg.substring(18, 21)) + Number(msg.substring(21, 23)) / 60)
+    });
+    ResultFormatter.altitude(decodeResult, Number(msg.substring(23, 28)));
+    ResultFormatter.unknown(decodeResult, msg.substring(28));
+    decodeResult.decoded = true;
+    decodeResult.decoder.decodeLevel = "partial";
     return decodeResult;
   }
 };
@@ -2553,21 +3072,13 @@ var Label_H1_WRN = class extends DecoderPlugin {
     decodeResult.message = message;
     const parts = message.text.split("/WN");
     if (parts.length > 1) {
-      decodeResult.remaining.text = "";
       const fields = parts[0].split("/");
-      for (let i = 1; i < fields.length; i++) {
-        const field = fields[i];
-        if (field.startsWith("PN")) {
-          processUnknown2(decodeResult, "/" + field);
-        } else {
-          processUnknown2(decodeResult, "/" + field);
-        }
-      }
+      ResultFormatter.unknownArr(decodeResult, fields.slice(1), "/");
       const data = parts[1].substring(0, 20);
       const msg = parts[1].substring(20);
       const datetime = data.substring(0, 12);
       const date = datetime.substring(4, 6) + datetime.substring(2, 4) + datetime.substring(0, 2);
-      processUnknown2(decodeResult, data.substring(12));
+      ResultFormatter.unknown(decodeResult, data.substring(12), "/");
       decodeResult.raw.message_timestamp = DateTimeUtils.convertDateTimeToEpoch(datetime.substring(6), date);
       decodeResult.raw.warning_message = msg;
       decodeResult.formatted.items.push({
@@ -2582,16 +3093,13 @@ var Label_H1_WRN = class extends DecoderPlugin {
       if (options.debug) {
         console.log(`Decoder: Unknown H1 message: ${message.text}`);
       }
-      decodeResult.remaining.text = message.text;
+      ResultFormatter.unknown(decodeResult, message.text);
       decodeResult.decoded = false;
       decodeResult.decoder.decodeLevel = "none";
     }
     return decodeResult;
   }
 };
-function processUnknown2(decodeResult, value) {
-  decodeResult.remaining.text += value;
-}
 
 // lib/plugins/Label_HX.ts
 var Label_HX = class extends DecoderPlugin {
@@ -2616,27 +3124,20 @@ var Label_HX = class extends DecoderPlugin {
       let londir = parts[4].substring(0, 1);
       let londeg = Number(parts[4].substring(1, 4));
       let lonmin = Number(parts[4].substring(4, 8));
-      decodeResult.raw.position = {
+      let pos = {
         latitude: (latdeg + latmin / 60) * (latdir === "N" ? 1 : -1),
         longitude: (londeg + lonmin / 60) * (londir === "E" ? 1 : -1)
       };
-      decodeResult.remaining.text = parts.slice(5).join(" ");
+      ResultFormatter.unknownArr(decodeResult, parts.slice(5), " ");
+      ResultFormatter.position(decodeResult, pos);
     } else if (parts[2] === "43") {
       ResultFormatter.departureAirport(decodeResult, parts[3]);
-      decodeResult.remaining.text = parts.slice(4).join(" ");
+      ResultFormatter.unknownArr(decodeResult, parts.slice(4), " ");
     } else {
       decodeResult.decoded = false;
     }
-    if (decodeResult.raw.position) {
-      decodeResult.formatted.items.push({
-        type: "aircraft_position",
-        code: "POS",
-        label: "Aircraft Position",
-        value: CoordinateUtils.coordinateString(decodeResult.raw.position)
-      });
-    }
     if (decodeResult.decoded) {
-      if (decodeResult.remaining.text === "")
+      if (!decodeResult.remaining.text)
         decodeResult.decoder.decodeLevel = "full";
       else
         decodeResult.decoder.decodeLevel = "partial";
@@ -2664,7 +3165,7 @@ var Label_SQ = class extends DecoderPlugin {
     if (decodeResult.raw.version === "2") {
       const regex = /0(\d)X(?<org>\w)(?<iata>\w\w\w)(?<icao>\w\w\w\w)(?<station>\d)(?<lat>\d+)(?<latd>[NS])(?<lng>\d+)(?<lngd>[EW])V(?<vfreq>\d+)\/.*/;
       const result = message.text.match(regex);
-      if (result && result.length >= 8) {
+      if (result?.groups && result.length >= 8) {
         decodeResult.raw.groundStation = {
           number: result.groups.station,
           iataCode: result.groups.iata,
@@ -2674,7 +3175,7 @@ var Label_SQ = class extends DecoderPlugin {
             longitude: Number(result.groups.lng) / 100 * (result.groups.lngd === "W" ? -1 : 1)
           }
         };
-        decodeResult.raw.vdlFrequency = result.groups.vfreq / 1e3;
+        decodeResult.raw.vdlFrequency = Number(result.groups.vfreq) / 1e3;
       }
     }
     decodeResult.formatted.description = "Ground Station Squitter";
@@ -2765,33 +3266,13 @@ var Label_QR = class extends DecoderPlugin {
   decode(message, options = {}) {
     const decodeResult = this.defaultResult();
     decodeResult.decoder.name = this.name;
-    decodeResult.raw.origin = message.text.substring(0, 4);
-    decodeResult.raw.destination = message.text.substring(4, 8);
-    decodeResult.raw.wheels_on = message.text.substring(8, 12);
-    decodeResult.remaining.text = message.text.substring(12);
     decodeResult.formatted.description = "ON Report";
-    decodeResult.formatted.items = [
-      {
-        type: "origin",
-        code: "ORG",
-        label: "Origin",
-        value: decodeResult.raw.origin
-      },
-      {
-        type: "destination",
-        code: "DST",
-        label: "Destination",
-        value: decodeResult.raw.destination
-      },
-      {
-        type: "wheels_on",
-        code: "WON",
-        label: "Wheels ON",
-        value: decodeResult.raw.wheels_on
-      }
-    ];
+    ResultFormatter.departureAirport(decodeResult, message.text.substring(0, 4));
+    ResultFormatter.arrivalAirport(decodeResult, message.text.substring(4, 8));
+    ResultFormatter.on(decodeResult, DateTimeUtils.convertHHMMSSToTod(message.text.substring(8, 12) + "00"));
+    ResultFormatter.unknown(decodeResult, message.text.substring(12));
     decodeResult.decoded = true;
-    if (decodeResult.remaining.text === "")
+    if (!decodeResult.remaining.text)
       decodeResult.decoder.decodeLevel = "full";
     else
       decodeResult.decoder.decodeLevel = "partial";
@@ -2810,33 +3291,13 @@ var Label_QP = class extends DecoderPlugin {
   decode(message, options = {}) {
     const decodeResult = this.defaultResult();
     decodeResult.decoder.name = this.name;
-    decodeResult.raw.origin = message.text.substring(0, 4);
-    decodeResult.raw.destination = message.text.substring(4, 8);
-    decodeResult.raw.gate_out = message.text.substring(8, 12);
-    decodeResult.remaining.text = message.text.substring(12);
     decodeResult.formatted.description = "OUT Report";
-    decodeResult.formatted.items = [
-      {
-        type: "origin",
-        code: "ORG",
-        label: "Origin",
-        value: decodeResult.raw.origin
-      },
-      {
-        type: "destination",
-        code: "DST",
-        label: "Destination",
-        value: decodeResult.raw.destination
-      },
-      {
-        type: "gate_out",
-        code: "GOUT",
-        label: "Gate OUT",
-        value: decodeResult.raw.gate_out
-      }
-    ];
+    ResultFormatter.departureAirport(decodeResult, message.text.substring(0, 4));
+    ResultFormatter.arrivalAirport(decodeResult, message.text.substring(4, 8));
+    ResultFormatter.out(decodeResult, DateTimeUtils.convertHHMMSSToTod(message.text.substring(8, 12) + "00"));
+    ResultFormatter.unknown(decodeResult, message.text.substring(12));
     decodeResult.decoded = true;
-    if (decodeResult.remaining.text === "")
+    if (!decodeResult.remaining.text)
       decodeResult.decoder.decodeLevel = "full";
     else
       decodeResult.decoder.decodeLevel = "partial";
@@ -2855,33 +3316,13 @@ var Label_QS = class extends DecoderPlugin {
   decode(message, options = {}) {
     const decodeResult = this.defaultResult();
     decodeResult.decoder.name = this.name;
-    decodeResult.raw.origin = message.text.substring(0, 4);
-    decodeResult.raw.destination = message.text.substring(4, 8);
-    decodeResult.raw.gate_in = message.text.substring(8, 12);
-    decodeResult.remaining.text = message.text.substring(12);
     decodeResult.formatted.description = "IN Report";
-    decodeResult.formatted.items = [
-      {
-        type: "origin",
-        code: "ORG",
-        label: "Origin",
-        value: decodeResult.raw.origin
-      },
-      {
-        type: "destination",
-        code: "DST",
-        label: "Destination",
-        value: decodeResult.raw.destination
-      },
-      {
-        type: "gate_in",
-        code: "GIN",
-        label: "Gate IN",
-        value: decodeResult.raw.gate_in
-      }
-    ];
+    ResultFormatter.departureAirport(decodeResult, message.text.substring(0, 4));
+    ResultFormatter.arrivalAirport(decodeResult, message.text.substring(4, 8));
+    ResultFormatter.in(decodeResult, DateTimeUtils.convertHHMMSSToTod(message.text.substring(8, 12) + "00"));
+    ResultFormatter.unknown(decodeResult, message.text.substring(12));
     decodeResult.decoded = true;
-    if (decodeResult.remaining.text === "")
+    if (!decodeResult.remaining.text)
       decodeResult.decoder.decodeLevel = "full";
     else
       decodeResult.decoder.decodeLevel = "partial";
@@ -2904,46 +3345,33 @@ var Label_QQ = class extends DecoderPlugin {
     decodeResult.formatted.description = "OFF Report";
     ResultFormatter.departureAirport(decodeResult, message.text.substring(0, 4));
     ResultFormatter.arrivalAirport(decodeResult, message.text.substring(4, 8));
-    decodeResult.raw.wheels_off = message.text.substring(8, 12);
     if (message.text.substring(12, 19) === "\r\n001FE") {
       decodeResult.raw.day_of_month = message.text.substring(19, 21);
-      decodeResult.raw.wheels_off = message.text.substring(21, 27);
+      ResultFormatter.off(decodeResult, DateTimeUtils.convertHHMMSSToTod(message.text.substring(21, 27)));
       let latdir = message.text.substring(27, 28);
       let latdeg = Number(message.text.substring(28, 30));
       let latmin = Number(message.text.substring(30, 34));
       let londir = message.text.substring(34, 35);
       let londeg = Number(message.text.substring(35, 38));
       let lonmin = Number(message.text.substring(38, 42));
-      decodeResult.raw.position = {
+      let pos = {
         latitude: (latdeg + latmin / 60) * (latdir === "N" ? 1 : -1),
         longitude: (londeg + lonmin / 60) * (londir === "E" ? 1 : -1)
       };
-      decodeResult.remaining.text = message.text.substring(42, 45);
+      ResultFormatter.unknown(decodeResult, message.text.substring(42, 45));
+      ResultFormatter.position(decodeResult, pos);
       if (decodeResult.remaining.text !== "---") {
-        ResultFormatter.groundspeed(decodeResult, message.text.substring(45, 48));
+        ResultFormatter.groundspeed(decodeResult, Number(message.text.substring(45, 48)));
       } else {
         ResultFormatter.unknown(decodeResult, message.text.substring(45, 48));
       }
       ResultFormatter.unknown(decodeResult, message.text.substring(48));
     } else {
-      decodeResult.remaining.text = message.text.substring(12);
-    }
-    decodeResult.formatted.items.push({
-      type: "wheels_off",
-      code: "WOFF",
-      label: "Wheels OFF",
-      value: decodeResult.raw.wheels_off
-    });
-    if (decodeResult.raw.position) {
-      decodeResult.formatted.items.push({
-        type: "aircraft_position",
-        code: "POS",
-        label: "Aircraft Position",
-        value: CoordinateUtils.coordinateString(decodeResult.raw.position)
-      });
+      ResultFormatter.off(decodeResult, DateTimeUtils.convertHHMMSSToTod(message.text.substring(8, 12) + "00"));
+      ResultFormatter.unknown(decodeResult, message.text.substring(12));
     }
     decodeResult.decoded = true;
-    if (decodeResult.remaining.text === "")
+    if (!decodeResult.remaining.text)
       decodeResult.decoder.decodeLevel = "full";
     else
       decodeResult.decoder.decodeLevel = "partial";
@@ -3763,7 +4191,7 @@ var MessageDecoder = class {
     this.plugins = [];
     this.debug = false;
     this.registerPlugin(new Label_ColonComma(this));
-    this.registerPlugin(new Label_5Z(this));
+    this.registerPlugin(new Label_5Z_Slash(this));
     this.registerPlugin(new Label_10_LDR(this));
     this.registerPlugin(new Label_10_POS(this));
     this.registerPlugin(new Label_10_Slash(this));
@@ -3772,23 +4200,33 @@ var MessageDecoder = class {
     this.registerPlugin(new Label_15(this));
     this.registerPlugin(new Label_15_FST(this));
     this.registerPlugin(new Label_16_N_Space(this));
+    this.registerPlugin(new Label_1L_3Line(this));
+    this.registerPlugin(new Label_1L_070(this));
+    this.registerPlugin(new Label_1L_660(this));
+    this.registerPlugin(new Label_1L_Slash(this));
     this.registerPlugin(new Label_20_POS(this));
     this.registerPlugin(new Label_21_POS(this));
+    this.registerPlugin(new Label_22_OFF(this));
+    this.registerPlugin(new Label_22_POS(this));
+    this.registerPlugin(new Label_24_Slash(this));
     this.registerPlugin(new Label_30_Slash_EA(this));
     this.registerPlugin(new Label_44_ETA(this));
     this.registerPlugin(new Label_44_IN(this));
     this.registerPlugin(new Label_44_OFF(this));
     this.registerPlugin(new Label_44_ON(this));
     this.registerPlugin(new Label_44_POS(this));
+    this.registerPlugin(new Label_4A(this));
+    this.registerPlugin(new Label_4A_01(this));
+    this.registerPlugin(new Label_4A_DIS(this));
+    this.registerPlugin(new Label_4A_DOOR(this));
+    this.registerPlugin(new Label_4A_Slash_01(this));
     this.registerPlugin(new Label_4N(this));
     this.registerPlugin(new Label_B6_Forwardslash(this));
-    this.registerPlugin(new Label_H1_FPN(this));
     this.registerPlugin(new Label_H1_FLR(this));
-    this.registerPlugin(new Label_H1_FTX(this));
-    this.registerPlugin(new Label_H1_INI(this));
     this.registerPlugin(new Label_H1_OHMA(this));
-    this.registerPlugin(new Label_H1_POS(this));
     this.registerPlugin(new Label_H1_WRN(this));
+    this.registerPlugin(new Label_H1(this));
+    this.registerPlugin(new Label_H1_StarPOS(this));
     this.registerPlugin(new Label_HX(this));
     this.registerPlugin(new Label_80(this));
     this.registerPlugin(new Label_83(this));
@@ -3836,29 +4274,30 @@ var MessageDecoder = class {
       console.log("Usable plugins");
       console.log(usablePlugins);
     }
-    let result;
-    if (usablePlugins.length > 0) {
-      const plugin = usablePlugins[0];
+    let result = {
+      decoded: false,
+      error: "No known decoder plugin for this message",
+      decoder: {
+        name: "none",
+        type: "none",
+        decodeLevel: "none"
+      },
+      message,
+      remaining: {
+        text: message.text
+      },
+      raw: {},
+      formatted: {
+        description: "Not Decoded",
+        items: []
+      }
+    };
+    for (let i = 0; i < usablePlugins.length; i++) {
+      const plugin = usablePlugins[i];
       result = plugin.decode(message);
-    } else {
-      result = {
-        decoded: false,
-        error: "No known decoder plugin for this message",
-        decoder: {
-          name: "none",
-          type: "none",
-          decodeLevel: "none"
-        },
-        message,
-        remaining: {
-          text: message.text
-        },
-        raw: {},
-        formatted: {
-          description: "Not Decoded",
-          items: []
-        }
-      };
+      if (result.decoded) {
+        break;
+      }
     }
     if (options.debug) {
       console.log("Result");