mostlyright 1.0.1 → 1.1.1

package/dist/index.global.js

@@ -1798,6 +1798,27 @@ var mostlyright = (() => {
     }
   });
 
+  // ../weather/src/_internal/tgroup.ts
+  function parseTgroup(rawMetar) {
+    if (!rawMetar) return [null, null];
+    const rmkIdx = rawMetar.indexOf("RMK");
+    if (rmkIdx < 0) return [null, null];
+    const match = TGROUP_RE.exec(rawMetar.slice(rmkIdx));
+    if (!match) return [null, null];
+    const tSign = match[1] === "1" ? -1 : 1;
+    const tVal = Number.parseInt(match[2], 10) / 10 * tSign;
+    const dSign = match[3] === "1" ? -1 : 1;
+    const dVal = Number.parseInt(match[4], 10) / 10 * dSign;
+    return [tVal, dVal];
+  }
+  var TGROUP_RE;
+  var init_tgroup = __esm({
+    "../weather/src/_internal/tgroup.ts"() {
+      "use strict";
+      TGROUP_RE = /\bT([01])(\d{3})([01])(\d{3})\b/;
+    }
+  });
+
   // ../weather/src/_parsers/awc.ts
   function icaoToStationCode(icao) {
     const upper = icao.trim().toUpperCase();
@@ -1871,18 +1892,6 @@ var mostlyright = (() => {
     }
     return { dir, speed: spd, time };
   }
-  function parseTGroup(rawMetar) {
-    if (!rawMetar) return { tempC: null, dewpC: null };
-    const rmkIdx = rawMetar.indexOf("RMK");
-    if (rmkIdx < 0) return { tempC: null, dewpC: null };
-    const m = TGROUP_RE.exec(rawMetar.slice(rmkIdx));
-    if (!m) return { tempC: null, dewpC: null };
-    const tSign = m[1] === "1" ? -1 : 1;
-    const tVal = Number.parseInt(m[2], 10) / 10 * tSign;
-    const dSign = m[3] === "1" ? -1 : 1;
-    const dVal = Number.parseInt(m[4], 10) / 10 * dSign;
-    return { tempC: tVal, dewpC: dVal };
-  }
   function safeInt(v) {
     if (v === null || v === void 0) return null;
     const f = typeof v === "number" ? v : Number(v);
@@ -1955,13 +1964,15 @@ var mostlyright = (() => {
     }
     let tempC = safeFloat(m.temp);
     let dewpC = safeFloat(m.dewp);
-    const { tempC: tgTemp, dewpC: tgDewp } = parseTGroup(rawMetar);
-    if (tgTemp !== null) tempC = tgTemp;
-    if (tgDewp !== null) dewpC = tgDewp;
+    const [tgTemp, tgDewp] = parseTgroup(rawMetar);
+    const hasTgroupTemp = tgTemp !== null;
+    const hasTgroupDewp = tgDewp !== null;
+    if (hasTgroupTemp) tempC = tgTemp;
+    if (hasTgroupDewp) dewpC = tgDewp;
     tempC = boundedFloat(tempC, TEMP_MIN_C, TEMP_MAX_C);
     dewpC = boundedFloat(dewpC, TEMP_MIN_C, TEMP_MAX_C);
-    const tempF = celsiusToFahrenheit(tempC);
-    const dewpointF = celsiusToFahrenheit(dewpC);
+    const tempF = hasTgroupTemp && tempC !== null ? Math.round(tempC * 9 / 5 + 32) : celsiusToFahrenheit(tempC);
+    const dewpointF = hasTgroupDewp && dewpC !== null ? Math.round(dewpC * 9 / 5 + 32) : celsiusToFahrenheit(dewpC);
     const pk = parsePeakWind(rawMetar);
     const pkDir = boundedInt(pk.dir, WIND_DIR_LO, WIND_DIR_HI);
     const pkSpd = boundedInt(pk.speed, 0, WIND_GUST_MAX);
@@ -2001,15 +2012,15 @@ var mostlyright = (() => {
       raw_metar: rawMetar
     };
   }
-  var WIND_DIR_LO, WIND_DIR_HI, PK_WND_RE, TGROUP_RE;
+  var WIND_DIR_LO, WIND_DIR_HI, PK_WND_RE;
   var init_awc = __esm({
     "../weather/src/_parsers/awc.ts"() {
       "use strict";
       init_bounds();
       init_convert();
+      init_tgroup();
       [WIND_DIR_LO, WIND_DIR_HI] = WIND_DIR_BOUNDS;
       PK_WND_RE = /PK WND (\d{3})(\d{2,3})\/(\d{4})/;
-      TGROUP_RE = /\bT([01])(\d{3})([01])(\d{3})\b/;
     }
   });
 
@@ -2212,12 +2223,19 @@ var mostlyright = (() => {
     const observationType = override !== void 0 ? override : detectObsType(metarText);
     const rawTempF = safeFloat2(row.tmpf ?? "");
     const rawDewpF = safeFloat2(row.dwpf ?? "");
-    const tempC = boundedFloat(fahrenheitToCelsius(rawTempF), TEMP_MIN_C, TEMP_MAX_C, {
+    let tempC = boundedFloat(fahrenheitToCelsius(rawTempF), TEMP_MIN_C, TEMP_MAX_C, {
       field: "temp_c"
     });
-    const dewpC = boundedFloat(fahrenheitToCelsius(rawDewpF), TEMP_MIN_C, TEMP_MAX_C, {
+    let dewpC = boundedFloat(fahrenheitToCelsius(rawDewpF), TEMP_MIN_C, TEMP_MAX_C, {
       field: "dewpoint_c"
     });
+    const [tgTemp, tgDewp] = parseTgroup(metarText);
+    if (tgTemp !== null && tempC !== null) {
+      tempC = boundedFloat(tgTemp, TEMP_MIN_C, TEMP_MAX_C, { field: "temp_c" });
+    }
+    if (tgDewp !== null && dewpC !== null) {
+      dewpC = boundedFloat(tgDewp, TEMP_MIN_C, TEMP_MAX_C, { field: "dewpoint_c" });
+    }
     const tempF = tempC !== null ? rawTempF : null;
     const dewpF = dewpC !== null ? rawDewpF : null;
     const windDir = boundedInt(safeInt2(row.drct ?? ""), WIND_DIR_LO2, WIND_DIR_HI2);
@@ -2315,6 +2333,7 @@ var mostlyright = (() => {
       "use strict";
       init_bounds();
       init_convert();
+      init_tgroup();
       init_awc();
       [WIND_DIR_LO2, WIND_DIR_HI2] = WIND_DIR_BOUNDS;
       TS_RE = /^(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2})$/;