metar-taf-parser 7.1.0 → 7.1.2

package/metar-taf-parser.js

@@ -2180,6 +2180,9 @@ class CommandSupplier {
 _CommandSupplier_commands = new WeakMap();
 
 var _AbstractParser_INTENSITY_REGEX, _AbstractParser_CAVOK, _AbstractParser_commonSupplier, _MetarParser_commandSupplier, _TAFParser_commandSupplier, _TAFParser_validityPattern, _RemarkParser_supplier;
+function isStation(stationString) {
+    return stationString.length === 4;
+}
 /**
  * Parses the delivery time of a METAR/TAF
  * @param abstractWeatherCode The TAF or METAR object
@@ -2289,26 +2292,46 @@ class AbstractParser {
         let intensity;
         if (input.match(__classPrivateFieldGet(this, _AbstractParser_INTENSITY_REGEX, "f"))) {
             const match = input.match(__classPrivateFieldGet(this, _AbstractParser_INTENSITY_REGEX, "f"))?.[0];
-            if (match)
+            if (match) {
                 intensity = match;
+                input = input.slice(match.length);
+            }
         }
         let descriptive;
-        for (const key of Object.values(Descriptive)) {
-            if (input.includes(key))
+        const descriptives = Object.values(Descriptive);
+        for (let i = 0; i < descriptives.length; i++) {
+            const key = descriptives[i];
+            if (input.startsWith(key)) {
                 descriptive = key;
+                input = input.slice(key.length);
+                break;
+            }
         }
         const weatherCondition = {
             intensity,
             descriptive,
             phenomenons: [],
         };
-        for (const key of Object.values(Phenomenon)) {
+        const phenomenons = Object.values(Phenomenon);
+        for (let i = 0; i < phenomenons.length; i++) {
+            const key = phenomenons[i];
             // Thunderstorm as descriptive should not be added as a phenomenon
             if (descriptive === key)
                 continue;
-            if (input.includes(key))
+            // Phenomenons can be separated with a slash
+            const conditionRegex = new RegExp(`^\/?${key}`);
+            const inputMatch = input.match(conditionRegex)?.[0];
+            if (inputMatch) {
                 weatherCondition.phenomenons.push(key);
+                input = input.slice(inputMatch.length);
+                // Restart the search for an additional phenomenon
+                i = -1;
+                continue;
+            }
         }
+        // If anything is left unparsed, it's not a valid weather condition
+        if (input.replace(/\//g, "").length)
+            return;
         return weatherCondition;
     }
     /**
@@ -2350,6 +2373,11 @@ class AbstractParser {
             };
             return true;
         }
+        const weatherCondition = this.parseWeatherCondition(input);
+        if (weatherCondition && isWeatherConditionValid(weatherCondition)) {
+            abstractWeatherContainer.weatherConditions.push(weatherCondition);
+            return true;
+        }
         const command = __classPrivateFieldGet(this, _AbstractParser_commonSupplier, "f").get(input);
         if (command) {
             try {
@@ -2361,11 +2389,6 @@ class AbstractParser {
                 throw error;
             }
         }
-        const weatherCondition = this.parseWeatherCondition(input);
-        if (isWeatherConditionValid(weatherCondition)) {
-            abstractWeatherContainer.weatherConditions.push(weatherCondition);
-            return true;
-        }
         return false;
     }
 }
@@ -2414,9 +2437,17 @@ class MetarParser extends AbstractParser {
      */
     parse(input) {
         const metarTab = this.tokenize(input);
+        let index = 0;
+        // Only parse flag if precedes station identifier
+        if (isStation(metarTab[index + 1])) {
+            var flags = findFlags(metarTab[index]);
+            if (flags)
+                index += 1;
+        }
         const metar = {
-            ...parseDeliveryTime(metarTab[1]),
-            station: metarTab[0],
+            ...parseDeliveryTime(metarTab[index + 1]),
+            station: metarTab[index],
+            ...flags,
             message: input,
             remarks: [],
             clouds: [],
@@ -2424,7 +2455,7 @@ class MetarParser extends AbstractParser {
             trends: [],
             runwaysInfo: [],
         };
-        let index = 2;
+        index += 2;
         while (index < metarTab.length) {
             if (!super.generalParse(metar, metarTab[index]) &&
                 !parseFlags(metar, metarTab[index])) {

package/package.json

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