@idm-plugin/meteo2 0.4.2 → 0.4.3

package/dist/index.js

@@ -36,8 +36,8 @@ class m0 {
       timeout: 3e4
     }, X = L(), R = X.valueOf();
     A.isBefore(X.subtract(1, "month")) && (r == null || r.warn("[%s] get history meteo on %s: %j", Y.requestId, A.format(), q));
-    const T = "https://aod4idm.idmwx.com/api/ocean/point", d = await $.get(T, q).json(), S = L().valueOf();
-    if (r == null || r.info("[%s] get meteo(cost: %d ms) from %s with options: %j", Y.requestId, S - R, T, q), (d == null ? void 0 : d.code) === 0)
+    const T = "https://aod4idm.idmwx.com/api/ocean/point", d = await $.get(T, q).json(), N = L().valueOf();
+    if (r == null || r.info("[%s] get meteo(cost: %d ms) from %s with options: %j", Y.requestId, N - R, T, q), (d == null ? void 0 : d.code) === 0)
       return {
         ...d.data,
         source: o
@@ -71,8 +71,8 @@ class m0 {
       timeout: 3e4
     }, X = L(), R = X.valueOf();
     A.isBefore(X.subtract(1, "month")) && (r == null || r.warn("[%s] get history factors on %s: %j", Y.requestId, A.format(), q));
-    const T = "https://aod4idm.idmwx.com/api/ocean/factor", d = await $.get(T, q).json(), S = L().valueOf();
-    if (r == null || r.info("[%s] get factors(cost: %d ms) from %s with options: %j", Y.requestId, S - R, T, q), (d == null ? void 0 : d.code) === 0)
+    const T = "https://aod4idm.idmwx.com/api/ocean/factor", d = await $.get(T, q).json(), N = L().valueOf();
+    if (r == null || r.info("[%s] get factors(cost: %d ms) from %s with options: %j", Y.requestId, N - R, T, q), (d == null ? void 0 : d.code) === 0)
       return {
         ...d.data,
         source: o
@@ -133,8 +133,8 @@ class m0 {
       }).json();
       X = L().valueOf(), r == null || r.info("[%s] get gfs-wave-factors(cost: %d ms) from %s", O.requestId, X - A, o);
       for (let d = 0; d < q.ts.length; d++) {
-        const S = this.populateUVFactor(q["wind_u-surface"][d], q["wind_v-surface"][d], !1, O);
-        S.scale = this.calculateBeaufortWindForceScale(S.speed), Y.push({
+        const N = this.populateUVFactor(q["wind_u-surface"][d], q["wind_v-surface"][d], !1, O);
+        N.scale = this.calculateBeaufortWindForceScale(N.speed), Y.push({
           utc: L(q.ts[d]).utc().format(),
           temp: q["temp-surface"][d] ? Math.round((q["temp-surface"][d] - 273.15) * 100) / 100 : void 0,
           dp_temp: q["dewpoint-surface"][d] ? Math.round((q["dewpoint-surface"][d] - 273.15) * 100) / 100 : void 0,
@@ -143,7 +143,7 @@ class m0 {
             inter3hSnow: q["past3hsnowprecip-surface"][d] ? Math.round(q["past3hsnowprecip-surface"][d] * 1e3 * 1e3) / 1e3 : 0,
             inter3hConv: q["past3hconvprecip-surface"][d] ? Math.round(q["past3hconvprecip-surface"][d] * 1e3 * 1e3) / 1e3 : 0
           },
-          wind: S,
+          wind: N,
           gusts: {
             speed: Math.round((q["gust-surface"][d] || 0) * 100) / 100,
             kts: this.convertMs2Kts(q["gust-surface"][d])
@@ -158,20 +158,20 @@ class m0 {
       }
       const T = [];
       for (let d = 0; d < R.ts.length; d++) {
-        const S = this.calculateDouglasScale(R["waves_height-surface"][d], R["waves_direction-surface"][d], R["waves_period-surface"][d]), N = this.calculateDouglasScale(R["wwaves_height-surface"][d], R["wwaves_direction-surface"][d], R["wwaves_period-surface"][d]), l = this.calculateDouglasScale(R["swell1_height-surface"][d], R["swell1_direction-surface"][d], R["swell1_period-surface"][d]), V = this.calculateDouglasScale(R["swell2_height-surface"][d], R["swell2_direction-surface"][d], R["swell2_period-surface"][d]);
+        const N = this.calculateDouglasScale(R["waves_height-surface"][d], R["waves_direction-surface"][d], R["waves_period-surface"][d]), S = this.calculateDouglasScale(R["wwaves_height-surface"][d], R["wwaves_direction-surface"][d], R["wwaves_period-surface"][d]), l = this.calculateDouglasScale(R["swell1_height-surface"][d], R["swell1_direction-surface"][d], R["swell1_period-surface"][d]), V = this.calculateDouglasScale(R["swell2_height-surface"][d], R["swell2_direction-surface"][d], R["swell2_period-surface"][d]);
         T.push({
           utc: L(R.ts[d]).utc().format(),
           wave: {
-            sig: S,
-            wd: N,
+            sig: N,
+            wd: S,
             swell: l,
             swell2: V
           }
         });
       }
       for (const d of Y) {
-        const S = T.find((N) => N.utc === d.utc);
-        d.wave = S == null ? void 0 : S.wave;
+        const N = T.find((S) => S.utc === d.utc);
+        d.wave = N == null ? void 0 : N.wave;
       }
     } catch (A) {
       r.warn("[%s] get-gfs-factor failed: %s", O.requestId, A);
@@ -296,7 +296,7 @@ var c0 = { exports: {} };
     function d(z) {
       return z > 96 ? z - 87 : z > 64 ? z - 29 : z - 48;
     }
-    function S(z) {
+    function N(z) {
       var c = 0, W = z.split("."), a = W[0], n = W[1] || "", i = 1, t, f = 0, B = 1;
       for (z.charCodeAt(0) === 45 && (c = 1, B = -1), c; c < a.length; c++)
         t = d(a.charCodeAt(c)), f = 60 * f + t;
@@ -304,9 +304,9 @@ var c0 = { exports: {} };
         i = i / 60, t = d(n.charCodeAt(c)), f += t * i;
       return f * B;
     }
-    function N(z) {
+    function S(z) {
       for (var c = 0; c < z.length; c++)
-        z[c] = S(z[c]);
+        z[c] = N(z[c]);
     }
     function l(z, c) {
       for (var W = 0; W < c; W++)
@@ -321,7 +321,7 @@ var c0 = { exports: {} };
     }
     function E(z) {
       var c = z.split("|"), W = c[2].split(" "), a = c[3].split(""), n = c[4].split(" ");
-      return N(W), N(a), N(n), l(n, a.length), {
+      return S(W), S(a), S(n), l(n, a.length), {
         name: c[0],
         abbrs: V(c[1].split(" "), a),
         offsets: V(W, a),
@@ -407,7 +407,7 @@ var c0 = { exports: {} };
     }
     function m(z, c) {
       var W, a;
-      for (N(c), W = 0; W < c.length; W++)
+      for (S(c), W = 0; W < c.length; W++)
         a = c[W], A[a] = A[a] || {}, A[a][z] = !0;
     }
     function s(z) {
@@ -513,7 +513,7 @@ var c0 = { exports: {} };
       var c = Array.prototype.slice.call(arguments, 0, -1), W = arguments[arguments.length - 1], a = M.utc.apply(null, c), n;
       return !M.isMoment(z) && x(a) && (n = K(W)) && a.add(n.parse(a), "minutes"), a.tz(W), a;
     }
-    U.version = b, U.dataVersion = "", U._zones = p, U._links = O, U._names = Y, U._countries = o, U.add = z0, U.link = b0, U.load = X0, U.zone = K, U.zoneExists = j, U.guess = F, U.names = q0, U.Zone = h, U.unpack = E, U.unpackBase60 = S, U.needsOffset = x, U.moveInvalidForward = !0, U.moveAmbiguousForward = !1, U.countries = o0, U.zonesForCountry = a0;
+    U.version = b, U.dataVersion = "", U._zones = p, U._links = O, U._names = Y, U._countries = o, U.add = z0, U.link = b0, U.load = X0, U.zone = K, U.zoneExists = j, U.guess = F, U.names = q0, U.Zone = h, U.unpack = E, U.unpackBase60 = N, U.needsOffset = x, U.moveInvalidForward = !0, U.moveAmbiguousForward = !1, U.countries = o0, U.zonesForCountry = a0;
     var D = M.fn;
     M.tz = U, M.defaultZone = null, M.updateOffset = function(z, c) {
       var W = M.defaultZone, a;
@@ -1561,7 +1561,7 @@ class C0 {
    * @private
    */
   async parseWeatherData(M, b, p = {}) {
-    var Y, A, q, X, R, T, d, S, N, l;
+    var Y, A, q, X, R, T, d, N, S, l;
     const O = [], o = Math.pow(10, p.precision || 6);
     for (let V = 0; V < M.length; V++) {
       const E = M[V], h = E.utcOffsetSeconds(), y = E.timezone(), _ = E.current(), I = E.hourly(), G = E.sixHourly(), Q = E.daily(), P = {};
@@ -1615,7 +1615,7 @@ class C0 {
           )
         };
         for (let s = 0; s < Q.variablesLength(); s += p.memberLength ?? 1) {
-          const u = (l = (N = (S = Q.variables(s).valuesArray()) == null ? void 0 : S.toString()) == null ? void 0 : N.split(",")) == null ? void 0 : l.map((F) => isNaN(F) ? null : Math.round(Number(F) * o) / o);
+          const u = (l = (S = (N = Q.variables(s).valuesArray()) == null ? void 0 : N.toString()) == null ? void 0 : S.split(",")) == null ? void 0 : l.map((F) => isNaN(F) ? null : Math.round(Number(F) * o) / o);
           P.daily[b.daily[s / (p.memberLength ?? 1)]] = u;
         }
         const m = L();
@@ -1741,7 +1741,7 @@ class C0 {
     precision: 6,
     selfHosted: !0
   }) {
-    var S, N, l;
+    var N, S, l;
     b = this.toStdLng(b), this.debug && Z.info("[%s] spot forecast params: %j", A.requestId, { lat: M, lng: b, datetime: p, simplify: O, withDaily: o, withHourly: Y, options: A });
     const q = {
       apikey: this.apikey,
@@ -1749,7 +1749,7 @@ class C0 {
       longitude: b,
       cell_selection: "sea",
       wind_speed_unit: "kn",
-      models: ((S = A.weatherModels) == null ? void 0 : S.split(",")) || ["best_match"],
+      models: ((N = A.weatherModels) == null ? void 0 : N.split(",")) || ["best_match"],
       timezone: "auto"
     };
     let X;
@@ -1757,7 +1757,7 @@ class C0 {
       const V = this.timezoneOffset(M, b);
       X = L.utc(p).utcOffset(V), X.subtract(V > 0 ? V : -V, "h");
     }
-    o && (q.daily = ((N = this.FORECAST.WEATHER_VARIABLES.NORMAL.DAILY) == null ? void 0 : N.split(",")) || []), X || (A.forecastDays = A.forecastDays || 1, A.pastDays = 0, Y = !0), Y && (q.hourly = ((l = this.FORECAST.WEATHER_VARIABLES.NORMAL.HOURLY) == null ? void 0 : l.split(",")) || []), 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 > 14 ? 14 : A.forecastDays < 0 ? 1 : A.forecastDays, this.prepare(X == null ? void 0 : X.utc().format(), !1, q, A);
+    o && (q.daily = ((S = this.FORECAST.WEATHER_VARIABLES.NORMAL.DAILY) == null ? void 0 : S.split(",")) || []), X || (A.forecastDays = A.forecastDays || 1, A.pastDays = 0, Y = !0), Y && (q.hourly = ((l = this.FORECAST.WEATHER_VARIABLES.NORMAL.HOURLY) == null ? void 0 : l.split(",")) || []), 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 > 14 ? 14 : A.forecastDays < 0 ? 1 : A.forecastDays, this.prepare(X == null ? void 0 : X.utc().format(), !1, q, A);
     const R = await this.weatherForecast(q, A), T = {
       apikey: this.apikey,
       latitude: M,
@@ -1812,8 +1812,8 @@ class C0 {
       end_date: T.format("YYYY-MM-DD")
     };
     o && (d.daily = this.HISTORICAL.WEATHER_VARIABLES.DAILY.split(",")), Y && (d.hourly = this.HISTORICAL.WEATHER_VARIABLES.HOURLY.split(","));
-    const S = await this.weatherForecast(d, q);
-    let N;
+    const N = await this.weatherForecast(d, q);
+    let S;
     if (A) {
       const E = {
         apikey: this.apikey,
@@ -1829,9 +1829,9 @@ class C0 {
         start_date: R.format("YYYY-MM-DD"),
         end_date: T.format("YYYY-MM-DD")
       };
-      N = await this.marineForecast(E, q);
+      S = await this.marineForecast(E, q);
     }
-    return { weather: S, marine: N };
+    return { weather: N, marine: S };
   }
   /**
    * 季节预报数据
@@ -1918,21 +1918,21 @@ class C0 {
       if (A.code === 0) {
         const q = A.data, X = k.standardWeatherModels();
         for (const R of X) {
-          const T = k.autoPickSubCategories(R.alias), S = q.filter((N) => T.includes(N.category)).map((N) => {
+          const T = k.autoPickSubCategories(R.alias), N = q.filter((S) => T.includes(S.category)).map((S) => {
             var l, V, E, h, y, _;
             return {
-              category: N.category,
+              category: S.category,
               meta: {
-                endTime: L.unix((l = N.meta) == null ? void 0 : l.data_end_time).utc().format(),
-                availabilityTime: L.unix((V = N.meta) == null ? void 0 : V.last_run_availability_time).utc().format(),
-                initialisationTime: L.unix((E = N.meta) == null ? void 0 : E.last_run_initialisation_time).utc().format(),
-                modificationTime: L.unix((h = N.meta) == null ? void 0 : h.last_run_modification_time).utc().format(),
-                temporalResolution: Math.round(((y = N.meta) == null ? void 0 : y.temporal_resolution_seconds) / 3600),
-                frequency: Math.round(((_ = N.meta) == null ? void 0 : _.update_interval_seconds) / 3600)
+                endTime: L.unix((l = S.meta) == null ? void 0 : l.data_end_time).utc().format(),
+                availabilityTime: L.unix((V = S.meta) == null ? void 0 : V.last_run_availability_time).utc().format(),
+                initialisationTime: L.unix((E = S.meta) == null ? void 0 : E.last_run_initialisation_time).utc().format(),
+                modificationTime: L.unix((h = S.meta) == null ? void 0 : h.last_run_modification_time).utc().format(),
+                temporalResolution: Math.round(((y = S.meta) == null ? void 0 : y.temporal_resolution_seconds) / 3600),
+                frequency: Math.round(((_ = S.meta) == null ? void 0 : _.update_interval_seconds) / 3600)
               }
             };
           });
-          R.update.length && (this.METEO2_UPDATE[R.alias] = S);
+          N.length && (this.METEO2_UPDATE[R.alias] = N);
         }
         this.METEO2_UPDATE.version = p + 1, this.METEO2_UPDATE.etime = O.unix();
       }