@idm-plugin/meteo2 0.7.3 → 0.7.5

package/dist/index.js

@@ -378,7 +378,7 @@ var n0 = { exports: {} };
         return this.offsets[this._index(O)];
       }
     };
-    function P(O, a) {
+    function m(O, a) {
       this.name = O, this.zones = a;
     }
     function E(O) {
@@ -412,7 +412,7 @@ var n0 = { exports: {} };
       for (e(a), n = 0; n < a.length; n++)
         R = a[n], A[R] = A[R] || {}, A[R][O] = !0;
     }
-    function m(O) {
+    function P(O) {
       var a = O.length, n = {}, R = [], t = {}, U, G, V, I;
       for (U = 0; U < a; U++)
         if (V = O[U].offset, !t.hasOwnProperty(V)) {
@@ -436,7 +436,7 @@ var n0 = { exports: {} };
         }
       } catch {
       }
-      var n = h(), R = n.length, t = m(n), U = [], G, V, I;
+      var n = h(), R = n.length, t = P(n), U = [], G, V, I;
       for (V = 0; V < t.length; V++) {
         for (G = new C(y(t[V])), I = 0; I < R; I++)
           G.scoreOffsetAt(n[I]);
@@ -478,7 +478,7 @@ var n0 = { exports: {} };
       var a, n, R, t;
       if (!(!O || !O.length))
         for (a = 0; a < O.length; a++)
-          t = O[a].split("|"), n = t[0].toUpperCase(), R = t[1].split(" "), c[n] = new P(
+          t = O[a].split("|"), n = t[0].toUpperCase(), R = t[1].split(" "), c[n] = new m(
             n,
             R
           );
@@ -1536,14 +1536,14 @@ class J0 {
       if (M.start_dates instanceof Array)
         for (let S = 0; S < M.start_dates.length; S++) {
           M.start_date = M.start_dates[S], M.end_date = M.end_dates[S], M.fake = M.fakes[S];
-          const P = M.url[S];
-          this.debug && K.debug("[%s] fetch marine via %s with %j", z.requestId, P, {
+          const m = M.url[S];
+          this.debug && K.debug("[%s] fetch marine via %s with %j", z.requestId, m, {
             start_date: M.start_date,
             end_date: M.end_date,
             fake: M.fake,
             step: S
           });
-          const E = await z0(P, M), C = await this.parseWeatherData(E, M, z);
+          const E = await z0(m, M), C = await this.parseWeatherData(E, M, z);
           q ? await this.mergeSegments(q, C) : q = C;
         }
       else {
@@ -1570,15 +1570,15 @@ class J0 {
     var W, A, o, d, Y, X, q, f, e, r;
     const p = [], c = Math.pow(10, b.precision || 6);
     for (let N = 0; N < M.length; N++) {
-      const u = M[N], B = u.utcOffsetSeconds(), S = u.timezone(), P = u.current(), E = u.hourly(), C = u.sixHourly(), H = u.daily(), h = {};
-      if (h.timezone = S || void 0, h.offset = this.prettyTimezoneOffset(B), h.model = z.models instanceof Array ? (W = z.models) == null ? void 0 : W[N] : z.models || "best_match", P) {
+      const u = M[N], B = u.utcOffsetSeconds(), S = u.timezone(), m = u.current(), E = u.hourly(), C = u.sixHourly(), H = u.daily(), h = {};
+      if (h.timezone = S || void 0, h.offset = this.prettyTimezoneOffset(B), h.model = z.models instanceof Array ? (W = z.models) == null ? void 0 : W[N] : z.models || "best_match", m) {
         const g = L();
         h.current = {
-          time: L.unix(Number(P.time())).utc().format()
+          time: L.unix(Number(m.time())).utc().format()
         };
-        for (let m = 0; m < P.variablesLength(); m++) {
-          const Z = P.variables(m).value();
-          h.current[z.current[m]] = isNaN(Z) ? null : Math.round(Z * c) / c;
+        for (let P = 0; P < m.variablesLength(); P++) {
+          const Z = m.variables(P).value();
+          h.current[z.current[P]] = isNaN(Z) ? null : Math.round(Z * c) / c;
         }
         const D = L();
         this.debug && K.debug("[%s] fetch current variables cost: %d ms", b.requestId, D.diff(g, "ms"));
@@ -1595,8 +1595,8 @@ class J0 {
           const k = (d = (o = (A = E.variables(Z).valuesArray()) == null ? void 0 : A.toString()) == null ? void 0 : o.split(",")) == null ? void 0 : d.map((_) => isNaN(_) ? null : Math.round(Number(_) * c) / c);
           h.hourly[z.hourly[Z]] = k;
         }
-        const m = L();
-        this.debug && K.debug("[%s] fetch hourly variables cost: %d ms", b.requestId, m.diff(g, "ms"));
+        const P = L();
+        this.debug && K.debug("[%s] fetch hourly variables cost: %d ms", b.requestId, P.diff(g, "ms"));
       }
       if (C) {
         const g = L(), D = L.unix(Number(C.time())).add(z.fake ? 1 : 0, "year");
@@ -1610,19 +1610,19 @@ class J0 {
           const k = (q = (X = (Y = C.variables(Z).valuesArray()) == null ? void 0 : Y.toString()) == null ? void 0 : X.split(",")) == null ? void 0 : q.map((_) => isNaN(_) ? null : Math.round(Number(_) * c) / c);
           C.variables(Z), h.sixHourly[z.six_hourly[Z / (b.memberLength ?? 1)]] = k;
         }
-        const m = L();
-        this.debug && K.debug("[%s] fetch 6-hourly variables cost: %d ms", b.requestId, m.diff(g, "ms"));
+        const P = L();
+        this.debug && K.debug("[%s] fetch 6-hourly variables cost: %d ms", b.requestId, P.diff(g, "ms"));
       }
       if (H) {
         const g = L();
         h.daily = {
           time: this.range(Number(H.time()), Number(H.timeEnd()), H.interval()).map(
-            (m) => L.unix(m).add(z.fake ? 1 : 0, "year").utc().format()
+            (P) => L.unix(P).add(z.fake ? 1 : 0, "year").utc().format()
           )
         };
-        for (let m = 0; m < H.variablesLength(); m += b.memberLength ?? 1) {
-          const Z = (r = (e = (f = H.variables(m).valuesArray()) == null ? void 0 : f.toString()) == null ? void 0 : e.split(",")) == null ? void 0 : r.map((k) => isNaN(k) ? null : Math.round(Number(k) * c) / c);
-          h.daily[z.daily[m / (b.memberLength ?? 1)]] = Z;
+        for (let P = 0; P < H.variablesLength(); P += b.memberLength ?? 1) {
+          const Z = (r = (e = (f = H.variables(P).valuesArray()) == null ? void 0 : f.toString()) == null ? void 0 : e.split(",")) == null ? void 0 : r.map((k) => isNaN(k) ? null : Math.round(Number(k) * c) / c);
+          h.daily[z.daily[P / (b.memberLength ?? 1)]] = Z;
         }
         const D = L();
         this.debug && K.debug("[%s] fetch daily variables cost: %d ms", b.requestId, D.diff(g, "ms"));
@@ -1791,7 +1791,7 @@ class J0 {
     };
     c && (q.daily = this.FORECAST.MARINE_VARIABLES.DAILY.split(",")), d || (A.forecastDays = A.forecastDays || 1, W = !0), W && (q.hourly = this.FORECAST.MARINE_VARIABLES.HOURLY.split(",")), await this.prepare(d == null ? void 0 : d.utc().format(), !0, q, A);
     let f = await this.marineForecast(q, A);
-    return (S = (B = (u = f[0]) == null ? void 0 : u.hourly) == null ? void 0 : B.wave_height) != null && S.every((P) => P === null) && (q.models = this.pickMarineModels("best_match,ncep_gfswave025,meteofrance_wave"), f = await this.marineForecast(q, A)), { weather: X, marine: f };
+    return (S = (B = (u = f[0]) == null ? void 0 : u.hourly) == null ? void 0 : B.wave_height) != null && S.every((m) => m === null || m === 0) && (q.models = this.pickMarineModels("best_match,ncep_gfswave025,meteofrance_wave"), f = await this.marineForecast(q, A)), { weather: X, marine: f };
   }
   /**
    * 历史再分析数据
@@ -1941,7 +1941,7 @@ class J0 {
         const o = A.data, d = M0.standardWeatherModels();
         for (const Y of d) {
           const X = M0.autoPickSubCategories(Y.alias), f = o.filter((e) => X.includes(e.category)).map((e) => {
-            var r, N, u, B, S, P;
+            var r, N, u, B, S, m;
             return {
               category: e.category,
               meta: {
@@ -1950,7 +1950,7 @@ class J0 {
                 initialisationTime: L.unix((u = e.meta) == null ? void 0 : u.last_run_initialisation_time).utc().format(),
                 modificationTime: L.unix((B = e.meta) == null ? void 0 : B.last_run_modification_time).utc().format(),
                 temporalResolution: Math.round(((S = e.meta) == null ? void 0 : S.temporal_resolution_seconds) / 3600),
-                frequency: Math.round(((P = e.meta) == null ? void 0 : P.update_interval_seconds) / 3600)
+                frequency: Math.round(((m = e.meta) == null ? void 0 : m.update_interval_seconds) / 3600)
               }
             };
           });
@@ -2120,9 +2120,10 @@ class $ {
     });
   }
   static async parseTropical(M) {
+    var W;
     const { id: z, name: b, strength: p } = M, c = {
       id: z == null ? void 0 : z.toLowerCase(),
-      name: b == null ? void 0 : b.toLowerCase(),
+      name: (W = b == null ? void 0 : b.toLowerCase()) == null ? void 0 : W.replaceAll(/\s/g, "-"),
       strength: p,
       history: await $.parseHistory(M.history),
       forecasts: await $.parseForecast(M.forecast)
@@ -2142,7 +2143,7 @@ const J = class J {
   static async parseHistory(M) {
     const z = `https://hifleet.com/hifleetapi/gettyphooninfo2.do?xuhao=${M}`, b = await Q.post(z).text(), p = await J.parser.parseStringPromise(b), c = p.typhoon.position instanceof Array ? p.typhoon.position : [p.typhoon.position], W = [];
     for (const A of c) {
-      const o = L(A.updatetime).utcOffset(8).utc().format(), d = Number(A.lat), Y = Number(A.lon), X = Number(A.pressure), q = Number(A.windspeed * 3600 / 1852), f = T.parseWindCircle(A.c7quad1 / 1.852), e = T.parseWindCircle(A.c7quad2 / 1.852), r = T.parseWindCircle(A.c7quad3 / 1.852), N = T.parseWindCircle(A.c7quad4 / 1.852), u = T.parseWindCircle(A.c10quad1 / 1.852), B = T.parseWindCircle(A.c10quad2 / 1.852), S = T.parseWindCircle(A.c10quad3 / 1.852), P = T.parseWindCircle(A.c10quad4 / 1.852), E = T.parseWindCircle(A.c12quad1 / 1.852), C = T.parseWindCircle(A.c12quad2 / 1.852), H = T.parseWindCircle(A.c12quad3 / 1.852), h = T.parseWindCircle(A.c12quad4 / 1.852), { r7: g, r10: D, r12: m } = T.estimateWindRadii(q, X, d), Z = {
+      const o = L(A.updatetime).utcOffset(8).utc().format(), d = Number(A.lat), Y = Number(A.lon), X = Number(A.pressure), q = Number(A.windspeed * 3600 / 1852), f = T.parseWindCircle(A.c7quad1 / 1.852), e = T.parseWindCircle(A.c7quad2 / 1.852), r = T.parseWindCircle(A.c7quad3 / 1.852), N = T.parseWindCircle(A.c7quad4 / 1.852), u = T.parseWindCircle(A.c10quad1 / 1.852), B = T.parseWindCircle(A.c10quad2 / 1.852), S = T.parseWindCircle(A.c10quad3 / 1.852), m = T.parseWindCircle(A.c10quad4 / 1.852), E = T.parseWindCircle(A.c12quad1 / 1.852), C = T.parseWindCircle(A.c12quad2 / 1.852), H = T.parseWindCircle(A.c12quad3 / 1.852), h = T.parseWindCircle(A.c12quad4 / 1.852), { r7: g, r10: D, r12: P } = T.estimateWindRadii(q, X, d), Z = {
         updated: o,
         lat: isNaN(d) ? null : d,
         lng: isNaN(Y) ? null : Y,
@@ -2159,8 +2160,8 @@ const J = class J {
           r10ne: u,
           r10nw: B,
           r10sw: S,
-          r10se: P,
-          r12: m,
+          r10se: m,
+          r12: P,
           r12ne: E,
           r12nw: C,
           r12sw: H,
@@ -2250,7 +2251,7 @@ let b0 = J;
 class j {
   static async parseHistory(M) {
     return M.map((z) => {
-      const b = Number(z.lat), p = Number(z.lon), c = Number(z.maxSP * 3600 / 1852), W = Number(z.minP), A = T.parseWindCircle(z.r7Ne / 1.852), o = T.parseWindCircle(z.r7Nw / 1.852), d = T.parseWindCircle(z.r7Se / 1.852), Y = T.parseWindCircle(z.r7Sw / 1.852), X = T.parseWindCircle(z.r10Ne / 1.852), q = T.parseWindCircle(z.r10Nw / 1.852), f = T.parseWindCircle(z.r10Se / 1.852), e = T.parseWindCircle(z.r10Sw / 1.852), r = T.parseWindCircle(z.r12Ne / 1.852), N = T.parseWindCircle(z.r12Nw / 1.852), u = T.parseWindCircle(z.r12Se / 1.852), B = T.parseWindCircle(z.r12Sw / 1.852), { r7: S, r10: P, r12: E } = T.estimateWindRadii(c, W, b);
+      const b = Number(z.lat), p = Number(z.lon), c = Number(z.maxSP * 3600 / 1852), W = Number(z.minP), A = T.parseWindCircle(z.r7Ne / 1.852), o = T.parseWindCircle(z.r7Nw / 1.852), d = T.parseWindCircle(z.r7Se / 1.852), Y = T.parseWindCircle(z.r7Sw / 1.852), X = T.parseWindCircle(z.r10Ne / 1.852), q = T.parseWindCircle(z.r10Nw / 1.852), f = T.parseWindCircle(z.r10Se / 1.852), e = T.parseWindCircle(z.r10Sw / 1.852), r = T.parseWindCircle(z.r12Ne / 1.852), N = T.parseWindCircle(z.r12Nw / 1.852), u = T.parseWindCircle(z.r12Se / 1.852), B = T.parseWindCircle(z.r12Sw / 1.852), { r7: S, r10: m, r12: E } = T.estimateWindRadii(c, W, b);
       return {
         updated: L.utc(z.realTime).format(),
         lat: isNaN(b) ? null : b || null,
@@ -2263,7 +2264,7 @@ class j {
           r7nw: o,
           r7se: d,
           r7sw: Y,
-          r10: P,
+          r10: m,
           r10ne: X,
           r10nw: q,
           r10se: f,
@@ -2281,7 +2282,7 @@ class j {
     return M.map((z) => {
       const b = z.currentPosition, p = z.forecastPoints, c = L.utc(b.realTime).format(), W = {};
       return p.forEach((A) => {
-        const o = L.utc(A.forecastTime), d = o.diff(c, "hour"), Y = Math.round(A.maxSP * 3600 / 1852), X = Math.round(A.maxSP * 3600 / 1852), q = A.pressure, f = T.parseWindCircle(A.r7Ne / 1.852), e = T.parseWindCircle(A.r7Nw / 1.852), r = T.parseWindCircle(A.r7Sw / 1.852), N = T.parseWindCircle(A.r7Se / 1.852), u = T.parseWindCircle(A.r10Ne / 1.852), B = T.parseWindCircle(A.r10Nw / 1.852), S = T.parseWindCircle(A.r10Sw / 1.852), P = T.parseWindCircle(A.r10Se / 1.852), E = T.parseWindCircle(A.r12Ne / 1.852), C = T.parseWindCircle(A.r12Nw / 1.852), H = T.parseWindCircle(A.r12Sw / 1.852), h = T.parseWindCircle(A.r12Se / 1.852), { r7: g, r10: D, r12: m } = T.estimateWindRadii(Y, q, A.lat);
+        const o = L.utc(A.forecastTime), d = o.diff(c, "hour"), Y = Math.round(A.maxSP * 3600 / 1852), X = Math.round(A.maxSP * 3600 / 1852), q = A.pressure, f = T.parseWindCircle(A.r7Ne / 1.852), e = T.parseWindCircle(A.r7Nw / 1.852), r = T.parseWindCircle(A.r7Sw / 1.852), N = T.parseWindCircle(A.r7Se / 1.852), u = T.parseWindCircle(A.r10Ne / 1.852), B = T.parseWindCircle(A.r10Nw / 1.852), S = T.parseWindCircle(A.r10Sw / 1.852), m = T.parseWindCircle(A.r10Se / 1.852), E = T.parseWindCircle(A.r12Ne / 1.852), C = T.parseWindCircle(A.r12Nw / 1.852), H = T.parseWindCircle(A.r12Sw / 1.852), h = T.parseWindCircle(A.r12Se / 1.852), { r7: g, r10: D, r12: P } = T.estimateWindRadii(Y, q, A.lat);
         W[d] = {
           lat: A.lat,
           lng: A.lon,
@@ -2300,8 +2301,8 @@ class j {
             r10ne: u,
             r10nw: B,
             r10sw: S,
-            r10se: P,
-            r12: m,
+            r10se: m,
+            r12: P,
             r12ne: E,
             r12nw: C,
             r12sw: H,