metar-taf-parser 6.0.0 → 6.1.1

package/metar-taf-parser.d.ts

@@ -242,6 +242,11 @@ declare enum DistanceUnit {
     Meters = "m",
     StatuteMiles = "SM"
 }
+declare enum SpeedUnit {
+    Knot = "KT",
+    MetersPerSecond = "MPS",
+    KilometersPerHour = "KM/H"
+}
 /**
  * Used to indicate the actual value is greater than or less than the value written
  *
@@ -1052,7 +1057,7 @@ interface IWind {
     gust?: number;
     minVariation?: number;
     maxVariation?: number;
-    unit: string;
+    unit: SpeedUnit;
 }
 interface IWindShear extends IWind {
     height: number;
@@ -1372,4 +1377,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, 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, ITemperature, 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, ITemperature, 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, SpeedUnit, TAFTrend, TAFTrendDated, TimeIndicator, TimestampOutOfBoundsError, UnexpectedParseError, ValueIndicator, Visibility, WeatherChangeType, getCompositeForecastForDate, isWeatherConditionValid, parseMetar, parseTAF, parseTAFAsForecast };

package/metar-taf-parser.js

@@ -436,6 +436,12 @@ var DistanceUnit;
     DistanceUnit["Meters"] = "m";
     DistanceUnit["StatuteMiles"] = "SM";
 })(DistanceUnit || (DistanceUnit = {}));
+var SpeedUnit;
+(function (SpeedUnit) {
+    SpeedUnit["Knot"] = "KT";
+    SpeedUnit["MetersPerSecond"] = "MPS";
+    SpeedUnit["KilometersPerHour"] = "KM/H";
+})(SpeedUnit || (SpeedUnit = {}));
 /**
  * Used to indicate the actual value is greater than or less than the value written
  *
@@ -1743,7 +1749,7 @@ function makeWind(direction, speed, gust, unit) {
         direction: degreesToCardinal(direction),
         degrees: direction !== "VRB" ? +direction : undefined,
         gust: gust ? +gust : undefined,
-        unit: unit || "KT",
+        unit,
     };
 }
 class CloudCommand {
@@ -1806,7 +1812,7 @@ class WindCommand {
         const matches = windString.match(__classPrivateFieldGet(this, _WindCommand_regex, "f"));
         if (!matches)
             throw new UnexpectedParseError("Wind should be defined");
-        return makeWind(matches[1], matches[2], matches[3], matches[4]);
+        return makeWind(matches[1], matches[2], matches[3], as(matches[4] || "KT", SpeedUnit));
     }
     execute(container, windString) {
         const wind = this.parseWind(windString);
@@ -1849,7 +1855,7 @@ class WindShearCommand {
         if (!matches)
             throw new UnexpectedParseError("Wind shear should be defined");
         return {
-            ...makeWind(matches[2], matches[3], matches[4], matches[5]),
+            ...makeWind(matches[2], matches[3], matches[4], as(matches[5], SpeedUnit)),
             height: 100 * +matches[1],
         };
     }
@@ -2378,21 +2384,36 @@ class TAFParser extends AbstractParser {
                 parseRemark(taf, lines[0], i, this.locale);
                 break;
             }
-            else if (token.startsWith(this.TX))
-                taf.maxTemperature = parseTemperature(token);
-            else if (token.startsWith(this.TN))
-                taf.minTemperature = parseTemperature(token);
             else {
                 parseFlags(taf, token);
                 this.generalParse(taf, token);
             }
         }
+        const minMaxTemperatureLines = [
+            lines[0].slice(index + 1), // EU countries have min/max in first line
+        ];
+        // US military bases have min/max in last line
+        if (lines.length > 1)
+            minMaxTemperatureLines.push(lines[lines.length - 1]);
+        this.parseMaxMinTemperatures(taf, minMaxTemperatureLines);
         // Handle the other lines
         for (let i = 1; i < lines.length; i++) {
             this.parseLine(taf, lines[i]);
         }
         return taf;
     }
+    parseMaxMinTemperatures(taf, lines) {
+        for (const line of lines) {
+            for (const token of line) {
+                if (token == this.RMK)
+                    break;
+                else if (token.startsWith(this.TX))
+                    taf.maxTemperature = parseTemperature(token);
+                else if (token.startsWith(this.TN))
+                    taf.minTemperature = parseTemperature(token);
+            }
+        }
+    }
     /**
      * Format the message as a multiple line code so each line can be parsed
      * @param tafCode The base message
@@ -2414,14 +2435,6 @@ class TAFParser extends AbstractParser {
             return ls;
         }
         const linesToken = lines.map(this.tokenize);
-        if (linesToken.length > 1) {
-            const lastLine = linesToken[lines.length - 1];
-            const temperatures = lastLine.filter((l) => l.startsWith(this.TX) || l.startsWith(this.TN));
-            if (temperatures.length) {
-                linesToken[0] = linesToken[0].concat(temperatures);
-                linesToken[lines.length - 1] = lastLine.filter((l) => !l.startsWith(this.TX) && !l.startsWith(this.TN));
-            }
-        }
         return linesToken;
     }
     /**
@@ -2818,4 +2831,4 @@ function parse(rawReport, options, parser, datesHydrator) {
     }
 }
 
-export { CloudQuantity, CloudType, CommandExecutionError, Descriptive, Direction, DistanceUnit, Intensity, InvalidWeatherStatementError, ParseError, Phenomenon, RemarkType, RunwayInfoTrend, RunwayInfoUnit, TimeIndicator, TimestampOutOfBoundsError, UnexpectedParseError, ValueIndicator, WeatherChangeType, getCompositeForecastForDate, isWeatherConditionValid, parseMetar, parseTAF, parseTAFAsForecast };
+export { CloudQuantity, CloudType, CommandExecutionError, Descriptive, Direction, DistanceUnit, Intensity, InvalidWeatherStatementError, ParseError, Phenomenon, RemarkType, RunwayInfoTrend, RunwayInfoUnit, SpeedUnit, TimeIndicator, TimestampOutOfBoundsError, UnexpectedParseError, ValueIndicator, WeatherChangeType, getCompositeForecastForDate, isWeatherConditionValid, parseMetar, parseTAF, parseTAFAsForecast };

package/package.json

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