@idm-plugin/vessel 3.6.1 → 3.6.2

package/dist/index.js

@@ -1,10 +1,10 @@
 var ht = Object.defineProperty;
 var mt = (x, e, t) => e in x ? ht(x, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : x[e] = t;
 var U = (x, e, t) => (mt(x, typeof e != "symbol" ? e + "" : e, t), t);
-import B from "got";
+import z from "got";
 import dt from "@log4js-node/log4js-api";
 import w from "moment";
-import { LaneHelper as O, LngLatHelper as z } from "@idm-plugin/geo2";
+import { LaneHelper as R, LngLatHelper as J } from "@idm-plugin/geo2";
 import { MeteoHelper2 as ft } from "@idm-plugin/meteo2";
 import { Meteo2Assist as ct } from "@idm-plugin/meteo";
 let g;
@@ -54,7 +54,7 @@ class at {
     return { labelCn: t, labelEn: a };
   }
 }
-class jt extends at {
+class Tt extends at {
   constructor(t, a) {
     super();
     U(this, "clientId");
@@ -69,7 +69,7 @@ class jt extends at {
         client_secret: this.clientSecret,
         grant_type: "client_credentials"
       }
-    }, n = await B.post(a, o).json();
+    }, n = await z.post(a, o).json();
     g == null || g.info("[%s] fetch access token from: %s - %j", t.requestId, a, n), n.error || (this.token = {
       accessToken: n.access_token,
       tokenType: n.token_type,
@@ -101,7 +101,7 @@ class jt extends at {
       }
     };
     g == null || g.info("[%s] fetch suggest vessels from: %s - %j", a.requestId, o, n);
-    const i = await B.post(o, n).json();
+    const i = await z.post(o, n).json();
     return i.status !== 200 ? (g == null || g.warn("[%s] fetch suggest vessels failed: %j", a.requestId, { message: i.message, status: i.status, code: i.code }), []) : (i.data || []).map((u) => ({
       mmsi: u.mmsi,
       name: u.nameEn,
@@ -129,7 +129,7 @@ class jt extends at {
       searchParams: i
     };
     g == null || g.info("[%s] fetch vessel from: %s - %j", a.requestId, n, s);
-    const r = await B.get(n, s).json();
+    const r = await z.get(n, s).json();
     if (r.status !== 200)
       return g == null || g.warn("[%s] fetch suggest vessels failed: %j", a.requestId, { message: r.message, status: r.status, code: r.code }), {};
     {
@@ -173,7 +173,7 @@ class jt extends at {
       }
     };
     g == null || g.info("[%s] fetch vessel archive from: %s - %j", a.requestId, o, n);
-    const i = await B.post(o, n).json();
+    const i = await z.post(o, n).json();
     return i.status !== 200 ? (g == null || g.warn("[%s] fetch vessel archive failed: %j", a.requestId, { message: i.message, status: i.status, code: i.code }), {}) : i.data;
   }
   async realTimePosition(t, a = {}) {
@@ -186,7 +186,7 @@ class jt extends at {
       searchParams: { mmsi: t }
     };
     g == null || g.info("[%s] fetch realtime position from: %s - %j", a.requestId, o, n);
-    const i = await B.get(o, n).json();
+    const i = await z.get(o, n).json();
     if (i.code)
       return g == null || g.warn("[%s] fetch realtime position failed: %j", a.requestId, { message: i.message, status: i.status, code: i.code }), i;
     const s = i.data;
@@ -237,7 +237,7 @@ class jt extends at {
    * @param options { requiretId: '请求ID', useAIModel: '启用AI算法', withECA: '是否计算低硫区航行距离', withSpecial: '是否计算穿越的特战区列表和海盗区列表', draught: '最大吃水' }
    */
   async calculateRoute(t, a, o, n, i, s = {}) {
-    var k, b, S;
+    var k, b, F;
     const r = w();
     await this.checkToken(s);
     const l = "https://market.myvessel.cn/sdc/v1/mkt/routes/plan", u = {
@@ -260,7 +260,7 @@ class jt extends at {
       json: u
     };
     g == null || g.info("[%s] fetch route from: %s - %j", s.requestId, l, c);
-    const h = await B.post(l, c).json();
+    const h = await z.post(l, c).json();
     if (h.status !== 200)
       return g == null || g.warn("[%s] fetch route failed: %j", s.requestId, { message: h.message, status: h.status, code: h.code }), {};
     {
@@ -273,8 +273,8 @@ class jt extends at {
         route: [],
         distance: 0,
         memo: ""
-      }, { nodes: p, seas: v, tracks: f, specialRegions: d, ecaLength: m } = h.data;
-      I.nodes = p == null ? void 0 : p.map((M) => ({
+      }, { nodes: v, seas: p, tracks: f, specialRegions: d, ecaLength: m } = h.data;
+      I.nodes = v == null ? void 0 : v.map((M) => ({
         code: M.nodeCode,
         nameEn: M.nameEn,
         nameCn: M.nameCn,
@@ -297,7 +297,7 @@ class jt extends at {
         isKey: M.isKeyNode,
         // 重要枢纽节点
         isHub: M.isHubNode
-      })), I.seas = v == null ? void 0 : v.map((M) => ({
+      })), I.seas = p == null ? void 0 : p.map((M) => ({
         code: M.mrgidSea,
         nameEn: M.nameEn,
         nameCn: M.nameCn,
@@ -329,9 +329,9 @@ class jt extends at {
       }), I.waypoints = f == null ? void 0 : f.map((M) => ({
         lat: Math.round(M.lat * 1e5) / 1e5,
         lng: Math.round(M.lon * 1e5) / 1e5
-      })), (S = I.waypoints) != null && S.length && (I.waypoints = O.simplifyCoordinates(I.waypoints), I.route = O.divideAccordingToLng(I.waypoints), I.distance = O.calculateRouteDistance(I.route), I.distanceInECA = m);
-      const C = w().diff(r, "second");
-      return I.memo = `time cost: ${C}s`, g.info("[%s] calculate route cost: %d seconds", s.requestId, C), I;
+      })), (F = I.waypoints) != null && F.length && (I.waypoints = R.simplifyCoordinates(I.waypoints), I.route = R.divideAccordingToLng(I.waypoints), I.distance = R.calculateRouteDistance(I.route), I.distanceInECA = m);
+      const S = w().diff(r, "second");
+      return I.memo = `time cost: ${S}s`, g.info("[%s] calculate route cost: %d seconds", s.requestId, S), I;
     }
   }
   async trajectory(t, a, o, n, i = !0, s = {}) {
@@ -342,10 +342,10 @@ class jt extends at {
     return await this.trajectoryIn30Day(t, l, u, r, n, c, s), c;
   }
   async trajectoryIn30Day(t, a, o, n, i, s, r = {}) {
-    var b, S, I, p, v;
+    var b, F, I, v, p;
     const l = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/track", u = {
       headers: {
-        Authorization: `${(b = this.token) == null ? void 0 : b.tokenType} ${(S = this.token) == null ? void 0 : S.accessToken}`
+        Authorization: `${(b = this.token) == null ? void 0 : b.tokenType} ${(F = this.token) == null ? void 0 : F.accessToken}`
       },
       json: {
         mmsi: t,
@@ -354,15 +354,15 @@ class jt extends at {
       }
     };
     g == null || g.info("[%s] fetch trajectory from: %s - %j", r.requestId, l, u);
-    const c = await B.post(l, u).json();
+    const c = await z.post(l, u).json();
     if (c.code)
       return g == null || g.warn("[%s] fetch trajectory failed: %j", r.requestId, l, { message: c.message, status: c.status, code: c.code }), c;
     let h = -1;
-    const k = w(`${(p = (I = c.data) == null ? void 0 : I[0]) == null ? void 0 : p.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-    return (v = c.data) == null || v.forEach((f) => {
-      for (const P in f)
-        !isNaN(f[P]) && Number(f[P]) !== 1 / 0 && (f[P] = Number(f[P]));
-      const d = w(`${f.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00"), m = f.status, { labelCn: y, labelEn: C } = this.parseStatus(m), M = {
+    const k = w(`${(v = (I = c.data) == null ? void 0 : I[0]) == null ? void 0 : v.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    return (p = c.data) == null || p.forEach((f) => {
+      for (const N in f)
+        !isNaN(f[N]) && Number(f[N]) !== 1 / 0 && (f[N] = Number(f[N]));
+      const d = w(`${f.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00"), m = f.status, { labelCn: y, labelEn: S } = this.parseStatus(m), M = {
         mmsi: f.mmsi,
         imo: n == null ? void 0 : n.imo,
         lat: f.lat,
@@ -376,7 +376,7 @@ class jt extends at {
         destination: f.dest,
         positionTime: d.unix(),
         labelCn: y,
-        labelEn: C,
+        labelEn: S,
         method: "trajectory",
         vendor: "myVessel",
         utc: d.utc().format()
@@ -385,7 +385,7 @@ class jt extends at {
     }), s;
   }
 }
-class Ft extends at {
+class jt extends at {
   constructor(t) {
     super();
     U(this, "token");
@@ -397,7 +397,7 @@ class Ft extends at {
         mmsi: t,
         usertoken: this.token
       }
-    }, i = await B.post(o, n).json();
+    }, i = await z.post(o, n).json();
     g == null || g.info("[%s] fetch realtime position from: %s - %j", a.requestId, o, n);
     const s = i == null ? void 0 : i.list;
     if (!s)
@@ -447,7 +447,7 @@ class Ft extends at {
         Host: "www.hifleet.com"
       }
     };
-    let i = await B.post(o, n).json();
+    let i = await z.post(o, n).json();
     g == null || g.info("[%s] fetch vessel props from: %s - %j", a.requestId, o, n), i instanceof Array && (i = i[0]);
     for (const r in i)
       !isNaN(i[r]) && Number(i[r]) !== 1 / 0 && (i[r] = Number(i[r]));
@@ -461,7 +461,7 @@ class Ft extends at {
       draught: i.dr,
       type: i.t
     };
-    return o = "https://www.hifleet.com/hifleetapi/sameShipSearch.do", i = await B.post(o, n).json(), g == null || g.info("[%s] search vessel dead weight from: %s - %j", a.requestId, o, n), i instanceof Array && (i = i[0]), i && (s.deadweight = Number(i.dwt)), s;
+    return o = "https://www.hifleet.com/hifleetapi/sameShipSearch.do", i = await z.post(o, n).json(), g == null || g.info("[%s] search vessel dead weight from: %s - %j", a.requestId, o, n), i instanceof Array && (i = i[0]), i && (s.deadweight = Number(i.dwt)), s;
   }
   async suggest(t, a = {}) {
     const o = "https://www.hifleet.com/hifleetapi/getShipSuggest.do", n = {
@@ -473,7 +473,7 @@ class Ft extends at {
         Origin: "https://www.hifleet.com",
         Host: "www.hifleet.com"
       }
-    }, i = await B.post(o, n).json();
+    }, i = await z.post(o, n).json();
     g == null || g.info("[%s] suggest vessel props from: %s - %j", a.requestId, o, n);
     const s = [];
     for (const r of i)
@@ -502,19 +502,19 @@ class Ft extends at {
         mmsi: t,
         usertoken: this.token
       }
-    }, k = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", b = await B.get(k, h).json();
+    }, k = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", b = await z.get(k, h).json();
     g == null || g.info("[%s] fetch trajectory from: %s - %j", s.requestId, k, h);
-    let S;
-    b && (S = ((d = (f = b.ships) == null ? void 0 : f.offors) == null ? void 0 : d.ship) || [], S.length || g == null || g.warn("[%s] fetch trajectory failed: %j", s.requestId, b));
+    let F;
+    b && (F = ((d = (f = b.ships) == null ? void 0 : f.offors) == null ? void 0 : d.ship) || [], F.length || g == null || g.warn("[%s] fetch trajectory failed: %j", s.requestId, b));
     const I = [];
-    let p = -1;
-    const v = w(`${(m = S == null ? void 0 : S[0]) == null ? void 0 : m.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-    for (const y of S) {
-      for (const H in y)
-        !isNaN(y[H]) && Number(y[H]) !== 1 / 0 && (y[H] = Number(y[H]));
-      const C = w(`${y.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    let v = -1;
+    const p = w(`${(m = F == null ? void 0 : F[0]) == null ? void 0 : m.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    for (const y of F) {
+      for (const L in y)
+        !isNaN(y[L]) && Number(y[L]) !== 1 / 0 && (y[L] = Number(y[L]));
+      const S = w(`${y.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
       y.status = y.sp > 4 ? 0 : 1;
-      const { labelEn: M, labelCn: j } = this.parseStatus(y.status), P = {
+      const { labelEn: M, labelCn: j } = this.parseStatus(y.status), N = {
         mmsi: y.m,
         name: y.n,
         imo: r == null ? void 0 : r.imo,
@@ -524,20 +524,20 @@ class Ft extends at {
         sog: y.sp,
         cog: y.co,
         hdg: y.hdg,
-        positionTime: C.unix(),
-        utc: C.utc().format(),
+        positionTime: S.unix(),
+        utc: S.utc().format(),
         status: y.status,
         labelCn: j,
         labelEn: M,
         method: "trajectory",
         vendor: "hifleet"
-      }, D = Math.floor(C.diff(v, "minute", !0) / (n || 1));
-      D !== p && (p = D, I.push(P));
+      }, D = Math.floor(S.diff(p, "minute", !0) / (n || 1));
+      D !== v && (v = D, I.push(N));
     }
     return I;
   }
 }
-class Nt extends at {
+class xt extends at {
   constructor(t) {
     super();
     U(this, "token");
@@ -550,7 +550,7 @@ class Nt extends at {
         k: this.token,
         enc: 1
       }
-    }, n = "https://api.shipxy.com/apicall/GetSingleShip", i = await B.get(n, o).json();
+    }, n = "https://api.shipxy.com/apicall/GetSingleShip", i = await z.get(n, o).json();
     if (g == null || g.info("[%s] fetch realtime position from: %s - %j", a.requestId, n, o), (i == null ? void 0 : i.status) !== 0)
       return i;
     const s = i.data[0];
@@ -581,7 +581,7 @@ class Nt extends at {
     };
   }
   async trajectory(t, a, o, n, i = !0, s = {}) {
-    var v;
+    var p;
     const r = await this.realTimePosition(t, s), l = w(a), u = w(o), c = "https://api.shipxy.com/apicall/GetShipTrack", h = {
       searchParams: {
         id: t,
@@ -591,11 +591,11 @@ class Nt extends at {
         btm: l.unix(),
         etm: u.unix()
       }
-    }, k = await B.get(c, h).json();
+    }, k = await z.get(c, h).json();
     if (g == null || g.info("[%s] fetch trajectory from: %s - %j", s.requestId, c, h), (k == null ? void 0 : k.status) !== 0)
       return k;
-    const b = k == null ? void 0 : k.points, S = [], I = w.unix((v = b[0]) == null ? void 0 : v.utc);
-    let p = -1;
+    const b = k == null ? void 0 : k.points, F = [], I = w.unix((p = b[0]) == null ? void 0 : p.utc);
+    let v = -1;
     for (const f of b) {
       const d = w.unix(f.utc), m = {
         imo: r == null ? void 0 : r.imo,
@@ -609,12 +609,12 @@ class Nt extends at {
         method: "trajectory",
         vendor: "shipxy"
       }, y = Math.floor(d.diff(I, "minute", !0) / (n || 1));
-      y !== p && (p = y, S.push(m));
+      y !== v && (v = y, F.push(m));
     }
-    return S;
+    return F;
   }
 }
-class xt extends at {
+class Nt extends at {
   constructor(t) {
     super();
     U(this, "token");
@@ -628,7 +628,7 @@ class xt extends at {
       json: {
         mmsiList: t
       }
-    }, n = "https://api3.myships.com/sp/ships/getShipIdByMMSI", i = await B.post(n, o).json();
+    }, n = "https://api3.myships.com/sp/ships/getShipIdByMMSI", i = await z.post(n, o).json();
     return g == null || g.info("[%s] fetch ship id from: %s - %j", a.requestId, n, o), i.code !== "0" ? i : i.data[0].shipId;
   }
   async getShipInfo(t, a = {}) {
@@ -639,7 +639,7 @@ class xt extends at {
       json: {
         shipId: t
       }
-    }, n = "https://api3.myships.com/sp/ships/aissta", i = await B.post(n, o).json();
+    }, n = "https://api3.myships.com/sp/ships/aissta", i = await z.post(n, o).json();
     if (g == null || g.info("[%s] fetch ship info from: %s - %j", a.requestId, n, o), i.code !== "0")
       return i;
     const s = i.data;
@@ -662,7 +662,7 @@ class xt extends at {
       json: {
         shipId: o
       }
-    }, s = "https://api3.myships.com/sp/ships/position/latest", r = await B.post(s, i).json();
+    }, s = "https://api3.myships.com/sp/ships/position/latest", r = await z.post(s, i).json();
     g == null || g.info("[%s] fetch realtime position from: %s - %j", a.requestId, s, i);
     const l = r.data[0];
     for (const b in l)
@@ -703,37 +703,37 @@ class xt extends at {
         startTime: a,
         endTime: o
       }
-    }, c = "https://api3.myships.com/sp/ships/position/history", h = await B.post(c, u).json();
+    }, c = "https://api3.myships.com/sp/ships/position/history", h = await z.post(c, u).json();
     if (g == null || g.info("[%s] fetch trajectory from: %s - %j", l.requestId, c, u), h.code !== "0")
       return g == null || g.warn("[%s] invoke myship trajectory failed: %j", l.requestId, h), h;
     const k = h.data;
-    for (const p in k)
-      !isNaN(k[p]) && Number(k[p]) !== 1 / 0 && (k[p] = Number(k[p]));
+    for (const v in k)
+      !isNaN(k[v]) && Number(k[v]) !== 1 / 0 && (k[v] = Number(k[v]));
     const b = w.unix((I = k[0]) == null ? void 0 : I.posTime);
-    let S = -1;
-    for (const p of k) {
-      const v = w.unix(p.posTime), f = {
+    let F = -1;
+    for (const v of k) {
+      const p = w.unix(v.posTime), f = {
         imo: n == null ? void 0 : n.imo,
         mmsi: i,
-        lat: Math.round(p.lat / 1e4 / 60 * 1e5) / 1e5,
-        lng: Math.round(p.lon / 1e4 / 60 * 1e5) / 1e5,
-        sog: Math.round(p.sog / 10 * 100) / 100,
-        cog: Math.round(p.cog / 10 * 100) / 100,
-        hdg: Math.round(p.heading * 100) / 100,
-        rot: Math.round(p.rot * 100) / 100,
-        positionTime: v.unix(),
-        utc: v.utc().format(),
+        lat: Math.round(v.lat / 1e4 / 60 * 1e5) / 1e5,
+        lng: Math.round(v.lon / 1e4 / 60 * 1e5) / 1e5,
+        sog: Math.round(v.sog / 10 * 100) / 100,
+        cog: Math.round(v.cog / 10 * 100) / 100,
+        hdg: Math.round(v.heading * 100) / 100,
+        rot: Math.round(v.rot * 100) / 100,
+        positionTime: p.unix(),
+        utc: p.utc().format(),
         method: "trajectory",
         vendor: "myship"
-      }, d = Math.floor(v.diff(b, "minute", !0) / (s || 1));
-      d !== S && (S = d, r.push(f));
+      }, d = Math.floor(p.diff(b, "minute", !0) / (s || 1));
+      d !== F && (F = d, r.push(f));
     }
     return r;
   }
 }
-let J;
+let K;
 try {
-  J = dt.getLogger("vessel");
+  K = dt.getLogger("vessel");
 } catch {
 } finally {
 }
@@ -749,7 +749,7 @@ class Mt {
    */
   parsePrinciple(e, t = {}) {
     var s, r, l;
-    J == null || J.debug("[%s] parse rule: %s", t.requestId, e);
+    K == null || K.debug("[%s] parse rule: %s", t.requestId, e);
     const a = new RegExp("(?<=\\[)(.+)(?=])", "g"), o = e.match(a) ? (s = e.match(a)) == null ? void 0 : s[0] : void 0, n = o == null ? void 0 : o.split(";");
     if (!n)
       return;
@@ -774,7 +774,7 @@ class Mt {
    */
   parseRule(e, t = {}) {
     var i;
-    J == null || J.debug("[%s] parse rule: %s", t.requestId, e), e = e.startsWith("[") ? e : `[${e}`, e = e.endsWith("]") ? e : `${e}]`;
+    K == null || K.debug("[%s] parse rule: %s", t.requestId, e), e = e.startsWith("[") ? e : `[${e}`, e = e.endsWith("]") ? e : `${e}]`;
     const a = new RegExp("(?<=\\[)(.+?)(?=])", "g"), o = (i = e == null ? void 0 : e.match(a)) == null ? void 0 : i[0], n = o == null ? void 0 : o.split(",");
     if (n) {
       let s = n[3] === "Number.MAX_VALUE" ? 100 : Number(n[3]);
@@ -794,12 +794,12 @@ class Mt {
    * @param options
    */
   checkWeather(e, t, a = {}) {
-    var b, S, I, p, v, f, d, m, y, C, M, j, P, D, H;
+    var b, F, I, v, p, f, d, m, y, S, M, j, N, D, L;
     let o = 0, n = 0, i = 0, s = 0;
-    const r = Math.round(((S = (b = t == null ? void 0 : t.SEVERE) == null ? void 0 : b.sigWave) == null ? void 0 : S.number) * 1.6 * 100) / 100, l = (p = (I = t == null ? void 0 : t.SEVERE) == null ? void 0 : I.sigWave) == null ? void 0 : p.number, u = (f = (v = t == null ? void 0 : t.HEAVY) == null ? void 0 : v.sigWave) == null ? void 0 : f.number, c = Math.round((((m = (d = t == null ? void 0 : t.SEVERE) == null ? void 0 : d.wind) == null ? void 0 : m.number) + 2) * 100) / 100, h = (C = (y = t == null ? void 0 : t.SEVERE) == null ? void 0 : y.wind) == null ? void 0 : C.number, k = (j = (M = t == null ? void 0 : t.HEAVY) == null ? void 0 : M.wind) == null ? void 0 : j.number;
-    for (let F = 0; F < (e == null ? void 0 : e.length); F++) {
-      const N = e[F], R = (D = (P = N == null ? void 0 : N.meteo) == null ? void 0 : P.wave) == null ? void 0 : D.sig, W = (H = N == null ? void 0 : N.meteo) == null ? void 0 : H.wind, K = F ? w(N.eta).diff(w(e[F - 1].eta), "hour", !0) : 0;
-      s = K > s ? K : s, J == null || J.debug("[%s] check sig.wave: %j", a.requestId, { ...R, dgThd4Wv: r, svThd4Wv: l, hvThd4Wv: u }), (R == null ? void 0 : R.height) >= r ? N.isDangerous = !0 : (R == null ? void 0 : R.height) >= l ? N.isSevere = !0 : (R == null ? void 0 : R.height) >= u && (N.isHeavy = !0), J == null || J.debug("[%s] check wind: %j", a.requestId, { ...W, dgThd4Wd: c, svThd4Wd: h, hvThd4Wd: k }), (W == null ? void 0 : W.scale) >= c ? (N.isDangerous = !0, delete N.isSevere, delete N.isHeavy) : (W == null ? void 0 : W.scale) > h ? (N.isDangerous || (N.isSevere = !0), delete N.isHeavy) : (W == null ? void 0 : W.scale) === k && !N.isDangerous && !N.isSevere && (N.isHeavy = !0), o += N.isDangerous ? K : 0, n += N.isSevere ? K : 0, i += N.isHeavy ? K : 0;
+    const r = Math.round(((F = (b = t == null ? void 0 : t.SEVERE) == null ? void 0 : b.sigWave) == null ? void 0 : F.number) * 1.6 * 100) / 100, l = (v = (I = t == null ? void 0 : t.SEVERE) == null ? void 0 : I.sigWave) == null ? void 0 : v.number, u = (f = (p = t == null ? void 0 : t.HEAVY) == null ? void 0 : p.sigWave) == null ? void 0 : f.number, c = Math.round((((m = (d = t == null ? void 0 : t.SEVERE) == null ? void 0 : d.wind) == null ? void 0 : m.number) + 2) * 100) / 100, h = (S = (y = t == null ? void 0 : t.SEVERE) == null ? void 0 : y.wind) == null ? void 0 : S.number, k = (j = (M = t == null ? void 0 : t.HEAVY) == null ? void 0 : M.wind) == null ? void 0 : j.number;
+    for (let W = 0; W < (e == null ? void 0 : e.length); W++) {
+      const C = e[W], Y = (D = (N = C == null ? void 0 : C.meteo) == null ? void 0 : N.wave) == null ? void 0 : D.sig, A = (L = C == null ? void 0 : C.meteo) == null ? void 0 : L.wind, V = W ? w(C.eta).diff(w(e[W - 1].eta), "hour", !0) : 0;
+      s = V > s ? V : s, K == null || K.debug("[%s] check sig.wave: %j", a.requestId, { ...Y, dgThd4Wv: r, svThd4Wv: l, hvThd4Wv: u }), (Y == null ? void 0 : Y.height) >= r ? C.isDangerous = !0 : (Y == null ? void 0 : Y.height) >= l ? C.isSevere = !0 : (Y == null ? void 0 : Y.height) >= u && (C.isHeavy = !0), K == null || K.debug("[%s] check wind: %j", a.requestId, { ...A, dgThd4Wd: c, svThd4Wd: h, hvThd4Wd: k }), (A == null ? void 0 : A.scale) >= c ? (C.isDangerous = !0, delete C.isSevere, delete C.isHeavy) : (A == null ? void 0 : A.scale) > h ? (C.isDangerous || (C.isSevere = !0), delete C.isHeavy) : (A == null ? void 0 : A.scale) === k && !C.isDangerous && !C.isSevere && (C.isHeavy = !0), o += C.isDangerous ? V : 0, n += C.isSevere ? V : 0, i += C.isHeavy ? V : 0;
     }
     return o = Math.round(o * 100) / 100, n = Math.round(n * 100) / 100, i = Math.round(i * 100) / 100, s = Math.round(s), { sample: e, dangerous: o, severe: n, heavy: i, step: s < 3 ? 3 : s, wind: { dgThd4Wd: c, svThd4Wd: h, hvThd4Wd: k }, sig: { dgThd4Wv: r, svThd4Wv: l, hvThd4Wv: u } };
   }
@@ -813,7 +813,7 @@ try {
 }
 const gt = new ft("", !0);
 var bt = /* @__PURE__ */ ((x) => (x.common = "common", x.container = "container", x.tugs = "tugs", x))(bt || {}), pt = /* @__PURE__ */ ((x) => (x.Ballast = "Ballast", x.Laden = "Laden", x))(pt || {}), vt = /* @__PURE__ */ ((x) => (x.Cp = "CP", x.Perf = "Basis", x.Instruct = "Other", x))(vt || {});
-class Y {
+class H {
   /**
    * @see https://baike.baidu.com/item/%E6%96%B9%E5%BD%A2%E7%B3%BB%E6%95%B0/4965568?fr=aladdin
    * 方形系数（block coefficient）
@@ -955,22 +955,22 @@ class Y {
    */
   static async speedLoseAt(e, t, a, o = "", n = 2, i = !0, s = !1, r = {}) {
     let l;
-    if (t.velocity && s && (e.speed = z.roundPrecision(t.velocity * 1852 / 3600, 6)), i) {
+    if (t.velocity && s && (e.speed = J.roundPrecision(t.velocity * 1852 / 3600, 6)), i) {
       let u;
       try {
         o = (o == null ? void 0 : o.toUpperCase()) === "CMEMS" ? "ECMWF" : o, o = (o == null ? void 0 : o.toUpperCase()) === "METEO2" ? "best_match" : o;
-        const { weatherModels: S, marineModels: I } = await ct.autoPickMeteoModel(o), p = await gt.spotForecast(t.lat, t.lng, a.utc().format(), !1, !1, !0, {
+        const { weatherModels: F, marineModels: I } = await ct.autoPickMeteoModel(o), v = await gt.spotForecast(t.lat, t.lng, a.utc().format(), !1, !1, !0, {
           ...r,
           pastDays: 1,
           forecastDays: 1,
-          weatherModels: S,
+          weatherModels: F,
           marineModels: I
-        }), [v] = ct.pickHourly(p, a);
-        u = ct.toLegacy(v);
-      } catch (S) {
-        E.warn("[%s] meteo2 spot(%j) forecast failed: %s", r.requestId, { ...t, eta: a.utc().format(), source: o }, S);
+        }), [p] = ct.pickHourly(v, a);
+        u = ct.toLegacy(p);
+      } catch (F) {
+        E.warn("[%s] meteo2 spot(%j) forecast failed: %s", r.requestId, { ...t, eta: a.utc().format(), source: o }, F);
       }
-      let c = Y.currentFactor(e.bearing, u == null ? void 0 : u.current, n), h = Y.weatherFactor(e, u, c);
+      let c = H.currentFactor(e.bearing, u == null ? void 0 : u.current, n), h = H.weatherFactor(e, u, c);
       const k = e.speed * 1.943844;
       k + c + h <= 0 && (E.warn(
         "[%s] v0(%d) is less then factor(%d) = wxFactor(%d) + cFactor(%d), scale factor with 0.6",
@@ -1016,50 +1016,50 @@ class Y {
   static async speedLoseInHoursStep(e, t, a, o, n, i, s = "", r = !0, l = !1, u = {}) {
     t.utc();
     const c = t.clone().add(14, "days"), h = [], k = [], b = [];
-    let S = 0, I = 0, p, v;
+    let F = 0, I = 0, v, p;
     for (let f = 0; f < i.length - 1; f++) {
       let d = i[f];
       d.distanceFromStart = Math.round((n + I) * 1e3) / 1e3;
       const m = i[f + 1];
-      if (e.bearing = O.calculateBearing(d, m, !m.gcToPrevious), d.bearing = e.bearing, d.suspend && l) {
+      if (e.bearing = R.calculateBearing(d, m, !m.gcToPrevious), d.bearing = e.bearing, d.suspend && l) {
         d.eta = d.eta || t.utc().format(), d.elapsed = d.elapsed ?? 0;
         const M = d.suspend - d.elapsed;
-        if (o - S > M)
-          o = o - S - M, t.add(M, "hour"), d.elapsed = d.suspend;
+        if (o - F > M)
+          o = o - F - M, t.add(M, "hour"), d.elapsed = d.suspend;
         else {
-          const j = o - S;
+          const j = o - F;
           d.elapsed += j, t.add(j, "hour"), o = 0;
         }
         if (E == null || E.info(`[%s] suspend ${d.elapsed} hours at %j, and remain ${o} hours need to go...`, u.requestId, d), o === 0)
-          return d.distanceFromPrevious = I, { etd: t, from: v || d, to: d, next: i.filter((j) => j), wps: h, days: k, all: b };
+          return d.distanceFromPrevious = I, { etd: t, from: p || d, to: d, next: i.filter((j) => j), wps: h, days: k, all: b };
       } else
         d.suspend = 0;
-      r = t.isAfter(c) ? !1 : r, d = await Y.speedLoseAt(e, d, t, s, 0, r, l, u), b.push(d), v = v || d, d.important && h.push(d), t.isSameOrAfter(a) && (k.push(d), a.add(24, "hour"));
-      const y = O.calculateDistance(d, m, !m.gcToPrevious);
-      let C = Math.round(y / v.speed * 1e5) / 1e5;
-      if (S + C < o) {
-        if (S += C, t.add(C, "hour"), delete i[f], E == null || E.debug(
-          `[%s] go to %j from %j with ${y}nm, and cost ${C} hours`,
+      r = t.isAfter(c) ? !1 : r, d = await H.speedLoseAt(e, d, t, s, 0, r, l, u), b.push(d), p = p || d, d.important && h.push(d), t.isSameOrAfter(a) && (k.push(d), a.add(24, "hour"));
+      const y = R.calculateDistance(d, m, !m.gcToPrevious);
+      let S = Math.round(y / p.speed * 1e5) / 1e5;
+      if (F + S < o) {
+        if (F += S, t.add(S, "hour"), delete i[f], E == null || E.debug(
+          `[%s] go to %j from %j with ${y}nm, and cost ${S} hours`,
           u.requestId,
           { lat: m.lat, lng: m.lng },
-          { lat: v.lat, lng: v.lng, etd: v.etd }
+          { lat: p.lat, lng: p.lng, etd: p.etd }
         ), I += y, i.filter((M) => M).length <= 1) {
-          p = m, p.eta = t.utc().format(), p.distanceFromPrevious = y, p.distanceFromStart = Math.round((n + I) * 1e4) / 1e4, h.push(p), b.push(p), delete i[f + 1];
+          v = m, v.eta = t.utc().format(), v.distanceFromPrevious = y, v.distanceFromStart = Math.round((n + I) * 1e4) / 1e4, h.push(v), b.push(v), delete i[f + 1];
           break;
         }
       } else {
-        C = o - S, t.add(C, "hour");
-        const M = z.roundPrecision(v.speed * C, 5);
-        p = O.calculateCoordinate(d, e.bearing, M, "nauticalmiles", !m.gcToPrevious), p.eta = t.utc().format(), i[f] = p, E == null || E.debug(
-          `[%s] go to %j from %j with ${M}nm, and cost ${C} hours`,
+        S = o - F, t.add(S, "hour");
+        const M = J.roundPrecision(p.speed * S, 5);
+        v = R.calculateCoordinate(d, e.bearing, M, "nauticalmiles", !m.gcToPrevious), v.eta = t.utc().format(), i[f] = v, E == null || E.debug(
+          `[%s] go to %j from %j with ${M}nm, and cost ${S} hours`,
           u.requestId,
-          { lat: p.lat, lng: p.lng },
+          { lat: v.lat, lng: v.lng },
           { lat: d.lat, lng: d.lng, etd: d.etd }
-        ), I += M, p.distanceFromPrevious = Math.round(I * 1e4) / 1e4, p.distanceFromStart = Math.round((n + I) * 1e4) / 1e4;
+        ), I += M, v.distanceFromPrevious = Math.round(I * 1e4) / 1e4, v.distanceFromStart = Math.round((n + I) * 1e4) / 1e4;
         break;
       }
     }
-    return { etd: t, from: v, to: p, next: i.filter((f) => f), wps: h, days: k, all: b };
+    return { etd: t, from: p, to: v, next: i.filter((f) => f), wps: h, days: k, all: b };
   }
   /**
    * 洋流影响因子
@@ -1068,7 +1068,7 @@ class Y {
    * @param role  1: 船东, 2: 租家, 0: 未知
    */
   static currentFactor(e, t, a = 0) {
-    const o = O.includedAngle(e, (t == null ? void 0 : t.degree) || 0) / 180 * Math.PI;
+    const o = R.includedAngle(e, (t == null ? void 0 : t.degree) || 0) / 180 * Math.PI;
     if (Math.abs(o) === Math.PI / 2)
       return 0;
     let n = ((t == null ? void 0 : t.kts) || 0) * Math.cos(o);
@@ -1081,14 +1081,14 @@ class Y {
    * @param cFactor 洋流因子
    */
   static weatherFactor(e, t, a = 0) {
-    var k, b, S, I, p, v, f;
+    var k, b, F, I, v, p, f;
     E == null || E.debug("calculate weather factor via: %j", { ...e, ...t });
-    const o = Y.blockCoefficient(e.displacement, e.lbp, e.breadthMoulded, e.draught), n = z.roundPrecision(a * 1852 / 3600, 6), i = Y.froudeNumber(e.speed - n, e.lbp), s = Y.amendFactor(o, i, e.loadCondition);
-    let r = O.includedAngle(e.bearing, (k = t == null ? void 0 : t.wind) == null ? void 0 : k.degree);
-    const l = Y.directionFactor(r, (b = t == null ? void 0 : t.wind) == null ? void 0 : b.scale), u = Y.vesselTagFactor(e.displacement, e.loadCondition, e.tag, (S = t == null ? void 0 : t.wind) == null ? void 0 : S.kts);
+    const o = H.blockCoefficient(e.displacement, e.lbp, e.breadthMoulded, e.draught), n = J.roundPrecision(a * 1852 / 3600, 6), i = H.froudeNumber(e.speed - n, e.lbp), s = H.amendFactor(o, i, e.loadCondition);
+    let r = R.includedAngle(e.bearing, (k = t == null ? void 0 : t.wind) == null ? void 0 : k.degree);
+    const l = H.directionFactor(r, (b = t == null ? void 0 : t.wind) == null ? void 0 : b.scale), u = H.vesselTagFactor(e.displacement, e.loadCondition, e.tag, (F = t == null ? void 0 : t.wind) == null ? void 0 : F.kts);
     let c = l * s * u / 100 * (e.speed - n);
-    c = Math.round(c * 1.943844 * 1e4) / 1e4 * -1, e.tag === "tugs" && Math.abs(c) > 1 && (c = c / (Math.abs(Math.round(c)) + 1)), E == null || E.debug("wind wx factor = %d", c), r = O.includedAngle(e.bearing, (p = (I = t == null ? void 0 : t.wave) == null ? void 0 : I.sig) == null ? void 0 : p.degree);
-    const h = Y.waveHeightFactor(((f = (v = t == null ? void 0 : t.wave) == null ? void 0 : v.sig) == null ? void 0 : f.height) ?? 1, r);
+    c = Math.round(c * 1.943844 * 1e4) / 1e4 * -1, e.tag === "tugs" && Math.abs(c) > 1 && (c = c / (Math.abs(Math.round(c)) + 1)), E == null || E.debug("wind wx factor = %d", c), r = R.includedAngle(e.bearing, (v = (I = t == null ? void 0 : t.wave) == null ? void 0 : I.sig) == null ? void 0 : v.degree);
+    const h = H.waveHeightFactor(((f = (p = t == null ? void 0 : t.wave) == null ? void 0 : p.sig) == null ? void 0 : f.height) ?? 1, r);
     return E == null || E.debug("wave wx factor = %d", h), c = Math.abs(c) > Math.abs(h) ? c : c * 0.3 + h * 0.7, E == null || E.debug("weather factor = %d", c), c = Math.abs(c) > 3 ? 3 * (Math.abs(c) / c) + Math.abs(c) / c * (Math.abs(c) - 2) * 0.1 : c, Math.round((c || 0) * 100) / 100;
   }
   /**
@@ -1123,11 +1123,11 @@ class Y {
   static async analyseInstant(e, t, a, o, n, i = "", s = 0, r = !0, l = !1, u = {}) {
     var _, G, X, Q, Z, $;
     const c = w().valueOf();
-    e.lng = z.convertToStdLng(e.lng);
-    const { route: h, waypoints: k } = n.points, b = O.calculateSubRoute(e, h);
+    e.lng = J.convertToStdLng(e.lng);
+    const { route: h, waypoints: k } = n.points, b = R.calculateSubRoute(e, h);
     if (((_ = b[0]) == null ? void 0 : _.length) <= 1)
       return;
-    const { v0: S, label: I } = e.sog ? {
+    const { v0: F, label: I } = e.sog ? {
       v0: e.sog,
       label: e.label || "Other"
       /* Instruct */
@@ -1135,13 +1135,13 @@ class Y {
       v0: o.speed,
       label: "CP"
       /* Cp */
-    }, p = Y.assembleProperties(a, o.loadCondition, S, 0), v = k.length ? O.calculateSubWaypoints(e, k) : [];
-    v.forEach((A) => A.important = !0);
+    }, v = H.assembleProperties(a, o.loadCondition, F, 0), p = k.length ? R.calculateSubWaypoints(e, k) : [];
+    p.forEach((P) => P.important = !0);
     const f = {
       from: { ...e },
       route: b,
-      waypoints: v,
-      v0: S,
+      waypoints: p,
+      v0: F,
       label: I
     }, d = {
       hours: [],
@@ -1149,16 +1149,16 @@ class Y {
       wps: [],
       all: []
     };
-    s || (O.calculateRouteDistance(b) / o.speed <= 72 ? s = 3 : s = 6);
-    let m = O.simplifyRouteToCoordinates(b, v, 0), y = 0, C = 0, M = 0, j = 0;
+    s || (R.calculateRouteDistance(b) / o.speed <= 72 ? s = 3 : s = 6);
+    let m = R.simplifyRouteToCoordinates(b, p, 0), y = 0, S = 0, M = 0, j = 0;
     t = w(t).utc();
-    const P = t.clone();
+    const N = t.clone();
     for (; m.length > 0; ) {
-      const A = s - t.hour() % s, V = Math.ceil(t.clone().add(A, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4, T = await Y.speedLoseInHoursStep(
-        p,
+      const P = s - t.hour() % s, B = Math.ceil(t.clone().add(P, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4, T = await H.speedLoseInHoursStep(
+        v,
         t,
-        P,
-        V,
+        N,
+        B,
         y,
         m,
         i,
@@ -1167,34 +1167,34 @@ class Y {
         u
       );
       if (d.all.push(...T.all), (G = T.from) != null && G.speed && (d.hours.push(T.from), d.wps.push(...T.wps), d.days.push(...T.days)), m = T == null ? void 0 : T.next, !m.length) {
-        const L = await Y.speedLoseAt(p, T.to, w(T.to.eta), i, 0, r, l, u);
-        L.bearing = p.bearing, d.hours.push(L), d.all.push(L);
+        const O = await H.speedLoseAt(v, T.to, w(T.to.eta), i, 0, r, l, u);
+        O.bearing = v.bearing, d.hours.push(O), d.all.push(O);
       }
       y += Math.round((((X = T == null ? void 0 : T.to) == null ? void 0 : X.distanceFromPrevious) ?? 0) * 1e4) / 1e4;
     }
     const D = d.hours;
-    for (let A = 0; A < D.length - 1; A++) {
-      const V = w(D[A + 1].eta).diff(D[A].etd, "hour", !0) || 1;
-      C += (D[A].wxFactor || 0) * V, M += (D[A].cFactor || 0) * V, j += V;
+    for (let P = 0; P < D.length - 1; P++) {
+      const B = w(D[P + 1].eta).diff(D[P].etd, "hour", !0) || 1;
+      S += (D[P].wxFactor || 0) * B, M += (D[P].cFactor || 0) * B, j += B;
     }
-    const H = D.reduce((A, V) => A + (V.suspend || 0), 0);
-    (Q = d.wps) == null || Q.forEach((A, V) => {
-      A.positionTime = w.utc(A.etd || A.eta).unix();
-      const T = d.wps[V - 1];
+    const L = D.reduce((P, B) => P + (B.suspend || 0), 0);
+    (Q = d.wps) == null || Q.forEach((P, B) => {
+      P.positionTime = w.utc(P.etd || P.eta).unix();
+      const T = d.wps[B - 1];
       if (T) {
-        const L = A.distanceFromStart - T.distanceFromStart, q = w(A.eta || A.etd).diff(w(T.etd || T.eta), "h", !0);
-        A.avgSpd = Math.round(L / q * 100) / 100, T.bearing = O.calculateBearing(T, A);
+        const O = P.distanceFromStart - T.distanceFromStart, q = w(P.eta || P.etd).diff(w(T.etd || T.eta), "h", !0);
+        P.avgSpd = Math.round(O / q * 100) / 100, T.bearing = R.calculateBearing(T, P);
       }
-    }), d.wps = await Y.reduceWPS(d.wps), d.days = await Y.reduceDays(d.days), d.all = (Z = d.all) == null ? void 0 : Z.reduce((A, V) => (V.positionTime = w.utc(V.etd || V.eta).unix(), A.some((T) => Math.round(T.positionTime / 60) === Math.round(V.positionTime / 60)) || A.push(V), A), []), f.sample = d;
-    const F = d.hours.at(0), N = d.hours.at(-1);
-    f.distance = Math.round(N.distanceFromStart * 1e3) / 1e3, f.etd = w(F.eta).utc().format(), f.eta = w(N.eta).utc().format(), f.wxFactor = Math.round(C / j * 1e3) / 1e3, f.cFactor = Math.round(M / j * 1e3) / 1e3, f.avgSpeed = Math.round(N.distanceFromStart / j * 1e3) / 1e3, f.totalHrs = Math.round(j * 1e3) / 1e3, f.suspend = Math.round(H * 1e3) / 1e3;
-    const R = z.roundPrecision(o.dgo / 24 * H, 3), { distanceInECA: W, hoursInECA: K, totalDgoConsInECA: nt, eca: tt } = await this.calculateECA(f, o, u), et = z.roundPrecision(o.fo / 24 * (j - K), 3), ot = z.roundPrecision(o.dgo / 24 * j + R, 3);
+    }), d.wps = await H.reduceWPS(d.wps), d.days = await H.reduceDays(d.days), d.all = (Z = d.all) == null ? void 0 : Z.reduce((P, B) => (B.positionTime = w.utc(B.etd || B.eta).unix(), P.some((T) => Math.round(T.positionTime / 60) === Math.round(B.positionTime / 60)) || P.push(B), P), []), f.sample = d;
+    const W = d.hours.at(0), C = d.hours.at(-1);
+    f.distance = Math.round(C.distanceFromStart * 1e3) / 1e3, f.etd = w(W.eta).utc().format(), f.eta = w(C.eta).utc().format(), f.wxFactor = Math.round(S / j * 1e3) / 1e3, f.cFactor = Math.round(M / j * 1e3) / 1e3, f.avgSpeed = Math.round(C.distanceFromStart / j * 1e3) / 1e3, f.totalHrs = Math.round(j * 1e3) / 1e3, f.suspend = Math.round(L * 1e3) / 1e3;
+    const Y = J.roundPrecision(o.dgo / 24 * L, 3), { distanceInECA: A, hoursInECA: V, totalDgoConsInECA: nt, eca: tt } = await this.calculateECA(f, o, u), et = J.roundPrecision(o.fo / 24 * (j - V), 3), ot = J.roundPrecision(o.dgo / 24 * j + Y, 3);
     f.extend = {
       eca: tt,
-      distanceInECA: W,
-      hoursInECA: K,
+      distanceInECA: A,
+      hoursInECA: V,
       totalDgoConsInECA: nt,
-      totalDgoConsInSuspend: R
+      totalDgoConsInSuspend: Y
     }, f.totalFoCons = et < 0 ? 0 : et, f.totalDgoCons = ot;
     const st = w().valueOf() - c, rt = (($ = d == null ? void 0 : d.hours) == null ? void 0 : $.length) || 1;
     return E == null || E.info("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", u == null ? void 0 : u.requestId, st, rt, Math.round(st / rt * 1e3) / 1e3), f;
@@ -1215,10 +1215,10 @@ class Y {
    * @param options
    */
   static async analyseInstantWithThreshed(e, t, a, o, n, i, s, r = "", l = 3, u = !0, c = !1, h = {}) {
-    var X, Q, Z, $, A, V;
+    var X, Q, Z, $, P, B;
     const k = w().valueOf();
-    e.lng = z.convertToStdLng(e.lng);
-    const { v0: b, label: S } = e.sog ? {
+    e.lng = J.convertToStdLng(e.lng);
+    const { v0: b, label: F } = e.sog ? {
       v0: e.sog,
       label: e.label || "Other"
       /* Instruct */
@@ -1226,12 +1226,12 @@ class Y {
       v0: n.speed,
       label: "CP"
       /* Cp */
-    }, I = Y.assembleProperties(o, n.loadCondition, b, 0), p = O.calculateSubRoute(e, i);
-    if (((X = p[0]) == null ? void 0 : X.length) <= 1)
+    }, I = H.assembleProperties(o, n.loadCondition, b, 0), v = R.calculateSubRoute(e, i);
+    if (((X = v[0]) == null ? void 0 : X.length) <= 1)
       return;
-    const v = s.length ? O.calculateSubWaypoints(e, s) : [];
-    v.forEach((T) => T.important = !0);
-    let f = O.simplifyRouteToCoordinates(p, v, 0), d = 0, m = 0, y = 0, C = 0;
+    const p = s.length ? R.calculateSubWaypoints(e, s) : [];
+    p.forEach((T) => T.important = !0);
+    let f = R.simplifyRouteToCoordinates(v, p, 0), d = 0, m = 0, y = 0, S = 0;
     const M = {
       hours: [],
       wps: [],
@@ -1242,51 +1242,51 @@ class Y {
     const j = t.clone();
     for (; f.length > 0; ) {
       const T = l - t.hour() % l;
-      let L = Math.ceil(t.clone().add(T, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4;
-      L = t.clone().add(L, "h").isSameOrAfter(a) ? a.diff(t, "h", !0) * 1e4 / 1e4 : L;
-      const q = await Y.speedLoseInHoursStep(I, t, j, L, d, f, r, u, c, h);
-      if (M.all.push(...q.all), (Q = q.from) != null && Q.speed && (M.hours.push(q.from), q != null && q.wps && M.wps.push(...q.wps), M.days.push(...q.days)), f = q == null ? void 0 : q.next, f.length || M.hours.push(q == null ? void 0 : q.to), d += Math.round((((Z = q == null ? void 0 : q.to) == null ? void 0 : Z.distanceFromPrevious) ?? 0) * 1e4) / 1e4, !L)
+      let O = Math.ceil(t.clone().add(T, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4;
+      O = t.clone().add(O, "h").isSameOrAfter(a) ? a.diff(t, "h", !0) * 1e4 / 1e4 : O;
+      const q = await H.speedLoseInHoursStep(I, t, j, O, d, f, r, u, c, h);
+      if (M.all.push(...q.all), (Q = q.from) != null && Q.speed && (M.hours.push(q.from), q != null && q.wps && M.wps.push(...q.wps), M.days.push(...q.days)), f = q == null ? void 0 : q.next, f.length || M.hours.push(q == null ? void 0 : q.to), d += Math.round((((Z = q == null ? void 0 : q.to) == null ? void 0 : Z.distanceFromPrevious) ?? 0) * 1e4) / 1e4, !O)
         break;
     }
-    M.wps = await Y.reduceWPS(M.wps), M.days = await Y.reduceDays(M.days), M.all = ($ = M.all) == null ? void 0 : $.reduce((T, L) => (L.positionTime = w.utc(L.etd || L.eta).unix(), T.some((q) => Math.round(w(q.etd).unix() / 60) === Math.round(w(L.etd).unix() / 60)) || T.push(L), T), []), (A = M.wps) == null || A.forEach((T, L) => {
-      const q = M.wps[L - 1];
+    M.wps = await H.reduceWPS(M.wps), M.days = await H.reduceDays(M.days), M.all = ($ = M.all) == null ? void 0 : $.reduce((T, O) => (O.positionTime = w.utc(O.etd || O.eta).unix(), T.some((q) => Math.round(w(q.etd).unix() / 60) === Math.round(w(O.etd).unix() / 60)) || T.push(O), T), []), (P = M.wps) == null || P.forEach((T, O) => {
+      const q = M.wps[O - 1];
       if (q) {
         const ut = T.distanceFromStart - q.distanceFromStart, lt = w(T.eta || T.etd).diff(w(q.etd || q.eta), "h", !0);
-        q.bearing = O.calculateBearing(q, T), T.avgSpd = Math.round(ut / lt * 100) / 100;
+        q.bearing = R.calculateBearing(q, T), T.avgSpd = Math.round(ut / lt * 100) / 100;
       }
     });
-    const P = M.hours;
-    for (let T = 0; T < P.length - 1; T++) {
-      const L = w(P[T + 1].eta).diff(P[T].etd, "hour", !0);
-      m += P[T].wxFactor * L, y += P[T].cFactor * L, C += L;
+    const N = M.hours;
+    for (let T = 0; T < N.length - 1; T++) {
+      const O = w(N[T + 1].eta).diff(N[T].etd, "hour", !0);
+      m += N[T].wxFactor * O, y += N[T].cFactor * O, S += O;
     }
-    const D = P.reduce((T, L) => T + (L.suspend || 0), 0), H = M.hours.at(0), F = M.hours.at(-1), N = await O.calculateRangeRoute(H, F, p), R = await O.calculateRangeWaypoints(H, F, p, v), W = {
+    const D = N.reduce((T, O) => T + (O.suspend || 0), 0), L = M.hours.at(0), W = M.hours.at(-1), C = await R.calculateRangeRoute(L, W, v), Y = await R.calculateRangeWaypoints(L, W, v, p), A = {
       sample: M,
-      distance: Math.round(((F == null ? void 0 : F.distanceFromStart) || 0) * 1e4) / 1e4,
+      distance: Math.round(((W == null ? void 0 : W.distanceFromStart) || 0) * 1e4) / 1e4,
       // 注意，可能会在first节点Drift,所有采用eta做为初始出发时间
-      etd: w(H.eta).utc().format(),
-      eta: w(F == null ? void 0 : F.eta).utc().format(),
-      wxFactor: Math.round(m / C * 1e3) / 1e3,
-      cFactor: Math.round(y / C * 1e3) / 1e3,
-      avgSpeed: Math.round(((F == null ? void 0 : F.distanceFromStart) || 0) / C * 1e3) / 1e3,
-      totalHrs: Math.round(C * 1e3) / 1e3,
+      etd: w(L.eta).utc().format(),
+      eta: w(W == null ? void 0 : W.eta).utc().format(),
+      wxFactor: Math.round(m / S * 1e3) / 1e3,
+      cFactor: Math.round(y / S * 1e3) / 1e3,
+      avgSpeed: Math.round(((W == null ? void 0 : W.distanceFromStart) || 0) / S * 1e3) / 1e3,
+      totalHrs: Math.round(S * 1e3) / 1e3,
       suspend: Math.round(D * 1e3) / 1e3,
-      from: H,
-      to: F,
-      route: N,
-      waypoints: R,
+      from: L,
+      to: W,
+      route: C,
+      waypoints: Y,
       v0: b,
-      label: S
-    }, K = z.roundPrecision(n.dgo / 24 * D, 3), { distanceInECA: nt, hoursInECA: tt, totalDgoConsInECA: et, eca: ot } = await this.calculateECA(W, n, h), it = z.roundPrecision(n.fo / 24 * (C - tt), 3), st = z.roundPrecision(n.dgo / 24 * C + K, 3);
-    W.extend = {
+      label: F
+    }, V = J.roundPrecision(n.dgo / 24 * D, 3), { distanceInECA: nt, hoursInECA: tt, totalDgoConsInECA: et, eca: ot } = await this.calculateECA(A, n, h), it = J.roundPrecision(n.fo / 24 * (S - tt), 3), st = J.roundPrecision(n.dgo / 24 * S + V, 3);
+    A.extend = {
       eca: ot,
       distanceInECA: nt,
       hoursInECA: tt,
       totalDgoConsInECA: et,
-      totalDgoConsInSuspend: K
-    }, W.totalDgoCons = st, W.totalFoCons = it < 0 ? 0 : it;
-    const _ = w().valueOf() - k, G = ((V = M == null ? void 0 : M.hours) == null ? void 0 : V.length) || 1;
-    return E == null || E.debug("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", h == null ? void 0 : h.requestId, _, G, Math.round(_ / G * 1e3) / 1e3), W;
+      totalDgoConsInSuspend: V
+    }, A.totalDgoCons = st, A.totalFoCons = it < 0 ? 0 : it;
+    const _ = w().valueOf() - k, G = ((B = M == null ? void 0 : M.hours) == null ? void 0 : B.length) || 1;
+    return E == null || E.debug("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", h == null ? void 0 : h.requestId, _, G, Math.round(_ / G * 1e3) / 1e3), A;
   }
   /**
    * 在指定航线条件下，基于多CP，动态计算最优成本(租金+油费)方案
@@ -1304,10 +1304,10 @@ class Y {
    * @param options
    */
   static async analyseCost(e, t, a, o, n = {}) {
-    var p, v;
+    var v, p;
     const i = w().valueOf(), s = [];
     e.speedStep = e.speedStep || 3, e.alterStep = e.alterStep ?? 1;
-    const r = O.calculateRouteDistance(o.route);
+    const r = R.calculateRouteDistance(o.route);
     let l = 0;
     a.forEach((f) => {
       const d = Math.ceil(r / f.speed / 24);
@@ -1316,7 +1316,7 @@ class Y {
     const u = w.utc(e.etd).add(l ?? 14, "day");
     let c = 1;
     for (const f of a) {
-      const d = JSON.parse(JSON.stringify(o.route)), m = JSON.parse(JSON.stringify(o.waypoints)), y = await Y.analyseInstantWithThreshed(
+      const d = JSON.parse(JSON.stringify(o.route)), m = JSON.parse(JSON.stringify(o.waypoints)), y = await H.analyseInstantWithThreshed(
         { lat: e.lat, lng: e.lng },
         e.etd,
         u,
@@ -1330,7 +1330,7 @@ class Y {
         e.useRouteParam,
         n
       );
-      y && (await Y.calculateCost(y, f, e, n), s.push(y), E == null || E.info("[%s][L%d-%d] analyse from %s to %s cost: %j", n.requestId, 1, c, e.etd, u.format(), {
+      y && (await H.calculateCost(y, f, e, n), s.push(y), E == null || E.info("[%s][L%d-%d] analyse from %s to %s cost: %j", n.requestId, 1, c, e.etd, u.format(), {
         cost: y.cost.total,
         hire: y.cost.hire,
         bunker: y.cost.bunker,
@@ -1341,18 +1341,18 @@ class Y {
     }
     s.sort((f, d) => f.cost.total - d.cost.total);
     const h = s.at(0), k = s.at(1), b = [];
-    if (b.push({ combined: !1, speeds: [h], cost: (p = h.cost) == null ? void 0 : p.total }), k) {
-      const f = h.cost.cp, d = k.cost.cp, m = w(h.eta), y = w(h.etd), C = m.diff(y, "days", !0);
-      let M = Math.ceil(C / 2);
+    if (b.push({ combined: !1, speeds: [h], cost: (v = h.cost) == null ? void 0 : v.total }), k) {
+      const f = h.cost.cp, d = k.cost.cp, m = w(h.eta), y = w(h.etd), S = m.diff(y, "days", !0);
+      let M = Math.ceil(S / 2);
       M = M > 7 ? 7 : M < e.alterStep ? e.alterStep : M;
-      let j = 2, P = { combined: !1, speeds: [k], cost: (v = k.cost) == null ? void 0 : v.total }, D;
+      let j = 2, N = { combined: !1, speeds: [k], cost: (p = k.cost) == null ? void 0 : p.total }, D;
       for (; M >= e.alterStep; ) {
-        const H = await Y.combinedAnalyse(e, t, u, [f, d], o, M, { ...n, level: j });
-        if (P.cost > H.cost ? D ? (D == null ? void 0 : D.cost) > H.cost && (D = H) : (D = P, P = H) : (!D || (D == null ? void 0 : D.cost) > H.cost) && (D = H), M <= e.alterStep)
+        const L = await H.combinedAnalyse(e, t, u, [f, d], o, M, { ...n, level: j });
+        if (N.cost > L.cost ? D ? (D == null ? void 0 : D.cost) > L.cost && (D = L) : (D = N, N = L) : (!D || (D == null ? void 0 : D.cost) > L.cost) && (D = L), M <= e.alterStep)
           break;
         M = Math.ceil(M / 2), j += 1;
       }
-      b.push(P), D && b.push(D);
+      b.push(N), D && b.push(D);
     }
     const I = w().valueOf() - i;
     return E == null || E.info("[%s] analyse elapsed: %d ms", n == null ? void 0 : n.requestId, I), b.sort((f, d) => f.cost - d.cost);
@@ -1369,7 +1369,7 @@ class Y {
    */
   static async combinedAnalyse(e, t, a, o, n, i, s = {}) {
     s.counter = 1, E == null || E.info("[%s][L%d] analyse with alternate cp in every %d days", s.requestId, s.level, i);
-    const r = await Y.alternateAnalyse(e, t, a, o, 0, n, i, s), l = r.reduce((d, m) => d + m.cost.total, 0), u = r.reduce((d, m) => d + m.cost.hire, 0), c = r.reduce((d, m) => d + m.cost.bunker, 0), h = r.reduce((d, m) => d + m.distance, 0), k = r.reduce((d, m) => d + m.totalHrs, 0);
+    const r = await H.alternateAnalyse(e, t, a, o, 0, n, i, s), l = r.reduce((d, m) => d + m.cost.total, 0), u = r.reduce((d, m) => d + m.cost.hire, 0), c = r.reduce((d, m) => d + m.cost.bunker, 0), h = r.reduce((d, m) => d + m.distance, 0), k = r.reduce((d, m) => d + m.totalHrs, 0);
     E == null || E.info("[%s][L%d] cost with cpa/cpb turn: %j", s.requestId, s.level, {
       cost: l,
       hire: u,
@@ -1377,14 +1377,14 @@ class Y {
       distance: h,
       hours: k
     });
-    const b = await Y.alternateAnalyse(e, t, a, o, 1, n, i, s), S = b.reduce((d, m) => d + m.cost.total, 0), I = b.reduce((d, m) => d + m.cost.hire, 0), p = b.reduce((d, m) => d + m.cost.bunker, 0), v = b.reduce((d, m) => d + m.distance, 0), f = b.reduce((d, m) => d + m.totalHrs, 0);
+    const b = await H.alternateAnalyse(e, t, a, o, 1, n, i, s), F = b.reduce((d, m) => d + m.cost.total, 0), I = b.reduce((d, m) => d + m.cost.hire, 0), v = b.reduce((d, m) => d + m.cost.bunker, 0), p = b.reduce((d, m) => d + m.distance, 0), f = b.reduce((d, m) => d + m.totalHrs, 0);
     return E == null || E.info("[%s][L%d] cost with cpb/cpa turn: %j", s.requestId, s.level, {
-      cost: S,
+      cost: F,
       hire: I,
-      bunker: p,
-      distance: v,
+      bunker: v,
+      distance: p,
       hours: f
-    }), l < S ? { combined: !0, cost: Math.round(l * 1e3) / 1e3, speeds: r, step: i } : { combined: !0, cost: Math.round(S * 1e3) / 1e3, speeds: b, step: i };
+    }), l < F ? { combined: !0, cost: Math.round(l * 1e3) / 1e3, speeds: r, step: i } : { combined: !0, cost: Math.round(F * 1e3) / 1e3, speeds: b, step: i };
   }
   /**
    * 基于cp索引，交替计算指定步长下的成本
@@ -1402,13 +1402,13 @@ class Y {
     let l = w.utc(e.etd);
     const u = { lat: e.lat, lng: e.lng }, c = [];
     for (; l.isBefore(a); ) {
-      const b = l.clone().utc().add(s, "day"), S = JSON.parse(JSON.stringify(i.route)), I = JSON.parse(JSON.stringify(i.waypoints)), p = o[n], v = await Y.analyseInstantWithThreshed(
+      const b = l.clone().utc().add(s, "day"), F = JSON.parse(JSON.stringify(i.route)), I = JSON.parse(JSON.stringify(i.waypoints)), v = o[n], p = await H.analyseInstantWithThreshed(
         u,
         l.utc().format(),
         b,
         t,
-        p,
-        S,
+        v,
+        F,
         I,
         e.meteoVendor,
         e.speedStep,
@@ -1416,7 +1416,7 @@ class Y {
         e.useRouteParam,
         r
       );
-      v && (await Y.calculateCost(v, p, e, r), E == null || E.info(
+      p && (await H.calculateCost(p, v, e, r), E == null || E.info(
         "[%s][L%d-%d] analyse from %s to %s cost: %j",
         r.requestId,
         r.level,
@@ -1424,17 +1424,17 @@ class Y {
         l.utc().format(),
         b.utc().format(),
         {
-          cost: v.cost.total,
-          hire: v.cost.hire,
-          bunker: v.cost.bunker,
-          distance: v.distance,
-          hours: v.totalHrs,
-          cp: `${p.speed}/${p.fo}/${p.dgo}`
+          cost: p.cost.total,
+          hire: p.cost.hire,
+          bunker: p.cost.bunker,
+          distance: p.distance,
+          hours: p.totalHrs,
+          cp: `${v.speed}/${v.fo}/${v.dgo}`
         }
       )), r.counter = r.counter + 1;
-      const f = (k = (h = v == null ? void 0 : v.sample) == null ? void 0 : h.hours) == null ? void 0 : k.at(-1);
+      const f = (k = (h = p == null ? void 0 : p.sample) == null ? void 0 : h.hours) == null ? void 0 : k.at(-1);
       if (f)
-        u.lat = f.lat, u.lng = f.lng, l = w(f.eta), c.push(v), n = n ? 0 : 1;
+        u.lat = f.lat, u.lng = f.lng, l = w(f.eta), c.push(p), n = n ? 0 : 1;
       else
         break;
     }
@@ -1467,17 +1467,17 @@ class Y {
    */
   static async calculateECA(e, t, a = {}) {
     var r, l, u, c;
-    const o = await O.intersectInECA((e == null ? void 0 : e.route) || []);
+    const o = await R.intersectInECA((e == null ? void 0 : e.route) || []);
     let n = 0, i = 0, s = 0;
     (l = (r = e == null ? void 0 : e.sample) == null ? void 0 : r.wps) == null || l.forEach((h) => {
       h.positionTime = w.utc(h.etd || h.eta).unix();
     });
     for (const h of o) {
       n += h.distance;
-      const k = await O.deadReckoningTime((u = h.waypoints) == null ? void 0 : u.at(0), e.sample.all || e.sample.wps), b = await O.deadReckoningTime((c = h.waypoints) == null ? void 0 : c.at(-1), e.sample.all || e.sample.wps);
-      h.in = k, h.out = b, h.totalHrs = z.roundPrecision((b.positionTime - k.positionTime) / 3600, 3), h.totalDgoCons = z.roundPrecision(t.fo / 24 * h.totalHrs, 3), i += h.totalHrs, s += h.totalDgoCons;
+      const k = await R.deadReckoningTime((u = h.waypoints) == null ? void 0 : u.at(0), e.sample.all || e.sample.wps), b = await R.deadReckoningTime((c = h.waypoints) == null ? void 0 : c.at(-1), e.sample.all || e.sample.wps);
+      h.in = k, h.out = b, h.totalHrs = J.roundPrecision((b.positionTime - k.positionTime) / 3600, 3), h.totalDgoCons = J.roundPrecision(t.fo / 24 * h.totalHrs, 3), i += h.totalHrs, s += h.totalDgoCons;
     }
-    return n = z.roundPrecision(n, 3), i = z.roundPrecision(i, 3), s = z.roundPrecision(s, 3), {
+    return n = J.roundPrecision(n, 3), i = J.roundPrecision(i, 3), s = J.roundPrecision(s, 3), {
       distanceInECA: n,
       hoursInECA: i,
       totalDgoConsInECA: s,
@@ -1494,49 +1494,55 @@ class Y {
     const a = {
       hours: [],
       wps: [],
-      days: []
+      days: [],
+      all: []
     }, o = e.reduce((m, y) => m + y.distance, 0), n = e.reduce((m, y) => {
-      var C;
-      return m + (((C = y.extend) == null ? void 0 : C.distanceInECA) || 0);
+      var S;
+      return m + (((S = y.extend) == null ? void 0 : S.distanceInECA) || 0);
     }, 0), i = e.reduce((m, y) => m + y.totalHrs, 0), s = e.reduce((m, y) => {
-      var C;
-      return m + (((C = y.extend) == null ? void 0 : C.hoursInECA) || 0);
+      var S;
+      return m + (((S = y.extend) == null ? void 0 : S.hoursInECA) || 0);
     }, 0), r = e.reduce((m, y) => {
-      var C;
-      return m + (((C = y.extend) == null ? void 0 : C.totalDgoConsInECA) || 0);
-    }, 0), l = e.reduce((m, y) => m + y.wxFactor * y.totalHrs / i, 0), u = e.reduce((m, y) => m + y.cFactor * y.totalHrs / i, 0), c = e.reduce((m, y) => m + y.totalFoCons, 0), h = e.reduce((m, y) => m + y.totalDgoCons, 0), k = e.reduce((m, y) => m + y.cost.total, 0), b = e.reduce((m, y) => m + y.cost.hire, 0), S = e.reduce((m, y) => m + y.cost.bunker, 0), I = [], p = [];
-    let v;
+      var S;
+      return m + (((S = y.extend) == null ? void 0 : S.totalDgoConsInECA) || 0);
+    }, 0), l = e.reduce((m, y) => m + y.wxFactor * y.totalHrs / i, 0), u = e.reduce((m, y) => m + y.cFactor * y.totalHrs / i, 0), c = e.reduce((m, y) => m + y.totalFoCons, 0), h = e.reduce((m, y) => m + y.totalDgoCons, 0), k = e.reduce((m, y) => m + y.cost.total, 0), b = e.reduce((m, y) => m + y.cost.hire, 0), F = e.reduce((m, y) => m + y.cost.bunker, 0), I = [], v = [];
+    let p;
     for (const m of e) {
-      p.push(...((f = m.extend) == null ? void 0 : f.eca) || []);
-      const y = m.sample.hours, C = m.sample.wps, M = m.sample.days, j = y.at(0);
-      v && (j.distanceFromPrevious = v.distanceFromPrevious, j.distanceFromStart = v.distanceFromStart, y.forEach((F, N) => {
-        N && (F.distanceFromStart = F.distanceFromStart + v.distanceFromStart);
-      }), C.at(0).distanceFromPrevious = v.distanceFromPrevious, C.at(0).distanceFromStart = v.distanceFromStart, C.forEach((F, N) => {
-        N && (F.distanceFromStart = F.distanceFromStart + v.distanceFromStart);
-      }), M.at(0).distanceFromPrevious = v.distanceFromPrevious, M.at(0).distanceFromStart = v.distanceFromStart, M.forEach((F, N) => {
-        N && (F.distanceFromStart = F.distanceFromStart + v.distanceFromStart);
-      })), j.cp = m.cost.cp;
-      const P = [m.etd, m.eta], D = I.findIndex((F) => F.id === j.cp.id);
-      D === -1 ? (j.cp.segment = [P], I.push(j.cp)) : I[D].segment.push(P), y.forEach((F) => {
-        var R;
-        ((R = a.hours) == null ? void 0 : R.findIndex((W) => W.eta === F.eta)) === -1 && a.hours.push(F);
-      }), C.forEach((F) => {
-        var R;
-        ((R = a.wps) == null ? void 0 : R.findIndex((W) => W.eta === F.eta)) === -1 && a.wps.push(F);
-      }), M.forEach((F) => {
-        var R;
-        ((R = a == null ? void 0 : a.days) == null ? void 0 : R.findIndex((W) => W.eta === F.eta)) === -1 && a.days.push(F);
+      v.push(...((f = m.extend) == null ? void 0 : f.eca) || []);
+      const y = m.sample.hours, S = m.sample.all, M = m.sample.wps, j = m.sample.days, N = y.at(0);
+      p && (N.distanceFromPrevious = p.distanceFromPrevious, N.distanceFromStart = p.distanceFromStart, y.forEach((C, Y) => {
+        Y && (C.distanceFromStart = C.distanceFromStart + p.distanceFromStart);
+      }), S.at(0).distanceFromPrevious = p.distanceFromPrevious, S.at(0).distanceFromStart = p.distanceFromStart, S.forEach((C, Y) => {
+        Y && (C.distanceFromStart = C.distanceFromStart + p.distanceFromStart);
+      }), M.at(0).distanceFromPrevious = p.distanceFromPrevious, M.at(0).distanceFromStart = p.distanceFromStart, M.forEach((C, Y) => {
+        Y && (C.distanceFromStart = C.distanceFromStart + p.distanceFromStart);
+      }), j.at(0).distanceFromPrevious = p.distanceFromPrevious, j.at(0).distanceFromStart = p.distanceFromStart, j.forEach((C, Y) => {
+        Y && (C.distanceFromStart = C.distanceFromStart + p.distanceFromStart);
+      })), N.cp = m.cost.cp;
+      const D = [m.etd, m.eta], L = I.findIndex((C) => C.id === N.cp.id);
+      L === -1 ? (N.cp.segment = [D], I.push(N.cp)) : I[L].segment.push(D), y.forEach((C) => {
+        var A;
+        ((A = a.hours) == null ? void 0 : A.findIndex((V) => V.eta === C.eta)) === -1 && a.hours.push(C);
+      }), S.forEach((C) => {
+        var A;
+        ((A = a.all) == null ? void 0 : A.findIndex((V) => V.eta === C.eta)) === -1 && a.all.push(C);
+      }), M.forEach((C) => {
+        var A;
+        ((A = a.wps) == null ? void 0 : A.findIndex((V) => V.eta === C.eta)) === -1 && a.wps.push(C);
+      }), j.forEach((C) => {
+        var A;
+        ((A = a == null ? void 0 : a.days) == null ? void 0 : A.findIndex((V) => V.eta === C.eta)) === -1 && a.days.push(C);
       });
-      const H = (d = a.wps) == null ? void 0 : d.findIndex((F) => F.eta === j.eta);
-      H === -1 ? a.wps.push(j) : a.wps[H] = j, v = y.at(-1);
+      const W = (d = a.wps) == null ? void 0 : d.findIndex((C) => C.eta === N.eta);
+      W === -1 ? a.wps.push(N) : a.wps[W] = N, p = y.at(-1);
     }
     return a.wps.sort((m, y) => w(m.etd).unix() - w(y.etd).unix()), a.wps.forEach((m, y) => {
-      const C = a.wps[y - 1];
-      if (C) {
-        const M = m.distanceFromStart - (C.distanceFromStart || 0), j = w(m.eta || m.etd).diff(w(C.etd || C.eta), "hour", !0), P = Math.round(M / j * 100) / 100;
-        m.avgSpd = P;
-        const D = O.calculateBearing(C, m);
-        C.bearing = D;
+      const S = a.wps[y - 1];
+      if (S) {
+        const M = m.distanceFromStart - (S.distanceFromStart || 0), j = w(m.eta || m.etd).diff(w(S.etd || S.eta), "hour", !0), N = Math.round(M / j * 100) / 100;
+        m.avgSpd = N;
+        const D = R.calculateBearing(S, m);
+        S.bearing = D;
       }
     }), {
       sample: a,
@@ -1556,11 +1562,11 @@ class Y {
       cost: {
         total: Math.round(k * 1e3) / 1e3,
         hire: Math.round(b * 1e3) / 1e3,
-        bunker: Math.round(S * 1e3) / 1e3
+        bunker: Math.round(F * 1e3) / 1e3
       },
       extend: {
         cps: I,
-        eca: p,
+        eca: v,
         distanceInECA: Math.round(n * 1e3) / 1e3,
         hoursInECA: Math.round(s * 1e3) / 1e3,
         totalDgoConsInECA: Math.round(r * 1e3) / 1e3,
@@ -1573,12 +1579,12 @@ export {
   at as AISImpl,
   Mt as AlertHelper,
   yt as AlertLevel,
-  Ft as HifleetImpl,
+  jt as HifleetImpl,
   pt as LoadCondition,
-  xt as MyShipImpl,
-  jt as MyVesselImpl,
-  Nt as ShipxyImpl,
-  Y as SpeedHelper,
+  Nt as MyShipImpl,
+  Tt as MyVesselImpl,
+  xt as ShipxyImpl,
+  H as SpeedHelper,
   vt as SpeedLabel,
   bt as VesselTag,
   Dt as alertHelper