metar-taf-parser 4.0.2 → 4.1.0

package/locale/en.js

@@ -207,7 +207,7 @@ var en = {
                 Hourly: "{0}/100 of an inch of precipitation fell in the last hour",
             },
             Beg: {
-                "0": "{0} {1} beginning at {2}:{3} ",
+                "0": "{0} {1} beginning at {2}:{3}",
                 End: "{0} {1} beginning at {2}:{3} ending at {4}:{5}",
             },
             End: "{0} {1} ending at {2}:{3}",

package/metar-taf-parser.d.ts

@@ -1101,7 +1101,29 @@ interface ICloud {
     quantity: CloudQuantity;
     type?: CloudType;
 }
-interface IAbstractWeatherContainer {
+interface IFlags {
+    /**
+     * Amended TAF
+     */
+    amendment?: true;
+    /**
+     * Amended METAR
+     */
+    auto?: true;
+    /**
+     * Canceled TAF
+     */
+    canceled?: true;
+    /**
+     * Corrected METAR/TAF
+     */
+    corrected?: true;
+    /**
+     * No data
+     */
+    nil?: true;
+}
+interface IAbstractWeatherContainer extends IFlags {
     wind?: IWind;
     visibility?: Visibility;
     verticalVisibility?: number;
@@ -1138,7 +1160,6 @@ interface IMetar extends IAbstractWeatherCode {
     dewPoint?: number;
     altimeter?: number;
     nosig?: true;
-    auto?: true;
     runwaysInfo: IRunwayInfo[];
     /**
      * Not used in North America
@@ -1149,7 +1170,6 @@ interface ITAF extends IAbstractWeatherCode {
     validity: IValidity;
     maxTemperature?: ITemperatureDated;
     minTemperature?: ITemperatureDated;
-    amendment?: true;
     trends: TAFTrend[];
 }
 interface IAbstractTrend extends IAbstractWeatherContainer {
@@ -1322,4 +1342,4 @@ declare function parseTAF(rawTAF: string, options?: IMetarTAFParserOptions): ITA
 declare function parseTAF(rawTAF: string, options?: IMetarTAFParserOptionsDated): ITAFDated;
 declare function parseTAFAsForecast(rawTAF: string, options: IMetarTAFParserOptionsDated): IForecastContainer;
 
-export { CloudQuantity, CloudType, CommandExecutionError, Descriptive, Direction, Distance, DistanceUnit, Forecast, IAbstractTrend, IAbstractValidity, IAbstractWeatherCode, IAbstractWeatherCodeDated, IAbstractWeatherContainer, IAirport, IBaseRemark, IBaseTAFTrend, ICeilingHeightRemark, ICeilingSecondLocationRemark, ICloud, ICompositeForecast, ICountry, IEndValidity, IFMValidity, IForecastContainer, IHourlyMaximumMinimumTemperatureRemark, IHourlyMaximumTemperatureRemark, IHourlyMinimumTemperatureRemark, IHourlyPrecipitationAmountRemark, IHourlyPressureRemark, IHourlyTemperatureDewPointRemark, IIceAccretionRemark, IMetar, IMetarTAFParserOptions, IMetarTAFParserOptionsDated, IMetarTrend, IMetarTrendTime, IObscurationRemark, IPrecipitationAmount24HourRemark, IPrecipitationAmount36HourRemark, IPrecipitationBegEndRemark, IPrevailingVisibilityRemark, IRunwayInfo, ISeaLevelPressureRemark, ISecondLocationVisibilityRemark, ISectorVisibilityRemark, ISmallHailSizeRemark, ISnowIncreaseRemark, ISnowPelletsRemark, ISunshineDurationRemark, ISurfaceVisibilityRemark, ITAF, ITAFDated, ITemperatureDated, IThunderStormLocationMovingRemark, IThunderStormLocationRemark, ITime, ITornadicActivityBegEndRemark, ITornadicActivityBegRemark, ITornadicActivityEndRemark, ITowerVisibilityRemark, IUnknownRemark, IValidity, IValidityDated, IVariableSkyHeightRemark, IVariableSkyRemark, IVirgaDirectionRemark, IWaterEquivalentSnowRemark, IWeatherCondition, IWind, IWindPeakCommandRemark, IWindShear, IWindShiftFropaRemark, Intensity, InvalidWeatherStatementError, Locale, ParseError, Phenomenon, Remark, RemarkType, RunwayInfoTrend, RunwayInfoUnit, TAFTrend, TAFTrendDated, TimeIndicator, TimestampOutOfBoundsError, UnexpectedParseError, ValueIndicator, Visibility, WeatherChangeType, getCompositeForecastForDate, isWeatherConditionValid, parseMetar, parseTAF, parseTAFAsForecast };
+export { CloudQuantity, CloudType, CommandExecutionError, Descriptive, Direction, Distance, DistanceUnit, Forecast, IAbstractTrend, IAbstractValidity, IAbstractWeatherCode, IAbstractWeatherCodeDated, IAbstractWeatherContainer, IAirport, IBaseRemark, IBaseTAFTrend, ICeilingHeightRemark, ICeilingSecondLocationRemark, ICloud, ICompositeForecast, ICountry, IEndValidity, IFMValidity, IFlags, IForecastContainer, IHourlyMaximumMinimumTemperatureRemark, IHourlyMaximumTemperatureRemark, IHourlyMinimumTemperatureRemark, IHourlyPrecipitationAmountRemark, IHourlyPressureRemark, IHourlyTemperatureDewPointRemark, IIceAccretionRemark, IMetar, IMetarTAFParserOptions, IMetarTAFParserOptionsDated, IMetarTrend, IMetarTrendTime, IObscurationRemark, IPrecipitationAmount24HourRemark, IPrecipitationAmount36HourRemark, IPrecipitationBegEndRemark, IPrevailingVisibilityRemark, IRunwayInfo, ISeaLevelPressureRemark, ISecondLocationVisibilityRemark, ISectorVisibilityRemark, ISmallHailSizeRemark, ISnowIncreaseRemark, ISnowPelletsRemark, ISunshineDurationRemark, ISurfaceVisibilityRemark, ITAF, ITAFDated, ITemperatureDated, IThunderStormLocationMovingRemark, IThunderStormLocationRemark, ITime, ITornadicActivityBegEndRemark, ITornadicActivityBegRemark, ITornadicActivityEndRemark, ITowerVisibilityRemark, IUnknownRemark, IValidity, IValidityDated, IVariableSkyHeightRemark, IVariableSkyRemark, IVirgaDirectionRemark, IWaterEquivalentSnowRemark, IWeatherCondition, IWind, IWindPeakCommandRemark, IWindShear, IWindShiftFropaRemark, Intensity, InvalidWeatherStatementError, Locale, ParseError, Phenomenon, Remark, RemarkType, RunwayInfoTrend, RunwayInfoUnit, TAFTrend, TAFTrendDated, TimeIndicator, TimestampOutOfBoundsError, UnexpectedParseError, ValueIndicator, Visibility, WeatherChangeType, getCompositeForecastForDate, isWeatherConditionValid, parseMetar, parseTAF, parseTAFAsForecast };

package/metar-taf-parser.js

@@ -2071,6 +2071,24 @@ function parseDeliveryTime(timeString) {
         minute,
     };
 }
+function parseFlags(abstractWeatherCode, flag) {
+    const flags = findFlags(flag);
+    if (flags)
+        Object.assign(abstractWeatherCode, flags);
+    return !!flags;
+}
+var FlagMap;
+(function (FlagMap) {
+    FlagMap["AMD"] = "amendment";
+    FlagMap["AUTO"] = "auto";
+    FlagMap["CNL"] = "canceled";
+    FlagMap["COR"] = "corrected";
+    FlagMap["NIL"] = "nil";
+})(FlagMap || (FlagMap = {}));
+function findFlags(flag) {
+    if (flag in FlagMap)
+        return { [FlagMap[flag]]: true };
+}
 /**
  * This function parses the array containing the remark and concat the array into a string
  * @param container the metar, taf or taf trend to update
@@ -2273,13 +2291,11 @@ class MetarParser extends AbstractParser {
         };
         let index = 2;
         while (index < metarTab.length) {
-            if (!super.generalParse(metar, metarTab[index])) {
+            if (!super.generalParse(metar, metarTab[index]) &&
+                !parseFlags(metar, metarTab[index])) {
                 if (metarTab[index] === "NOSIG") {
                     metar.nosig = true;
                 }
-                else if (metarTab[index] === "AUTO") {
-                    metar.auto = true;
-                }
                 else if (metarTab[index] === this.TEMPO ||
                     metarTab[index] === this.BECMG) {
                     const trend = {
@@ -2327,15 +2343,14 @@ class TAFParser extends AbstractParser {
      * @throws ParseError if the message is invalid
      */
     parse(input) {
-        let amendment;
         const lines = this.extractLinesTokens(input);
         let index = 0;
         if (lines[0][0] === this.TAF)
             index = 1;
         if (lines[0][1] === this.TAF)
             index = 2;
-        if (lines[0][index] === "AMD") {
-            amendment = true;
+        const flags = findFlags(lines[0][index]);
+        if (flags) {
             index += 1;
         }
         const station = lines[0][index];
@@ -2345,7 +2360,7 @@ class TAFParser extends AbstractParser {
         const validity = parseValidity(lines[0][index]);
         const taf = {
             station,
-            amendment,
+            ...flags,
             ...time,
             validity,
             message: input,
@@ -2364,8 +2379,10 @@ class TAFParser extends AbstractParser {
                 taf.maxTemperature = parseTemperature(token);
             else if (token.startsWith(this.TN))
                 taf.minTemperature = parseTemperature(token);
-            else
+            else {
+                parseFlags(taf, token);
                 this.generalParse(taf, token);
+            }
         }
         // Handle the other lines
         for (let i = 1; i < lines.length; i++) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metar-taf-parser",
-  "version": "4.0.2",
+  "version": "4.1.0",
   "description": "Parse METAR and TAF reports",
   "homepage": "https://aeharding.github.io/metar-taf-parser",
   "keywords": [