@idm-plugin/vessel 1.8.4 → 1.8.5

package/dist/index.js

@@ -1,15 +1,15 @@
 var ht = Object.defineProperty;
-var lt = (j, e, t) => e in j ? ht(j, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : j[e] = t;
-var G = (j, e, t) => (lt(j, typeof e != "symbol" ? e + "" : e, t), t);
+var lt = (C, e, t) => e in C ? ht(C, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : C[e] = t;
+var G = (C, e, t) => (lt(C, typeof e != "symbol" ? e + "" : e, t), t);
 import B from "got";
 import it from "@log4js-node/log4js-api";
-import g from "moment";
+import b from "moment";
 import { LngLatHelper as J, LaneHelper as W } from "@idm-plugin/geo2";
 import { MeteoHelper2 as ft, MeteoHelper as mt } from "@idm-plugin/meteo2";
 import { Meteo2Assist as ct } from "@idm-plugin/meteo";
-let b;
+let p;
 try {
-  b = it.getLogger("vessel");
+  p = it.getLogger("vessel");
 } catch {
 } finally {
 }
@@ -54,7 +54,7 @@ class et {
     return { labelCn: t, labelEn: n };
   }
 }
-class jt extends et {
+class Ct extends et {
   constructor(t, n) {
     super();
     G(this, "clientId");
@@ -70,32 +70,32 @@ class jt extends et {
         grant_type: "client_credentials"
       }
     }, o = await B.post(n, i).json();
-    b == null || b.info("[%s] fetch access token from: %s - %j", t.requestId, n, o), o.error || (this.token = {
+    p == null || p.info("[%s] fetch access token from: %s - %j", t.requestId, n, o), o.error || (this.token = {
       accessToken: o.access_token,
       tokenType: o.token_type,
       expiresIn: o.expires_in,
       scope: o.scope,
       jti: o.jti,
-      issuedAt: g().utc().format()
+      issuedAt: b().utc().format()
     });
   }
   async realTimePosition(t, n = {}) {
-    var u, m, l;
-    (!this.token || g().diff(g(this.token.issuedAt), "seconds") > ((u = this.token) == null ? void 0 : u.expiresIn) - 300) && await this.authToken(n);
+    var h, M, l;
+    (!this.token || b().diff(b(this.token.issuedAt), "seconds") > ((h = this.token) == null ? void 0 : h.expiresIn) - 300) && await this.authToken(n);
     const i = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/location/unit", o = {
       headers: {
-        Authorization: `${(m = this.token) == null ? void 0 : m.tokenType} ${(l = this.token) == null ? void 0 : l.accessToken}`
+        Authorization: `${(M = this.token) == null ? void 0 : M.tokenType} ${(l = this.token) == null ? void 0 : l.accessToken}`
       },
       searchParams: { mmsi: t }
     };
-    b == null || b.info("[%s] fetch realtime position from: %s - %j", n.requestId, i, o);
+    p == null || p.info("[%s] fetch realtime position from: %s - %j", n.requestId, i, o);
     const a = await B.get(i, o).json();
     if (a.code)
-      return b == null || b.warn("[%s] fetch realtime position failed: %j", n.requestId, i, { message: a.message, status: a.status, code: a.code }), a;
+      return p == null || p.warn("[%s] fetch realtime position failed: %j", n.requestId, i, { message: a.message, status: a.status, code: a.code }), a;
     const s = a.data;
-    for (const M in s)
-      !isNaN(s[M]) && Number(s[M]) !== 1 / 0 && (s[M] = Number(s[M]));
-    const d = g(`${s.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    for (const g in s)
+      !isNaN(s[g]) && Number(s[g]) !== 1 / 0 && (s[g] = Number(s[g]));
+    const d = b(`${s.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
     return {
       mmsi: s.mmsi,
       name: s.vesselName,
@@ -110,7 +110,7 @@ class jt extends et {
       cog: s.cog,
       hdg: s.hdg,
       rot: s.rot,
-      eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(s.eta) ? g.utc(s.eta).format() : void 0,
+      eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(s.eta) ? b.utc(s.eta).format() : void 0,
       destination: s.dest,
       positionTime: d.unix(),
       status: s.status,
@@ -122,17 +122,17 @@ class jt extends et {
     };
   }
   async trajectory(t, n, i, o, a = !0, s = {}) {
-    (!this.token || g().diff(g(this.token.issuedAt), "seconds") > this.token.expiresIn - 300) && await this.authToken(s);
-    const d = await this.realTimePosition(t, s), r = g(n), u = g(i), m = [];
-    for (; u.diff(r, "day", !0) > 30; )
-      await this.trajectoryIn30Day(t, r, r.clone().add(30, "day"), d, o, m, s), r.add(30, "day");
-    return await this.trajectoryIn30Day(t, r, u, d, o, m, s), m;
+    (!this.token || b().diff(b(this.token.issuedAt), "seconds") > this.token.expiresIn - 300) && await this.authToken(s);
+    const d = await this.realTimePosition(t, s), r = b(n), h = b(i), M = [];
+    for (; h.diff(r, "day", !0) > 30; )
+      await this.trajectoryIn30Day(t, r, r.clone().add(30, "day"), d, o, M, s), r.add(30, "day");
+    return await this.trajectoryIn30Day(t, r, h, d, o, M, s), M;
   }
   async trajectoryIn30Day(t, n, i, o, a, s, d = {}) {
-    var f, C, k, w, v;
-    const r = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/track", u = {
+    var f, x, I, m, v;
+    const r = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/track", h = {
       headers: {
-        Authorization: `${(f = this.token) == null ? void 0 : f.tokenType} ${(C = this.token) == null ? void 0 : C.accessToken}`
+        Authorization: `${(f = this.token) == null ? void 0 : f.tokenType} ${(x = this.token) == null ? void 0 : x.accessToken}`
       },
       json: {
         mmsi: t,
@@ -140,16 +140,16 @@ class jt extends et {
         endTime: i.utcOffset(8).format("YYYY-MM-DD HH:mm:ss")
       }
     };
-    b == null || b.info("[%s] fetch trajectory from: %s - %j", d.requestId, r, u);
-    const m = await B.post(r, u).json();
-    if (m.code)
-      return b == null || b.warn("[%s] fetch trajectory failed: %j", d.requestId, r, { message: m.message, status: m.status, code: m.code }), m;
+    p == null || p.info("[%s] fetch trajectory from: %s - %j", d.requestId, r, h);
+    const M = await B.post(r, h).json();
+    if (M.code)
+      return p == null || p.warn("[%s] fetch trajectory failed: %j", d.requestId, r, { message: M.message, status: M.status, code: M.code }), M;
     let l = -1;
-    const M = g(`${(w = (k = m.data) == null ? void 0 : k[0]) == null ? void 0 : w.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-    return (v = m.data) == null || v.forEach((c) => {
+    const g = b(`${(m = (I = M.data) == null ? void 0 : I[0]) == null ? void 0 : m.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    return (v = M.data) == null || v.forEach((c) => {
       for (const Y in c)
         !isNaN(c[Y]) && Number(c[Y]) !== 1 / 0 && (c[Y] = Number(c[Y]));
-      const p = g(`${c.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00"), y = c.status, { labelCn: h, labelEn: I } = this.parseStatus(y), S = {
+      const w = b(`${c.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00"), y = c.status, { labelCn: u, labelEn: k } = this.parseStatus(y), S = {
         mmsi: c.mmsi,
         imo: o == null ? void 0 : o.imo,
         lat: c.lat,
@@ -159,15 +159,15 @@ class jt extends et {
         hdg: c.hdg,
         draught: c.draught,
         status: y,
-        eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(c.eta) ? g(`${c.eta} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00").utc().format() : void 0,
+        eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(c.eta) ? b(`${c.eta} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00").utc().format() : void 0,
         destination: c.dest,
-        positionTime: p.unix(),
-        labelCn: h,
-        labelEn: I,
+        positionTime: w.unix(),
+        labelCn: u,
+        labelEn: k,
         method: "trajectory",
         vendor: "myVessel",
-        utc: p.utc().format()
-      }, D = Math.floor(p.diff(M, "minute", !0) / (a || 1));
+        utc: w.utc().format()
+      }, D = Math.floor(w.diff(g, "minute", !0) / (a || 1));
       D !== l && (l = D, s.push(S));
     }), s;
   }
@@ -185,14 +185,14 @@ class Et extends et {
         usertoken: this.token
       }
     }, a = await B.post(i, o).json();
-    b == null || b.info("[%s] fetch realtime position from: %s - %j", n.requestId, i, o);
+    p == null || p.info("[%s] fetch realtime position from: %s - %j", n.requestId, i, o);
     const s = a == null ? void 0 : a.list;
     if (!s)
-      return b == null || b.warn("[%s] fetch realtime position failed: %j", n.requestId, i, a), a;
-    for (const M in s)
-      !isNaN(s[M]) && Number(s[M]) !== 1 / 0 && (s[M] = Number(s[M]));
+      return p == null || p.warn("[%s] fetch realtime position failed: %j", n.requestId, i, a), a;
+    for (const g in s)
+      !isNaN(s[g]) && Number(s[g]) !== 1 / 0 && (s[g] = Number(s[g]));
     s.status = s.sp > 3 ? 0 : 1;
-    const d = s.status, { labelCn: r, labelEn: u } = this.parseStatus(d), m = g(`${s.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    const d = s.status, { labelCn: r, labelEn: h } = this.parseStatus(d), M = b(`${s.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
     return {
       mmsi: s.m,
       name: s.n,
@@ -207,13 +207,13 @@ class Et extends et {
       cog: s.co,
       hdg: s.h,
       rot: isNaN(s.rot) ? 0 : s.rot,
-      eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(s.eta) ? g.utc(s.eta).format() : void 0,
+      eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(s.eta) ? b.utc(s.eta).format() : void 0,
       destination: s.destination,
-      positionTime: m.unix(),
-      utc: m.utc().format(),
+      positionTime: M.unix(),
+      utc: M.utc().format(),
       status: d,
       labelCn: r,
-      labelEn: u,
+      labelEn: h,
       method: "position",
       vendor: "hifleet"
     };
@@ -231,7 +231,7 @@ class Et extends et {
       }
     };
     let a = await B.post(i, o).json();
-    b == null || b.info("[%s] fetch vessel props from: %s - %j", n.requestId, i, o), a instanceof Array && (a = a[0]);
+    p == null || p.info("[%s] fetch vessel props from: %s - %j", n.requestId, i, o), a instanceof Array && (a = a[0]);
     for (const d in a)
       !isNaN(a[d]) && Number(a[d]) !== 1 / 0 && (a[d] = Number(a[d]));
     const s = {
@@ -244,7 +244,7 @@ class Et extends et {
       draught: a.dr,
       type: a.t
     };
-    return i = "https://www.hifleet.com/hifleetapi/sameShipSearch.do", a = await B.post(i, o).json(), b == null || b.info("[%s] search vessel dead weight from: %s - %j", n.requestId, i, o), a instanceof Array && (a = a[0]), a && (s.deadweight = Number(a.dwt)), s;
+    return i = "https://www.hifleet.com/hifleetapi/sameShipSearch.do", a = await B.post(i, o).json(), p == null || p.info("[%s] search vessel dead weight from: %s - %j", n.requestId, i, o), a instanceof Array && (a = a[0]), a && (s.deadweight = Number(a.dwt)), s;
   }
   async suggest(t, n = {}) {
     const i = "https://www.hifleet.com/hifleetapi/getShipSuggest.do", o = {
@@ -257,7 +257,7 @@ class Et extends et {
         Host: "www.hifleet.com"
       }
     }, a = await B.post(i, o).json();
-    b == null || b.info("[%s] suggest vessel props from: %s - %j", n.requestId, i, o);
+    p == null || p.info("[%s] suggest vessel props from: %s - %j", n.requestId, i, o);
     const s = [];
     for (const d of a)
       s.push({
@@ -270,54 +270,54 @@ class Et extends et {
     return s.sort((d, r) => r.score - d.score), s;
   }
   async trajectory(t, n, i, o, a = !0, s = {}) {
-    var c, p, y;
+    var c, w, y;
     const d = await this.realTimePosition(t, s);
-    let r = g(n);
-    const u = g(i), m = g();
+    let r = b(n);
+    const h = b(i), M = b();
     if (a) {
-      let h = u.diff(r, "d", !0);
-      h < 0 ? r = u.clone().subtract(40, "d") : h < 30 ? r.subtract(10, "d") : h < 60 ? r.subtract(5, "d") : r = u.clone().subtract(80, "d"), h = m.diff(u, "d", !0), u.add(h > 10 ? 240 : h * 24, "h");
+      let u = h.diff(r, "d", !0);
+      u < 0 ? r = h.clone().subtract(40, "d") : u < 30 ? r.subtract(10, "d") : u < 60 ? r.subtract(5, "d") : r = h.clone().subtract(80, "d"), u = M.diff(h, "d", !0), h.add(u > 10 ? 240 : u * 24, "h");
     }
     const l = {
       searchParams: {
-        endtime: u.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
+        endtime: h.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
         starttime: r.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
         mmsi: t,
         usertoken: this.token
       }
-    }, M = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", f = await B.get(M, l).json();
-    b == null || b.info("[%s] fetch trajectory from: %s - %j", s.requestId, M, l);
-    let C;
-    f && (C = ((p = (c = f.ships) == null ? void 0 : c.offors) == null ? void 0 : p.ship) || [], C.length || b == null || b.warn("[%s] fetch trajectory failed: %j", s.requestId, f));
-    const k = [];
-    let w = -1;
-    const v = g(`${(y = C == null ? void 0 : C[0]) == null ? void 0 : y.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-    for (const h of C) {
-      for (const P in h)
-        !isNaN(h[P]) && Number(h[P]) !== 1 / 0 && (h[P] = Number(h[P]));
-      const I = g(`${h.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-      h.status = h.sp > 4 ? 0 : 1;
-      const { labelEn: S, labelCn: D } = this.parseStatus(h.status), Y = {
-        mmsi: h.m,
-        name: h.n,
+    }, g = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", f = await B.get(g, l).json();
+    p == null || p.info("[%s] fetch trajectory from: %s - %j", s.requestId, g, l);
+    let x;
+    f && (x = ((w = (c = f.ships) == null ? void 0 : c.offors) == null ? void 0 : w.ship) || [], x.length || p == null || p.warn("[%s] fetch trajectory failed: %j", s.requestId, f));
+    const I = [];
+    let m = -1;
+    const v = b(`${(y = x == null ? void 0 : x[0]) == null ? void 0 : y.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    for (const u of x) {
+      for (const P in u)
+        !isNaN(u[P]) && Number(u[P]) !== 1 / 0 && (u[P] = Number(u[P]));
+      const k = b(`${u.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+      u.status = u.sp > 4 ? 0 : 1;
+      const { labelEn: S, labelCn: D } = this.parseStatus(u.status), Y = {
+        mmsi: u.m,
+        name: u.n,
         imo: d == null ? void 0 : d.imo,
-        lat: h.la,
-        lng: h.lo,
-        draught: h.draught,
-        sog: h.sp,
-        cog: h.co,
-        hdg: h.hdg,
-        positionTime: I.unix(),
-        utc: I.utc().format(),
-        status: h.status,
+        lat: u.la,
+        lng: u.lo,
+        draught: u.draught,
+        sog: u.sp,
+        cog: u.co,
+        hdg: u.hdg,
+        positionTime: k.unix(),
+        utc: k.utc().format(),
+        status: u.status,
         labelCn: D,
         labelEn: S,
         method: "trajectory",
         vendor: "hifleet"
-      }, E = Math.floor(I.diff(v, "minute", !0) / (o || 1));
-      E !== w && (w = E, k.push(Y));
+      }, E = Math.floor(k.diff(v, "minute", !0) / (o || 1));
+      E !== m && (m = E, I.push(Y));
     }
-    return k;
+    return I;
   }
 }
 class Nt extends et {
@@ -334,12 +334,12 @@ class Nt extends et {
         enc: 1
       }
     }, o = "https://api.shipxy.com/apicall/GetSingleShip", a = await B.get(o, i).json();
-    if (b == null || b.info("[%s] fetch realtime position from: %s - %j", n.requestId, o, i), (a == null ? void 0 : a.status) !== 0)
+    if (p == null || p.info("[%s] fetch realtime position from: %s - %j", n.requestId, o, i), (a == null ? void 0 : a.status) !== 0)
       return a;
     const s = a.data[0];
     for (const l in s)
       !isNaN(s[l]) && Number(s[l]) !== 1 / 0 && (s[l] = Number(s[l]));
-    const { labelCn: d, labelEn: r } = await this.parseStatus(s.navistat), u = g.unix(s.lasttime);
+    const { labelCn: d, labelEn: r } = await this.parseStatus(s.navistat), h = b.unix(s.lasttime);
     return {
       mmsi: s.ShipID,
       name: s.name,
@@ -355,7 +355,7 @@ class Nt extends et {
       hdg: Math.round(s.hdg / 100 * 100) / 100,
       rot: Math.round(s.rot / 100 * 100) / 100,
       positionTime: s.lasttime,
-      utc: u.utc().format(),
+      utc: h.utc().format(),
       status: s.navistat,
       labelEn: r,
       labelCn: d,
@@ -365,36 +365,36 @@ class Nt extends et {
   }
   async trajectory(t, n, i, o, a = !0, s = {}) {
     var v;
-    const d = await this.realTimePosition(t, s), r = g(n), u = g(i), m = "https://api.shipxy.com/apicall/GetShipTrack", l = {
+    const d = await this.realTimePosition(t, s), r = b(n), h = b(i), M = "https://api.shipxy.com/apicall/GetShipTrack", l = {
       searchParams: {
         id: t,
         k: this.token,
         enc: 1,
         cut: 0,
         btm: r.unix(),
-        etm: u.unix()
+        etm: h.unix()
       }
-    }, M = await B.get(m, l).json();
-    if (b == null || b.info("[%s] fetch trajectory from: %s - %j", s.requestId, m, l), (M == null ? void 0 : M.status) !== 0)
-      return M;
-    const f = M == null ? void 0 : M.points, C = [], k = g.unix((v = f[0]) == null ? void 0 : v.utc);
-    let w = -1;
+    }, g = await B.get(M, l).json();
+    if (p == null || p.info("[%s] fetch trajectory from: %s - %j", s.requestId, M, l), (g == null ? void 0 : g.status) !== 0)
+      return g;
+    const f = g == null ? void 0 : g.points, x = [], I = b.unix((v = f[0]) == null ? void 0 : v.utc);
+    let m = -1;
     for (const c of f) {
-      const p = g.unix(c.utc), y = {
+      const w = b.unix(c.utc), y = {
         imo: d == null ? void 0 : d.imo,
         mmsi: t,
         sog: Math.round(c.sog * 3600 / 1e3 / 1852 * 100) / 100,
         cog: Math.round(c.cog / 100 * 100) / 100,
         lat: Math.round(c.lat / 1e6 * 1e5) / 1e5,
         lng: Math.round(c.lon / 1e6 * 1e5) / 1e5,
-        positionTime: p.unix(),
-        utc: p.utc().format(),
+        positionTime: w.unix(),
+        utc: w.utc().format(),
         method: "trajectory",
         vendor: "shipxy"
-      }, h = Math.floor(p.diff(k, "minute", !0) / (o || 1));
-      h !== w && (w = h, C.push(y));
+      }, u = Math.floor(w.diff(I, "minute", !0) / (o || 1));
+      u !== m && (m = u, x.push(y));
     }
-    return C;
+    return x;
   }
 }
 class Tt extends et {
@@ -412,7 +412,7 @@ class Tt extends et {
         mmsiList: t
       }
     }, o = "https://api3.myships.com/sp/ships/getShipIdByMMSI", a = await B.post(o, i).json();
-    return b == null || b.info("[%s] fetch ship id from: %s - %j", n.requestId, o, i), a.code !== "0" ? a : a.data[0].shipId;
+    return p == null || p.info("[%s] fetch ship id from: %s - %j", n.requestId, o, i), a.code !== "0" ? a : a.data[0].shipId;
   }
   async getShipInfo(t, n = {}) {
     const i = {
@@ -423,11 +423,11 @@ class Tt extends et {
         shipId: t
       }
     }, o = "https://api3.myships.com/sp/ships/aissta", a = await B.post(o, i).json();
-    if (b == null || b.info("[%s] fetch ship info from: %s - %j", n.requestId, o, i), a.code !== "0")
+    if (p == null || p.info("[%s] fetch ship info from: %s - %j", n.requestId, o, i), a.code !== "0")
       return a;
     const s = a.data;
     let d = s.imo;
-    return t === "407170" && (d = "9198379", b == null || b.warn("[%s] ship(%s) imo error: %s, should be %s", n.requestId, t, s.imo, d)), {
+    return t === "407170" && (d = "9198379", p == null || p.warn("[%s] ship(%s) imo error: %s, should be %s", n.requestId, t, s.imo, d)), {
       mmsi: s.mmsi,
       name: s.shipnameEn,
       imo: d,
@@ -446,11 +446,11 @@ class Tt extends et {
         shipId: i
       }
     }, s = "https://api3.myships.com/sp/ships/position/latest", d = await B.post(s, a).json();
-    b == null || b.info("[%s] fetch realtime position from: %s - %j", n.requestId, s, a);
+    p == null || p.info("[%s] fetch realtime position from: %s - %j", n.requestId, s, a);
     const r = d.data[0];
     for (const f in r)
       !isNaN(r[f]) && Number(r[f]) !== 1 / 0 && (r[f] = Number(r[f]));
-    const { labelCn: u, labelEn: m } = await this.parseStatus(r.aisNavStatus), l = g.unix(r.posTime);
+    const { labelCn: h, labelEn: M } = await this.parseStatus(r.aisNavStatus), l = b.unix(r.posTime);
     return {
       ...o,
       mmsi: t,
@@ -463,21 +463,21 @@ class Tt extends et {
       positionTime: r.posTime,
       utc: l.utc().format(),
       status: r.aisNavStatus,
-      labelEn: m,
-      labelCn: u,
+      labelEn: M,
+      labelCn: h,
       method: "position",
       vendor: "myship"
     };
   }
   async trajectory(t, n, i, o, a = !0, s = {}) {
-    const d = g(n), r = g(i), u = await this.getShipId(t), m = await this.getShipInfo(u), l = [];
+    const d = b(n), r = b(i), h = await this.getShipId(t), M = await this.getShipInfo(h), l = [];
     for (; r.diff(d, "day", !0) > 30; )
-      await this.trajectoryIn30Day(u, d.unix(), d.add(30, "day").unix(), m, t, o, l);
-    return await this.trajectoryIn30Day(u, d.unix(), r.unix(), m, t, o, l), l;
+      await this.trajectoryIn30Day(h, d.unix(), d.add(30, "day").unix(), M, t, o, l);
+    return await this.trajectoryIn30Day(h, d.unix(), r.unix(), M, t, o, l), l;
   }
   async trajectoryIn30Day(t, n, i, o, a, s, d, r = {}) {
-    var k;
-    const u = {
+    var I;
+    const h = {
       headers: {
         appKey: this.token
       },
@@ -486,30 +486,30 @@ class Tt extends et {
         startTime: n,
         endTime: i
       }
-    }, m = "https://api3.myships.com/sp/ships/position/history", l = await B.post(m, u).json();
-    if (b == null || b.info("[%s] fetch trajectory from: %s - %j", r.requestId, m, u), l.code !== "0")
-      return b == null || b.warn("[%s] invoke myship trajectory failed: %j", r.requestId, l), l;
-    const M = l.data;
-    for (const w in M)
-      !isNaN(M[w]) && Number(M[w]) !== 1 / 0 && (M[w] = Number(M[w]));
-    const f = g.unix((k = M[0]) == null ? void 0 : k.posTime);
-    let C = -1;
-    for (const w of M) {
-      const v = g.unix(w.posTime), c = {
+    }, M = "https://api3.myships.com/sp/ships/position/history", l = await B.post(M, h).json();
+    if (p == null || p.info("[%s] fetch trajectory from: %s - %j", r.requestId, M, h), l.code !== "0")
+      return p == null || p.warn("[%s] invoke myship trajectory failed: %j", r.requestId, l), l;
+    const g = l.data;
+    for (const m in g)
+      !isNaN(g[m]) && Number(g[m]) !== 1 / 0 && (g[m] = Number(g[m]));
+    const f = b.unix((I = g[0]) == null ? void 0 : I.posTime);
+    let x = -1;
+    for (const m of g) {
+      const v = b.unix(m.posTime), c = {
         imo: o == null ? void 0 : o.imo,
         mmsi: a,
-        lat: Math.round(w.lat / 1e4 / 60 * 1e5) / 1e5,
-        lng: Math.round(w.lon / 1e4 / 60 * 1e5) / 1e5,
-        sog: Math.round(w.sog / 10 * 100) / 100,
-        cog: Math.round(w.cog / 10 * 100) / 100,
-        hdg: Math.round(w.heading * 100) / 100,
-        rot: Math.round(w.rot * 100) / 100,
+        lat: Math.round(m.lat / 1e4 / 60 * 1e5) / 1e5,
+        lng: Math.round(m.lon / 1e4 / 60 * 1e5) / 1e5,
+        sog: Math.round(m.sog / 10 * 100) / 100,
+        cog: Math.round(m.cog / 10 * 100) / 100,
+        hdg: Math.round(m.heading * 100) / 100,
+        rot: Math.round(m.rot * 100) / 100,
         positionTime: v.unix(),
         utc: v.utc().format(),
         method: "trajectory",
         vendor: "myship"
-      }, p = Math.floor(v.diff(f, "minute", !0) / (s || 1));
-      p !== C && (C = p, d.push(c));
+      }, w = Math.floor(v.diff(f, "minute", !0) / (s || 1));
+      w !== x && (x = w, d.push(c));
     }
     return d;
   }
@@ -520,7 +520,7 @@ try {
 } catch {
 } finally {
 }
-var yt = /* @__PURE__ */ ((j) => (j.NOTICE = "NOTICE", j.WARN = "WARN", j.HEAVY = "HEAVY", j.SEVERE = "SEVERE", j.ERROR = "ERROR", j.FATAL = "FATAL", j))(yt || {});
+var yt = /* @__PURE__ */ ((C) => (C.NOTICE = "NOTICE", C.WARN = "WARN", C.HEAVY = "HEAVY", C.SEVERE = "SEVERE", C.ERROR = "ERROR", C.FATAL = "FATAL", C))(yt || {});
 class Mt {
   /**
    * 解析告警规则, 多规则场景
@@ -537,13 +537,13 @@ class Mt {
     if (!o)
       return;
     const a = {};
-    for (let u = 0; u < (o == null ? void 0 : o.length); u++) {
-      const m = (r = (d = o[u].match(n)) == null ? void 0 : d[0]) == null ? void 0 : r.split("],");
-      if (u === 0 && !m)
+    for (let h = 0; h < (o == null ? void 0 : o.length); h++) {
+      const M = (r = (d = o[h].match(n)) == null ? void 0 : d[0]) == null ? void 0 : r.split("],");
+      if (h === 0 && !M)
         a.scope = o[0];
-      else if (m)
-        for (let l = 0, M = m.length; l < M; l++) {
-          const f = this.parseRule(m[l]);
+      else if (M)
+        for (let l = 0, g = M.length; l < g; l++) {
+          const f = this.parseRule(M[l]);
           f && (a[f.level] ? f.key ? a[f.level][f == null ? void 0 : f.key] = f : a[f.level] = f : f.key ? a[f.level] = { [f == null ? void 0 : f.key]: f } : a[f.level] = f);
         }
     }
@@ -575,14 +575,14 @@ class Mt {
    * @param options
    */
   checkWeather(e, t, n = {}) {
-    var f, C, k, w, v, c, p, y, h, I, S, D, Y, E, P;
+    var f, x, I, m, v, c, w, y, u, k, S, D, Y, E, P;
     let i = 0, o = 0, a = 0, s = 0;
-    const d = Math.round(((C = (f = t == null ? void 0 : t.SEVERE) == null ? void 0 : f.sigWave) == null ? void 0 : C.number) * 1.6 * 100) / 100, r = (w = (k = t == null ? void 0 : t.SEVERE) == null ? void 0 : k.sigWave) == null ? void 0 : w.number, u = (c = (v = t == null ? void 0 : t.HEAVY) == null ? void 0 : v.sigWave) == null ? void 0 : c.number, m = Math.round((((y = (p = t == null ? void 0 : t.SEVERE) == null ? void 0 : p.wind) == null ? void 0 : y.number) + 2) * 100) / 100, l = (I = (h = t == null ? void 0 : t.SEVERE) == null ? void 0 : h.wind) == null ? void 0 : I.number, M = (D = (S = t == null ? void 0 : t.HEAVY) == null ? void 0 : S.wind) == null ? void 0 : D.number;
+    const d = Math.round(((x = (f = t == null ? void 0 : t.SEVERE) == null ? void 0 : f.sigWave) == null ? void 0 : x.number) * 1.6 * 100) / 100, r = (m = (I = t == null ? void 0 : t.SEVERE) == null ? void 0 : I.sigWave) == null ? void 0 : m.number, h = (c = (v = t == null ? void 0 : t.HEAVY) == null ? void 0 : v.sigWave) == null ? void 0 : c.number, M = Math.round((((y = (w = t == null ? void 0 : t.SEVERE) == null ? void 0 : w.wind) == null ? void 0 : y.number) + 2) * 100) / 100, l = (k = (u = t == null ? void 0 : t.SEVERE) == null ? void 0 : u.wind) == null ? void 0 : k.number, g = (D = (S = t == null ? void 0 : t.HEAVY) == null ? void 0 : S.wind) == null ? void 0 : D.number;
     for (let T = 0; T < (e == null ? void 0 : e.length); T++) {
-      const N = e[T], A = (E = (Y = N == null ? void 0 : N.meteo) == null ? void 0 : Y.wave) == null ? void 0 : E.sig, R = (P = N == null ? void 0 : N.meteo) == null ? void 0 : P.wind, K = T ? g(N.eta).diff(g(e[T - 1].eta), "hour", !0) : 0;
-      s = K > s ? K : s, _ == null || _.info("[%s] check sig.wave: %j", n.requestId, { ...A, dgThd4Wv: d, svThd4Wv: r, hvThd4Wv: u }), (A == null ? void 0 : A.height) >= d ? N.isDangerous = !0 : (A == null ? void 0 : A.height) >= r ? N.isSevere = !0 : (A == null ? void 0 : A.height) >= u && (N.isHeavy = !0), _ == null || _.info("[%s] check wind: %j", n.requestId, { ...R, dgThd4Wd: m, svThd4Wd: l, hvThd4Wd: M }), (R == null ? void 0 : R.scale) >= m ? (N.isDangerous = !0, delete N.isSevere, delete N.isHeavy) : (R == null ? void 0 : R.scale) > l ? (N.isDangerous || (N.isSevere = !0), delete N.isHeavy) : (R == null ? void 0 : R.scale) === M && !N.isDangerous && !N.isSevere && (N.isHeavy = !0), i += N.isDangerous ? K : 0, o += N.isSevere ? K : 0, a += N.isHeavy ? K : 0;
+      const N = e[T], A = (E = (Y = N == null ? void 0 : N.meteo) == null ? void 0 : Y.wave) == null ? void 0 : E.sig, R = (P = N == null ? void 0 : N.meteo) == null ? void 0 : P.wind, K = T ? b(N.eta).diff(b(e[T - 1].eta), "hour", !0) : 0;
+      s = K > s ? K : s, _ == null || _.info("[%s] check sig.wave: %j", n.requestId, { ...A, dgThd4Wv: d, svThd4Wv: r, hvThd4Wv: h }), (A == null ? void 0 : A.height) >= d ? N.isDangerous = !0 : (A == null ? void 0 : A.height) >= r ? N.isSevere = !0 : (A == null ? void 0 : A.height) >= h && (N.isHeavy = !0), _ == null || _.info("[%s] check wind: %j", n.requestId, { ...R, dgThd4Wd: M, svThd4Wd: l, hvThd4Wd: g }), (R == null ? void 0 : R.scale) >= M ? (N.isDangerous = !0, delete N.isSevere, delete N.isHeavy) : (R == null ? void 0 : R.scale) > l ? (N.isDangerous || (N.isSevere = !0), delete N.isHeavy) : (R == null ? void 0 : R.scale) === g && !N.isDangerous && !N.isSevere && (N.isHeavy = !0), i += N.isDangerous ? K : 0, o += N.isSevere ? K : 0, a += N.isHeavy ? K : 0;
     }
-    return i = Math.round(i * 100) / 100, o = Math.round(o * 100) / 100, a = Math.round(a * 100) / 100, s = Math.round(s), { sample: e, dangerous: i, severe: o, heavy: a, step: s < 3 ? 3 : s, wind: { dgThd4Wd: m, svThd4Wd: l, hvThd4Wd: M }, sig: { dgThd4Wv: d, svThd4Wv: r, hvThd4Wv: u } };
+    return i = Math.round(i * 100) / 100, o = Math.round(o * 100) / 100, a = Math.round(a * 100) / 100, s = Math.round(s), { sample: e, dangerous: i, severe: o, heavy: a, step: s < 3 ? 3 : s, wind: { dgThd4Wd: M, svThd4Wd: l, hvThd4Wd: g }, sig: { dgThd4Wv: d, svThd4Wv: r, hvThd4Wv: h } };
   }
 }
 const Dt = new Mt();
@@ -593,7 +593,7 @@ try {
 } finally {
 }
 const gt = new ft("", !0);
-var bt = /* @__PURE__ */ ((j) => (j.common = "common", j.container = "container", j.tugs = "tugs", j))(bt || {}), pt = /* @__PURE__ */ ((j) => (j.Ballast = "Ballast", j.Laden = "Laden", j))(pt || {}), vt = /* @__PURE__ */ ((j) => (j.Cp = "CP", j.Perf = "Basis", j.Instruct = "Other", j))(vt || {});
+var bt = /* @__PURE__ */ ((C) => (C.common = "common", C.container = "container", C.tugs = "tugs", C))(bt || {}), pt = /* @__PURE__ */ ((C) => (C.Ballast = "Ballast", C.Laden = "Laden", C))(pt || {}), vt = /* @__PURE__ */ ((C) => (C.Cp = "CP", C.Perf = "Basis", C.Instruct = "Other", C))(vt || {});
 class O {
   /**
    * @see https://baike.baidu.com/item/%E6%96%B9%E5%BD%A2%E7%B3%BB%E6%95%B0/4965568?fr=aladdin
@@ -735,22 +735,22 @@ class O {
   static async speedLoseAt(e, t, n, i = "", o = 2, a = !0, s = !1, d = {}) {
     let r;
     if (t.velocity && s && (e.speed = J.roundPrecision(t.velocity * 1852 / 3600, 6)), a) {
-      let u;
+      let h;
       if (d.meteo2)
         try {
-          const f = await gt.spotForecast(t.lat, t.lng, n.utc().format(), !1, !1, !0, d), [C] = ct.pickHourly(f, n);
-          u = ct.toLegacy(C);
+          const f = await gt.spotForecast(t.lat, t.lng, n.utc().format(), !1, !1, !0, d), [x] = ct.pickHourly(f, n);
+          h = ct.toLegacy(x);
         } catch (f) {
           F.warn("[%s] meteo2 spot(%j) forecast failed: %s", d.requestId, { ...t, eta: n.utc().format() }, f);
         }
       else
-        u = await mt.queryPointFactor(t.lng, t.lat, n.valueOf(), "wind,wave,current,watertemp", i, d);
-      const m = O.weatherFactor(e, u), l = O.currentFactor(e.bearing, u == null ? void 0 : u.current, o), M = Math.round((e.speed * 1.943844 + m + l) * 100) / 100;
+        h = await mt.queryPointFactor(t.lng, t.lat, n.valueOf(), "wind,wave,current,watertemp", i, d);
+      const M = O.weatherFactor(e, h), l = O.currentFactor(e.bearing, h == null ? void 0 : h.current, o), g = Math.round((e.speed * 1.943844 + M + l) * 100) / 100;
       r = {
-        meteo: { ...u },
-        wxFactor: m,
+        meteo: { ...h },
+        wxFactor: M,
         cFactor: l,
-        speed: t.velocity && s ? t.velocity : M < 0 ? 1 : M,
+        speed: t.velocity && s ? t.velocity : g < 0 ? 1 : g,
         eta: n.utc().format(),
         etd: n.utc().format()
       };
@@ -777,53 +777,53 @@ class O {
    * @param useRouteParam true 启用航线上设置的参数 { suspend: 停留时长（小时）, velocity: 速度（kts）}
    * @private
    */
-  static async speedLoseInHoursStep(e, t, n, i, o, a, s = "", d = !0, r = !1, u = {}) {
+  static async speedLoseInHoursStep(e, t, n, i, o, a, s = "", d = !0, r = !1, h = {}) {
     t.utc();
-    const m = t.clone().add(14, "days"), l = [], M = [];
-    let f = 0, C = 0, k, w;
+    const M = t.clone().add(14, "days"), l = [], g = [];
+    let f = 0, x = 0, I, m;
     for (let v = 0; v < a.length - 1; v++) {
       let c = a[v];
-      c.distanceFromStart = Math.round((o + C) * 1e4) / 1e4;
-      const p = a[v + 1];
-      if (e.bearing = W.calculateBearing(c, p, !p.gcToPrevious), c.bearing = e.bearing, c.suspend && r) {
+      c.distanceFromStart = Math.round((o + x) * 1e4) / 1e4;
+      const w = a[v + 1];
+      if (e.bearing = W.calculateBearing(c, w, !w.gcToPrevious), c.bearing = e.bearing, c.suspend && r) {
         c.eta = c.eta || t.utc().format(), c.elapsed = c.elapsed ?? 0;
-        const I = c.suspend - c.elapsed;
-        if (i - f > I)
-          i = i - f - I, t.add(I, "hour"), c.elapsed = c.suspend;
+        const k = c.suspend - c.elapsed;
+        if (i - f > k)
+          i = i - f - k, t.add(k, "hour"), c.elapsed = c.suspend;
         else {
           const S = i - f;
           c.elapsed += S, t.add(S, "hour"), i = 0;
         }
-        if (F == null || F.info(`[%s] suspend ${c.elapsed} hours at %j, and remain ${i} hours need to go...`, u.requestId, c), i === 0)
-          return c.distanceFromPrevious = C, { etd: t, from: w || c, to: c, next: a.filter((S) => S), wps: l, days: M };
+        if (F == null || F.info(`[%s] suspend ${c.elapsed} hours at %j, and remain ${i} hours need to go...`, h.requestId, c), i === 0)
+          return c.distanceFromPrevious = x, { etd: t, from: m || c, to: c, next: a.filter((S) => S), wps: l, days: g };
       } else
         c.suspend = 0;
-      d = t.isAfter(m) ? !1 : d, c = await O.speedLoseAt(e, c, t, s, 0, d, r, u), w = w || c, c.important && l.push(c), t.isSameOrAfter(n) && (M.push(c), n.add(24, "hour"));
-      const y = W.calculateDistance(c, p, !p.gcToPrevious);
-      let h = Math.round(y / w.speed * 1e5) / 1e5;
-      if (f + h < i) {
-        if (f += h, t.add(h, "hour"), delete a[v], F == null || F.debug(
-          `[%s] go to %j from %j with ${y}nm, and cost ${h} hours`,
-          u.requestId,
-          { lat: p.lat, lng: p.lng },
-          { lat: w.lat, lng: w.lng, etd: w.etd }
-        ), C += y, a.filter((I) => I).length <= 1) {
-          k = p, k.eta = t.utc().format(), k.distanceFromPrevious = y, k.distanceFromStart = Math.round((o + C) * 1e4) / 1e4, l.push(k), delete a[v + 1];
+      d = t.isAfter(M) ? !1 : d, c = await O.speedLoseAt(e, c, t, s, 0, d, r, h), m = m || c, c.important && l.push(c), t.isSameOrAfter(n) && (g.push(c), n.add(24, "hour"));
+      const y = W.calculateDistance(c, w, !w.gcToPrevious);
+      let u = Math.round(y / m.speed * 1e5) / 1e5;
+      if (f + u < i) {
+        if (f += u, t.add(u, "hour"), delete a[v], F == null || F.debug(
+          `[%s] go to %j from %j with ${y}nm, and cost ${u} hours`,
+          h.requestId,
+          { lat: w.lat, lng: w.lng },
+          { lat: m.lat, lng: m.lng, etd: m.etd }
+        ), x += y, a.filter((k) => k).length <= 1) {
+          I = w, I.eta = t.utc().format(), I.distanceFromPrevious = y, I.distanceFromStart = Math.round((o + x) * 1e4) / 1e4, l.push(I), delete a[v + 1];
           break;
         }
       } else {
-        h = i - f, t.add(h, "hour");
-        const I = J.roundPrecision(w.speed * h, 5);
-        k = W.calculateCoordinate(c, e.bearing, I, "nauticalmiles", !p.gcToPrevious), k.eta = t.utc().format(), a[v] = k, F == null || F.debug(
-          `[%s] go to %j from %j with ${I}nm, and cost ${h} hours`,
-          u.requestId,
-          { lat: k.lat, lng: k.lng },
+        u = i - f, t.add(u, "hour");
+        const k = J.roundPrecision(m.speed * u, 5);
+        I = W.calculateCoordinate(c, e.bearing, k, "nauticalmiles", !w.gcToPrevious), I.eta = t.utc().format(), a[v] = I, F == null || F.debug(
+          `[%s] go to %j from %j with ${k}nm, and cost ${u} hours`,
+          h.requestId,
+          { lat: I.lat, lng: I.lng },
           { lat: c.lat, lng: c.lng, etd: c.etd }
-        ), C += I, k.distanceFromPrevious = Math.round(C * 1e4) / 1e4, k.distanceFromStart = Math.round((o + C) * 1e4) / 1e4;
+        ), x += k, I.distanceFromPrevious = Math.round(x * 1e4) / 1e4, I.distanceFromStart = Math.round((o + x) * 1e4) / 1e4;
         break;
       }
     }
-    return { etd: t, from: w, to: k, next: a.filter((v) => v), wps: l, days: M };
+    return { etd: t, from: m, to: I, next: a.filter((v) => v), wps: l, days: g };
   }
   /**
    * 洋流影响因子
@@ -844,16 +844,16 @@ class O {
    * @param wwc 气象要素
    */
   static weatherFactor(e, t) {
-    var m, l, M, f, C, k, w;
+    var M, l, g, f, x, I, m;
     F == null || F.debug("calculate weather factor via: %j", { ...e, ...t });
     const n = O.blockCoefficient(e.displacement, e.lbp, e.breadthMoulded, e.draught), i = O.froudeNumber(e.speed, e.lbp), o = O.amendFactor(n, i, e.loadCondition);
-    let a = Math.abs(e.bearing % 360 - (((m = t == null ? void 0 : t.wind) == null ? void 0 : m.degree) % 360 || 0));
+    let a = Math.abs(e.bearing % 360 - (((M = t == null ? void 0 : t.wind) == null ? void 0 : M.degree) % 360 || 0));
     a = a > 180 ? 360 - a : a;
-    const s = O.directionFactor(a, (l = t == null ? void 0 : t.wind) == null ? void 0 : l.scale), d = O.vesselTagFactor(e.displacement, e.loadCondition, e.tag, (M = t == null ? void 0 : t.wind) == null ? void 0 : M.scale);
+    const s = O.directionFactor(a, (l = t == null ? void 0 : t.wind) == null ? void 0 : l.scale), d = O.vesselTagFactor(e.displacement, e.loadCondition, e.tag, (g = t == null ? void 0 : t.wind) == null ? void 0 : g.scale);
     let r = s * o * d / 100 * e.speed;
-    r = Math.round(r * 1.943844 * 1e4) / 1e4 * -1, e.tag === "tugs" && Math.abs(r) > 1 && (r = r / (Math.abs(Math.round(r)) + 1)), F == null || F.debug("wind wx factor = %d", r), a = Math.abs(e.bearing % 360 - (((C = (f = t == null ? void 0 : t.wave) == null ? void 0 : f.sig) == null ? void 0 : C.degree) % 360 || 0));
-    const u = O.waveHeightFactor(((w = (k = t == null ? void 0 : t.wave) == null ? void 0 : k.sig) == null ? void 0 : w.height) ?? 1, a);
-    return F == null || F.debug("wave wx factor = %d", u), r = r * 0.4 + u, F == null || F.debug("weather factor = %d", r), r = Math.abs(r) > 4 ? 4 * (Math.abs(r) / r) + Math.abs(r) / r * (Math.abs(r) - 4) * 0.1 : r, Math.round((r || 0) * 100) / 100;
+    r = Math.round(r * 1.943844 * 1e4) / 1e4 * -1, e.tag === "tugs" && Math.abs(r) > 1 && (r = r / (Math.abs(Math.round(r)) + 1)), F == null || F.debug("wind wx factor = %d", r), a = Math.abs(e.bearing % 360 - (((x = (f = t == null ? void 0 : t.wave) == null ? void 0 : f.sig) == null ? void 0 : x.degree) % 360 || 0));
+    const h = O.waveHeightFactor(((m = (I = t == null ? void 0 : t.wave) == null ? void 0 : I.sig) == null ? void 0 : m.height) ?? 1, a);
+    return F == null || F.debug("wave wx factor = %d", h), r = r * 0.4 + h, F == null || F.debug("weather factor = %d", r), r = Math.abs(r) > 4 ? 4 * (Math.abs(r) / r) + Math.abs(r) / r * (Math.abs(r) - 4) * 0.1 : r, Math.round((r || 0) * 100) / 100;
   }
   /**
    * 全程失速分析(走完航程)
@@ -867,14 +867,14 @@ class O {
    * @param useMeteo true 启用气象分析
    * @param useRouteParam
    */
-  static async analyseInstant(e, t, n, i, o, a = "", s = 0, d = !0, r = !1, u = {}) {
+  static async analyseInstant(e, t, n, i, o, a = "", s = 0, d = !0, r = !1, h = {}) {
     var z, U, Q, X, Z, $;
-    const m = g().valueOf();
+    const M = b().valueOf();
     e.lng = J.convertToStdLng(e.lng);
-    const { route: l, waypoints: M } = o.points, f = W.calculateSubRoute(e, l);
+    const { route: l, waypoints: g } = o.points, f = W.calculateSubRoute(e, l);
     if (((z = f[0]) == null ? void 0 : z.length) <= 1)
       return;
-    const { v0: C, label: k } = e.sog ? {
+    const { v0: x, label: I } = e.sog ? {
       v0: e.sog,
       label: "Other"
       /* Instruct */
@@ -882,64 +882,64 @@ class O {
       v0: i.speed,
       label: "CP"
       /* Cp */
-    }, w = O.assembleProperties(n, i.loadCondition, C, 0), v = M.length ? W.calculateSubWaypoints(e, M) : [];
+    }, m = O.assembleProperties(n, i.loadCondition, x, 0), v = g.length ? W.calculateSubWaypoints(e, g) : [];
     v.forEach((q) => q.important = !0);
     const c = {
       from: { ...e },
       route: f,
       waypoints: v,
-      v0: C,
-      label: k
-    }, p = {
+      v0: x,
+      label: I
+    }, w = {
       hours: [],
       days: [],
       wps: []
     };
     s || (W.calculateRouteDistance(f) / i.speed <= 72 ? s = 3 : s = 6);
-    let y = W.simplifyRouteToCoordinates(f, v, 0), h = 0, I = 0, S = 0, D = 0;
-    t = g(t).utc();
+    let y = W.simplifyRouteToCoordinates(f, v, 0), u = 0, k = 0, S = 0, D = 0;
+    t = b(t).utc();
     const Y = t.clone();
     for (; y.length > 0; ) {
-      const q = s - t.hour() % s, V = Math.ceil(t.clone().add(q, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4, x = await O.speedLoseInHoursStep(
-        w,
+      const q = s - t.hour() % s, V = Math.ceil(t.clone().add(q, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4, j = await O.speedLoseInHoursStep(
+        m,
         t,
         Y,
         V,
-        h,
+        u,
         y,
         a,
         d,
         r,
-        u
+        h
       );
-      (U = x.from) != null && U.speed && (p.hours.push(x.from), p.wps.push(...x.wps), p.days.push(...x.days)), y = x == null ? void 0 : x.next, y.length || p.hours.push(x == null ? void 0 : x.to), h += Math.round((((Q = x == null ? void 0 : x.to) == null ? void 0 : Q.distanceFromPrevious) ?? 0) * 1e4) / 1e4;
+      (U = j.from) != null && U.speed && (w.hours.push(j.from), w.wps.push(...j.wps), w.days.push(...j.days)), y = j == null ? void 0 : j.next, y.length || w.hours.push(j == null ? void 0 : j.to), u += Math.round((((Q = j == null ? void 0 : j.to) == null ? void 0 : Q.distanceFromPrevious) ?? 0) * 1e4) / 1e4;
     }
-    const E = p.hours;
+    const E = w.hours;
     for (let q = 0; q < E.length - 1; q++) {
-      const V = g(E[q + 1].eta).diff(E[q].etd, "hour", !0) || 1;
-      I += (E[q].wxFactor || 0) * V, S += (E[q].cFactor || 0) * V, D += V;
+      const V = b(E[q + 1].eta).diff(E[q].etd, "hour", !0) || 1;
+      k += (E[q].wxFactor || 0) * V, S += (E[q].cFactor || 0) * V, D += V;
     }
-    (X = p.wps) == null || X.forEach((q, V) => {
-      q.positionTime = g.utc(q.etd || q.eta).unix();
-      const x = p.wps[V - 1];
-      if (x) {
-        const L = q.distanceFromStart - x.distanceFromStart, H = g(q.eta || q.etd).diff(g(x.etd || x.eta), "h", !0);
+    (X = w.wps) == null || X.forEach((q, V) => {
+      q.positionTime = b.utc(q.etd || q.eta).unix();
+      const j = w.wps[V - 1];
+      if (j) {
+        const L = q.distanceFromStart - j.distanceFromStart, H = b(q.eta || q.etd).diff(b(j.etd || j.eta), "h", !0);
         q.avgSpd = Math.round(L / H * 100) / 100;
-        const nt = W.calculateBearing(x, q);
-        x.bearing = nt;
+        const nt = W.calculateBearing(j, q);
+        j.bearing = nt;
       }
-    }), p.wps = (Z = p.wps) == null ? void 0 : Z.reduce((q, V) => (q.some((x) => Math.round(x.positionTime / 60) === Math.round(V.positionTime / 60)) || q.push(V), q), []), c.sample = p;
-    const P = p.hours.at(0), T = p.hours.at(-1);
-    c.distance = Math.round(T.distanceFromStart * 1e4) / 1e4, c.etd = g(P.eta).utc().format(), c.eta = g(T.eta).utc().format(), c.wxFactor = Math.round(I / D * 1e4) / 1e4, c.cFactor = Math.round(S / D * 1e4) / 1e4, c.avgSpeed = Math.round(T.distanceFromStart / D * 1e4) / 1e4, c.totalHrs = Math.round(D * 1e4) / 1e4;
-    const { distanceInECA: N, hoursInECA: A, totalDgoConsInECA: R, eca: K } = await this.calculateECA(c, i, u), st = J.roundPrecision(i.fo / 24 * (D - A), 3), at = J.roundPrecision(i.dgo / 24 * D, 3);
+    }), w.wps = (Z = w.wps) == null ? void 0 : Z.reduce((q, V) => (q.some((j) => Math.round(j.positionTime / 60) === Math.round(V.positionTime / 60)) || q.push(V), q), []), c.sample = w;
+    const P = w.hours.at(0), T = w.hours.at(-1);
+    c.distance = Math.round(T.distanceFromStart * 1e4) / 1e4, c.etd = b(P.eta).utc().format(), c.eta = b(T.eta).utc().format(), c.wxFactor = Math.round(k / D * 1e4) / 1e4, c.cFactor = Math.round(S / D * 1e4) / 1e4, c.avgSpeed = Math.round(T.distanceFromStart / D * 1e4) / 1e4, c.totalHrs = Math.round(D * 1e4) / 1e4;
+    const { distanceInECA: N, hoursInECA: A, totalDgoConsInECA: R, eca: K } = await this.calculateECA(c, i, h), st = J.roundPrecision(i.fo / 24 * (D - A), 3), at = J.roundPrecision(i.dgo / 24 * D, 3);
     c.extend = {
       eca: K,
       distanceInECA: N,
       hoursInECA: A,
       totalDgoConsInECA: R
     }, c.totalFoCons = st, c.totalDgoCons = at;
-    const tt = g().valueOf() - m, ot = (($ = p == null ? void 0 : p.hours) == null ? void 0 : $.length) || 1;
-    return F == null || F.info("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", u == null ? void 0 : u.requestId, tt, ot, Math.round(tt / ot * 1e3) / 1e3), c;
+    const tt = b().valueOf() - M, ot = (($ = w == null ? void 0 : w.hours) == null ? void 0 : $.length) || 1;
+    return F == null || F.info("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", h == null ? void 0 : h.requestId, tt, ot, Math.round(tt / ot * 1e3) / 1e3), c;
   }
   /**
    * 分段失速分析（最多走hours 小时）
@@ -954,11 +954,11 @@ class O {
    * @param useMeteo true 启用气象分析
    * @param useRouteParam
    */
-  static async analyseInstantWithThreshed(e, t, n, i, o, a, s, d = "", r = 3, u = !0, m = !1, l = {}) {
+  static async analyseInstantWithThreshed(e, t, n, i, o, a, s, d = "", r = 3, h = !0, M = !1, l = {}) {
     var Q, X, Z, $, q, V;
-    const M = g().valueOf();
+    const g = b().valueOf();
     e.lng = J.convertToStdLng(e.lng);
-    const { v0: f, label: C } = e.sog ? {
+    const { v0: f, label: x } = e.sog ? {
       v0: e.sog,
       label: "Other"
       /* Instruct */
@@ -966,65 +966,65 @@ class O {
       v0: o.speed,
       label: "CP"
       /* Cp */
-    }, k = O.assembleProperties(i, o.loadCondition, f, 0), w = W.calculateSubRoute(e, a);
-    if (((Q = w[0]) == null ? void 0 : Q.length) <= 1)
+    }, I = O.assembleProperties(i, o.loadCondition, f, 0), m = W.calculateSubRoute(e, a);
+    if (((Q = m[0]) == null ? void 0 : Q.length) <= 1)
       return;
     const v = s.length ? W.calculateSubWaypoints(e, s) : [];
-    v.forEach((x) => x.important = !0);
-    let c = W.simplifyRouteToCoordinates(w, v, 0), p = 0, y = 0, h = 0, I = 0;
+    v.forEach((j) => j.important = !0);
+    let c = W.simplifyRouteToCoordinates(m, v, 0), w = 0, y = 0, u = 0, k = 0;
     const S = {
       hours: [],
       wps: [],
       days: []
     };
-    t = g(t).utc();
+    t = b(t).utc();
     const D = t.clone();
     for (; c.length > 0; ) {
-      const x = r - t.hour() % r;
-      let L = Math.ceil(t.clone().add(x, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4;
+      const j = r - t.hour() % r;
+      let L = Math.ceil(t.clone().add(j, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4;
       L = t.clone().add(L, "h").isSameOrAfter(n) ? n.diff(t, "h", !0) * 1e4 / 1e4 : L;
-      const H = await O.speedLoseInHoursStep(k, t, D, L, p, c, d, u, m, l);
-      if ((X = H.from) != null && X.speed && (S.hours.push(H.from), H != null && H.wps && S.wps.push(...H.wps), S.days.push(...H.days)), c = H == null ? void 0 : H.next, c.length || S.hours.push(H == null ? void 0 : H.to), p += Math.round((((Z = H == null ? void 0 : H.to) == null ? void 0 : Z.distanceFromPrevious) ?? 0) * 1e4) / 1e4, !L)
+      const H = await O.speedLoseInHoursStep(I, t, D, L, w, c, d, h, M, l);
+      if ((X = H.from) != null && X.speed && (S.hours.push(H.from), H != null && H.wps && S.wps.push(...H.wps), S.days.push(...H.days)), c = H == null ? void 0 : H.next, c.length || S.hours.push(H == null ? void 0 : H.to), w += Math.round((((Z = H == null ? void 0 : H.to) == null ? void 0 : Z.distanceFromPrevious) ?? 0) * 1e4) / 1e4, !L)
         break;
     }
-    S.wps = ($ = S.wps) == null ? void 0 : $.reduce((x, L) => (x.some((H) => Math.round(g(H.etd).unix() / 60) === Math.round(g(L.etd).unix() / 60)) || x.push(L), x), []), (q = S.wps) == null || q.forEach((x, L) => {
+    S.wps = ($ = S.wps) == null ? void 0 : $.reduce((j, L) => (j.some((H) => Math.round(b(H.etd).unix() / 60) === Math.round(b(L.etd).unix() / 60)) || j.push(L), j), []), (q = S.wps) == null || q.forEach((j, L) => {
       const H = S.wps[L - 1];
       if (H) {
-        const nt = x.distanceFromStart - H.distanceFromStart, dt = g(x.eta || x.etd).diff(g(H.etd || H.eta), "h", !0);
-        x.avgSpd = Math.round(nt / dt * 100) / 100;
-        const ut = W.calculateBearing(H, x);
+        const nt = j.distanceFromStart - H.distanceFromStart, dt = b(j.eta || j.etd).diff(b(H.etd || H.eta), "h", !0);
+        j.avgSpd = Math.round(nt / dt * 100) / 100;
+        const ut = W.calculateBearing(H, j);
         H.bearing = ut;
       }
     });
     const Y = S.hours;
-    for (let x = 0; x < Y.length - 1; x++) {
-      const L = g(Y[x + 1].eta).diff(Y[x].etd, "hour", !0);
-      y += Y[x].wxFactor * L, h += Y[x].cFactor * L, I += L;
+    for (let j = 0; j < Y.length - 1; j++) {
+      const L = b(Y[j + 1].eta).diff(Y[j].etd, "hour", !0);
+      y += Y[j].wxFactor * L, u += Y[j].cFactor * L, k += L;
     }
-    const E = S.hours.at(0), P = S.hours.at(-1), T = await W.calculateRangeRoute(E, P, w), N = await W.calculateRangeWaypoints(E, P, w, v), A = {
+    const E = S.hours.at(0), P = S.hours.at(-1), T = await W.calculateRangeRoute(E, P, m), N = await W.calculateRangeWaypoints(E, P, m, v), A = {
       sample: S,
       distance: Math.round(((P == null ? void 0 : P.distanceFromStart) || 0) * 1e4) / 1e4,
       // 注意，可能会在first节点Drift,所有采用eta做为初始出发时间
-      etd: g(E.eta).utc().format(),
-      eta: g(P == null ? void 0 : P.eta).utc().format(),
-      wxFactor: Math.round(y / I * 1e4) / 1e4,
-      cFactor: Math.round(h / I * 1e4) / 1e4,
-      avgSpeed: Math.round(((P == null ? void 0 : P.distanceFromStart) || 0) / I * 1e4) / 1e4,
-      totalHrs: Math.round(I * 1e4) / 1e4,
+      etd: b(E.eta).utc().format(),
+      eta: b(P == null ? void 0 : P.eta).utc().format(),
+      wxFactor: Math.round(y / k * 1e4) / 1e4,
+      cFactor: Math.round(u / k * 1e4) / 1e4,
+      avgSpeed: Math.round(((P == null ? void 0 : P.distanceFromStart) || 0) / k * 1e4) / 1e4,
+      totalHrs: Math.round(k * 1e4) / 1e4,
       from: E,
       to: P,
       route: T,
       waypoints: N,
       v0: f,
-      label: C
-    }, { distanceInECA: R, hoursInECA: K, totalDgoConsInECA: st, eca: at } = await this.calculateECA(A, o, l), rt = J.roundPrecision(o.fo / 24 * (I - K), 3), tt = J.roundPrecision(o.dgo / 24 * I, 3);
+      label: x
+    }, { distanceInECA: R, hoursInECA: K, totalDgoConsInECA: st, eca: at } = await this.calculateECA(A, o, l), rt = J.roundPrecision(o.fo / 24 * (k - K), 3), tt = J.roundPrecision(o.dgo / 24 * k, 3);
     A.extend = {
       eca: at,
       distanceInECA: R,
       hoursInECA: K,
       totalDgoConsInECA: st
     }, A.totalDgoCons = tt, A.totalFoCons = rt;
-    const z = g().valueOf() - M, U = ((V = S == null ? void 0 : S.hours) == null ? void 0 : V.length) || 1;
+    const z = b().valueOf() - g, U = ((V = S == null ? void 0 : S.hours) == null ? void 0 : V.length) || 1;
     return F == null || F.debug("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", l == null ? void 0 : l.requestId, z, U, Math.round(z / U * 1e3) / 1e3), A;
   }
   /**
@@ -1043,25 +1043,25 @@ class O {
    * @param options
    */
   static async analyseCost(e, t, n, i, o = {}) {
-    var w, v;
-    const a = g().valueOf(), s = [];
+    var m, v;
+    const a = b().valueOf(), s = [];
     o.meteo2 = o.meteo2 || !0, e.speedStep = e.speedStep || 3, e.alterStep = e.alterStep ?? 1;
     const d = W.calculateRouteDistance(i.route);
     let r = 0;
     n.forEach((c) => {
-      const p = Math.ceil(d / c.speed / 24);
-      r = r < p ? p : r;
+      const w = Math.ceil(d / c.speed / 24);
+      r = r < w ? w : r;
     }), r = r * 1.3;
-    const u = g.utc(e.etd).add(r ?? 14, "day");
-    let m = 1;
+    const h = b.utc(e.etd).add(r ?? 14, "day");
+    let M = 1;
     for (const c of n) {
-      const p = JSON.parse(JSON.stringify(i.route)), y = JSON.parse(JSON.stringify(i.waypoints)), h = await O.analyseInstantWithThreshed(
+      const w = JSON.parse(JSON.stringify(i.route)), y = JSON.parse(JSON.stringify(i.waypoints)), u = await O.analyseInstantWithThreshed(
         { lat: e.lat, lng: e.lng },
         e.etd,
-        u,
+        h,
         t,
         c,
-        p,
+        w,
         y,
         e.meteoVendor,
         e.speedStep,
@@ -1069,30 +1069,32 @@ class O {
         e.useRouteParam,
         o
       );
-      h && (await O.calculateCost(h, c, e, o), s.push(h), F == null || F.info("[%s][L%d-%d] analyse from %s to %s cost: %j", o.requestId, 1, m, e.etd, u.format(), {
-        cost: h.cost.total,
-        distance: h.distance,
-        hours: h.totalHrs,
+      u && (await O.calculateCost(u, c, e, o), s.push(u), F == null || F.info("[%s][L%d-%d] analyse from %s to %s cost: %j", o.requestId, 1, M, e.etd, h.format(), {
+        cost: u.cost.total,
+        hire: u.cost.hire,
+        bunker: u.cost.bunker,
+        distance: u.distance,
+        hours: u.totalHrs,
         cp: `${c.speed}/${c.fo}/${c.dgo}`
-      })), m++;
+      })), M++;
     }
-    s.sort((c, p) => c.cost.total - p.cost.total);
-    const l = s.at(0), M = s.at(1), f = [];
-    if (f.push({ combined: !1, speeds: [l], cost: (w = l.cost) == null ? void 0 : w.total }), M) {
-      const c = l.cost.cp, p = M.cost.cp, y = g(l.eta), h = g(l.etd), I = y.diff(h, "days", !0);
-      let S = Math.ceil(I / 2);
+    s.sort((c, w) => c.cost.total - w.cost.total);
+    const l = s.at(0), g = s.at(1), f = [];
+    if (f.push({ combined: !1, speeds: [l], cost: (m = l.cost) == null ? void 0 : m.total }), g) {
+      const c = l.cost.cp, w = g.cost.cp, y = b(l.eta), u = b(l.etd), k = y.diff(u, "days", !0);
+      let S = Math.ceil(k / 2);
       S = S > 7 ? 7 : S < e.alterStep ? e.alterStep : S;
-      let D = 2, Y = { combined: !1, speeds: [M], cost: (v = M.cost) == null ? void 0 : v.total }, E;
+      let D = 2, Y = { combined: !1, speeds: [g], cost: (v = g.cost) == null ? void 0 : v.total }, E;
       for (; S >= e.alterStep; ) {
-        const P = await O.combinedAnalyse(e, t, u, [c, p], i, S, { ...o, level: D });
+        const P = await O.combinedAnalyse(e, t, h, [c, w], i, S, { ...o, level: D });
         if (Y.cost > P.cost ? E ? (E == null ? void 0 : E.cost) > P.cost && (E = P) : (E = Y, Y = P) : (!E || (E == null ? void 0 : E.cost) > P.cost) && (E = P), S <= e.alterStep)
           break;
         S = Math.ceil(S / 2), D += 1;
       }
       f.push(Y), E && f.push(E);
     }
-    const k = g().valueOf() - a;
-    return F == null || F.info("[%s] analyse elapsed: %d ms", o == null ? void 0 : o.requestId, k), f.sort((c, p) => c.cost - p.cost);
+    const I = b().valueOf() - a;
+    return F == null || F.info("[%s] analyse elapsed: %d ms", o == null ? void 0 : o.requestId, I), f.sort((c, w) => c.cost - w.cost);
   }
   /**
    * 按步长多次减半，分别用7,4,2,1天步长及cpa,cpb交替计算各种组合下的成本
@@ -1106,10 +1108,10 @@ class O {
    */
   static async combinedAnalyse(e, t, n, i, o, a, s = {}) {
     s.counter = 1, F == null || F.info("[%s][L%d] analyse with alternate cp in every %d days", s.requestId, s.level, a);
-    const d = await O.alternateAnalyse(e, t, n, i, 0, o, a, s), r = d.reduce((l, M) => l + M.cost.total, 0);
-    F == null || F.info("[%s][L%d] cost with cpa/cpb turn: %d", s.requestId, s.level, r);
-    const u = await O.alternateAnalyse(e, t, n, i, 1, o, a, s), m = u.reduce((l, M) => l + M.cost.total, 0);
-    return F == null || F.info("[%s][L%d] cost with cpb/cpa turn: %d", s.requestId, s.level, m), r < m ? { combined: !0, cost: Math.round(r * 1e3) / 1e3, speeds: d, step: a } : { combined: !0, cost: Math.round(m * 1e3) / 1e3, speeds: u, step: a };
+    const d = await O.alternateAnalyse(e, t, n, i, 0, o, a, s), r = d.reduce((I, m) => I + m.cost.total, 0), h = d.reduce((I, m) => I + m.cost.hire, 0), M = d.reduce((I, m) => I + m.cost.bunker, 0);
+    F == null || F.info("[%s][L%d] cost with cpa/cpb turn: %j", s.requestId, s.level, { cost: r, hire: h, bunker: M });
+    const l = await O.alternateAnalyse(e, t, n, i, 1, o, a, s), g = l.reduce((I, m) => I + m.cost.total, 0), f = l.reduce((I, m) => I + m.cost.hire, 0), x = l.reduce((I, m) => I + m.cost.bunker, 0);
+    return F == null || F.info("[%s][L%d] cost with cpb/cpa turn: %j", s.requestId, s.level, { cost: g, hire: f, bunker: x }), r < g ? { combined: !0, cost: Math.round(r * 1e3) / 1e3, speeds: d, step: a } : { combined: !0, cost: Math.round(g * 1e3) / 1e3, speeds: l, step: a };
   }
   /**
    * 基于cp索引，交替计算指定步长下的成本
@@ -1123,40 +1125,47 @@ class O {
    * @param options
    */
   static async alternateAnalyse(e, t, n, i, o, a, s, d = {}) {
-    var l, M;
-    let r = g.utc(e.etd);
-    const u = { lat: e.lat, lng: e.lng }, m = [];
+    var l, g;
+    let r = b.utc(e.etd);
+    const h = { lat: e.lat, lng: e.lng }, M = [];
     for (; r.isBefore(n); ) {
-      const f = r.clone().utc().add(s, "day"), C = JSON.parse(JSON.stringify(a.route)), k = JSON.parse(JSON.stringify(a.waypoints)), w = i[o], v = await O.analyseInstantWithThreshed(
-        u,
+      const f = r.clone().utc().add(s, "day"), x = JSON.parse(JSON.stringify(a.route)), I = JSON.parse(JSON.stringify(a.waypoints)), m = i[o], v = await O.analyseInstantWithThreshed(
+        h,
         r.utc().format(),
         f,
         t,
-        w,
-        C,
-        k,
+        m,
+        x,
+        I,
         e.meteoVendor,
         e.speedStep,
         e.useMeteo,
         e.useRouteParam,
         d
       );
-      v && (await O.calculateCost(v, w, e, d), F == null || F.info(
+      v && (await O.calculateCost(v, m, e, d), F == null || F.info(
         "[%s][L%d-%d] analyse from %s to %s cost: %j",
         d.requestId,
         d.level,
         d.counter,
         r.utc().format(),
         f.utc().format(),
-        { cost: v.cost.total, distance: v.distance, hours: v.totalHrs, cp: `${w.speed}/${w.fo}/${w.dgo}` }
+        {
+          cost: v.cost.total,
+          hire: v.cost.hire,
+          bunker: v.cost.bunker,
+          distance: v.distance,
+          hours: v.totalHrs,
+          cp: `${m.speed}/${m.fo}/${m.dgo}`
+        }
       )), d.counter = d.counter + 1;
-      const c = (M = (l = v == null ? void 0 : v.sample) == null ? void 0 : l.hours) == null ? void 0 : M.at(-1);
+      const c = (g = (l = v == null ? void 0 : v.sample) == null ? void 0 : l.hours) == null ? void 0 : g.at(-1);
       if (c)
-        u.lat = c.lat, u.lng = c.lng, r = g(c.eta), m.push(v), o = o ? 0 : 1;
+        h.lat = c.lat, h.lng = c.lng, r = b(c.eta), M.push(v), o = o ? 0 : 1;
       else
         break;
     }
-    return m;
+    return M;
   }
   /**
    * 计算Speed的cost
@@ -1185,13 +1194,13 @@ class O {
     var d, r;
     const i = await W.intersectInECA(e.route);
     let o = 0, a = 0, s = 0;
-    e.sample.wps.forEach((u) => {
-      u.positionTime = g.utc(u.etd || u.eta).unix();
+    e.sample.wps.forEach((h) => {
+      h.positionTime = b.utc(h.etd || h.eta).unix();
     });
-    for (const u of i) {
-      o += u.distance;
-      const m = await W.deadReckoningTime((d = u.waypoints) == null ? void 0 : d.at(0), e.sample.wps), l = await W.deadReckoningTime((r = u.waypoints) == null ? void 0 : r.at(-1), e.sample.wps);
-      u.in = m, u.out = l, u.totalHrs = J.roundPrecision((l.positionTime - m.positionTime) / 3600, 2), u.totalDgoCons = J.roundPrecision(t.fo / 24 * u.totalHrs, 3), a += u.totalHrs, s += u.totalDgoCons;
+    for (const h of i) {
+      o += h.distance;
+      const M = await W.deadReckoningTime((d = h.waypoints) == null ? void 0 : d.at(0), e.sample.wps), l = await W.deadReckoningTime((r = h.waypoints) == null ? void 0 : r.at(-1), e.sample.wps);
+      h.in = M, h.out = l, h.totalHrs = J.roundPrecision((l.positionTime - M.positionTime) / 3600, 2), h.totalDgoCons = J.roundPrecision(t.fo / 24 * h.totalHrs, 3), a += h.totalHrs, s += h.totalDgoCons;
     }
     return o = J.roundPrecision(o, 3), a = J.roundPrecision(a, 3), s = J.roundPrecision(s, 3), {
       distanceInECA: o,
@@ -1206,55 +1215,55 @@ class O {
    * @param options
    */
   static async mergeSpeeds(e, t = {}) {
-    var c, p;
+    var c, w;
     const n = {
       hours: [],
       wps: [],
       days: []
-    }, i = e.reduce((y, h) => y + h.distance, 0), o = e.reduce((y, h) => {
-      var I;
-      return y + (((I = h.extend) == null ? void 0 : I.distanceInECA) || 0);
-    }, 0), a = e.reduce((y, h) => y + h.totalHrs, 0), s = e.reduce((y, h) => {
-      var I;
-      return y + (((I = h.extend) == null ? void 0 : I.hoursInECA) || 0);
-    }, 0), d = e.reduce((y, h) => {
-      var I;
-      return y + (((I = h.extend) == null ? void 0 : I.totalDgoConsInECA) || 0);
-    }, 0), r = e.reduce((y, h) => y + h.wxFactor * h.totalHrs / a, 0), u = e.reduce((y, h) => y + h.cFactor * h.totalHrs / a, 0), m = e.reduce((y, h) => y + h.totalFoCons, 0), l = e.reduce((y, h) => y + h.totalDgoCons, 0), M = e.reduce((y, h) => y + h.cost.total, 0), f = e.reduce((y, h) => y + h.cost.hire, 0), C = e.reduce((y, h) => y + h.cost.bunker, 0), k = [], w = [];
+    }, i = e.reduce((y, u) => y + u.distance, 0), o = e.reduce((y, u) => {
+      var k;
+      return y + (((k = u.extend) == null ? void 0 : k.distanceInECA) || 0);
+    }, 0), a = e.reduce((y, u) => y + u.totalHrs, 0), s = e.reduce((y, u) => {
+      var k;
+      return y + (((k = u.extend) == null ? void 0 : k.hoursInECA) || 0);
+    }, 0), d = e.reduce((y, u) => {
+      var k;
+      return y + (((k = u.extend) == null ? void 0 : k.totalDgoConsInECA) || 0);
+    }, 0), r = e.reduce((y, u) => y + u.wxFactor * u.totalHrs / a, 0), h = e.reduce((y, u) => y + u.cFactor * u.totalHrs / a, 0), M = e.reduce((y, u) => y + u.totalFoCons, 0), l = e.reduce((y, u) => y + u.totalDgoCons, 0), g = e.reduce((y, u) => y + u.cost.total, 0), f = e.reduce((y, u) => y + u.cost.hire, 0), x = e.reduce((y, u) => y + u.cost.bunker, 0), I = [], m = [];
     let v;
     for (const y of e) {
-      w.push(...((c = y.extend) == null ? void 0 : c.eca) || []);
-      const h = y.sample.hours, I = y.sample.wps, S = y.sample.days, D = h.at(0);
-      v && (D.distanceFromPrevious = v.distanceFromPrevious, D.distanceFromStart = v.distanceFromStart, h.forEach((T, N) => {
+      m.push(...((c = y.extend) == null ? void 0 : c.eca) || []);
+      const u = y.sample.hours, k = y.sample.wps, S = y.sample.days, D = u.at(0);
+      v && (D.distanceFromPrevious = v.distanceFromPrevious, D.distanceFromStart = v.distanceFromStart, u.forEach((T, N) => {
         N && (T.distanceFromStart = T.distanceFromStart + v.distanceFromStart);
-      }), I.at(0).distanceFromPrevious = v.distanceFromPrevious, I.at(0).distanceFromStart = v.distanceFromStart, I.forEach((T, N) => {
+      }), k.at(0).distanceFromPrevious = v.distanceFromPrevious, k.at(0).distanceFromStart = v.distanceFromStart, k.forEach((T, N) => {
         N && (T.distanceFromStart = T.distanceFromStart + v.distanceFromStart);
       }), S.at(0).distanceFromPrevious = v.distanceFromPrevious, S.at(0).distanceFromStart = v.distanceFromStart, S.forEach((T, N) => {
         N && (T.distanceFromStart = T.distanceFromStart + v.distanceFromStart);
       })), D.cp = y.cost.cp;
-      const Y = [y.etd, y.eta], E = k.findIndex((T) => T.id === D.cp.id);
-      E === -1 ? (D.cp.segment = [Y], k.push(D.cp)) : k[E].segment.push(Y), h.forEach((T) => {
+      const Y = [y.etd, y.eta], E = I.findIndex((T) => T.id === D.cp.id);
+      E === -1 ? (D.cp.segment = [Y], I.push(D.cp)) : I[E].segment.push(Y), u.forEach((T) => {
         var A;
         ((A = n.hours) == null ? void 0 : A.findIndex((R) => R.eta === T.eta)) === -1 && n.hours.push(T);
-      }), I.forEach((T) => {
+      }), k.forEach((T) => {
         var A;
         ((A = n.wps) == null ? void 0 : A.findIndex((R) => R.eta === T.eta)) === -1 && n.wps.push(T);
       }), S.forEach((T) => {
         var A;
         ((A = n == null ? void 0 : n.days) == null ? void 0 : A.findIndex((R) => R.eta === T.eta)) === -1 && n.days.push(T);
       });
-      const P = (p = n.wps) == null ? void 0 : p.findIndex((T) => T.eta === D.eta);
-      P === -1 ? n.wps.push(D) : n.wps[P] = D, v = h.at(-1);
+      const P = (w = n.wps) == null ? void 0 : w.findIndex((T) => T.eta === D.eta);
+      P === -1 ? n.wps.push(D) : n.wps[P] = D, v = u.at(-1);
     }
-    return n.wps.sort((y, h) => {
-      g(y.etd).unix() - g(h.etd).unix();
-    }), n.wps.forEach((y, h) => {
-      const I = n.wps[h - 1];
-      if (I) {
-        const S = y.distanceFromStart - (I.distanceFromStart || 0), D = g(y.eta || y.etd).diff(g(I.etd || I.eta), "hour", !0), Y = Math.round(S / D * 100) / 100;
+    return n.wps.sort((y, u) => {
+      b(y.etd).unix() - b(u.etd).unix();
+    }), n.wps.forEach((y, u) => {
+      const k = n.wps[u - 1];
+      if (k) {
+        const S = y.distanceFromStart - (k.distanceFromStart || 0), D = b(y.eta || y.etd).diff(b(k.etd || k.eta), "hour", !0), Y = Math.round(S / D * 100) / 100;
         y.avgSpd = Y;
-        const E = W.calculateBearing(I, y);
-        I.bearing = E;
+        const E = W.calculateBearing(k, y);
+        k.bearing = E;
       }
     }), {
       sample: n,
@@ -1268,17 +1277,17 @@ class O {
       totalHrs: Math.round(a * 1e3) / 1e3,
       avgSpeed: Math.round(i / a * 1e3) / 1e3,
       wxFactor: Math.round(r / a * 1e3) / 1e3,
-      cFactor: Math.round(u / a * 1e3) / 1e3,
-      totalFoCons: Math.round(m * 1e3) / 1e3,
+      cFactor: Math.round(h / a * 1e3) / 1e3,
+      totalFoCons: Math.round(M * 1e3) / 1e3,
       totalDgoCons: Math.round(l * 1e3) / 1e3,
       cost: {
-        total: Math.round(M * 1e3) / 1e3,
+        total: Math.round(g * 1e3) / 1e3,
         hire: Math.round(f * 1e3) / 1e3,
-        bunker: Math.round(C * 1e3) / 1e3
+        bunker: Math.round(x * 1e3) / 1e3
       },
       extend: {
-        cps: k,
-        eca: w,
+        cps: I,
+        eca: m,
         distanceInECA: Math.round(o * 1e4) / 1e4,
         hoursInECA: Math.round(s * 1e3) / 1e3,
         totalDgoConsInECA: Math.round(d * 1e3) / 1e3,
@@ -1294,7 +1303,7 @@ export {
   Et as HifleetImpl,
   pt as LoadCondition,
   Tt as MyShipImpl,
-  jt as MyVesselImpl,
+  Ct as MyVesselImpl,
   Nt as ShipxyImpl,
   O as SpeedHelper,
   vt as SpeedLabel,