@idm-plugin/meteo2 0.9.1 → 0.9.3

package/dist/index.js

@@ -5,9 +5,9 @@ import Y0 from "@log4js-node/log4js-api";
 import L from "moment";
 import $ from "got";
 import { fetchWeatherApi as o0 } from "openmeteo";
-import { Meteo2Assist as K } from "@idm-plugin/meteo";
+import { Meteo2Assist as w } from "@idm-plugin/meteo";
 import Z0 from "xml2js";
-import { LaneHelper as i0 } from "@idm-plugin/geo2";
+import { LaneHelper as T0 } from "@idm-plugin/geo2";
 let Z;
 try {
   Z = Y0.getLogger("meteo");
@@ -36,10 +36,10 @@ class j0 {
         source: W == null ? void 0 : W.toLowerCase()
       },
       timeout: 3e4
-    }, Y = L(), a = Y.valueOf();
-    A.isBefore(Y.subtract(1, "month")) && (Z == null || Z.warn("[%s] get history meteo on %s: %j", o.requestId, A.format(), q));
+    }, a = L(), Y = a.valueOf();
+    A.isBefore(a.subtract(1, "month")) && (Z == null || Z.warn("[%s] get history meteo on %s: %j", o.requestId, A.format(), q));
     const e = "https://aod4idm.idmwx.com/api/ocean/point", d = await $.get(e, q).json(), t = L().valueOf();
-    if (Z == null || Z.info("[%s] get meteo(cost: %d ms) from %s with options: %j", o.requestId, t - a, e, q), (d == null ? void 0 : d.code) === 0)
+    if (Z == null || Z.info("[%s] get meteo(cost: %d ms) from %s with options: %j", o.requestId, t - Y, e, q), (d == null ? void 0 : d.code) === 0)
       return {
         ...d.data,
         source: W
@@ -71,10 +71,10 @@ class j0 {
         source: W == null ? void 0 : W.toLowerCase()
       },
       timeout: 3e4
-    }, Y = L(), a = Y.valueOf();
-    A.isBefore(Y.subtract(1, "month")) && (Z == null || Z.warn("[%s] get history factors on %s: %j", o.requestId, A.format(), q));
+    }, a = L(), Y = a.valueOf();
+    A.isBefore(a.subtract(1, "month")) && (Z == null || Z.warn("[%s] get history factors on %s: %j", o.requestId, A.format(), q));
     const e = "https://aod4idm.idmwx.com/api/ocean/factor", d = await $.get(e, q).json(), t = L().valueOf();
-    if (Z == null || Z.info("[%s] get factors(cost: %d ms) from %s with options: %j", o.requestId, t - a, e, q), (d == null ? void 0 : d.code) === 0)
+    if (Z == null || Z.info("[%s] get factors(cost: %d ms) from %s with options: %j", o.requestId, t - Y, e, q), (d == null ? void 0 : d.code) === 0)
       return {
         ...d.data,
         source: W
@@ -118,9 +118,9 @@ class j0 {
           levels: ["surface"]
         }
       }).json();
-      let Y = L().valueOf();
-      Z == null || Z.info("[%s] get gfs-factors(cost: %d ms) from %s", O.requestId, Y - A, W), A = Y;
-      const a = await $.post(W, {
+      let a = L().valueOf();
+      Z == null || Z.info("[%s] get gfs-factors(cost: %d ms) from %s", O.requestId, a - A, W), A = a;
+      const Y = await $.post(W, {
         headers: {
           "Content-Type": "application/json"
         },
@@ -133,7 +133,7 @@ class j0 {
           levels: ["surface"]
         }
       }).json();
-      Y = L().valueOf(), Z == null || Z.info("[%s] get gfs-wave-factors(cost: %d ms) from %s", O.requestId, Y - A, W);
+      a = L().valueOf(), Z == null || Z.info("[%s] get gfs-wave-factors(cost: %d ms) from %s", O.requestId, a - A, W);
       for (let d = 0; d < q.ts.length; d++) {
         const t = this.populateUVFactor(q["wind_u-surface"][d], q["wind_v-surface"][d], !1, O);
         t.scale = this.calculateBeaufortWindForceScale(t.speed), o.push({
@@ -159,20 +159,20 @@ class j0 {
         });
       }
       const e = [];
-      for (let d = 0; d < a.ts.length; d++) {
-        const t = this.calculateDouglasScale(a["waves_height-surface"][d], a["waves_direction-surface"][d], a["waves_period-surface"][d]), T = this.calculateDouglasScale(a["wwaves_height-surface"][d], a["wwaves_direction-surface"][d], a["wwaves_period-surface"][d]), U = this.calculateDouglasScale(a["swell1_height-surface"][d], a["swell1_direction-surface"][d], a["swell1_period-surface"][d]), s = this.calculateDouglasScale(a["swell2_height-surface"][d], a["swell2_direction-surface"][d], a["swell2_period-surface"][d]);
+      for (let d = 0; d < Y.ts.length; d++) {
+        const t = this.calculateDouglasScale(Y["waves_height-surface"][d], Y["waves_direction-surface"][d], Y["waves_period-surface"][d]), i = this.calculateDouglasScale(Y["wwaves_height-surface"][d], Y["wwaves_direction-surface"][d], Y["wwaves_period-surface"][d]), U = this.calculateDouglasScale(Y["swell1_height-surface"][d], Y["swell1_direction-surface"][d], Y["swell1_period-surface"][d]), s = this.calculateDouglasScale(Y["swell2_height-surface"][d], Y["swell2_direction-surface"][d], Y["swell2_period-surface"][d]);
         e.push({
-          utc: L(a.ts[d]).utc().format(),
+          utc: L(Y.ts[d]).utc().format(),
           wave: {
             sig: t,
-            wd: T,
+            wd: i,
             swell: U,
             swell2: s
           }
         });
       }
       for (const d of o) {
-        const t = e.find((T) => T.utc === d.utc);
+        const t = e.find((i) => i.utc === d.utc);
         d.wave = t == null ? void 0 : t.wave;
       }
     } catch (A) {
@@ -271,9 +271,9 @@ var t0 = { exports: {} };
       throw new RangeError("invalid coordinates");
     if (90 <= p)
       return "Etc/GMT";
-    var o = -1, A = 48 * (180 + b) / 360.00000000000006, q = 24 * (90 - p) / 180.00000000000003, Y = 0 | A, a = 0 | q, e = 96 * a + 2 * Y;
+    var o = -1, A = 48 * (180 + b) / 360.00000000000006, q = 24 * (90 - p) / 180.00000000000003, a = 0 | A, Y = 0 | q, e = 96 * Y + 2 * a;
     for (e = 56 * O.charCodeAt(e) + O.charCodeAt(e + 1) - 1995; e + W.length < 3136; )
-      e = 56 * O.charCodeAt(e = 8 * (o = o + e + 1) + 4 * (a = 0 | (q = 2 * (q - a) % 2)) + 2 * (Y = 0 | (A = 2 * (A - Y) % 2)) + 2304) + O.charCodeAt(e + 1) - 1995;
+      e = 56 * O.charCodeAt(e = 8 * (o = o + e + 1) + 4 * (Y = 0 | (q = 2 * (q - Y) % 2)) + 2 * (a = 0 | (A = 2 * (A - a) % 2)) + 2304) + O.charCodeAt(e + 1) - 1995;
     return W[e + W.length - 3136];
   }
   M.exports = z;
@@ -293,8 +293,8 @@ var N0 = { exports: {} };
     z.version === void 0 && z.default && (z = z.default);
     var p = "0.5.48", b = {}, O = {}, W = {}, o = {}, A = {}, q;
     (!z || typeof z.version != "string") && j("Moment Timezone requires Moment.js. See https://momentjs.com/timezone/docs/#/use-it/browser/");
-    var Y = z.version.split("."), a = +Y[0], e = +Y[1];
-    (a < 2 || a === 2 && e < 6) && j("Moment Timezone requires Moment.js >= 2.6.0. You are using Moment.js " + z.version + ". See momentjs.com");
+    var a = z.version.split("."), Y = +a[0], e = +a[1];
+    (Y < 2 || Y === 2 && e < 6) && j("Moment Timezone requires Moment.js >= 2.6.0. You are using Moment.js " + z.version + ". See momentjs.com");
     function d(c) {
       return c > 96 ? c - 87 : c > 64 ? c - 29 : c - 48;
     }
@@ -306,7 +306,7 @@ var N0 = { exports: {} };
         u = u / 60, C = d(f.charCodeAt(n)), B += C * u;
       return B * G;
     }
-    function T(c) {
+    function i(c) {
       for (var n = 0; n < c.length; n++)
         c[n] = t(c[n]);
     }
@@ -323,7 +323,7 @@ var N0 = { exports: {} };
     }
     function V(c) {
       var n = c.split("|"), R = n[2].split(" "), X = n[3].split(""), f = n[4].split(" ");
-      return T(R), T(X), T(f), U(f, X.length), {
+      return i(R), i(X), i(f), U(f, X.length), {
         name: n[0],
         abbrs: s(n[1].split(" "), X),
         offsets: s(R, X),
@@ -407,9 +407,9 @@ var N0 = { exports: {} };
     function v(c, n) {
       return c.offsetScore !== n.offsetScore ? c.offsetScore - n.offsetScore : c.abbrScore !== n.abbrScore ? c.abbrScore - n.abbrScore : c.zone.population !== n.zone.population ? n.zone.population - c.zone.population : n.zone.name.localeCompare(c.zone.name);
     }
-    function g(c, n) {
+    function K(c, n) {
       var R, X;
-      for (T(n), R = 0; R < n.length; R++)
+      for (i(n), R = 0; R < n.length; R++)
         X = n[R], A[X] = A[X] || {}, A[X][c] = !0;
     }
     function k(c) {
@@ -453,7 +453,7 @@ var N0 = { exports: {} };
     function W0(c) {
       var n, R, X, f;
       for (typeof c == "string" && (c = [c]), n = 0; n < c.length; n++)
-        X = c[n].split("|"), R = X[0], f = x(R), b[f] = c[n], o[f] = R, g(f, X[2].split(" "));
+        X = c[n].split("|"), R = X[0], f = x(R), b[f] = c[n], o[f] = R, K(f, X[2].split(" "));
     }
     function y(c, n) {
       c = x(c);
@@ -466,7 +466,7 @@ var N0 = { exports: {} };
         o.hasOwnProperty(c) && (b[c] || b[O[c]]) && o[c] && n.push(o[c]);
       return n.sort();
     }
-    function i() {
+    function T() {
       return Object.keys(W);
     }
     function M0(c) {
@@ -474,7 +474,7 @@ var N0 = { exports: {} };
       for (typeof c == "string" && (c = [c]), n = 0; n < c.length; n++)
         R = c[n].split("|"), X = x(R[0]), f = x(R[1]), O[X] = f, o[X] = R[0], O[f] = X, o[f] = R[1];
     }
-    function w(c) {
+    function g(c) {
       var n, R, X, f;
       if (!(!c || !c.length))
         for (n = 0; n < c.length; n++)
@@ -499,7 +499,7 @@ var N0 = { exports: {} };
       }) : R;
     }
     function B0(c) {
-      W0(c.zones), M0(c.links), w(c.countries), m.dataVersion = c.version;
+      W0(c.zones), M0(c.links), g(c.countries), m.dataVersion = c.version;
     }
     function a0(c) {
       return a0.didShowError || (a0.didShowError = !0, j("moment.tz.zoneExists('" + c + "') has been deprecated in favor of !moment.tz.zone('" + c + "')")), !!y(c);
@@ -515,7 +515,7 @@ var N0 = { exports: {} };
       var n = Array.prototype.slice.call(arguments, 0, -1), R = arguments[arguments.length - 1], X = z.utc.apply(null, n), f;
       return !z.isMoment(c) && n0(X) && (f = y(R)) && X.add(f.parse(X), "minutes"), X.tz(R), X;
     }
-    m.version = p, m.dataVersion = "", m._zones = b, m._links = O, m._names = o, m._countries = W, m.add = W0, m.link = M0, m.load = B0, m.zone = y, m.zoneExists = a0, m.guess = d0, m.names = H, m.Zone = S, m.unpack = V, m.unpackBase60 = t, m.needsOffset = n0, m.moveInvalidForward = !0, m.moveAmbiguousForward = !1, m.countries = i, m.zonesForCountry = U0;
+    m.version = p, m.dataVersion = "", m._zones = b, m._links = O, m._names = o, m._countries = W, m.add = W0, m.link = M0, m.load = B0, m.zone = y, m.zoneExists = a0, m.guess = d0, m.names = H, m.Zone = S, m.unpack = V, m.unpackBase60 = t, m.needsOffset = n0, m.moveInvalidForward = !0, m.moveAmbiguousForward = !1, m.countries = T, m.zonesForCountry = U0;
     var F = z.fn;
     z.tz = m, z.defaultZone = null, z.updateOffset = function(c, n) {
       var R = z.defaultZone, X;
@@ -539,7 +539,7 @@ var N0 = { exports: {} };
         return this._z ? this._z.abbr(this) : c.call(this);
       };
     }
-    function T0(c) {
+    function i0(c) {
       return function() {
         return this._z = null, c.apply(this, arguments);
       };
@@ -549,8 +549,8 @@ var N0 = { exports: {} };
         return arguments.length > 0 && (this._z = null), c.apply(this, arguments);
       };
     }
-    F.zoneName = L0(F.zoneName), F.zoneAbbr = L0(F.zoneAbbr), F.utc = T0(F.utc), F.local = T0(F.local), F.utcOffset = s0(F.utcOffset), z.tz.setDefault = function(c) {
-      return (a < 2 || a === 2 && e < 9) && j("Moment Timezone setDefault() requires Moment.js >= 2.9.0. You are using Moment.js " + z.version + "."), z.defaultZone = c ? y(c) : null, z;
+    F.zoneName = L0(F.zoneName), F.zoneAbbr = L0(F.zoneAbbr), F.utc = i0(F.utc), F.local = i0(F.local), F.utcOffset = s0(F.utcOffset), z.tz.setDefault = function(c) {
+      return (Y < 2 || Y === 2 && e < 9) && j("Moment Timezone setDefault() requires Moment.js >= 2.9.0. You are using Moment.js " + z.version + "."), z.defaultZone = c ? y(c) : null, z;
     };
     var A0 = z.momentProperties;
     return Object.prototype.toString.call(A0) === "[object Array]" ? (A0.push("_z"), A0.push("_a")) : A0 && (A0._z = null), z;
@@ -1156,7 +1156,7 @@ const _0 = "2025b", h0 = [
   "Pacific/Tarawa|Pacific/Majuro",
   "Pacific/Tarawa|Pacific/Wake",
   "Pacific/Tarawa|Pacific/Wallis"
-], K0 = [
+], w0 = [
   "AD|Europe/Andorra",
   "AE|Asia/Dubai",
   "AF|Asia/Kabul",
@@ -1404,14 +1404,14 @@ const _0 = "2025b", h0 = [
   "ZA|Africa/Johannesburg",
   "ZM|Africa/Maputo Africa/Lusaka",
   "ZW|Africa/Maputo Africa/Harare"
-], g0 = {
+], K0 = {
   version: _0,
   zones: h0,
   links: D0,
-  countries: K0
+  countries: w0
 };
-var w0 = C0;
-w0.tz.load(g0);
+var g0 = C0;
+g0.tz.load(K0);
 var R0 = {};
 Object.defineProperty(R0, "__esModule", { value: !0 });
 var z0 = R0.Variable = void 0, r0;
@@ -1483,13 +1483,13 @@ class b0 {
     this.apikey = z || "smE3JnDLHy3TizVv", this.debug = p;
   }
   async standardWeatherModels() {
-    return K.standardWeatherModels();
+    return w.standardWeatherModels();
   }
   async standardMarineModels() {
-    return K.standardMarineModels();
+    return w.standardMarineModels();
   }
   async autoPickMeteoModel(z = "best_match") {
-    return K.autoPickMeteoModel(z);
+    return w.autoPickMeteoModel(z);
   }
   static range(z, p, b) {
     return Array.from({ length: (p - z) / b }, (O, W) => z + W * b);
@@ -1514,8 +1514,8 @@ class b0 {
             fake: z.fake,
             step: A
           });
-          const Y = await o0(q, z), a = p ? await p(Y, z, b) : await this.parseWeatherData(Y, z, b);
-          W ? await this.mergeSegments(W, a) : W = a;
+          const a = await o0(q, z), Y = p ? await p(a, z, b) : await this.parseWeatherData(a, z, b);
+          W ? await this.mergeSegments(W, Y) : W = Y;
         }
       else {
         const A = await o0(z.url, z);
@@ -1545,7 +1545,7 @@ class b0 {
    * @param options
    */
   async marineForecast(z, p = {}) {
-    var b, O, W, o, A, q, Y, a;
+    var b, O, W, o, A, q, a, Y;
     try {
       const e = L();
       let d;
@@ -1569,8 +1569,8 @@ class b0 {
       delete z.apikey;
       const t = L();
       this.debug && D.info("[%s] fetch marine api (%j) cost: %d ms", p.requestId, z.url, t.diff(e, "ms"));
-      const T = await this.mergeMarineData(d), U = T.find((r) => r.model === "ncep_gfswave016"), s = T.find((r) => r.model === "ncep_gfswave025"), V = T.find((r) => r.model === "meteofrance_wave"), S = T.find((r) => r.model === "best_match");
-      return (O = (b = S == null ? void 0 : S.hourly) == null ? void 0 : b.wave_height) != null && O.every((r) => r !== null) ? [S] : (o = (W = V == null ? void 0 : V.hourly) == null ? void 0 : W.wave_height) != null && o.every((r) => r !== null) ? [V] : (q = (A = U == null ? void 0 : U.hourly) == null ? void 0 : A.wave_height) != null && q.every((r) => r !== null) ? [U] : (a = (Y = s == null ? void 0 : s.hourly) == null ? void 0 : Y.wave_height) != null && a.every((r) => r !== null) ? [s] : T != null && T.length ? [T[0]] : [];
+      const i = await this.mergeMarineData(d), U = i.find((r) => r.model === "ncep_gfswave016"), s = i.find((r) => r.model === "ncep_gfswave025"), V = i.find((r) => r.model === "meteofrance_wave"), S = i.find((r) => r.model === "best_match");
+      return (O = (b = S == null ? void 0 : S.hourly) == null ? void 0 : b.wave_height) != null && O.every((r) => r !== null) ? [S] : (o = (W = V == null ? void 0 : V.hourly) == null ? void 0 : W.wave_height) != null && o.every((r) => r !== null) ? [V] : (q = (A = U == null ? void 0 : U.hourly) == null ? void 0 : A.wave_height) != null && q.every((r) => r !== null) ? [U] : (Y = (a = s == null ? void 0 : s.hourly) == null ? void 0 : a.wave_height) != null && Y.every((r) => r !== null) ? [s] : i != null && i.length ? [i[0]] : [];
     } catch (e) {
       return D.warn("[%s] marine forecast failed: %s, with %j", p.requestId, e, z), [];
     }
@@ -1583,10 +1583,10 @@ class b0 {
    * @private
    */
   async parseWeatherData(z, p, b = {}) {
-    var o, A, q, Y, a, e, d;
+    var o, A, q, a, Y, e, d;
     const O = [], W = Math.pow(10, b.precision || 6);
     for (let t = 0; t < z.length; t++) {
-      const T = z[t], U = T.utcOffsetSeconds(), s = T.timezone(), V = T.current(), S = T.hourly(), r = T.daily(), l = {};
+      const i = z[t], U = i.utcOffsetSeconds(), s = i.timezone(), V = i.current(), S = i.hourly(), r = i.daily(), l = {};
       if (l.timezone = s || void 0, l.offset = b0.prettyTimezoneOffset(U), l.model = p.models instanceof Array ? (o = p.models) == null ? void 0 : o[t] : p.models || "best_match", V) {
         const I = L();
         l.current = {
@@ -1608,7 +1608,7 @@ class b0 {
           )
         };
         for (let _ = 0; _ < S.variablesLength(); _++) {
-          const v = (Y = (q = (A = S.variables(_).valuesArray()) == null ? void 0 : A.toString()) == null ? void 0 : q.split(",")) == null ? void 0 : Y.map((g) => isNaN(g) ? null : Math.round(Number(g) * W) / W);
+          const v = (a = (q = (A = S.variables(_).valuesArray()) == null ? void 0 : A.toString()) == null ? void 0 : q.split(",")) == null ? void 0 : a.map((K) => isNaN(K) ? null : Math.round(Number(K) * W) / W);
           l.hourly[p.hourly[_]] = v;
         }
         const E = L();
@@ -1622,7 +1622,7 @@ class b0 {
           )
         };
         for (let E = 0; E < r.variablesLength(); E += b.memberLength ?? 1) {
-          const _ = (d = (e = (a = r.variables(E).valuesArray()) == null ? void 0 : a.toString()) == null ? void 0 : e.split(",")) == null ? void 0 : d.map((v) => isNaN(v) ? null : Math.round(Number(v) * W) / W);
+          const _ = (d = (e = (Y = r.variables(E).valuesArray()) == null ? void 0 : Y.toString()) == null ? void 0 : e.split(",")) == null ? void 0 : d.map((v) => isNaN(v) ? null : Math.round(Number(v) * W) / W);
           l.daily[p.daily[E / (b.memberLength ?? 1)]] = _;
         }
         const P = L();
@@ -1639,37 +1639,37 @@ class b0 {
    * @private
    */
   async parseSeasonalDailyVariable(z, p, b = {}) {
-    var o, A, q, Y, a, e, d, t, T, U, s, V, S, r, l, I;
+    var o, A, q, a, Y, e, d, t, i, U, s, V, S, r, l, I;
     const O = [], W = Math.pow(10, b.precision || 6);
     for (let P = 0; P < z.length; P++) {
-      const E = z[P], _ = E.utcOffsetSeconds(), v = E.timezone(), g = E.daily(), k = [...Array(g.variablesLength())].map((i, M0) => g.variables(M0)), O0 = k.filter(
-        (i) => (i == null ? void 0 : i.variable()) === z0.temperature && (i == null ? void 0 : i.altitude()) === 2 && (i == null ? void 0 : i.aggregation()) === c0.maximum
+      const E = z[P], _ = E.utcOffsetSeconds(), v = E.timezone(), K = E.daily(), k = [...Array(K.variablesLength())].map((T, M0) => K.variables(M0)), O0 = k.filter(
+        (T) => (T == null ? void 0 : T.variable()) === z0.temperature && (T == null ? void 0 : T.altitude()) === 2 && (T == null ? void 0 : T.aggregation()) === c0.maximum
       ), d0 = k.filter(
-        (i) => (i == null ? void 0 : i.variable()) === z0.temperature && (i == null ? void 0 : i.altitude()) === 2 && (i == null ? void 0 : i.aggregation()) === c0.minimum
-      ), x = k.filter((i) => (i == null ? void 0 : i.variable()) === z0.precipitation), W0 = k.filter(
-        (i) => (i == null ? void 0 : i.variable()) === z0.wind_speed && (i == null ? void 0 : i.altitude()) === 10 && (i == null ? void 0 : i.aggregation()) === c0.maximum
+        (T) => (T == null ? void 0 : T.variable()) === z0.temperature && (T == null ? void 0 : T.altitude()) === 2 && (T == null ? void 0 : T.aggregation()) === c0.minimum
+      ), x = k.filter((T) => (T == null ? void 0 : T.variable()) === z0.precipitation), W0 = k.filter(
+        (T) => (T == null ? void 0 : T.variable()) === z0.wind_speed && (T == null ? void 0 : T.altitude()) === 10 && (T == null ? void 0 : T.aggregation()) === c0.maximum
       ), y = k.filter(
-        (i) => (i == null ? void 0 : i.variable()) === z0.wind_direction && (i == null ? void 0 : i.altitude()) === 10 && (i == null ? void 0 : i.aggregation()) === c0.dominant
+        (T) => (T == null ? void 0 : T.variable()) === z0.wind_direction && (T == null ? void 0 : T.altitude()) === 10 && (T == null ? void 0 : T.aggregation()) === c0.dominant
       ), H = {};
-      if (H.timezone = v || void 0, H.offset = b0.prettyTimezoneOffset(_), H.model = p.models instanceof Array ? (o = p.models) == null ? void 0 : o[P] : p.models || "best_match", g) {
-        const i = L();
+      if (H.timezone = v || void 0, H.offset = b0.prettyTimezoneOffset(_), H.model = p.models instanceof Array ? (o = p.models) == null ? void 0 : o[P] : p.models || "best_match", K) {
+        const T = L();
         H.daily = {
-          time: b0.range(Number(g.time()), Number(g.timeEnd()), g.interval()).map(
-            (w) => L.unix(w).add(p.fake ? 1 : 0, "year").utc().format()
+          time: b0.range(Number(K.time()), Number(K.timeEnd()), K.interval()).map(
+            (g) => L.unix(g).add(p.fake ? 1 : 0, "year").utc().format()
           )
         };
-        for (const w of O0)
-          H.daily.temperature_2m_max = (Y = (q = (A = w.valuesArray()) == null ? void 0 : A.toString()) == null ? void 0 : q.split(",")) == null ? void 0 : Y.map((h) => isNaN(h) ? null : Math.round(Number(h) * W) / W);
-        for (const w of d0)
-          H.daily.temperature_2m_min = (d = (e = (a = w.valuesArray()) == null ? void 0 : a.toString()) == null ? void 0 : e.split(",")) == null ? void 0 : d.map((h) => isNaN(h) ? null : Math.round(Number(h) * W) / W);
-        for (const w of x)
-          H.daily.precipitation_sum = (U = (T = (t = w.valuesArray()) == null ? void 0 : t.toString()) == null ? void 0 : T.split(",")) == null ? void 0 : U.map((h) => isNaN(h) ? null : Math.round(Number(h) * W) / W);
-        for (const w of y)
-          H.daily.wind_direction_10m_dominant = (S = (V = (s = w.valuesArray()) == null ? void 0 : s.toString()) == null ? void 0 : V.split(",")) == null ? void 0 : S.map((h) => isNaN(h) ? null : Math.round(Number(h) * W) / W);
-        for (const w of W0)
-          H.daily.wind_speed_10m_max = (I = (l = (r = w.valuesArray()) == null ? void 0 : r.toString()) == null ? void 0 : l.split(",")) == null ? void 0 : I.map((h) => isNaN(h) ? null : Math.round(Number(h) * W) / W);
+        for (const g of O0)
+          H.daily.temperature_2m_max = (a = (q = (A = g.valuesArray()) == null ? void 0 : A.toString()) == null ? void 0 : q.split(",")) == null ? void 0 : a.map((h) => isNaN(h) ? null : Math.round(Number(h) * W) / W);
+        for (const g of d0)
+          H.daily.temperature_2m_min = (d = (e = (Y = g.valuesArray()) == null ? void 0 : Y.toString()) == null ? void 0 : e.split(",")) == null ? void 0 : d.map((h) => isNaN(h) ? null : Math.round(Number(h) * W) / W);
+        for (const g of x)
+          H.daily.precipitation_sum = (U = (i = (t = g.valuesArray()) == null ? void 0 : t.toString()) == null ? void 0 : i.split(",")) == null ? void 0 : U.map((h) => isNaN(h) ? null : Math.round(Number(h) * W) / W);
+        for (const g of y)
+          H.daily.wind_direction_10m_dominant = (S = (V = (s = g.valuesArray()) == null ? void 0 : s.toString()) == null ? void 0 : V.split(",")) == null ? void 0 : S.map((h) => isNaN(h) ? null : Math.round(Number(h) * W) / W);
+        for (const g of W0)
+          H.daily.wind_speed_10m_max = (I = (l = (r = g.valuesArray()) == null ? void 0 : r.toString()) == null ? void 0 : l.split(",")) == null ? void 0 : I.map((h) => isNaN(h) ? null : Math.round(Number(h) * W) / W);
         const M0 = L();
-        D.debug("[%s] fetch daily variables cost: %d ms", b.requestId, M0.diff(i, "ms"));
+        D.debug("[%s] fetch daily variables cost: %d ms", b.requestId, M0.diff(T, "ms"));
       }
       O.push(H);
     }
@@ -1689,8 +1689,8 @@ class b0 {
               } else {
                 const o = L(p[b][O].date), A = L(z[b][O].date);
                 for (let q = 0; q < p[b][O][W].length; q++) {
-                  const Y = o.clone().add(q, "h").diff(A, "h");
-                  Y < z[b][O][W].length ? z[b][O][W][Y] === null && (z[b][O][W][Y] = p[b][O][W][q]) : W === "time" ? z[b][O][W].push(Y) : z[b][O][W].push(p[b][O][W][q]);
+                  const a = o.clone().add(q, "h").diff(A, "h");
+                  a < z[b][O][W].length ? z[b][O][W][a] === null && (z[b][O][W][a] = p[b][O][W][q]) : W === "time" ? z[b][O][W].push(a) : z[b][O][W].push(p[b][O][W][q]);
                 }
               }
         } else if (O === "daily") {
@@ -1704,12 +1704,12 @@ class b0 {
     return z;
   }
   async mergeMarineData(z) {
-    var W, o, A, q;
+    var o, A, q, a;
     const p = [], b = z.find((Y) => Y.model === "best_match");
     b && p.push(b);
-    const O = z.find((Y) => Y.model === "meteofrance_currents");
+    const O = z.find((Y) => Y.model === "meteofrance_currents"), W = z.find((Y) => Y.model === "ecmwf_wam025");
     for (const Y of z)
-      ["best_match", "meteofrance_currents"].includes(Y.model) || (Y.hourly.ocean_current_velocity = (W = O == null ? void 0 : O.hourly) == null ? void 0 : W.ocean_current_velocity, Y.hourly.ocean_current_direction = (o = O == null ? void 0 : O.hourly) == null ? void 0 : o.ocean_current_direction, Y.hourly.sea_level_height_msl = (A = O == null ? void 0 : O.hourly) == null ? void 0 : A.sea_level_height_msl, Y.hourly.sea_surface_temperature = (q = O == null ? void 0 : O.hourly) == null ? void 0 : q.sea_surface_temperature, p.push(Y));
+      ["best_match", "meteofrance_currents"].includes(Y.model) || (Y.hourly.ocean_current_velocity = (o = O == null ? void 0 : O.hourly) == null ? void 0 : o.ocean_current_velocity, Y.hourly.ocean_current_direction = (A = O == null ? void 0 : O.hourly) == null ? void 0 : A.ocean_current_direction, Y.hourly.sea_level_height_msl = (q = O == null ? void 0 : O.hourly) == null ? void 0 : q.sea_level_height_msl, Y.hourly.sea_surface_temperature = (a = O == null ? void 0 : O.hourly) == null ? void 0 : a.sea_surface_temperature, p.push(Y)), Y.model === "meteofrance_wave" && W && (Y.hourly.time = W.hourly.time, Y.hourly.wave_height = W.hourly.wave_height, Y.hourly.wave_direction = W.hourly.wave_direction, Y.hourly.wave_period = W.hourly.wave_period, Y.daily.time = W.daily.time, Y.daily.wave_height_max = W.daily.wave_height_max, Y.daily.wave_direction_dominant = W.daily.wave_direction_dominant, Y.daily.wave_period_max = W.daily.wave_period_max);
     return p;
   }
   pickForecastUrl(z, p, b, O = {}) {
@@ -1723,12 +1723,12 @@ class b0 {
     const b = [];
     for (let A = 0; A < p.length; A++) {
       const q = p[A];
-      ["ecmwf_wam025", "meteofrance_wave", "ewam", "gwam", "era5_ocean"].includes(q) ? b.push("meteofrance_currents", q) : ["gfswave", "ncep_gfswave025", "ncep_gfswave016"].includes(q) ? b.push("meteofrance_currents", "ncep_gfswave025", "ncep_gfswave016") : b.push("best_match");
+      ["ecmwf_wam025", "meteofrance_wave", "ewam", "gwam", "era5_ocean"].includes(q) ? b.push("meteofrance_currents", "ecmwf_wam025", q) : ["gfswave", "ncep_gfswave025", "ncep_gfswave016"].includes(q) ? b.push("meteofrance_currents", "ncep_gfswave025", "ncep_gfswave016") : b.push("best_match");
     }
-    const O = b.reduce((A, q) => (A.includes(q) || A.push(q), A), []), W = ["best_match", "meteofrance_currents", "meteofrance_wave", "ecmwf_wam025", "ncep_gfswave025", "gwam", "era5_ocean", "ewam", "ncep_gfswave016"];
+    const O = b.reduce((A, q) => (A.includes(q) || A.push(q), A), []), W = ["best_match", "meteofrance_currents", "ecmwf_wam025", "meteofrance_wave", "ncep_gfswave025", "gwam", "era5_ocean", "ewam", "ncep_gfswave016"];
     return O.sort((A, q) => {
-      const Y = W.indexOf(A), a = W.indexOf(q);
-      return Y - a;
+      const a = W.indexOf(A), Y = W.indexOf(q);
+      return a - Y;
     }), O;
   }
   /**
@@ -1740,16 +1740,16 @@ class b0 {
    * @private
    */
   async prepare(z, p, b, O = {}) {
-    var a, e;
-    const W = O.maxDays || 14, o = L.utc(), A = z ? L.utc(z) : void 0, q = p ? await this.pickUpdateMeta(b.models) : [], Y = (e = (a = q[0]) == null ? void 0 : a.meta) != null && e.endTime ? L(q[0].meta.endTime) : o.clone().add(W, "day");
+    var Y, e;
+    const W = O.maxDays || 14, o = L.utc(), A = z ? L.utc(z) : void 0, q = p ? await this.pickUpdateMeta(b.models) : [], a = (e = (Y = q[0]) == null ? void 0 : Y.meta) != null && e.endTime ? L(q[0].meta.endTime) : o.clone().add(W, "day");
     if (z) {
       const d = A.clone().utc().add(O.forecastDays ?? 1, "day");
-      d.isAfter(Y) ? (d.subtract(1, "year"), A.isAfter(Y) ? (A.subtract(1, "year"), b.start_dates = [
+      d.isAfter(a) ? (d.subtract(1, "year"), A.isAfter(a) ? (A.subtract(1, "year"), b.start_dates = [
         A.clone().subtract(O.pastDays || 0, "day").utc().format("YYYY-MM-DD")
       ], b.end_dates = [d.utc().format("YYYY-MM-DD")], b.fakes = [!0], b.url = [this.pickForecastUrl(p, O.selfHosted ?? !0, !0, O)]) : (b.start_dates = [
         A.clone().subtract(O.pastDays || 0, "day").utc().format("YYYY-MM-DD"),
-        Y.clone().subtract(1, "year").subtract(1, "day").utc().format("YYYY-MM-DD")
-      ], b.end_dates = [Y.clone().subtract(1, "day").utc().format("YYYY-MM-DD"), d.utc().format("YYYY-MM-DD")], b.fakes = [!1, !0], b.url = [
+        a.clone().subtract(1, "year").subtract(1, "day").utc().format("YYYY-MM-DD")
+      ], b.end_dates = [a.clone().subtract(1, "day").utc().format("YYYY-MM-DD"), d.utc().format("YYYY-MM-DD")], b.fakes = [!1, !0], b.url = [
         this.pickForecastUrl(p, O.selfHosted ?? !0, !1, O),
         this.pickForecastUrl(p, O.selfHosted ?? !0, !0, O)
       ])) : (b.start_dates = [
@@ -1811,7 +1811,7 @@ class b0 {
     selfHosted: !0,
     maxDays: 14
   }) {
-    var T, U, s, V, S, r;
+    var i, U, s, V, S, r;
     p = this.toStdLng(p), this.debug && D.info("[%s] spot forecast params: %j", A.requestId, { lat: z, lng: p, datetime: b, simplify: O, withDaily: W, withHourly: o, options: A });
     const q = {
       apikey: this.apikey,
@@ -1819,12 +1819,12 @@ class b0 {
       longitude: p,
       cell_selection: "sea",
       wind_speed_unit: "kn",
-      models: ((T = A.weatherModels) == null ? void 0 : T.split(",")) || ["best_match"],
+      models: ((i = A.weatherModels) == null ? void 0 : i.split(",")) || ["best_match"],
       timezone: "auto"
     };
-    let Y;
-    const a = this.timezoneOffset(z, p);
-    b && (Y = L.utc(b).utcOffset(a), Y.subtract(a > 0 ? a : -a, "h"), A.selfHistory = !(Y != null && Y.isBefore(L.utc().subtract(240, "days")))), W && (q.daily = ((U = this.FORECAST.WEATHER_VARIABLES.NORMAL.DAILY) == null ? void 0 : U.split(",")) || []), Y || (A.forecastDays = A.forecastDays || 1, A.pastDays = 0, o = !0), o && (q.hourly = ((s = this.FORECAST.WEATHER_VARIABLES.NORMAL.HOURLY) == null ? void 0 : s.split(",")) || []), A.maxDays = A.maxDays || 14, A.pastDays = A.pastDays || 0, A.pastDays = A.pastDays > 7 ? 7 : A.pastDays < 0 ? 0 : A.pastDays, A.forecastDays = A.forecastDays ?? 1, A.forecastDays = A.forecastDays > A.maxDays ? A.maxDays : A.forecastDays < 0 ? 1 : A.forecastDays, await this.prepare(Y == null ? void 0 : Y.utc().format(), !1, q, A);
+    let a;
+    const Y = this.timezoneOffset(z, p);
+    b && (a = L.utc(b).utcOffset(Y), a.subtract(Y > 0 ? Y : -Y, "h"), A.selfHistory = !(a != null && a.isBefore(L.utc().subtract(240, "days")))), W && (q.daily = ((U = this.FORECAST.WEATHER_VARIABLES.NORMAL.DAILY) == null ? void 0 : U.split(",")) || []), a || (A.forecastDays = A.forecastDays || 1, A.pastDays = 0, o = !0), o && (q.hourly = ((s = this.FORECAST.WEATHER_VARIABLES.NORMAL.HOURLY) == null ? void 0 : s.split(",")) || []), A.maxDays = A.maxDays || 14, A.pastDays = A.pastDays || 0, A.pastDays = A.pastDays > 7 ? 7 : A.pastDays < 0 ? 0 : A.pastDays, A.forecastDays = A.forecastDays ?? 1, A.forecastDays = A.forecastDays > A.maxDays ? A.maxDays : A.forecastDays < 0 ? 1 : A.forecastDays, await this.prepare(a == null ? void 0 : a.utc().format(), !1, q, A);
     const e = await this.weatherForecast(q, void 0, A), d = {
       apikey: this.apikey,
       latitude: z,
@@ -1834,9 +1834,9 @@ class b0 {
       wind_speed_unit: "kn",
       models: this.pickMarineModels(A.marineModels)
     };
-    W && (d.daily = this.FORECAST.MARINE_VARIABLES.DAILY.split(",")), Y || (A.forecastDays = A.forecastDays || 1, o = !0), o && (d.hourly = this.FORECAST.MARINE_VARIABLES.HOURLY.split(",")), await this.prepare(Y == null ? void 0 : Y.utc().format(), !0, d, A);
+    W && (d.daily = this.FORECAST.MARINE_VARIABLES.DAILY.split(",")), a || (A.forecastDays = A.forecastDays || 1, o = !0), o && (d.hourly = this.FORECAST.MARINE_VARIABLES.HOURLY.split(",")), await this.prepare(a == null ? void 0 : a.utc().format(), !0, d, A);
     let t = await this.marineForecast(d, A);
-    return (r = (S = (V = t[0]) == null ? void 0 : V.hourly) == null ? void 0 : S.wave_height) != null && r.every((l) => l === null || l === 0) && (d.models = this.pickMarineModels("best_match,ncep_gfswave025,meteofrance_wave"), t = await this.marineForecast(d, A)), { weather: e, marine: t };
+    return (r = (S = (V = t[0]) == null ? void 0 : V.hourly) == null ? void 0 : S.wave_height) != null && r.every((l) => l === null || l === 0) && (d.models = this.pickMarineModels("best_match,ncep_gfswave025,ecmwf_wam025,meteofrance_wave"), t = await this.marineForecast(d, A)), { weather: e, marine: t };
   }
   /**
    * 历史再分析数据
@@ -1864,8 +1864,8 @@ class b0 {
   }) {
     var U, s;
     p = this.toStdLng(p), this.debug && D.info("[%s] spot historical params: %j", q.requestId, { lat: z, lng: p, startDate: b, endDate: O, withMarine: A, options: q });
-    const Y = this.timezoneOffset(z, p), a = L.utc(b).utcOffset(Y), e = L.utc(O).utcOffset(Y);
-    a.subtract(Y > 0 ? Y : -Y, "h"), e.subtract(Y > 0 ? Y : -Y, "h");
+    const a = this.timezoneOffset(z, p), Y = L.utc(b).utcOffset(a), e = L.utc(O).utcOffset(a);
+    Y.subtract(a > 0 ? a : -a, "h"), e.subtract(a > 0 ? a : -a, "h");
     const d = {
       apikey: this.apikey,
       latitude: z,
@@ -1875,12 +1875,12 @@ class b0 {
       models: ((U = q.weatherModels) == null ? void 0 : U.split(",")) || ["best_match"],
       timezone: "auto",
       url: this.HISTORICAL.OM_URL,
-      start_date: a.format("YYYY-MM-DD"),
+      start_date: Y.format("YYYY-MM-DD"),
       end_date: e.format("YYYY-MM-DD")
     };
     W && (d.daily = this.HISTORICAL.WEATHER_VARIABLES.DAILY.split(",")), o && (d.hourly = this.HISTORICAL.WEATHER_VARIABLES.HOURLY.split(","));
     const t = await this.weatherForecast(d, void 0, q);
-    let T;
+    let i;
     if (A) {
       const V = {
         apikey: this.apikey,
@@ -1893,12 +1893,12 @@ class b0 {
         daily: this.FORECAST.MARINE_VARIABLES.DAILY.split(","),
         hourly: this.FORECAST.MARINE_VARIABLES.HOURLY.split(","),
         url: this.FORECAST.OM_MARINE_URL,
-        start_date: a.format("YYYY-MM-DD"),
+        start_date: Y.format("YYYY-MM-DD"),
         end_date: e.format("YYYY-MM-DD")
       };
-      T = await this.marineForecast(V, q);
+      i = await this.marineForecast(V, q);
     }
-    return { weather: t, marine: T };
+    return { weather: t, marine: i };
   }
   /**
    * 季节预报数据
@@ -1916,9 +1916,9 @@ class b0 {
     precision: 6
   }) {
     p = this.toStdLng(p), this.debug && D.info("[%s] spot seasonal params: %j", o.requestId, { lat: z, lng: p, startDate: b, endDate: O, options: o });
-    const A = this.timezoneOffset(z, p), q = L.utc(b).utcOffset(A), Y = O ? L.utc(O).utcOffset(A) : q.clone().add(1, "month");
-    q.subtract(A > 0 ? A : -A, "h"), Y.subtract(A > 0 ? A : -A, "h");
-    const a = {
+    const A = this.timezoneOffset(z, p), q = L.utc(b).utcOffset(A), a = O ? L.utc(O).utcOffset(A) : q.clone().add(1, "month");
+    q.subtract(A > 0 ? A : -A, "h"), a.subtract(A > 0 ? A : -A, "h");
+    const Y = {
       apikey: this.apikey,
       latitude: z,
       longitude: p,
@@ -1927,10 +1927,10 @@ class b0 {
       timezone: "auto",
       url: this.SEASONAL.OM_URL,
       start_date: q.format("YYYY-MM-DD"),
-      end_date: Y.format("YYYY-MM-DD"),
+      end_date: a.format("YYYY-MM-DD"),
       daily: this.SEASONAL.WEATHER_VARIABLES.DAILY.split(",")
     };
-    return W && (a.six_hourly = this.SEASONAL.WEATHER_VARIABLES.SIX_HOURLY.split(",")), o.memberLength = 4, { weather: await this.weatherForecast(a, this.parseSeasonalDailyVariable, o) };
+    return W && (Y.six_hourly = this.SEASONAL.WEATHER_VARIABLES.SIX_HOURLY.split(",")), o.memberLength = 4, { weather: await this.weatherForecast(Y, this.parseSeasonalDailyVariable, o) };
   }
   /**
    * 气候态数据
@@ -1959,7 +1959,7 @@ class b0 {
     p = this.toStdLng(p), this.debug && D.info("[%s] spot climate params: %j", W.requestId, { lat: z, lng: p, startDate: b, endDate: O, options: W });
     const o = this.timezoneOffset(z, p), A = L.utc(b).utcOffset(o), q = O ? L.utc(O).utcOffset(o) : A.clone().add(1, "day");
     q.subtract(o > 0 ? o : -o, "h"), A.subtract(o > 0 ? o : -o, "h");
-    const Y = {
+    const a = {
       apikey: this.apikey,
       latitude: z,
       longitude: p,
@@ -1972,7 +1972,7 @@ class b0 {
       end_date: q.format("YYYY-MM-DD"),
       daily: this.CLIMATE.WEATHER_VARIABLES.DAILY.split(",")
     };
-    return { weather: await this.weatherForecast(Y, void 0, W) };
+    return { weather: await this.weatherForecast(a, void 0, W) };
   }
   async update(z = {}) {
     const p = L.unix(this.METEO2_UPDATE.etime), b = this.METEO2_UPDATE.version, O = L();
@@ -1986,25 +1986,25 @@ class b0 {
       try {
         const A = await o.json();
         if (A.code === 0) {
-          const q = A.data, Y = K.standardWeatherModels();
-          for (const a of Y) {
-            const e = K.autoPickSubCategories(a.alias), t = q.filter((T) => e.includes(T.category)).map((T) => {
+          const q = A.data, a = w.standardWeatherModels();
+          for (const Y of a) {
+            const e = w.autoPickSubCategories(Y.alias), t = q.filter((i) => e.includes(i.category)).map((i) => {
               var S, r, l, I, P, E;
-              const U = L.unix((S = T.meta) == null ? void 0 : S.data_end_time).utc(), s = L.unix((r = T.meta) == null ? void 0 : r.last_run_availability_time).utc(), V = U.diff(s, "days");
+              const U = L.unix((S = i.meta) == null ? void 0 : S.data_end_time).utc(), s = L.unix((r = i.meta) == null ? void 0 : r.last_run_availability_time).utc(), V = U.diff(s, "days");
               return {
-                category: T.category,
+                category: i.category,
                 meta: {
                   endTime: U.format(),
                   availabilityTime: s.format(),
                   days: V,
-                  initialisationTime: L.unix((l = T.meta) == null ? void 0 : l.last_run_initialisation_time).utc().format(),
-                  modificationTime: L.unix((I = T.meta) == null ? void 0 : I.last_run_modification_time).utc().format(),
-                  temporalResolution: Math.round(((P = T.meta) == null ? void 0 : P.temporal_resolution_seconds) / 3600),
-                  frequency: Math.round(((E = T.meta) == null ? void 0 : E.update_interval_seconds) / 3600)
+                  initialisationTime: L.unix((l = i.meta) == null ? void 0 : l.last_run_initialisation_time).utc().format(),
+                  modificationTime: L.unix((I = i.meta) == null ? void 0 : I.last_run_modification_time).utc().format(),
+                  temporalResolution: Math.round(((P = i.meta) == null ? void 0 : P.temporal_resolution_seconds) / 3600),
+                  frequency: Math.round(((E = i.meta) == null ? void 0 : E.update_interval_seconds) / 3600)
                 }
               };
             });
-            t.length && (this.METEO2_UPDATE[a.alias] = t);
+            t.length && (this.METEO2_UPDATE[Y.alias] = t);
           }
           this.METEO2_UPDATE.version = b + 1, this.METEO2_UPDATE.etime = O.unix();
         }
@@ -2070,11 +2070,11 @@ class M1 {
    * @param datum
    * @param options
    */
-  async tidesForecast(z, p, b = 7, O = "today", W = !0, o = !1, A = !1, q = "CD", Y = {}) {
-    O = O || "today", b = b || 7, p = this.toStdLng(p), this.debug && S0.info("[%s] spot tides forecast params: %j", Y.requestId, { lat: z, lng: p, date: O, extremes: W, heights: o, datums: A, datum: q });
-    let a = `https://www.worldtides.info/api/v3?lat=${z}&lon=${p}&days=${b}&date=${O}&datum=${q}&key=${this.apikey}&localtime`;
-    W && (a = `${a}&extremes`), o && (a = `${a}&heights`), A && (a = `${a}&datums`);
-    const d = await (await fetch(a)).json();
+  async tidesForecast(z, p, b = 7, O = "today", W = !0, o = !1, A = !1, q = "CD", a = {}) {
+    O = O || "today", b = b || 7, p = this.toStdLng(p), this.debug && S0.info("[%s] spot tides forecast params: %j", a.requestId, { lat: z, lng: p, date: O, extremes: W, heights: o, datums: A, datum: q });
+    let Y = `https://www.worldtides.info/api/v3?lat=${z}&lon=${p}&days=${b}&date=${O}&datum=${q}&key=${this.apikey}&localtime`;
+    W && (Y = `${Y}&extremes`), o && (Y = `${Y}&heights`), A && (Y = `${Y}&datums`);
+    const d = await (await fetch(Y)).json();
     return d.status === 200 ? {
       rqt: {
         lat: z,
@@ -2109,7 +2109,7 @@ class p0 {
         lng: isNaN(W) ? null : W,
         pressure: isNaN(b) ? null : Math.round(b) || null,
         kts: isNaN(o) ? null : Math.round(o) || null,
-        bf: K.beaufort(K.kts2ms(o ?? 0)),
+        bf: w.beaufort(w.kts2ms(o ?? 0)),
         ...N.parseTropicalType(o),
         wind: {
           r7: null,
@@ -2136,16 +2136,16 @@ class p0 {
       var W;
       const b = L.utc(p.reftime).format(), O = {};
       return (W = p.records) == null || W.forEach((o) => {
-        const A = L.utc(o.time), q = A.diff(b, "hour"), Y = Number(o.pressure / 100), a = Number(o.lat), e = Number(o.lon), d = Number(o.windSpeed * 3600 / 1852);
+        const A = L.utc(o.time), q = A.diff(b, "hour"), a = Number(o.pressure / 100), Y = Number(o.lat), e = Number(o.lon), d = Number(o.windSpeed * 3600 / 1852);
         O[q] = {
-          lat: isNaN(a) ? null : a,
+          lat: isNaN(Y) ? null : Y,
           lng: isNaN(e) ? null : e,
-          pressure: isNaN(Y) ? null : Math.round(Y) || null,
+          pressure: isNaN(a) ? null : Math.round(a) || null,
           utc: A.format(),
           wind: {
             datetime: A.format(),
             kts: isNaN(d) ? null : Math.round(d) || null,
-            bf: K.beaufort(K.kts2ms(d ?? 0)),
+            bf: w.beaufort(w.kts2ms(d ?? 0)),
             ...N.parseTropicalType(d),
             r7: null,
             r7ne: null,
@@ -2199,21 +2199,21 @@ const J = class J {
   static async parseHistory(z) {
     const p = `https://hifleet.com/hifleetapi/gettyphooninfo2.do?xuhao=${z}`, b = await $.post(p).text(), O = await J.parser.parseStringPromise(b), W = O.typhoon.position instanceof Array ? O.typhoon.position : [O.typhoon.position], o = [];
     for (const A of W) {
-      const q = L(A.updatetime).utcOffset(8).utc().format(), Y = Number(A.lat), a = Number(A.lon), e = Number(A.pressure), d = Number(A.windspeed * 3600 / 1852), t = N.parseWindCircle(A.c7quad1 / 1.852), T = N.parseWindCircle(A.c7quad2 / 1.852), U = N.parseWindCircle(A.c7quad3 / 1.852), s = N.parseWindCircle(A.c7quad4 / 1.852), V = N.parseWindCircle(A.c10quad1 / 1.852), S = N.parseWindCircle(A.c10quad2 / 1.852), r = N.parseWindCircle(A.c10quad3 / 1.852), l = N.parseWindCircle(A.c10quad4 / 1.852), I = N.parseWindCircle(A.c12quad1 / 1.852), P = N.parseWindCircle(A.c12quad2 / 1.852), E = N.parseWindCircle(A.c12quad3 / 1.852), _ = N.parseWindCircle(A.c12quad4 / 1.852), { r7: v, r10: g, r12: k } = N.estimateWindRadii(d, Y), O0 = {
+      const q = L(A.updatetime).utcOffset(8).utc().format(), a = Number(A.lat), Y = Number(A.lon), e = Number(A.pressure), d = Number(A.windspeed * 3600 / 1852), t = N.parseWindCircle(A.c7quad1 / 1.852), i = N.parseWindCircle(A.c7quad2 / 1.852), U = N.parseWindCircle(A.c7quad3 / 1.852), s = N.parseWindCircle(A.c7quad4 / 1.852), V = N.parseWindCircle(A.c10quad1 / 1.852), S = N.parseWindCircle(A.c10quad2 / 1.852), r = N.parseWindCircle(A.c10quad3 / 1.852), l = N.parseWindCircle(A.c10quad4 / 1.852), I = N.parseWindCircle(A.c12quad1 / 1.852), P = N.parseWindCircle(A.c12quad2 / 1.852), E = N.parseWindCircle(A.c12quad3 / 1.852), _ = N.parseWindCircle(A.c12quad4 / 1.852), { r7: v, r10: K, r12: k } = N.estimateWindRadii(d, a), O0 = {
         updated: q,
-        lat: isNaN(Y) ? null : Y,
-        lng: isNaN(a) ? null : a,
+        lat: isNaN(a) ? null : a,
+        lng: isNaN(Y) ? null : Y,
         pressure: isNaN(e) ? null : Math.round(e),
         kts: isNaN(d) ? null : Math.round(d) || null,
-        bf: K.beaufort(K.kts2ms(d ?? 0)),
+        bf: w.beaufort(w.kts2ms(d ?? 0)),
         ...N.parseTropicalType(d),
         wind: {
           r7: v,
           r7ne: t,
-          r7nw: T,
+          r7nw: i,
           r7sw: U,
           r7se: s,
-          r10: g,
+          r10: K,
           r10ne: V,
           r10nw: S,
           r10sw: r,
@@ -2233,15 +2233,15 @@ const J = class J {
     const b = `https://hifleet.com/hifleetapi/gettyphooforecast.do?xuhao=${z}`, O = await $.post(b).text(), W = await J.parser.parseStringPromise(O), o = W.list.forecast instanceof Array ? W.list.forecast : [W.list.forecast], A = [];
     for (const q of o)
       if (q.xuhao === z) {
-        const Y = q.positions.forecastposition instanceof Array ? q.positions.forecastposition : [q.positions.forecastposition];
-        if (Y.length) {
-          p = p || L(Y.at(0).forecasttime).utcOffset(8).utc();
-          const a = {};
-          for (const d of Y) {
-            const t = L(d.forecasttime).utcOffset(8).utc(), T = t.diff(p, "hours");
-            if (T) {
+        const a = q.positions.forecastposition instanceof Array ? q.positions.forecastposition : [q.positions.forecastposition];
+        if (a.length) {
+          p = p || L(a.at(0).forecasttime).utcOffset(8).utc();
+          const Y = {};
+          for (const d of a) {
+            const t = L(d.forecasttime).utcOffset(8).utc(), i = t.diff(p, "hours");
+            if (i) {
               const U = Number(d.forelat), s = Number(d.forelon), V = Number(d.forepressure), S = Number(d.forespeed * 3600 / 1852);
-              a[T] = {
+              Y[i] = {
                 lat: isNaN(U) ? null : U,
                 lng: isNaN(s) ? null : s,
                 pressure: V ? Math.round(V) : null,
@@ -2249,7 +2249,7 @@ const J = class J {
                 wind: {
                   datetime: t.format(),
                   kts: isNaN(S) ? null : Math.round(S),
-                  bf: K.beaufort(K.kts2ms(S ?? 0)),
+                  bf: w.beaufort(w.kts2ms(S ?? 0)),
                   ...N.parseTropicalType(S),
                   r7: null,
                   r7ne: null,
@@ -2276,7 +2276,7 @@ const J = class J {
           const e = {
             date: p.utc().format(),
             model: N.parseTropicalModel(q.country).toLowerCase(),
-            hours: a
+            hours: Y
           };
           A.push(e);
         }
@@ -2320,8 +2320,8 @@ class N {
     var b;
     const p = Object.values(e0);
     return (b = z.forecasts) == null || b.sort((O, W) => {
-      var q, Y;
-      const o = p.indexOf((q = O.model) == null ? void 0 : q.toUpperCase()), A = p.indexOf((Y = W.model) == null ? void 0 : Y.toUpperCase());
+      var q, a;
+      const o = p.indexOf((q = O.model) == null ? void 0 : q.toUpperCase()), A = p.indexOf((a = W.model) == null ? void 0 : a.toUpperCase());
       return (o === -1 ? 999 : o) - (A === -1 ? 999 : A);
     }), z;
   }
@@ -2329,31 +2329,31 @@ class N {
     var W, o;
     const b = await p0.realtimeForecast(), O = z ? await q0.realtimeForecast() : [];
     for (const A of b) {
-      const q = O.find((a) => {
+      const q = O.find((Y) => {
         var e, d;
-        return ((e = a.name) == null ? void 0 : e.toLowerCase()) === ((d = A.name) == null ? void 0 : d.toLowerCase());
+        return ((e = Y.name) == null ? void 0 : e.toLowerCase()) === ((d = A.name) == null ? void 0 : d.toLowerCase());
       });
       if (q) {
-        A.cnName = q.cnName, (W = q.history) != null && W.length && (A.history = q.history), A.history.sort((a, e) => L(e.updated).valueOf() - L(a.updated).valueOf());
-        for (const a of q.forecasts)
-          ["CMA", "JMA", "CNTW", "CNHK", "KMA"].includes((o = a.model) == null ? void 0 : o.toUpperCase()) && !A.forecasts.find((e) => e.model.toLowerCase() === a.model.toLowerCase()) && A.forecasts.push(a);
+        A.cnName = q.cnName, (W = q.history) != null && W.length && (A.history = q.history), A.history.sort((Y, e) => L(e.updated).valueOf() - L(Y.updated).valueOf());
+        for (const Y of q.forecasts)
+          ["CMA", "JMA", "CNTW", "CNHK", "KMA"].includes((o = Y.model) == null ? void 0 : o.toUpperCase()) && !A.forecasts.find((e) => e.model.toLowerCase() === Y.model.toLowerCase()) && A.forecasts.push(Y);
       }
-      A.history = A.history.reduce((a, e) => (a.find((d) => d.updated === e.updated) || a.push(e), a), []);
-      const Y = A.history[0];
-      Y && A.forecasts.forEach((a) => {
-        a.date = Y.updated;
-        const e = L(Y.updated), d = {};
-        for (const t in a.hours) {
-          const T = a.hours[t], U = L(T.utc).diff(e, "h");
-          U > 0 && (d[U] = T);
+      A.history = A.history.reduce((Y, e) => (Y.find((d) => d.updated === e.updated) || Y.push(e), Y), []);
+      const a = A.history[0];
+      a && A.forecasts.forEach((Y) => {
+        Y.date = a.updated;
+        const e = L(a.updated), d = {};
+        for (const t in Y.hours) {
+          const i = Y.hours[t], U = L(i.utc).diff(e, "h");
+          U > 0 && (d[U] = i);
         }
-        a.hours = d;
+        Y.hours = d;
       }), await N.tropicalMovement(A);
     }
     for (const A of O)
       b.every((q) => {
-        var Y, a;
-        return ((Y = q.name) == null ? void 0 : Y.toLowerCase()) !== ((a = A.name) == null ? void 0 : a.toLowerCase());
+        var a, Y;
+        return ((a = q.name) == null ? void 0 : a.toLowerCase()) !== ((Y = A.name) == null ? void 0 : Y.toLowerCase());
       }) && b.push(A);
     return b;
   }
@@ -2369,10 +2369,10 @@ class N {
       for (let A = 0; A < o.length - 1; A++) {
         const q = W[o[A]];
         p = p || q;
-        const Y = W[o[A + 1]];
-        q.movement = N.calculateMovement(q, Y);
-        const a = N.supplementWindRadii(q);
-        q.wind = { ...q.wind || {}, ...a };
+        const a = W[o[A + 1]];
+        q.movement = N.calculateMovement(q, a);
+        const Y = N.supplementWindRadii(q);
+        q.wind = { ...q.wind || {}, ...Y };
       }
     });
     let b = null;
@@ -2390,10 +2390,10 @@ class N {
     return z;
   }
   static calculateMovement(z, p) {
-    const b = i0.calculateDistance(z, p), O = L(p.utc || p.updated).diff(z.utc || z.updated, "h", !0);
+    const b = T0.calculateDistance(z, p), O = L(p.utc || p.updated).diff(z.utc || z.updated, "h", !0);
     return {
       kts: Math.round(b / O * 100) / 100,
-      deg: i0.calculateBearing(z, p, !0, 0)
+      deg: T0.calculateBearing(z, p, !0, 0)
     };
   }
   /**
@@ -2426,10 +2426,10 @@ class N {
       return 0;
     let W = b, o = b * 10;
     for (; o - W > 0.1; ) {
-      const A = (W + o) / 2, q = b / A, Y = Math.pow(q, O) * Math.exp(1 - Math.pow(q, O));
-      p * Math.sqrt(Y) > z ? W = A : o = A;
+      const A = (W + o) / 2, q = b / A, a = Math.pow(q, O) * Math.exp(1 - Math.pow(q, O));
+      p * Math.sqrt(a) > z ? W = A : o = A;
     }
-    return K.kmh2kts(W + o);
+    return w.kmh2kts(W + o);
   }
   /**
    * 基于台风强度推算风圈基础半径的经验公式
@@ -2438,7 +2438,7 @@ class N {
    * @returns 风圈半径对象
    */
   static estimateWindRadii(z, p) {
-    const b = K.kts2ms(z), O = N.estimateRMW(b, p), W = N.estimateHollandB(b, O, p), o = N.findWindRadius(17.2, b, O, W), A = N.findWindRadius(28.5, b, O, W), q = N.findWindRadius(37, b, O, W);
+    const b = w.kts2ms(z), O = N.estimateRMW(b, p), W = N.estimateHollandB(b, O, p), o = N.findWindRadius(17.2, b, O, W), A = N.findWindRadius(28.5, b, O, W), q = N.findWindRadius(37, b, O, W);
     return {
       r7: o ? Math.round(o) : null,
       r10: A ? Math.round(A) : null,
@@ -2463,8 +2463,8 @@ class N {
       nw: (315 - b + 360) % 360,
       se: (135 - b + 360) % 360,
       sw: (225 - b + 360) % 360
-    }, q = (Y) => {
-      const a = Y > 180 ? Y - 360 : Y, e = Math.cos(a * Math.PI / 180);
+    }, q = (a) => {
+      const Y = a > 180 ? a - 360 : a, e = Math.cos(Y * Math.PI / 180);
       return 1 - o * e;
     };
     return {
@@ -2481,8 +2481,8 @@ class N {
   static supplementWindRadii(z) {
     const { wind: p, lat: b, movement: O } = z;
     if (p.r7) {
-      for (const Y of Object.keys(p))
-        /^r[7,10,12]/.test(Y) && (isNaN(Number(p[Y])) || p[Y] < 0) && (p[Y] = null);
+      for (const a of Object.keys(p))
+        /^r[7,10,12]/.test(a) && (isNaN(Number(p[a])) || p[a] < 0) && (p[a] = null);
       return p;
     }
     const W = p.kts;
@@ -2505,14 +2505,14 @@ class N {
         r12sw: null
       };
     const o = N.estimateWindRadii(W, b), A = {};
-    return ["r7", "r10", "r12"].forEach((Y) => {
-      const a = o[Y];
-      if (a) {
-        A[Y] = a;
-        const e = N.estimateAsymmetricRadii(a, (O == null ? void 0 : O.kts) || 0, (O == null ? void 0 : O.deg) || 0, b > 0 ? "N" : "S");
-        A[`${Y}ne`] = e.ne, A[`${Y}nw`] = e.nw, A[`${Y}se`] = e.se, A[`${Y}sw`] = e.sw;
+    return ["r7", "r10", "r12"].forEach((a) => {
+      const Y = o[a];
+      if (Y) {
+        A[a] = Y;
+        const e = N.estimateAsymmetricRadii(Y, (O == null ? void 0 : O.kts) || 0, (O == null ? void 0 : O.deg) || 0, b > 0 ? "N" : "S");
+        A[`${a}ne`] = e.ne, A[`${a}nw`] = e.nw, A[`${a}se`] = e.se, A[`${a}sw`] = e.sw;
       } else
-        A[Y] = null, A[`${Y}ne`] = null, A[`${Y}nw`] = null, A[`${Y}se`] = null, A[`${Y}sw`] = null;
+        A[a] = null, A[`${a}ne`] = null, A[`${a}nw`] = null, A[`${a}se`] = null, A[`${a}sw`] = null;
     }), A;
   }
   /**