@idm-plugin/vessel 1.7.8 → 1.8.0

package/dist/index.js

@@ -1,15 +1,15 @@
-var ut = Object.defineProperty;
-var ht = (j, e, t) => e in j ? ut(j, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : j[e] = t;
-var G = (j, e, t) => (ht(j, typeof e != "symbol" ? e + "" : e, t), t);
-import J from "got";
-import nt from "@log4js-node/log4js-api";
-import p from "moment";
-import { LngLatHelper as B, LaneHelper as L } from "@idm-plugin/geo2";
-import { MeteoHelper2 as lt, MeteoHelper as ft } from "@idm-plugin/meteo2";
-import { Meteo2Assist as rt } from "@idm-plugin/meteo";
-let g;
+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);
+import B from "got";
+import it from "@log4js-node/log4js-api";
+import g 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;
 try {
-  g = nt.getLogger("vessel");
+  b = it.getLogger("vessel");
 } catch {
 } finally {
 }
@@ -54,7 +54,7 @@ class et {
     return { labelCn: t, labelEn: n };
   }
 }
-class Ct extends et {
+class jt extends et {
   constructor(t, n) {
     super();
     G(this, "clientId");
@@ -69,33 +69,33 @@ class Ct extends et {
         client_secret: this.clientSecret,
         grant_type: "client_credentials"
       }
-    }, o = await J.post(n, i).json();
-    g == null || g.info("[%s] fetch access token from: %s - %j", t.requestId, n, o), o.error || (this.token = {
+    }, 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 = {
       accessToken: o.access_token,
       tokenType: o.token_type,
       expiresIn: o.expires_in,
       scope: o.scope,
       jti: o.jti,
-      issuedAt: p().utc().format()
+      issuedAt: g().utc().format()
     });
   }
   async realTimePosition(t, n = {}) {
     var u, m, l;
-    (!this.token || p().diff(p(this.token.issuedAt), "seconds") > ((u = this.token) == null ? void 0 : u.expiresIn) - 300) && await this.authToken(n);
+    (!this.token || g().diff(g(this.token.issuedAt), "seconds") > ((u = this.token) == null ? void 0 : u.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}`
       },
       searchParams: { mmsi: t }
     };
-    g == null || g.info("[%s] fetch realtime position from: %s - %j", n.requestId, i, o);
-    const a = await J.get(i, o).json();
+    b == null || b.info("[%s] fetch realtime position from: %s - %j", n.requestId, i, o);
+    const a = await B.get(i, o).json();
     if (a.code)
-      return g == null || g.warn("[%s] fetch realtime position failed: %j", n.requestId, i, { message: a.message, status: a.status, code: a.code }), a;
+      return b == null || b.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 y in s)
-      !isNaN(s[y]) && Number(s[y]) !== 1 / 0 && (s[y] = Number(s[y]));
-    const d = p(`${s.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    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");
     return {
       mmsi: s.mmsi,
       name: s.vesselName,
@@ -110,7 +110,7 @@ class Ct 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) ? p.utc(s.eta).format() : void 0,
+      eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(s.eta) ? g.utc(s.eta).format() : void 0,
       destination: s.dest,
       positionTime: d.unix(),
       status: s.status,
@@ -122,17 +122,17 @@ class Ct extends et {
     };
   }
   async trajectory(t, n, i, o, a = !0, s = {}) {
-    (!this.token || p().diff(p(this.token.issuedAt), "seconds") > this.token.expiresIn - 300) && await this.authToken(s);
-    const d = await this.realTimePosition(t, s), r = p(n), u = p(i), m = [];
+    (!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;
   }
   async trajectoryIn30Day(t, n, i, o, a, s, d = {}) {
-    var f, x, k, v, b;
+    var f, C, k, w, v;
     const r = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/track", u = {
       headers: {
-        Authorization: `${(f = this.token) == null ? void 0 : f.tokenType} ${(x = this.token) == null ? void 0 : x.accessToken}`
+        Authorization: `${(f = this.token) == null ? void 0 : f.tokenType} ${(C = this.token) == null ? void 0 : C.accessToken}`
       },
       json: {
         mmsi: t,
@@ -140,16 +140,16 @@ class Ct extends et {
         endTime: i.utcOffset(8).format("YYYY-MM-DD HH:mm:ss")
       }
     };
-    g == null || g.info("[%s] fetch trajectory from: %s - %j", d.requestId, r, u);
-    const m = await J.post(r, u).json();
+    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 g == null || g.warn("[%s] fetch trajectory failed: %j", d.requestId, r, { message: m.message, status: m.status, code: m.code }), m;
+      return b == null || b.warn("[%s] fetch trajectory failed: %j", d.requestId, r, { message: m.message, status: m.status, code: m.code }), m;
     let l = -1;
-    const y = p(`${(v = (k = m.data) == null ? void 0 : k[0]) == null ? void 0 : v.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-    return (b = m.data) == null || b.forEach((c) => {
+    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) => {
       for (const Y in c)
         !isNaN(c[Y]) && Number(c[Y]) !== 1 / 0 && (c[Y] = Number(c[Y]));
-      const w = p(`${c.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00"), M = c.status, { labelCn: h, labelEn: I } = this.parseStatus(M), S = {
+      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 = {
         mmsi: c.mmsi,
         imo: o == null ? void 0 : o.imo,
         lat: c.lat,
@@ -158,21 +158,21 @@ class Ct extends et {
         cog: c.cog,
         hdg: c.hdg,
         draught: c.draught,
-        status: M,
-        eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(c.eta) ? p(`${c.eta} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00").utc().format() : void 0,
+        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,
         destination: c.dest,
-        positionTime: w.unix(),
+        positionTime: p.unix(),
         labelCn: h,
         labelEn: I,
         method: "trajectory",
         vendor: "myVessel",
-        utc: w.utc().format()
-      }, D = Math.floor(w.diff(y, "minute", !0) / (a || 1));
+        utc: p.utc().format()
+      }, D = Math.floor(p.diff(M, "minute", !0) / (a || 1));
       D !== l && (l = D, s.push(S));
     }), s;
   }
 }
-class jt extends et {
+class Et extends et {
   constructor(t) {
     super();
     G(this, "token");
@@ -184,15 +184,15 @@ class jt extends et {
         mmsi: t,
         usertoken: this.token
       }
-    }, a = await J.post(i, o).json();
-    g == null || g.info("[%s] fetch realtime position from: %s - %j", n.requestId, i, o);
+    }, a = await B.post(i, o).json();
+    b == null || b.info("[%s] fetch realtime position from: %s - %j", n.requestId, i, o);
     const s = a == null ? void 0 : a.list;
     if (!s)
-      return g == null || g.warn("[%s] fetch realtime position failed: %j", n.requestId, i, a), a;
-    for (const y in s)
-      !isNaN(s[y]) && Number(s[y]) !== 1 / 0 && (s[y] = Number(s[y]));
+      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]));
     s.status = s.sp > 3 ? 0 : 1;
-    const d = s.status, { labelCn: r, labelEn: u } = this.parseStatus(d), m = p(`${s.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    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");
     return {
       mmsi: s.m,
       name: s.n,
@@ -207,7 +207,7 @@ class jt 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) ? p.utc(s.eta).format() : void 0,
+      eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(s.eta) ? g.utc(s.eta).format() : void 0,
       destination: s.destination,
       positionTime: m.unix(),
       utc: m.utc().format(),
@@ -230,8 +230,8 @@ class jt extends et {
         Host: "www.hifleet.com"
       }
     };
-    let a = await J.post(i, o).json();
-    g == null || g.info("[%s] fetch vessel props from: %s - %j", n.requestId, i, o), a instanceof Array && (a = a[0]);
+    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]);
     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 jt extends et {
       draught: a.dr,
       type: a.t
     };
-    return i = "https://www.hifleet.com/hifleetapi/sameShipSearch.do", a = await J.post(i, o).json(), g == null || g.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(), 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;
   }
   async suggest(t, n = {}) {
     const i = "https://www.hifleet.com/hifleetapi/getShipSuggest.do", o = {
@@ -256,8 +256,8 @@ class jt extends et {
         Origin: "https://www.hifleet.com",
         Host: "www.hifleet.com"
       }
-    }, a = await J.post(i, o).json();
-    g == null || g.info("[%s] suggest vessel props from: %s - %j", n.requestId, i, o);
+    }, a = await B.post(i, o).json();
+    b == null || b.info("[%s] suggest vessel props from: %s - %j", n.requestId, i, o);
     const s = [];
     for (const d of a)
       s.push({
@@ -270,10 +270,10 @@ class jt extends et {
     return s.sort((d, r) => r.score - d.score), s;
   }
   async trajectory(t, n, i, o, a = !0, s = {}) {
-    var c, w, M;
+    var c, p, y;
     const d = await this.realTimePosition(t, s);
-    let r = p(n);
-    const u = p(i), m = p();
+    let r = g(n);
+    const u = g(i), m = g();
     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");
@@ -285,17 +285,17 @@ class jt extends et {
         mmsi: t,
         usertoken: this.token
       }
-    }, y = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", f = await J.get(y, l).json();
-    g == null || g.info("[%s] fetch trajectory from: %s - %j", s.requestId, y, l);
-    let x;
-    f && (x = ((w = (c = f.ships) == null ? void 0 : c.offors) == null ? void 0 : w.ship) || [], x.length || g == null || g.warn("[%s] fetch trajectory failed: %j", s.requestId, f));
+    }, 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 v = -1;
-    const b = p(`${(M = x == null ? void 0 : x[0]) == null ? void 0 : M.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-    for (const h of x) {
+    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 = p(`${h.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+      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,
@@ -314,13 +314,13 @@ class jt extends et {
         labelEn: S,
         method: "trajectory",
         vendor: "hifleet"
-      }, N = Math.floor(I.diff(b, "minute", !0) / (o || 1));
-      N !== v && (v = N, k.push(Y));
+      }, E = Math.floor(I.diff(v, "minute", !0) / (o || 1));
+      E !== w && (w = E, k.push(Y));
     }
     return k;
   }
 }
-class Et extends et {
+class Nt extends et {
   constructor(t) {
     super();
     G(this, "token");
@@ -333,13 +333,13 @@ class Et extends et {
         k: this.token,
         enc: 1
       }
-    }, o = "https://api.shipxy.com/apicall/GetSingleShip", a = await J.get(o, i).json();
-    if (g == null || g.info("[%s] fetch realtime position from: %s - %j", n.requestId, o, i), (a == null ? void 0 : a.status) !== 0)
+    }, 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)
       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 = p.unix(s.lasttime);
+    const { labelCn: d, labelEn: r } = await this.parseStatus(s.navistat), u = g.unix(s.lasttime);
     return {
       mmsi: s.ShipID,
       name: s.name,
@@ -364,8 +364,8 @@ class Et extends et {
     };
   }
   async trajectory(t, n, i, o, a = !0, s = {}) {
-    var b;
-    const d = await this.realTimePosition(t, s), r = p(n), u = p(i), m = "https://api.shipxy.com/apicall/GetShipTrack", l = {
+    var v;
+    const d = await this.realTimePosition(t, s), r = g(n), u = g(i), m = "https://api.shipxy.com/apicall/GetShipTrack", l = {
       searchParams: {
         id: t,
         k: this.token,
@@ -374,30 +374,30 @@ class Et extends et {
         btm: r.unix(),
         etm: u.unix()
       }
-    }, y = await J.get(m, l).json();
-    if (g == null || g.info("[%s] fetch trajectory from: %s - %j", s.requestId, m, l), (y == null ? void 0 : y.status) !== 0)
-      return y;
-    const f = y == null ? void 0 : y.points, x = [], k = p.unix((b = f[0]) == null ? void 0 : b.utc);
-    let v = -1;
+    }, 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;
     for (const c of f) {
-      const w = p.unix(c.utc), M = {
+      const p = g.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: w.unix(),
-        utc: w.utc().format(),
+        positionTime: p.unix(),
+        utc: p.utc().format(),
         method: "trajectory",
         vendor: "shipxy"
-      }, h = Math.floor(w.diff(k, "minute", !0) / (o || 1));
-      h !== v && (v = h, x.push(M));
+      }, h = Math.floor(p.diff(k, "minute", !0) / (o || 1));
+      h !== w && (w = h, C.push(y));
     }
-    return x;
+    return C;
   }
 }
-class Nt extends et {
+class Tt extends et {
   constructor(t) {
     super();
     G(this, "token");
@@ -411,8 +411,8 @@ class Nt extends et {
       json: {
         mmsiList: t
       }
-    }, o = "https://api3.myships.com/sp/ships/getShipIdByMMSI", a = await J.post(o, i).json();
-    return g == null || g.info("[%s] fetch ship id from: %s - %j", n.requestId, o, i), a.code !== "0" ? a : a.data[0].shipId;
+    }, 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;
   }
   async getShipInfo(t, n = {}) {
     const i = {
@@ -422,12 +422,12 @@ class Nt extends et {
       json: {
         shipId: t
       }
-    }, o = "https://api3.myships.com/sp/ships/aissta", a = await J.post(o, i).json();
-    if (g == null || g.info("[%s] fetch ship info from: %s - %j", n.requestId, o, i), a.code !== "0")
+    }, 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")
       return a;
     const s = a.data;
     let d = s.imo;
-    return t === "407170" && (d = "9198379", g == null || g.warn("[%s] ship(%s) imo error: %s, should be %s", n.requestId, t, s.imo, d)), {
+    return t === "407170" && (d = "9198379", b == null || b.warn("[%s] ship(%s) imo error: %s, should be %s", n.requestId, t, s.imo, d)), {
       mmsi: s.mmsi,
       name: s.shipnameEn,
       imo: d,
@@ -445,12 +445,12 @@ class Nt extends et {
       json: {
         shipId: i
       }
-    }, s = "https://api3.myships.com/sp/ships/position/latest", d = await J.post(s, a).json();
-    g == null || g.info("[%s] fetch realtime position from: %s - %j", n.requestId, s, a);
+    }, 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);
     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 = p.unix(r.posTime);
+    const { labelCn: u, labelEn: m } = await this.parseStatus(r.aisNavStatus), l = g.unix(r.posTime);
     return {
       ...o,
       mmsi: t,
@@ -470,7 +470,7 @@ class Nt extends et {
     };
   }
   async trajectory(t, n, i, o, a = !0, s = {}) {
-    const d = p(n), r = p(i), u = await this.getShipId(t), m = await this.getShipInfo(u), l = [];
+    const d = g(n), r = g(i), u = await this.getShipId(t), m = await this.getShipInfo(u), 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;
@@ -486,42 +486,42 @@ class Nt extends et {
         startTime: n,
         endTime: i
       }
-    }, m = "https://api3.myships.com/sp/ships/position/history", l = await J.post(m, u).json();
-    if (g == null || g.info("[%s] fetch trajectory from: %s - %j", r.requestId, m, u), l.code !== "0")
-      return g == null || g.warn("[%s] invoke myship trajectory failed: %j", r.requestId, l), l;
-    const y = l.data;
-    for (const v in y)
-      !isNaN(y[v]) && Number(y[v]) !== 1 / 0 && (y[v] = Number(y[v]));
-    const f = p.unix((k = y[0]) == null ? void 0 : k.posTime);
-    let x = -1;
-    for (const v of y) {
-      const b = p.unix(v.posTime), c = {
+    }, 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 = {
         imo: o == null ? void 0 : o.imo,
         mmsi: a,
-        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: b.unix(),
-        utc: b.utc().format(),
+        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,
+        positionTime: v.unix(),
+        utc: v.utc().format(),
         method: "trajectory",
         vendor: "myship"
-      }, w = Math.floor(b.diff(f, "minute", !0) / (s || 1));
-      w !== x && (x = w, d.push(c));
+      }, p = Math.floor(v.diff(f, "minute", !0) / (s || 1));
+      p !== C && (C = p, d.push(c));
     }
     return d;
   }
 }
 let _;
 try {
-  _ = nt.getLogger("vessel");
+  _ = it.getLogger("vessel");
 } catch {
 } finally {
 }
-var mt = /* @__PURE__ */ ((j) => (j.NOTICE = "NOTICE", j.WARN = "WARN", j.HEAVY = "HEAVY", j.SEVERE = "SEVERE", j.ERROR = "ERROR", j.FATAL = "FATAL", j))(mt || {});
-class yt {
+var yt = /* @__PURE__ */ ((j) => (j.NOTICE = "NOTICE", j.WARN = "WARN", j.HEAVY = "HEAVY", j.SEVERE = "SEVERE", j.ERROR = "ERROR", j.FATAL = "FATAL", j))(yt || {});
+class Mt {
   /**
    * 解析告警规则, 多规则场景
    * @param rule
@@ -542,7 +542,7 @@ class yt {
       if (u === 0 && !m)
         a.scope = o[0];
       else if (m)
-        for (let l = 0, y = m.length; l < y; l++) {
+        for (let l = 0, M = m.length; l < M; 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,25 +575,25 @@ class yt {
    * @param options
    */
   checkWeather(e, t, n = {}) {
-    var f, x, k, v, b, c, w, M, h, I, S, D, Y, N, P;
+    var f, C, k, w, v, c, p, y, h, I, S, D, Y, E, P;
     let i = 0, o = 0, a = 0, s = 0;
-    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 = (v = (k = t == null ? void 0 : t.SEVERE) == null ? void 0 : k.sigWave) == null ? void 0 : v.number, u = (c = (b = t == null ? void 0 : t.HEAVY) == null ? void 0 : b.sigWave) == null ? void 0 : c.number, m = Math.round((((M = (w = t == null ? void 0 : t.SEVERE) == null ? void 0 : w.wind) == null ? void 0 : M.number) + 2) * 100) / 100, l = (I = (h = t == null ? void 0 : t.SEVERE) == null ? void 0 : h.wind) == null ? void 0 : I.number, y = (D = (S = t == null ? void 0 : t.HEAVY) == null ? void 0 : S.wind) == null ? void 0 : D.number;
+    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;
     for (let T = 0; T < (e == null ? void 0 : e.length); T++) {
-      const E = e[T], A = (N = (Y = E == null ? void 0 : E.meteo) == null ? void 0 : Y.wave) == null ? void 0 : N.sig, R = (P = E == null ? void 0 : E.meteo) == null ? void 0 : P.wind, K = T ? p(E.eta).diff(p(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 ? E.isDangerous = !0 : (A == null ? void 0 : A.height) >= r ? E.isSevere = !0 : (A == null ? void 0 : A.height) >= u && (E.isHeavy = !0), _ == null || _.info("[%s] check wind: %j", n.requestId, { ...R, dgThd4Wd: m, svThd4Wd: l, hvThd4Wd: y }), (R == null ? void 0 : R.scale) >= m ? (E.isDangerous = !0, delete E.isSevere, delete E.isHeavy) : (R == null ? void 0 : R.scale) > l ? (E.isDangerous || (E.isSevere = !0), delete E.isHeavy) : (R == null ? void 0 : R.scale) === y && !E.isDangerous && !E.isSevere && (E.isHeavy = !0), i += E.isDangerous ? K : 0, o += E.isSevere ? K : 0, a += E.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 ? 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;
     }
-    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: y }, 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: M }, sig: { dgThd4Wv: d, svThd4Wv: r, hvThd4Wv: u } };
   }
 }
-const Tt = new yt();
+const Dt = new Mt();
 let F;
 try {
-  F = nt.getLogger("vessel");
+  F = it.getLogger("vessel");
 } catch {
 } finally {
 }
-const Mt = new lt("", !0);
-var gt = /* @__PURE__ */ ((j) => (j.common = "common", j.container = "container", j.tugs = "tugs", j))(gt || {}), pt = /* @__PURE__ */ ((j) => (j.Ballast = "Ballast", j.Laden = "Laden", j))(pt || {}), wt = /* @__PURE__ */ ((j) => (j.Cp = "CP", j.Perf = "Basis", j.Instruct = "Other", j))(wt || {});
+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 || {});
 class O {
   /**
    * @see https://baike.baidu.com/item/%E6%96%B9%E5%BD%A2%E7%B3%BB%E6%95%B0/4965568?fr=aladdin
@@ -734,23 +734,23 @@ class O {
    */
   static async speedLoseAt(e, t, n, i = "", o = 2, a = !0, s = !1, d = {}) {
     let r;
-    if (t.velocity && s && (e.speed = B.roundPrecision(t.velocity * 1852 / 3600, 6)), a) {
+    if (t.velocity && s && (e.speed = J.roundPrecision(t.velocity * 1852 / 3600, 6)), a) {
       let u;
       if (d.meteo2)
         try {
-          const f = await Mt.spotForecast(t.lat, t.lng, n.utc().format(), !1, !1, !0, d), [x] = rt.pickHourly(f, n);
-          u = rt.toLegacy(x);
+          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);
         } catch (f) {
           F.warn("[%s] meteo2 spot(%j) forecast failed: %s", d.requestId, { ...t, eta: n.utc().format() }, f);
         }
       else
-        u = await ft.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), y = Math.round((e.speed * 1.943844 + m + l) * 100) / 100;
+        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;
       r = {
         meteo: { ...u },
         wxFactor: m,
         cFactor: l,
-        speed: t.velocity && s ? t.velocity : y < 0 ? 1 : y,
+        speed: t.velocity && s ? t.velocity : M < 0 ? 1 : M,
         eta: n.utc().format(),
         etd: n.utc().format()
       };
@@ -779,13 +779,13 @@ class O {
    */
   static async speedLoseInHoursStep(e, t, n, i, o, a, s = "", d = !0, r = !1, u = {}) {
     t.utc();
-    const m = t.clone().add(14, "days"), l = [], y = [];
-    let f = 0, x = 0, k, v;
-    for (let b = 0; b < a.length - 1; b++) {
-      let c = a[b];
-      c.distanceFromStart = Math.round((o + x) * 1e4) / 1e4;
-      const w = a[b + 1];
-      if (e.bearing = L.calculateBearing(c, w, !w.gcToPrevious), c.bearing = e.bearing, c.suspend && r) {
+    const m = t.clone().add(14, "days"), l = [], M = [];
+    let f = 0, C = 0, k, w;
+    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.eta = c.eta || t.utc().format(), c.elapsed = c.elapsed ?? 0;
         const I = c.suspend - c.elapsed;
         if (i - f > I)
@@ -795,35 +795,35 @@ class O {
           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 = x, { etd: t, from: v || c, to: c, next: a.filter((S) => S), wps: l, days: y };
+          return c.distanceFromPrevious = C, { etd: t, from: w || c, to: c, next: a.filter((S) => S), wps: l, days: M };
       } else
         c.suspend = 0;
-      d = t.isAfter(m) ? !1 : d, c = await O.speedLoseAt(e, c, t, s, 0, d, r, u), v = v || c, c.important && l.push(c), t.isSameOrAfter(n) && (y.push(c), n.add(24, "hour"));
-      const M = L.calculateDistance(c, w, !w.gcToPrevious);
-      let h = Math.round(M / v.speed * 1e5) / 1e5;
+      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[b], F == null || F.debug(
-          `[%s] go to %j from %j with ${M}nm, and cost ${h} hours`,
+        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: w.lat, lng: w.lng },
-          { lat: v.lat, lng: v.lng, etd: v.etd }
-        ), x += M, a.filter((I) => I).length <= 1) {
-          k = w, k.eta = t.utc().format(), k.distanceFromPrevious = M, k.distanceFromStart = Math.round((o + x) * 1e4) / 1e4, l.push(k), delete a[b + 1];
+          { 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];
           break;
         }
       } else {
         h = i - f, t.add(h, "hour");
-        const I = B.roundPrecision(v.speed * h, 5);
-        k = L.calculateCoordinate(c, e.bearing, I, "nauticalmiles", !w.gcToPrevious), k.eta = t.utc().format(), a[b] = k, F == null || F.debug(
+        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 },
           { lat: c.lat, lng: c.lng, etd: c.etd }
-        ), x += I, k.distanceFromPrevious = Math.round(x * 1e4) / 1e4, k.distanceFromStart = Math.round((o + x) * 1e4) / 1e4;
+        ), C += I, k.distanceFromPrevious = Math.round(C * 1e4) / 1e4, k.distanceFromStart = Math.round((o + C) * 1e4) / 1e4;
         break;
       }
     }
-    return { etd: t, from: v, to: k, next: a.filter((b) => b), wps: l, days: y };
+    return { etd: t, from: w, to: k, next: a.filter((v) => v), wps: l, days: M };
   }
   /**
    * 洋流影响因子
@@ -844,15 +844,15 @@ class O {
    * @param wwc 气象要素
    */
   static weatherFactor(e, t) {
-    var m, l, y, f, x, k, v;
+    var m, l, M, f, C, k, w;
     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));
     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, (y = t == null ? void 0 : t.wind) == null ? void 0 : y.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, (M = t == null ? void 0 : t.wind) == null ? void 0 : M.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 - (((x = (f = t == null ? void 0 : t.wave) == null ? void 0 : f.sig) == null ? void 0 : x.degree) % 360 || 0));
-    const u = O.waveHeightFactor(((v = (k = t == null ? void 0 : t.wave) == null ? void 0 : k.sig) == null ? void 0 : v.height) ?? 1, a);
+    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;
   }
   /**
@@ -869,12 +869,12 @@ class O {
    */
   static async analyseInstant(e, t, n, i, o, a = "", s = 0, d = !0, r = !1, u = {}) {
     var z, U, Q, X, Z, $;
-    const m = p().valueOf();
-    e.lng = B.convertToStdLng(e.lng);
-    const { route: l, waypoints: y } = o.points, f = L.calculateSubRoute(e, l);
+    const m = g().valueOf();
+    e.lng = J.convertToStdLng(e.lng);
+    const { route: l, waypoints: M } = o.points, f = W.calculateSubRoute(e, l);
     if (((z = f[0]) == null ? void 0 : z.length) <= 1)
       return;
-    const { v0: x, label: k } = e.sog ? {
+    const { v0: C, label: k } = e.sog ? {
       v0: e.sog,
       label: "Other"
       /* Instruct */
@@ -882,59 +882,63 @@ class O {
       v0: i.speed,
       label: "CP"
       /* Cp */
-    }, v = O.assembleProperties(n, i.loadCondition, x, 0), b = y.length ? L.calculateSubWaypoints(e, y) : [];
-    b.forEach((q) => q.important = !0);
+    }, w = O.assembleProperties(n, i.loadCondition, C, 0), v = M.length ? W.calculateSubWaypoints(e, M) : [];
+    v.forEach((q) => q.important = !0);
     const c = {
       from: { ...e },
       route: f,
-      waypoints: b,
-      v0: x,
+      waypoints: v,
+      v0: C,
       label: k
-    }, w = {
+    }, p = {
       hours: [],
       days: [],
       wps: []
     };
-    s || (L.calculateRouteDistance(f) / i.speed <= 72 ? s = 3 : s = 6);
-    let M = L.simplifyRouteToCoordinates(f, b, 0), h = 0, I = 0, S = 0, D = 0;
-    t = p(t).utc();
+    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();
     const Y = t.clone();
-    for (; M.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, C = await O.speedLoseInHoursStep(
-        v,
+    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,
         t,
         Y,
         V,
         h,
-        M,
+        y,
         a,
         d,
         r,
         u
       );
-      (U = C.from) != null && U.speed && (w.hours.push(C.from), w.wps.push(...C.wps), w.days.push(...C.days)), M = C == null ? void 0 : C.next, M.length || w.hours.push(C == null ? void 0 : C.to), h += Math.round((((Q = C == null ? void 0 : C.to) == null ? void 0 : Q.distanceFromPrevious) ?? 0) * 1e4) / 1e4;
+      (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;
     }
-    const N = w.hours;
-    for (let q = 0; q < N.length - 1; q++) {
-      const V = p(N[q + 1].eta).diff(N[q].etd, "hour", !0) || 1;
-      I += (N[q].wxFactor || 0) * V, S += (N[q].cFactor || 0) * V, D += V;
+    const E = p.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;
     }
-    (X = w.wps) == null || X.forEach((q, V) => {
-      if (q.positionTime = p.utc(q.etd || q.eta).unix(), V) {
-        const C = w.wps[V - 1], W = q.distanceFromStart - C.distanceFromStart, H = p(q.eta).diff(p(C.etd), "h", !0);
-        q.avgSpd = Math.round(W / H * 100) / 100;
+    (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);
+        q.avgSpd = Math.round(L / H * 100) / 100;
+        const nt = W.calculateBearing(x, q);
+        x.bearing = nt;
       }
-    }), w.wps = (Z = w.wps) == null ? void 0 : Z.reduce((q, V) => (q.some((C) => C.positionTime === V.positionTime) || 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 = p(P.eta).utc().format(), c.eta = p(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: E, hoursInECA: A, totalDgoConsInECA: R, eca: K } = await this.calculateECA(c, i, u), st = B.roundPrecision(i.fo / 24 * (D - A), 3), at = B.roundPrecision(i.dgo / 24 * D, 3);
+    }), 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);
     c.extend = {
       eca: K,
-      distanceInECA: E,
+      distanceInECA: N,
       hoursInECA: A,
       totalDgoConsInECA: R
     }, c.totalFoCons = st, c.totalDgoCons = at;
-    const tt = p().valueOf() - m, ot = (($ = w == null ? void 0 : w.hours) == null ? void 0 : $.length) || 1;
+    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;
   }
   /**
@@ -952,9 +956,9 @@ class O {
    */
   static async analyseInstantWithThreshed(e, t, n, i, o, a, s, d = "", r = 3, u = !0, m = !1, l = {}) {
     var Q, X, Z, $, q, V;
-    const y = p().valueOf();
-    e.lng = B.convertToStdLng(e.lng);
-    const { v0: f, label: x } = e.sog ? {
+    const M = g().valueOf();
+    e.lng = J.convertToStdLng(e.lng);
+    const { v0: f, label: C } = e.sog ? {
       v0: e.sog,
       label: "Other"
       /* Instruct */
@@ -962,62 +966,65 @@ class O {
       v0: o.speed,
       label: "CP"
       /* Cp */
-    }, k = O.assembleProperties(i, o.loadCondition, f, 0), v = L.calculateSubRoute(e, a);
-    if (((Q = v[0]) == null ? void 0 : Q.length) <= 1)
+    }, k = O.assembleProperties(i, o.loadCondition, f, 0), w = W.calculateSubRoute(e, a);
+    if (((Q = w[0]) == null ? void 0 : Q.length) <= 1)
       return;
-    const b = s.length ? L.calculateSubWaypoints(e, s) : [];
-    b.forEach((C) => C.important = !0);
-    let c = L.simplifyRouteToCoordinates(v, b, 0), w = 0, M = 0, h = 0, I = 0;
+    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;
     const S = {
       hours: [],
       wps: [],
       days: []
     };
-    t = p(t).utc();
+    t = g(t).utc();
     const D = t.clone();
     for (; c.length > 0; ) {
-      const C = r - t.hour() % r;
-      let W = Math.ceil(t.clone().add(C, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4;
-      W = t.clone().add(W, "h").isSameOrAfter(n) ? n.diff(t, "h", !0) * 1e4 / 1e4 : W;
-      const H = await O.speedLoseInHoursStep(k, t, D, W, w, 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), w += Math.round((((Z = H == null ? void 0 : H.to) == null ? void 0 : Z.distanceFromPrevious) ?? 0) * 1e4) / 1e4, !W)
+      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;
+      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)
         break;
     }
-    S.wps = ($ = S.wps) == null ? void 0 : $.reduce((C, W) => (C.some((H) => H.etd === W.etd) || C.push(W), C), []), (q = S.wps) == null || q.forEach((C, W) => {
-      if (W) {
-        const H = S.wps[W - 1], ct = C.distanceFromStart - H.distanceFromStart, dt = p(C.eta).diff(p(H.etd), "h", !0);
-        C.avgSpd = Math.round(ct / dt * 100) / 100;
+    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) => {
+      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);
+        H.bearing = ut;
       }
     });
     const Y = S.hours;
-    for (let C = 0; C < Y.length - 1; C++) {
-      const W = p(Y[C + 1].eta).diff(Y[C].etd, "hour", !0);
-      M += Y[C].wxFactor * W, h += Y[C].cFactor * W, I += W;
+    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;
     }
-    const N = S.hours.at(0), P = S.hours.at(-1), T = await L.calculateRangeRoute(N, P, v), E = await L.calculateRangeWaypoints(N, P, v, b), A = {
+    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 = {
       sample: S,
       distance: Math.round(((P == null ? void 0 : P.distanceFromStart) || 0) * 1e4) / 1e4,
       // 注意，可能会在first节点Drift,所有采用eta做为初始出发时间
-      etd: p(N.eta).utc().format(),
-      eta: p(P == null ? void 0 : P.eta).utc().format(),
-      wxFactor: Math.round(M / I * 1e4) / 1e4,
+      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,
-      from: N,
+      from: E,
       to: P,
       route: T,
-      waypoints: E,
+      waypoints: N,
       v0: f,
-      label: x
-    }, { distanceInECA: R, hoursInECA: K, totalDgoConsInECA: st, eca: at } = await this.calculateECA(A, o, l), it = B.roundPrecision(o.fo / 24 * (I - K), 3), tt = B.roundPrecision(o.dgo / 24 * I, 3);
+      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);
     A.extend = {
       eca: at,
       distanceInECA: R,
       hoursInECA: K,
       totalDgoConsInECA: st
-    }, A.totalDgoCons = tt, A.totalFoCons = it;
-    const z = p().valueOf() - y, U = ((V = S == null ? void 0 : S.hours) == null ? void 0 : V.length) || 1;
+    }, 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;
     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;
   }
   /**
@@ -1036,26 +1043,26 @@ class O {
    * @param options
    */
   static async analyseCost(e, t, n, i, o = {}) {
-    var v, b;
-    const a = p().valueOf(), s = [];
+    var w, v;
+    const a = g().valueOf(), s = [];
     o.meteo2 = o.meteo2 || !0, e.speedStep = e.speedStep || 3, e.alterStep = e.alterStep ?? 1;
-    const d = L.calculateRouteDistance(i.route);
+    const d = W.calculateRouteDistance(i.route);
     let r = 0;
     n.forEach((c) => {
-      const w = Math.ceil(d / c.speed / 24);
-      r = r < w ? w : r;
+      const p = Math.ceil(d / c.speed / 24);
+      r = r < p ? p : r;
     }), r = r * 1.3;
-    const u = p.utc(e.etd).add(r ?? 14, "day");
+    const u = g.utc(e.etd).add(r ?? 14, "day");
     let m = 1;
     for (const c of n) {
-      const w = JSON.parse(JSON.stringify(i.route)), M = JSON.parse(JSON.stringify(i.waypoints)), h = await O.analyseInstantWithThreshed(
+      const p = JSON.parse(JSON.stringify(i.route)), y = JSON.parse(JSON.stringify(i.waypoints)), h = await O.analyseInstantWithThreshed(
         { lat: e.lat, lng: e.lng },
         e.etd,
         u,
         t,
         c,
-        w,
-        M,
+        p,
+        y,
         e.meteoVendor,
         e.speedStep,
         e.useMeteo,
@@ -1069,23 +1076,23 @@ class O {
         cp: `${c.speed}/${c.fo}/${c.dgo}`
       })), m++;
     }
-    s.sort((c, w) => c.cost.total - w.cost.total);
-    const l = s.at(0), y = s.at(1), f = [];
-    if (f.push({ combined: !1, speeds: [l], cost: (v = l.cost) == null ? void 0 : v.total }), y) {
-      const c = l.cost.cp, w = y.cost.cp, M = p(l.eta), h = p(l.etd), I = M.diff(h, "days", !0);
+    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 = S > 7 ? 7 : S < e.alterStep ? e.alterStep : S;
-      let D = 2, Y = { combined: !1, speeds: [y], cost: (b = y.cost) == null ? void 0 : b.total }, N;
+      let D = 2, Y = { combined: !1, speeds: [M], cost: (v = M.cost) == null ? void 0 : v.total }, E;
       for (; S >= e.alterStep; ) {
-        const P = await O.combinedAnalyse(e, t, u, [c, w], i, S, { ...o, level: D });
-        if (Y.cost > P.cost ? N ? (N == null ? void 0 : N.cost) > P.cost && (N = P) : (N = Y, Y = P) : (!N || (N == null ? void 0 : N.cost) > P.cost) && (N = P), S <= e.alterStep)
+        const P = await O.combinedAnalyse(e, t, u, [c, p], 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), N && f.push(N);
+      f.push(Y), E && f.push(E);
     }
-    const k = p().valueOf() - a;
-    return F == null || F.info("[%s] analyse elapsed: %d ms", o == null ? void 0 : o.requestId, k), f.sort((c, w) => c.cost - w.cost);
+    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);
   }
   /**
    * 按步长多次减半，分别用7,4,2,1天步长及cpa,cpb交替计算各种组合下的成本
@@ -1099,9 +1106,9 @@ 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, y) => l + y.cost.total, 0);
+    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, y) => l + y.cost.total, 0);
+    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 };
   }
   /**
@@ -1116,17 +1123,17 @@ class O {
    * @param options
    */
   static async alternateAnalyse(e, t, n, i, o, a, s, d = {}) {
-    var l, y;
-    let r = p.utc(e.etd);
+    var l, M;
+    let r = g.utc(e.etd);
     const u = { lat: e.lat, lng: e.lng }, m = [];
     for (; r.isBefore(n); ) {
-      const f = r.clone().utc().add(s, "day"), x = JSON.parse(JSON.stringify(a.route)), k = JSON.parse(JSON.stringify(a.waypoints)), v = i[o], b = await O.analyseInstantWithThreshed(
+      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,
         r.utc().format(),
         f,
         t,
-        v,
-        x,
+        w,
+        C,
         k,
         e.meteoVendor,
         e.speedStep,
@@ -1134,18 +1141,18 @@ class O {
         e.useRouteParam,
         d
       );
-      b && (await O.calculateCost(b, v, e, d), F == null || F.info(
+      v && (await O.calculateCost(v, w, 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: b.cost.total, distance: b.distance, hours: b.totalHrs, cp: `${v.speed}/${v.fo}/${v.dgo}` }
+        { cost: v.cost.total, distance: v.distance, hours: v.totalHrs, cp: `${w.speed}/${w.fo}/${w.dgo}` }
       )), d.counter = d.counter + 1;
-      const c = (y = (l = b == null ? void 0 : b.sample) == null ? void 0 : l.hours) == null ? void 0 : y.at(-1);
+      const c = (M = (l = v == null ? void 0 : v.sample) == null ? void 0 : l.hours) == null ? void 0 : M.at(-1);
       if (c)
-        u.lat = c.lat, u.lng = c.lng, r = p(c.eta), m.push(b), o = o ? 0 : 1;
+        u.lat = c.lat, u.lng = c.lng, r = g(c.eta), m.push(v), o = o ? 0 : 1;
       else
         break;
     }
@@ -1176,17 +1183,17 @@ class O {
    */
   static async calculateECA(e, t, n = {}) {
     var d, r;
-    const i = await L.intersectInECA(e.route);
+    const i = await W.intersectInECA(e.route);
     let o = 0, a = 0, s = 0;
     e.sample.wps.forEach((u) => {
-      u.positionTime = p.utc(u.etd || u.eta).unix();
+      u.positionTime = g.utc(u.etd || u.eta).unix();
     });
     for (const u of i) {
       o += u.distance;
-      const m = await L.deadReckoningTime((d = u.waypoints) == null ? void 0 : d.at(0), e.sample.wps), l = await L.deadReckoningTime((r = u.waypoints) == null ? void 0 : r.at(-1), e.sample.wps);
-      u.in = m, u.out = l, u.totalHrs = B.roundPrecision((l.positionTime - m.positionTime) / 3600, 2), u.totalDgoCons = B.roundPrecision(t.fo / 24 * u.totalHrs, 3), a += u.totalHrs, s += u.totalDgoCons;
+      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;
     }
-    return o = B.roundPrecision(o, 3), a = B.roundPrecision(a, 3), s = B.roundPrecision(s, 3), {
+    return o = J.roundPrecision(o, 3), a = J.roundPrecision(a, 3), s = J.roundPrecision(s, 3), {
       distanceInECA: o,
       hoursInECA: a,
       totalDgoConsInECA: s,
@@ -1199,34 +1206,34 @@ class O {
    * @param options
    */
   static async mergeSpeeds(e, t = {}) {
-    var c, w;
+    var c, p;
     const n = {
       hours: [],
       wps: [],
       days: []
-    }, i = e.reduce((M, h) => M + h.distance, 0), o = e.reduce((M, h) => {
+    }, i = e.reduce((y, h) => y + h.distance, 0), o = e.reduce((y, h) => {
       var I;
-      return M + (((I = h.extend) == null ? void 0 : I.distanceInECA) || 0);
-    }, 0), a = e.reduce((M, h) => M + h.totalHrs, 0), s = e.reduce((M, h) => {
+      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 M + (((I = h.extend) == null ? void 0 : I.hoursInECA) || 0);
-    }, 0), d = e.reduce((M, h) => {
+      return y + (((I = h.extend) == null ? void 0 : I.hoursInECA) || 0);
+    }, 0), d = e.reduce((y, h) => {
       var I;
-      return M + (((I = h.extend) == null ? void 0 : I.totalDgoConsInECA) || 0);
-    }, 0), r = e.reduce((M, h) => M + h.wxFactor * h.totalHrs / a, 0), u = e.reduce((M, h) => M + h.cFactor * h.totalHrs / a, 0), m = e.reduce((M, h) => M + h.totalFoCons, 0), l = e.reduce((M, h) => M + h.totalDgoCons, 0), y = e.reduce((M, h) => M + h.cost.total, 0), f = e.reduce((M, h) => M + h.cost.hire, 0), x = e.reduce((M, h) => M + h.cost.bunker, 0), k = [], v = [];
-    let b;
-    for (const M of e) {
-      v.push(...((c = M.extend) == null ? void 0 : c.eca) || []);
-      const h = M.sample.hours, I = M.sample.wps, S = M.sample.days, D = h.at(0);
-      b && (D.distanceFromPrevious = b.distanceFromPrevious, D.distanceFromStart = b.distanceFromStart, h.forEach((T, E) => {
-        E && (T.distanceFromStart = T.distanceFromStart + b.distanceFromStart);
-      }), I.at(0).distanceFromPrevious = b.distanceFromPrevious, I.at(0).distanceFromStart = b.distanceFromStart, I.forEach((T, E) => {
-        E && (T.distanceFromStart = T.distanceFromStart + b.distanceFromStart);
-      }), S.at(0).distanceFromPrevious = b.distanceFromPrevious, S.at(0).distanceFromStart = b.distanceFromStart, S.forEach((T, E) => {
-        E && (T.distanceFromStart = T.distanceFromStart + b.distanceFromStart);
-      })), D.cp = M.cost.cp;
-      const Y = [M.etd, M.eta], N = k.findIndex((T) => T.id === D.cp.id);
-      N === -1 ? (D.cp.segment = [Y], k.push(D.cp)) : k[N].segment.push(Y), h.forEach((T) => {
+      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 = [];
+    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) => {
+        N && (T.distanceFromStart = T.distanceFromStart + v.distanceFromStart);
+      }), I.at(0).distanceFromPrevious = v.distanceFromPrevious, I.at(0).distanceFromStart = v.distanceFromStart, I.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) => {
         var A;
         ((A = n.hours) == null ? void 0 : A.findIndex((R) => R.eta === T.eta)) === -1 && n.hours.push(T);
       }), I.forEach((T) => {
@@ -1236,16 +1243,18 @@ class O {
         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 = (w = n.wps) == null ? void 0 : w.findIndex((T) => T.eta === D.eta);
-      P === -1 ? n.wps.push(D) : n.wps[P] = D, b = h.at(-1);
+      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);
     }
-    return n.wps.sort((M, h) => {
-      p(M.etd).unix() - p(h.etd).unix();
-    }), n.wps.forEach((M, h) => {
+    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 = M.distanceFromStart - (I.distanceFromStart || 0), D = p(M.etd || M.eta).diff(p(I.etd || I.eta), "hour", !0), Y = Math.round(S / D * 100) / 100;
-        M.avgSpd = Y;
+        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;
+        y.avgSpd = Y;
+        const E = W.calculateBearing(I, y);
+        I.bearing = E;
       }
     }), {
       sample: n,
@@ -1263,13 +1272,13 @@ class O {
       totalFoCons: Math.round(m * 1e3) / 1e3,
       totalDgoCons: Math.round(l * 1e3) / 1e3,
       cost: {
-        total: Math.round(y * 1e3) / 1e3,
+        total: Math.round(M * 1e3) / 1e3,
         hire: Math.round(f * 1e3) / 1e3,
-        bunker: Math.round(x * 1e3) / 1e3
+        bunker: Math.round(C * 1e3) / 1e3
       },
       extend: {
         cps: k,
-        eca: v,
+        eca: w,
         distanceInECA: Math.round(o * 1e4) / 1e4,
         hoursInECA: Math.round(s * 1e3) / 1e3,
         totalDgoConsInECA: Math.round(d * 1e3) / 1e3,
@@ -1280,15 +1289,15 @@ class O {
 }
 export {
   et as AISImpl,
-  yt as AlertHelper,
-  mt as AlertLevel,
-  jt as HifleetImpl,
+  Mt as AlertHelper,
+  yt as AlertLevel,
+  Et as HifleetImpl,
   pt as LoadCondition,
-  Nt as MyShipImpl,
-  Ct as MyVesselImpl,
-  Et as ShipxyImpl,
+  Tt as MyShipImpl,
+  jt as MyVesselImpl,
+  Nt as ShipxyImpl,
   O as SpeedHelper,
-  wt as SpeedLabel,
-  gt as VesselTag,
-  Tt as alertHelper
+  vt as SpeedLabel,
+  bt as VesselTag,
+  Dt as alertHelper
 };