metar-taf-parser 6.1.0 → 6.1.1

package/metar-taf-parser.js

@@ -2384,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
@@ -2420,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;
     }
     /**

package/package.json

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