@idm-plugin/vessel 2.0.8 → 2.1.0

package/dist/index.js

@@ -1,15 +1,15 @@
 var ht = Object.defineProperty;
-var lt = (E, e, t) => e in E ? ht(E, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : E[e] = t;
-var K = (E, e, t) => (lt(E, typeof e != "symbol" ? e + "" : e, t), t);
+var lt = (E, t, e) => t in E ? ht(E, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : E[t] = e;
+var K = (E, t, e) => (lt(E, typeof t != "symbol" ? t + "" : t, e), e);
 import B from "got";
 import rt 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 } from "@idm-plugin/meteo2";
 import { Meteo2Assist as it } from "@idm-plugin/meteo";
-let p;
+let v;
 try {
-  p = rt.getLogger("vessel");
+  v = rt.getLogger("vessel");
 } catch {
 } finally {
 }
@@ -18,85 +18,85 @@ class et {
    * 解析AIS状态码
    * @param status
    */
-  parseStatus(e) {
-    let t, n;
-    switch (e) {
+  parseStatus(t) {
+    let e, a;
+    switch (t) {
       case 0:
-        t = "在航（主机推动）", n = "Underway Using Engine";
+        e = "在航（主机推动）", a = "Underway Using Engine";
         break;
       case 1:
-        t = "锚泊", n = "Anchored";
+        e = "锚泊", a = "Anchored";
         break;
       case 2:
-        t = "失控", n = "Not operated";
+        e = "失控", a = "Not operated";
         break;
       case 3:
-        t = "操纵受限", n = "Limited airworthiness";
+        e = "操纵受限", a = "Limited airworthiness";
         break;
       case 4:
-        t = "吃水受限", n = "Limited by ship's draft";
+        e = "吃水受限", a = "Limited by ship's draft";
         break;
       case 5:
-        t = "靠泊", n = "Mooring";
+        e = "靠泊", a = "Mooring";
         break;
       case 6:
-        t = "搁浅", n = "Stranded";
+        e = "搁浅", a = "Stranded";
         break;
       case 7:
-        t = "捕捞作业", n = "Engaged in fishing";
+        e = "捕捞作业", a = "Engaged in fishing";
         break;
       case 8:
-        t = "靠帆船提供动力", n = "Sailing";
+        e = "靠帆船提供动力", a = "Sailing";
         break;
       default:
-        t = "未定义", n = "Undefined";
+        e = "未定义", a = "Undefined";
     }
-    return { labelCn: t, labelEn: n };
+    return { labelCn: e, labelEn: a };
   }
 }
 class xt extends et {
-  constructor(t, n) {
+  constructor(e, a) {
     super();
     K(this, "clientId");
     K(this, "clientSecret");
     K(this, "token");
-    this.clientId = t, this.clientSecret = n;
+    this.clientId = e, this.clientSecret = a;
   }
-  async authToken(t = {}) {
-    const n = "https://svc.data.myvessel.cn/ada/oauth/token", i = {
+  async authToken(e = {}) {
+    const a = "https://svc.data.myvessel.cn/ada/oauth/token", i = {
       searchParams: {
         client_id: this.clientId,
         client_secret: this.clientSecret,
         grant_type: "client_credentials"
       }
-    }, o = await B.post(n, i).json();
-    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()
+    }, n = await B.post(a, i).json();
+    v == null || v.info("[%s] fetch access token from: %s - %j", e.requestId, a, n), n.error || (this.token = {
+      accessToken: n.access_token,
+      tokenType: n.token_type,
+      expiresIn: n.expires_in,
+      scope: n.scope,
+      jti: n.jti,
+      issuedAt: b().utc().format()
     });
   }
-  async realTimePosition(t, n = {}) {
-    var d, r, h;
-    (!this.token || g().diff(g(this.token.issuedAt), "seconds") > ((d = this.token) == null ? void 0 : d.expiresIn) - 300) && await this.authToken(n);
-    const i = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/location/unit", o = {
+  async realTimePosition(e, a = {}) {
+    var d, r, m;
+    (!this.token || b().diff(b(this.token.issuedAt), "seconds") > ((d = this.token) == null ? void 0 : d.expiresIn) - 300) && await this.authToken(a);
+    const i = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/location/unit", n = {
       headers: {
-        Authorization: `${(r = this.token) == null ? void 0 : r.tokenType} ${(h = this.token) == null ? void 0 : h.accessToken}`
+        Authorization: `${(r = this.token) == null ? void 0 : r.tokenType} ${(m = this.token) == null ? void 0 : m.accessToken}`
       },
-      searchParams: { mmsi: t }
+      searchParams: { mmsi: e }
     };
-    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 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;
+    v == null || v.info("[%s] fetch realtime position from: %s - %j", a.requestId, i, n);
+    const o = await B.get(i, n).json();
+    if (o.code)
+      return v == null || v.warn("[%s] fetch realtime position failed: %j", a.requestId, i, { message: o.message, status: o.status, code: o.code }), o;
+    const s = o.data;
     for (const M in s)
       !isNaN(s[M]) && Number(s[M]) !== 1 / 0 && (s[M] = Number(s[M]));
     if (s) {
-      const M = g(`${s.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+      const M = b(`${s.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
       return {
         mmsi: s.mmsi,
         name: s.vesselName || s.aisVesselName,
@@ -111,7 +111,7 @@ class xt 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: M.unix(),
         status: s.status,
@@ -131,78 +131,78 @@ class xt extends et {
     } else
       return {};
   }
-  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), h = g(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 trajectory(e, a, i, n, o = !0, s = {}) {
+    (!this.token || b().diff(b(this.token.issuedAt), "seconds") > this.token.expiresIn - 300) && await this.authToken(s);
+    const d = await this.realTimePosition(e, s), r = b(a), m = b(i), M = [];
+    for (; m.diff(r, "day", !0) > 30; )
+      await this.trajectoryIn30Day(e, r, r.clone().add(30, "day"), d, n, M, s), r.add(30, "day");
+    return await this.trajectoryIn30Day(e, r, m, d, n, M, s), M;
   }
-  async trajectoryIn30Day(t, n, i, o, a, s, d = {}) {
-    var m, C, S, w, b;
-    const r = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/track", h = {
+  async trajectoryIn30Day(e, a, i, n, o, s, d = {}) {
+    var f, C, S, p, w;
+    const r = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/track", m = {
       headers: {
-        Authorization: `${(m = this.token) == null ? void 0 : m.tokenType} ${(C = this.token) == null ? void 0 : C.accessToken}`
+        Authorization: `${(f = this.token) == null ? void 0 : f.tokenType} ${(C = this.token) == null ? void 0 : C.accessToken}`
       },
       json: {
-        mmsi: t,
-        startTime: n.utcOffset(8).format("YYYY-MM-DD HH:mm:ss"),
+        mmsi: e,
+        startTime: a.utcOffset(8).format("YYYY-MM-DD HH:mm:ss"),
         endTime: i.utcOffset(8).format("YYYY-MM-DD HH:mm:ss")
       }
     };
-    p == null || p.info("[%s] fetch trajectory from: %s - %j", d.requestId, r, h);
-    const M = await B.post(r, h).json();
+    v == null || v.info("[%s] fetch trajectory from: %s - %j", d.requestId, r, m);
+    const M = await B.post(r, m).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 y = -1;
-    const v = g(`${(w = (S = M.data) == null ? void 0 : S[0]) == null ? void 0 : w.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-    return (b = M.data) == null || b.forEach((c) => {
+      return v == null || v.warn("[%s] fetch trajectory failed: %j", d.requestId, r, { message: M.message, status: M.status, code: M.code }), M;
+    let l = -1;
+    const g = b(`${(p = (S = M.data) == null ? void 0 : S[0]) == null ? void 0 : p.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    return (w = M.data) == null || w.forEach((c) => {
       for (const Y in c)
         !isNaN(c[Y]) && Number(c[Y]) !== 1 / 0 && (c[Y] = Number(c[Y]));
-      const f = g(`${c.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00"), l = c.status, { labelCn: u, labelEn: I } = this.parseStatus(l), k = {
+      const y = b(`${c.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00"), h = c.status, { labelCn: u, labelEn: I } = this.parseStatus(h), k = {
         mmsi: c.mmsi,
-        imo: o == null ? void 0 : o.imo,
+        imo: n == null ? void 0 : n.imo,
         lat: c.lat,
         lng: c.lon,
         sog: c.sog,
         cog: c.cog,
         hdg: c.hdg,
         draught: c.draught,
-        status: l,
-        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,
+        status: h,
+        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: f.unix(),
+        positionTime: y.unix(),
         labelCn: u,
         labelEn: I,
         method: "trajectory",
         vendor: "myVessel",
-        utc: f.utc().format()
-      }, D = Math.floor(f.diff(v, "minute", !0) / (a || 1));
-      D !== y && (y = D, s.push(k));
+        utc: y.utc().format()
+      }, D = Math.floor(y.diff(g, "minute", !0) / (o || 1));
+      D !== l && (l = D, s.push(k));
     }), s;
   }
 }
 class Et extends et {
-  constructor(t) {
+  constructor(e) {
     super();
     K(this, "token");
-    this.token = t;
+    this.token = e;
   }
-  async realTimePosition(t, n = {}) {
-    const i = "https://api.hifleet.com/position/position/get/token", o = {
+  async realTimePosition(e, a = {}) {
+    const i = "https://api.hifleet.com/position/position/get/token", n = {
       searchParams: {
-        mmsi: t,
+        mmsi: e,
         usertoken: this.token
       }
-    }, a = await B.post(i, o).json();
-    p == null || p.info("[%s] fetch realtime position from: %s - %j", n.requestId, i, o);
-    const s = a == null ? void 0 : a.list;
+    }, o = await B.post(i, n).json();
+    v == null || v.info("[%s] fetch realtime position from: %s - %j", a.requestId, i, n);
+    const s = o == null ? void 0 : o.list;
     if (!s)
-      return p == null || p.warn("[%s] fetch realtime position failed: %j", n.requestId, i, a), a;
-    for (const v in s)
-      !isNaN(s[v]) && Number(s[v]) !== 1 / 0 && (s[v] = Number(s[v]));
+      return v == null || v.warn("[%s] fetch realtime position failed: %j", a.requestId, i, o), o;
+    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: h } = this.parseStatus(d), M = g(`${s.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    const d = s.status, { labelCn: r, labelEn: m } = this.parseStatus(d), M = b(`${s.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
     return {
       mmsi: s.m,
       name: s.n,
@@ -217,7 +217,7 @@ 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,
       vesselType: s.type,
       dwt: s.dwt,
@@ -227,16 +227,16 @@ class Et extends et {
       utc: M.utc().format(),
       status: d,
       labelCn: r,
-      labelEn: h,
+      labelEn: m,
       method: "position",
       vendor: "hifleet"
     };
   }
-  async search(t, n = {}) {
+  async search(e, a = {}) {
     let i = "https://www.hifleet.com/hifleetapi/searchVesselOL.do";
-    const o = {
+    const n = {
       searchParams: {
-        keyword: t
+        keyword: e
       },
       headers: {
         Referer: "https://www.hifleet.com",
@@ -244,36 +244,36 @@ class Et extends et {
         Host: "www.hifleet.com"
       }
     };
-    let a = await B.post(i, o).json();
-    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]));
+    let o = await B.post(i, n).json();
+    v == null || v.info("[%s] fetch vessel props from: %s - %j", a.requestId, i, n), o instanceof Array && (o = o[0]);
+    for (const d in o)
+      !isNaN(o[d]) && Number(o[d]) !== 1 / 0 && (o[d] = Number(o[d]));
     const s = {
-      mmsi: a.m,
-      name: a.n,
-      imo: a.i,
-      callSign: a.c,
-      length: a.l,
-      breadth: a.b,
-      draught: a.dr,
-      type: a.t
+      mmsi: o.m,
+      name: o.n,
+      imo: o.i,
+      callSign: o.c,
+      length: o.l,
+      breadth: o.b,
+      draught: o.dr,
+      type: o.t
     };
-    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;
+    return i = "https://www.hifleet.com/hifleetapi/sameShipSearch.do", o = await B.post(i, n).json(), v == null || v.info("[%s] search vessel dead weight from: %s - %j", a.requestId, i, n), o instanceof Array && (o = o[0]), o && (s.deadweight = Number(o.dwt)), s;
   }
-  async suggest(t, n = {}) {
-    const i = "https://www.hifleet.com/hifleetapi/getShipSuggest.do", o = {
+  async suggest(e, a = {}) {
+    const i = "https://www.hifleet.com/hifleetapi/getShipSuggest.do", n = {
       searchParams: {
-        q: t
+        q: e
       },
       headers: {
         Referer: "https://www.hifleet.com",
         Origin: "https://www.hifleet.com",
         Host: "www.hifleet.com"
       }
-    }, a = await B.post(i, o).json();
-    p == null || p.info("[%s] suggest vessel props from: %s - %j", n.requestId, i, o);
+    }, o = await B.post(i, n).json();
+    v == null || v.info("[%s] suggest vessel props from: %s - %j", a.requestId, i, n);
     const s = [];
-    for (const d of a)
+    for (const d of o)
       s.push({
         mmsi: !d.mmsi || isNaN(d.mmsi) ? null : Number(d.mmsi),
         name: d.name,
@@ -283,33 +283,33 @@ 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, f, l;
-    const d = await this.realTimePosition(t, s);
-    let r = g(n);
-    const h = g(i), M = g();
-    if (a) {
-      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");
+  async trajectory(e, a, i, n, o = !0, s = {}) {
+    var c, y, h;
+    const d = await this.realTimePosition(e, s);
+    let r = b(a);
+    const m = b(i), M = b();
+    if (o) {
+      let u = m.diff(r, "d", !0);
+      u < 0 ? r = m.clone().subtract(40, "d") : u < 30 ? r.subtract(10, "d") : u < 60 ? r.subtract(5, "d") : r = m.clone().subtract(80, "d"), u = M.diff(m, "d", !0), m.add(u > 10 ? 240 : u * 24, "h");
     }
-    const y = {
+    const l = {
       searchParams: {
-        endtime: h.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
+        endtime: m.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
         starttime: r.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
-        mmsi: t,
+        mmsi: e,
         usertoken: this.token
       }
-    }, v = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", m = await B.get(v, y).json();
-    p == null || p.info("[%s] fetch trajectory from: %s - %j", s.requestId, v, y);
+    }, g = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", f = await B.get(g, l).json();
+    v == null || v.info("[%s] fetch trajectory from: %s - %j", s.requestId, g, l);
     let C;
-    m && (C = ((f = (c = m.ships) == null ? void 0 : c.offors) == null ? void 0 : f.ship) || [], C.length || p == null || p.warn("[%s] fetch trajectory failed: %j", s.requestId, m));
+    f && (C = ((y = (c = f.ships) == null ? void 0 : c.offors) == null ? void 0 : y.ship) || [], C.length || v == null || v.warn("[%s] fetch trajectory failed: %j", s.requestId, f));
     const S = [];
-    let w = -1;
-    const b = g(`${(l = C == null ? void 0 : C[0]) == null ? void 0 : l.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    let p = -1;
+    const w = b(`${(h = C == null ? void 0 : C[0]) == null ? void 0 : h.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
     for (const u of C) {
       for (const P in u)
         !isNaN(u[P]) && Number(u[P]) !== 1 / 0 && (u[P] = Number(u[P]));
-      const I = g(`${u.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+      const I = b(`${u.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
       u.status = u.sp > 4 ? 0 : 1;
       const { labelEn: k, labelCn: D } = this.parseStatus(u.status), Y = {
         mmsi: u.m,
@@ -328,32 +328,32 @@ class Et extends et {
         labelEn: k,
         method: "trajectory",
         vendor: "hifleet"
-      }, j = Math.floor(I.diff(b, "minute", !0) / (o || 1));
-      j !== w && (w = j, S.push(Y));
+      }, j = Math.floor(I.diff(w, "minute", !0) / (n || 1));
+      j !== p && (p = j, S.push(Y));
     }
     return S;
   }
 }
 class jt extends et {
-  constructor(t) {
+  constructor(e) {
     super();
     K(this, "token");
-    this.token = t;
+    this.token = e;
   }
-  async realTimePosition(t, n = {}) {
+  async realTimePosition(e, a = {}) {
     const i = {
       searchParams: {
-        id: t,
+        id: e,
         k: this.token,
         enc: 1
       }
-    }, o = "https://api.shipxy.com/apicall/GetSingleShip", a = await B.get(o, i).json();
-    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 y in s)
-      !isNaN(s[y]) && Number(s[y]) !== 1 / 0 && (s[y] = Number(s[y]));
-    const { labelCn: d, labelEn: r } = await this.parseStatus(s.navistat), h = g.unix(s.lasttime);
+    }, n = "https://api.shipxy.com/apicall/GetSingleShip", o = await B.get(n, i).json();
+    if (v == null || v.info("[%s] fetch realtime position from: %s - %j", a.requestId, n, i), (o == null ? void 0 : o.status) !== 0)
+      return o;
+    const s = o.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), m = b.unix(s.lasttime);
     return {
       mmsi: s.ShipID,
       name: s.name,
@@ -369,7 +369,7 @@ class jt extends et {
       hdg: Math.round(s.hdg / 100 * 100) / 100,
       rot: Math.round(s.rot / 100 * 100) / 100,
       positionTime: s.lasttime,
-      utc: h.utc().format(),
+      utc: m.utc().format(),
       status: s.navistat,
       labelEn: r,
       labelCn: d,
@@ -377,71 +377,71 @@ class jt extends et {
       vendor: "shipxy"
     };
   }
-  async trajectory(t, n, i, o, a = !0, s = {}) {
-    var b;
-    const d = await this.realTimePosition(t, s), r = g(n), h = g(i), M = "https://api.shipxy.com/apicall/GetShipTrack", y = {
+  async trajectory(e, a, i, n, o = !0, s = {}) {
+    var w;
+    const d = await this.realTimePosition(e, s), r = b(a), m = b(i), M = "https://api.shipxy.com/apicall/GetShipTrack", l = {
       searchParams: {
-        id: t,
+        id: e,
         k: this.token,
         enc: 1,
         cut: 0,
         btm: r.unix(),
-        etm: h.unix()
+        etm: m.unix()
       }
-    }, v = await B.get(M, y).json();
-    if (p == null || p.info("[%s] fetch trajectory from: %s - %j", s.requestId, M, y), (v == null ? void 0 : v.status) !== 0)
-      return v;
-    const m = v == null ? void 0 : v.points, C = [], S = g.unix((b = m[0]) == null ? void 0 : b.utc);
-    let w = -1;
-    for (const c of m) {
-      const f = g.unix(c.utc), l = {
+    }, g = await B.get(M, l).json();
+    if (v == null || v.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, C = [], S = b.unix((w = f[0]) == null ? void 0 : w.utc);
+    let p = -1;
+    for (const c of f) {
+      const y = b.unix(c.utc), h = {
         imo: d == null ? void 0 : d.imo,
-        mmsi: t,
+        mmsi: e,
         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: f.unix(),
-        utc: f.utc().format(),
+        positionTime: y.unix(),
+        utc: y.utc().format(),
         method: "trajectory",
         vendor: "shipxy"
-      }, u = Math.floor(f.diff(S, "minute", !0) / (o || 1));
-      u !== w && (w = u, C.push(l));
+      }, u = Math.floor(y.diff(S, "minute", !0) / (n || 1));
+      u !== p && (p = u, C.push(h));
     }
     return C;
   }
 }
 class Nt extends et {
-  constructor(t) {
+  constructor(e) {
     super();
     K(this, "token");
-    this.token = t;
+    this.token = e;
   }
-  async getShipId(t, n = {}) {
+  async getShipId(e, a = {}) {
     const i = {
       headers: {
         appKey: this.token
       },
       json: {
-        mmsiList: t
+        mmsiList: e
       }
-    }, o = "https://api3.myships.com/sp/ships/getShipIdByMMSI", a = await B.post(o, i).json();
-    return p == null || p.info("[%s] fetch ship id from: %s - %j", n.requestId, o, i), a.code !== "0" ? a : a.data[0].shipId;
+    }, n = "https://api3.myships.com/sp/ships/getShipIdByMMSI", o = await B.post(n, i).json();
+    return v == null || v.info("[%s] fetch ship id from: %s - %j", a.requestId, n, i), o.code !== "0" ? o : o.data[0].shipId;
   }
-  async getShipInfo(t, n = {}) {
+  async getShipInfo(e, a = {}) {
     const i = {
       headers: {
         appKey: this.token
       },
       json: {
-        shipId: t
+        shipId: e
       }
-    }, o = "https://api3.myships.com/sp/ships/aissta", a = await B.post(o, i).json();
-    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;
+    }, n = "https://api3.myships.com/sp/ships/aissta", o = await B.post(n, i).json();
+    if (v == null || v.info("[%s] fetch ship info from: %s - %j", a.requestId, n, i), o.code !== "0")
+      return o;
+    const s = o.data;
     let d = s.imo;
-    return t === "407170" && (d = "9198379", p == null || p.warn("[%s] ship(%s) imo error: %s, should be %s", n.requestId, t, s.imo, d)), {
+    return e === "407170" && (d = "9198379", v == null || v.warn("[%s] ship(%s) imo error: %s, should be %s", a.requestId, e, s.imo, d)), {
       mmsi: s.mmsi,
       name: s.shipnameEn,
       imo: d,
@@ -451,23 +451,23 @@ class Nt extends et {
       draught: (s.draught || 100) / 10
     };
   }
-  async realTimePosition(t, n = {}) {
-    const i = await this.getShipId(t, n), o = await this.getShipInfo(i, n), a = {
+  async realTimePosition(e, a = {}) {
+    const i = await this.getShipId(e, a), n = await this.getShipInfo(i, a), o = {
       headers: {
         appKey: this.token
       },
       json: {
         shipId: i
       }
-    }, s = "https://api3.myships.com/sp/ships/position/latest", d = await B.post(s, a).json();
-    p == null || p.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, o).json();
+    v == null || v.info("[%s] fetch realtime position from: %s - %j", a.requestId, s, o);
     const r = d.data[0];
-    for (const m in r)
-      !isNaN(r[m]) && Number(r[m]) !== 1 / 0 && (r[m] = Number(r[m]));
-    const { labelCn: h, labelEn: M } = await this.parseStatus(r.aisNavStatus), y = g.unix(r.posTime);
+    for (const f in r)
+      !isNaN(r[f]) && Number(r[f]) !== 1 / 0 && (r[f] = Number(r[f]));
+    const { labelCn: m, labelEn: M } = await this.parseStatus(r.aisNavStatus), l = b.unix(r.posTime);
     return {
-      ...o,
-      mmsi: t,
+      ...n,
+      mmsi: e,
       lat: Math.round(r.lat / 1e4 / 60 * 1e5) / 1e5,
       lng: Math.round(r.lon / 1e4 / 60 * 1e5) / 1e5,
       sog: Math.round(r.sog / 10 * 100) / 100,
@@ -475,55 +475,55 @@ class Nt extends et {
       hdg: Math.round(r.heading * 100) / 100,
       rot: Math.round(r.rot * 100) / 100,
       positionTime: r.posTime,
-      utc: y.utc().format(),
+      utc: l.utc().format(),
       status: r.aisNavStatus,
       labelEn: M,
-      labelCn: h,
+      labelCn: m,
       method: "position",
       vendor: "myship"
     };
   }
-  async trajectory(t, n, i, o, a = !0, s = {}) {
-    const d = g(n), r = g(i), h = await this.getShipId(t), M = await this.getShipInfo(h), y = [];
+  async trajectory(e, a, i, n, o = !0, s = {}) {
+    const d = b(a), r = b(i), m = await this.getShipId(e), M = await this.getShipInfo(m), l = [];
     for (; r.diff(d, "day", !0) > 30; )
-      await this.trajectoryIn30Day(h, d.unix(), d.add(30, "day").unix(), M, t, o, y);
-    return await this.trajectoryIn30Day(h, d.unix(), r.unix(), M, t, o, y), y;
+      await this.trajectoryIn30Day(m, d.unix(), d.add(30, "day").unix(), M, e, n, l);
+    return await this.trajectoryIn30Day(m, d.unix(), r.unix(), M, e, n, l), l;
   }
-  async trajectoryIn30Day(t, n, i, o, a, s, d, r = {}) {
+  async trajectoryIn30Day(e, a, i, n, o, s, d, r = {}) {
     var S;
-    const h = {
+    const m = {
       headers: {
         appKey: this.token
       },
       json: {
-        shipId: t,
-        startTime: n,
+        shipId: e,
+        startTime: a,
         endTime: i
       }
-    }, M = "https://api3.myships.com/sp/ships/position/history", y = await B.post(M, h).json();
-    if (p == null || p.info("[%s] fetch trajectory from: %s - %j", r.requestId, M, h), y.code !== "0")
-      return p == null || p.warn("[%s] invoke myship trajectory failed: %j", r.requestId, y), y;
-    const v = y.data;
-    for (const w in v)
-      !isNaN(v[w]) && Number(v[w]) !== 1 / 0 && (v[w] = Number(v[w]));
-    const m = g.unix((S = v[0]) == null ? void 0 : S.posTime);
+    }, M = "https://api3.myships.com/sp/ships/position/history", l = await B.post(M, m).json();
+    if (v == null || v.info("[%s] fetch trajectory from: %s - %j", r.requestId, M, m), l.code !== "0")
+      return v == null || v.warn("[%s] invoke myship trajectory failed: %j", r.requestId, l), l;
+    const g = l.data;
+    for (const p in g)
+      !isNaN(g[p]) && Number(g[p]) !== 1 / 0 && (g[p] = Number(g[p]));
+    const f = b.unix((S = g[0]) == null ? void 0 : S.posTime);
     let C = -1;
-    for (const w of v) {
-      const b = g.unix(w.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,
-        positionTime: b.unix(),
-        utc: b.utc().format(),
+    for (const p of g) {
+      const w = b.unix(p.posTime), c = {
+        imo: n == null ? void 0 : n.imo,
+        mmsi: o,
+        lat: Math.round(p.lat / 1e4 / 60 * 1e5) / 1e5,
+        lng: Math.round(p.lon / 1e4 / 60 * 1e5) / 1e5,
+        sog: Math.round(p.sog / 10 * 100) / 100,
+        cog: Math.round(p.cog / 10 * 100) / 100,
+        hdg: Math.round(p.heading * 100) / 100,
+        rot: Math.round(p.rot * 100) / 100,
+        positionTime: w.unix(),
+        utc: w.utc().format(),
         method: "trajectory",
         vendor: "myship"
-      }, f = Math.floor(b.diff(m, "minute", !0) / (s || 1));
-      f !== C && (C = f, d.push(c));
+      }, y = Math.floor(w.diff(f, "minute", !0) / (s || 1));
+      y !== C && (C = y, d.push(c));
     }
     return d;
   }
@@ -544,24 +544,24 @@ class yt {
    *
    * @param options
    */
-  parsePrinciple(e, t = {}) {
+  parsePrinciple(t, e = {}) {
     var s, d, r;
-    _ == null || _.info("[%s] parse rule: %s", t.requestId, e);
-    const n = new RegExp("(?<=\\[)(.+)(?=])", "g"), i = e.match(n) ? (s = e.match(n)) == null ? void 0 : s[0] : void 0, o = i == null ? void 0 : i.split(";");
-    if (!o)
+    _ == null || _.info("[%s] parse rule: %s", e.requestId, t);
+    const a = new RegExp("(?<=\\[)(.+)(?=])", "g"), i = t.match(a) ? (s = t.match(a)) == null ? void 0 : s[0] : void 0, n = i == null ? void 0 : i.split(";");
+    if (!n)
       return;
-    const a = {};
-    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];
+    const o = {};
+    for (let m = 0; m < (n == null ? void 0 : n.length); m++) {
+      const M = (r = (d = n[m].match(a)) == null ? void 0 : d[0]) == null ? void 0 : r.split("],");
+      if (m === 0 && !M)
+        o.scope = n[0];
       else if (M)
-        for (let y = 0, v = M.length; y < v; y++) {
-          const m = this.parseRule(M[y]);
-          m && (a[m.level] ? m.key ? a[m.level][m == null ? void 0 : m.key] = m : a[m.level] = m : m.key ? a[m.level] = { [m == null ? void 0 : m.key]: m } : a[m.level] = m);
+        for (let l = 0, g = M.length; l < g; l++) {
+          const f = this.parseRule(M[l]);
+          f && (o[f.level] ? f.key ? o[f.level][f == null ? void 0 : f.key] = f : o[f.level] = f : f.key ? o[f.level] = { [f == null ? void 0 : f.key]: f } : o[f.level] = f);
         }
     }
-    return a;
+    return o;
   }
   /**
    * 解析单一告警规则
@@ -569,17 +569,17 @@ class yt {
    * @param rule
    * @param options
    */
-  parseRule(e, t = {}) {
-    var a;
-    _ == null || _.debug("[%s] parse rule: %s", t.requestId, e), e = e.startsWith("[") ? e : `[${e}`, e = e.endsWith("]") ? e : `${e}]`;
-    const n = new RegExp("(?<=\\[)(.+?)(?=])", "g"), i = (a = e == null ? void 0 : e.match(n)) == null ? void 0 : a[0], o = i == null ? void 0 : i.split(",");
-    if (o)
+  parseRule(t, e = {}) {
+    var o;
+    _ == null || _.debug("[%s] parse rule: %s", e.requestId, t), t = t.startsWith("[") ? t : `[${t}`, t = t.endsWith("]") ? t : `${t}]`;
+    const a = new RegExp("(?<=\\[)(.+?)(?=])", "g"), i = (o = t == null ? void 0 : t.match(a)) == null ? void 0 : o[0], n = i == null ? void 0 : i.split(",");
+    if (n)
       return {
-        operator: o[0],
-        number: Number.isNaN(Number(o[1])) ? o[1] : Number(o[1]),
-        level: o[2],
-        time: Number(o[3]),
-        key: o[4]
+        operator: n[0],
+        number: Number.isNaN(Number(n[1])) ? n[1] : Number(n[1]),
+        level: n[2],
+        time: Number(n[3]),
+        key: n[4]
       };
   }
   /**
@@ -588,15 +588,15 @@ class yt {
    * @param principle 告警规则
    * @param options
    */
-  checkWeather(e, t, n = {}) {
-    var m, C, S, w, b, c, f, l, u, I, k, D, Y, j, P;
-    let i = 0, o = 0, a = 0, s = 0;
-    const d = Math.round(((C = (m = t == null ? void 0 : t.SEVERE) == null ? void 0 : m.sigWave) == null ? void 0 : C.number) * 1.6 * 100) / 100, r = (w = (S = t == null ? void 0 : t.SEVERE) == null ? void 0 : S.sigWave) == null ? void 0 : w.number, h = (c = (b = t == null ? void 0 : t.HEAVY) == null ? void 0 : b.sigWave) == null ? void 0 : c.number, M = Math.round((((l = (f = t == null ? void 0 : t.SEVERE) == null ? void 0 : f.wind) == null ? void 0 : l.number) + 2) * 100) / 100, y = (I = (u = t == null ? void 0 : t.SEVERE) == null ? void 0 : u.wind) == null ? void 0 : I.number, v = (D = (k = t == null ? void 0 : t.HEAVY) == null ? void 0 : k.wind) == null ? void 0 : D.number;
-    for (let T = 0; T < (e == null ? void 0 : e.length); T++) {
-      const N = e[T], A = (j = (Y = N == null ? void 0 : N.meteo) == null ? void 0 : Y.wave) == null ? void 0 : j.sig, R = (P = N == null ? void 0 : N.meteo) == null ? void 0 : P.wind, U = T ? g(N.eta).diff(g(e[T - 1].eta), "hour", !0) : 0;
-      s = U > s ? U : s, _ == null || _.debug("[%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 || _.debug("[%s] check wind: %j", n.requestId, { ...R, dgThd4Wd: M, svThd4Wd: y, hvThd4Wd: v }), (R == null ? void 0 : R.scale) >= M ? (N.isDangerous = !0, delete N.isSevere, delete N.isHeavy) : (R == null ? void 0 : R.scale) > y ? (N.isDangerous || (N.isSevere = !0), delete N.isHeavy) : (R == null ? void 0 : R.scale) === v && !N.isDangerous && !N.isSevere && (N.isHeavy = !0), i += N.isDangerous ? U : 0, o += N.isSevere ? U : 0, a += N.isHeavy ? U : 0;
+  checkWeather(t, e, a = {}) {
+    var f, C, S, p, w, c, y, h, u, I, k, D, Y, j, P;
+    let i = 0, n = 0, o = 0, s = 0;
+    const d = Math.round(((C = (f = e == null ? void 0 : e.SEVERE) == null ? void 0 : f.sigWave) == null ? void 0 : C.number) * 1.6 * 100) / 100, r = (p = (S = e == null ? void 0 : e.SEVERE) == null ? void 0 : S.sigWave) == null ? void 0 : p.number, m = (c = (w = e == null ? void 0 : e.HEAVY) == null ? void 0 : w.sigWave) == null ? void 0 : c.number, M = Math.round((((h = (y = e == null ? void 0 : e.SEVERE) == null ? void 0 : y.wind) == null ? void 0 : h.number) + 2) * 100) / 100, l = (I = (u = e == null ? void 0 : e.SEVERE) == null ? void 0 : u.wind) == null ? void 0 : I.number, g = (D = (k = e == null ? void 0 : e.HEAVY) == null ? void 0 : k.wind) == null ? void 0 : D.number;
+    for (let T = 0; T < (t == null ? void 0 : t.length); T++) {
+      const N = t[T], A = (j = (Y = N == null ? void 0 : N.meteo) == null ? void 0 : Y.wave) == null ? void 0 : j.sig, R = (P = N == null ? void 0 : N.meteo) == null ? void 0 : P.wind, U = T ? b(N.eta).diff(b(t[T - 1].eta), "hour", !0) : 0;
+      s = U > s ? U : s, _ == null || _.debug("[%s] check sig.wave: %j", a.requestId, { ...A, dgThd4Wv: d, svThd4Wv: r, hvThd4Wv: m }), (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) >= m && (N.isHeavy = !0), _ == null || _.debug("[%s] check wind: %j", a.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 ? U : 0, n += N.isSevere ? U : 0, o += N.isHeavy ? U : 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: y, hvThd4Wd: v }, sig: { dgThd4Wv: d, svThd4Wv: r, hvThd4Wv: h } };
+    return i = Math.round(i * 100) / 100, n = Math.round(n * 100) / 100, o = Math.round(o * 100) / 100, s = Math.round(s), { sample: t, dangerous: i, severe: n, heavy: o, step: s < 3 ? 3 : s, wind: { dgThd4Wd: M, svThd4Wd: l, hvThd4Wd: g }, sig: { dgThd4Wv: d, svThd4Wv: r, hvThd4Wv: m } };
   }
 }
 const Tt = new yt();
@@ -607,7 +607,7 @@ try {
 } finally {
 }
 const Mt = new ft("", !0);
-var gt = /* @__PURE__ */ ((E) => (E.common = "common", E.container = "container", E.tugs = "tugs", E))(gt || {}), bt = /* @__PURE__ */ ((E) => (E.Ballast = "Ballast", E.Laden = "Laden", E))(bt || {}), pt = /* @__PURE__ */ ((E) => (E.Cp = "CP", E.Perf = "Basis", E.Instruct = "Other", E))(pt || {});
+var gt = /* @__PURE__ */ ((E) => (E.common = "common", E.container = "container", E.tugs = "tugs", E))(gt || {}), bt = /* @__PURE__ */ ((E) => (E.Ballast = "Ballast", E.Laden = "Laden", E))(bt || {}), wt = /* @__PURE__ */ ((E) => (E.Cp = "CP", E.Perf = "Basis", E.Instruct = "Other", E))(wt || {});
 class O {
   /**
    * @see https://baike.baidu.com/item/%E6%96%B9%E5%BD%A2%E7%B3%BB%E6%95%B0/4965568?fr=aladdin
@@ -621,11 +621,11 @@ class O {
    * @param draught 吃水 m
    * @return [0.55, 0.85]
    */
-  static blockCoefficient(e, t, n, i) {
-    let o = Math.round(e / (t * n * i) * 100) / 100;
-    o = o < 0.55 ? 0.55 : o > 0.85 ? 0.85 : o;
-    const a = [0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85], s = a.map((d) => Math.abs(d - o));
-    return a[s.indexOf(Math.min(...s))];
+  static blockCoefficient(t, e, a, i) {
+    let n = Math.round(t / (e * a * i) * 100) / 100;
+    n = n < 0.55 ? 0.55 : n > 0.85 ? 0.85 : n;
+    const o = [0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85], s = o.map((d) => Math.abs(d - n));
+    return o[s.indexOf(Math.min(...s))];
   }
   /**
    * @see https://baike.baidu.com/item/%E5%BC%97%E5%8A%B3%E5%BE%B7%E6%95%B0/228891?fromModule=search-result_lemma-recommend
@@ -638,8 +638,8 @@ class O {
    * @param g 重力加速度 9.80 m/s^2
    * @return [0.05, 0.30]
    */
-  static froudeNumber(e, t, n = 9.8) {
-    let i = Math.round(Math.sqrt(e * e / (n * t)) * 100) / 100;
+  static froudeNumber(t, e, a = 9.8) {
+    let i = Math.round(Math.sqrt(t * t / (a * e)) * 100) / 100;
     return i = i < 0.05 ? 0.05 : i > 0.3 ? 0.3 : i, i;
   }
   /**
@@ -649,7 +649,7 @@ class O {
    * @param loadCondition
    * @private
    */
-  static amendFactor(e, t, n) {
+  static amendFactor(t, e, a) {
     const i = {
       0.55: [1.7, -1.4, -7.4],
       0.6: [2.2, -2.5, -9.7],
@@ -659,7 +659,7 @@ class O {
       0.8: [2.6, -13.1, -15.1],
       0.85: [3.1, -18.7, 28]
     };
-    let a = {
+    let o = {
       0.55: [1.7, -1.4, -7.4],
       0.6: [2.2, -2.5, -9.7],
       0.65: [2.6, -3.7, -11.6],
@@ -667,8 +667,8 @@ class O {
       0.75: [2.6, -12.5, -13.5],
       0.8: [3, -16.3, -21.6],
       0.85: [3.4, -20.9, 31.8]
-    }[e];
-    return n === "Laden" && (a = i[e]), a[0] + a[1] * t + a[2] * Math.pow(t, 2);
+    }[t];
+    return a === "Laden" && (o = i[t]), o[0] + o[1] * e + o[2] * Math.pow(e, 2);
   }
   /**
    * 失速方向因子
@@ -681,9 +681,9 @@ class O {
    * @param bn
    * @private
    */
-  static directionFactor(e, t = 0) {
-    let n;
-    return e > 30 && e <= 60 ? n = (1.7 - 0.03 * Math.pow(t - 4, 2)) / 2 : e > 60 && e <= 150 ? n = (0.9 - 0.06 * Math.pow(t - 6, 2)) / 2 : e > 150 && e <= 180 ? n = (0.4 - 0.03 * Math.pow(t - 8, 2)) / 2 : n = 1, Math.round(n * 1e5) / 1e5;
+  static directionFactor(t, e = 0) {
+    let a;
+    return t > 30 && t <= 60 ? a = (1.7 - 0.03 * Math.pow(e - 4, 2)) / 2 : t > 60 && t <= 150 ? a = (0.9 - 0.06 * Math.pow(e - 6, 2)) / 2 : t > 150 && t <= 180 ? a = (0.4 - 0.03 * Math.pow(e - 8, 2)) / 2 : a = 1, Math.round(a * 1e5) / 1e5;
   }
   /**
    * 失速船型因子
@@ -696,20 +696,20 @@ class O {
    * @param bn
    * @private
    */
-  static vesselTagFactor(e, t, n, i = 0) {
+  static vesselTagFactor(t, e, a, i = 0) {
     i = i > 6 ? i - 0.9 * (i - 6) : i;
-    let o;
-    return n === "container" ? o = 0.7 * i + Math.pow(i, 6.5) / (22 * Math.pow(e, 2 / 3)) : t === "Ballast" ? o = 0.7 * i + Math.pow(i, 6.5) / (2.7 * Math.pow(e, 2 / 3)) : o = 0.5 * i + Math.pow(i, 6.5) / (2.7 * Math.pow(e, 2 / 3)), o;
+    let n;
+    return a === "container" ? n = 0.7 * i + Math.pow(i, 6.5) / (22 * Math.pow(t, 2 / 3)) : e === "Ballast" ? n = 0.7 * i + Math.pow(i, 6.5) / (2.7 * Math.pow(t, 2 / 3)) : n = 0.5 * i + Math.pow(i, 6.5) / (2.7 * Math.pow(t, 2 / 3)), n;
   }
   /**
    * 浪高影响因子
    * @param ht 浪高，单位m
    * @private
    */
-  static waveHeightFactor(e, t) {
-    e = e < 0 ? 0.2 : e, e = e > 6 ? e - 0.9 * (e - 6) : e, e = e > 9 ? 9 : e;
-    let n;
-    return t > 30 && t <= 60 ? n = -0.6 : t > 60 && t <= 90 ? n = -0.4 : t > 90 && t <= 120 ? n = e < 3 ? 0.4 : -0.3 : t > 120 && t <= 150 ? n = e < 3 ? 0.6 : -0.5 : t > 150 && t <= 180 ? n = e < 3 ? 0.7 : -0.6 : n = -0.7, Math.round(n * (0.144 * Math.pow(e, 2) + 0.178 * e) * 1e4) / 1e4;
+  static waveHeightFactor(t, e) {
+    t = t < 0 ? 0.2 : t, t = t > 6 ? t - 0.9 * (t - 6) : t, t = t > 9 ? 9 : t;
+    let a;
+    return e > 30 && e <= 60 ? a = -0.6 : e > 60 && e <= 90 ? a = -0.4 : e > 90 && e <= 120 ? a = t < 3 ? 0.4 : -0.3 : e > 120 && e <= 150 ? a = t < 3 ? 0.6 : -0.5 : e > 150 && e <= 180 ? a = t < 3 ? 0.7 : -0.6 : a = -0.7, Math.round(a * (0.144 * Math.pow(t, 2) + 0.178 * t) * 1e4) / 1e4;
   }
   /**
    * 组装船舶运行参数
@@ -719,20 +719,20 @@ class O {
    * @param bearing 方位角
    * @private
    */
-  static assembleProperties(e, t, n, i) {
-    var y;
-    const o = e.lbp ?? e.length ?? e.lengthOverall ?? 198.9642, a = e.draught ?? 8, s = e.breadthMoulded ?? e.breadth ?? e.breadthExtreme ?? 32.4572, d = e.deadweight ?? 67035.7773, r = ((y = e == null ? void 0 : e.type) == null ? void 0 : y.toLowerCase()) || "common";
+  static assembleProperties(t, e, a, i) {
+    var l;
+    const n = t.lbp ?? t.length ?? t.lengthOverall ?? 198.9642, o = t.draught ?? 8, s = t.breadthMoulded ?? t.breadth ?? t.breadthExtreme ?? 32.4572, d = t.deadweight ?? 67035.7773, r = ((l = t == null ? void 0 : t.type) == null ? void 0 : l.toLowerCase()) || "common";
     return {
       tag: r.indexOf("container") > -1 ? "container" : r.indexOf("tugs") > -1 ? "tugs" : "common",
-      lbp: o,
-      loadCondition: t,
-      draught: a,
+      lbp: n,
+      loadCondition: e,
+      draught: o,
       breadthMoulded: s,
       // 排水量（吨）= 载重量（吨）/ 1.025 + 吃水（米）× 船舶型宽（米）× 船舶型长（米）× 0.7
       // 其中，1.025是指海水的密度，吨是指公吨，吃水是指船舶的最大吃水深度。船舶型宽是指船舶的最大型宽，船舶型长是指船舶的设计型长。上述公式是针对常规船舶适用的，不同类型的船舶可能会有一些差异。
-      displacement: Math.round((d / 1.025 + a * s * o * 0.7) * 1e4) / 1e4,
+      displacement: Math.round((d / 1.025 + o * s * n * 0.7) * 1e4) / 1e4,
       // 换算为m/s
-      speed: Math.round((n ?? 14.1382) * 1852 / 3600 * 1e4) / 1e4,
+      speed: Math.round((a ?? 14.1382) * 1852 / 3600 * 1e4) / 1e4,
       bearing: i || 90
     };
   }
@@ -746,41 +746,41 @@ class O {
    * @param useMeteo true 启用气象分析
    * @param useRouteParam true 启用设置速度
    */
-  static async speedLoseAt(e, t, n, i = "", o = 2, a = !0, s = !1, d = {}) {
+  static async speedLoseAt(t, e, a, i = "", n = 2, o = !0, s = !1, d = {}) {
     let r;
-    if (t.velocity && s && (e.speed = J.roundPrecision(t.velocity * 1852 / 3600, 6)), a) {
-      let h;
+    if (e.velocity && s && (t.speed = J.roundPrecision(e.velocity * 1852 / 3600, 6)), o) {
+      let m;
       try {
         i = (i == null ? void 0 : i.toUpperCase()) === "CMEMS" ? "ECMWF" : i, i = (i == null ? void 0 : i.toUpperCase()) === "METEO2" ? "best_match" : i;
-        const { weatherModels: m, marineModels: C } = await it.autoPickMeteoModel(i), S = await Mt.spotForecast(t.lat, t.lng, n.utc().format(), !1, !1, !0, {
+        const { weatherModels: f, marineModels: C } = await it.autoPickMeteoModel(i), S = await Mt.spotForecast(e.lat, e.lng, a.utc().format(), !1, !1, !0, {
           ...d,
           pastDays: 1,
           forecastDays: 1,
-          weatherModels: m,
+          weatherModels: f,
           marineModels: C
-        }), [w] = it.pickHourly(S, n);
-        h = it.toLegacy(w);
-      } catch (m) {
-        F.warn("[%s] meteo2 spot(%j) forecast failed: %s", d.requestId, { ...t, eta: n.utc().format(), source: i }, m);
+        }), [p] = it.pickHourly(S, a);
+        m = it.toLegacy(p);
+      } catch (f) {
+        F.warn("[%s] meteo2 spot(%j) forecast failed: %s", d.requestId, { ...e, eta: a.utc().format(), source: i }, f);
       }
-      const M = O.weatherFactor(e, h), y = O.currentFactor(e.bearing, h == null ? void 0 : h.current, o), v = Math.round((e.speed * 1.943844 + M + y) * 100) / 100;
+      const M = O.weatherFactor(t, m), l = O.currentFactor(t.bearing, m == null ? void 0 : m.current, n), g = Math.round((t.speed * 1.943844 + M + l) * 100) / 100;
       r = {
-        meteo: { ...h },
+        meteo: { ...m },
         wxFactor: M,
-        cFactor: y,
-        speed: t.velocity && s ? t.velocity : v < 0 ? 1 : v,
-        eta: n.utc().format(),
-        etd: n.utc().format()
+        cFactor: l,
+        speed: e.velocity && s ? e.velocity : g < 0 ? 1 : g,
+        eta: a.utc().format(),
+        etd: a.utc().format()
       };
     } else
       r = {
         wxFactor: 0,
         cFactor: 0,
-        speed: t.velocity && s ? t.velocity : Math.round((e.speed * 1.943844 + 0 + 0) * 100) / 100,
-        eta: n.utc().format(),
-        etd: n.utc().format()
+        speed: e.velocity && s ? e.velocity : Math.round((t.speed * 1.943844 + 0 + 0) * 100) / 100,
+        eta: a.utc().format(),
+        etd: a.utc().format()
       };
-    return delete t.meteo, delete t.wxFactor, delete t.cFactor, delete t.speed, delete t.etd, { ...r, ...t };
+    return delete e.meteo, delete e.wxFactor, delete e.cFactor, delete e.speed, delete e.etd, { ...r, ...e };
   }
   /**
    * 基于步长计算失速样本
@@ -795,53 +795,53 @@ class O {
    * @param useRouteParam true 启用航线上设置的参数 { suspend: 停留时长（小时）, velocity: 速度（kts）}
    * @private
    */
-  static async speedLoseInHoursStep(e, t, n, i, o, a, s = "", d = !0, r = !1, h = {}) {
-    t.utc();
-    const M = t.clone().add(14, "days"), y = [], v = [];
-    let m = 0, C = 0, S, w;
-    for (let b = 0; b < a.length - 1; b++) {
-      let c = a[b];
-      c.distanceFromStart = Math.round((o + C) * 1e4) / 1e4;
-      const f = a[b + 1];
-      if (e.bearing = W.calculateBearing(c, f, !f.gcToPrevious), c.bearing = e.bearing, c.suspend && r) {
-        c.eta = c.eta || t.utc().format(), c.elapsed = c.elapsed ?? 0;
+  static async speedLoseInHoursStep(t, e, a, i, n, o, s = "", d = !0, r = !1, m = {}) {
+    e.utc();
+    const M = e.clone().add(14, "days"), l = [], g = [];
+    let f = 0, C = 0, S, p;
+    for (let w = 0; w < o.length - 1; w++) {
+      let c = o[w];
+      c.distanceFromStart = Math.round((n + C) * 1e4) / 1e4;
+      const y = o[w + 1];
+      if (t.bearing = W.calculateBearing(c, y, !y.gcToPrevious), c.bearing = t.bearing, c.suspend && r) {
+        c.eta = c.eta || e.utc().format(), c.elapsed = c.elapsed ?? 0;
         const I = c.suspend - c.elapsed;
-        if (i - m > I)
-          i = i - m - I, t.add(I, "hour"), c.elapsed = c.suspend;
+        if (i - f > I)
+          i = i - f - I, e.add(I, "hour"), c.elapsed = c.suspend;
         else {
-          const k = i - m;
-          c.elapsed += k, t.add(k, "hour"), i = 0;
+          const k = i - f;
+          c.elapsed += k, e.add(k, "hour"), i = 0;
         }
-        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 = C, { etd: t, from: w || c, to: c, next: a.filter((k) => k), wps: y, days: v };
+        if (F == null || F.info(`[%s] suspend ${c.elapsed} hours at %j, and remain ${i} hours need to go...`, m.requestId, c), i === 0)
+          return c.distanceFromPrevious = C, { etd: e, from: p || c, to: c, next: o.filter((k) => k), 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, h), w = w || c, c.important && y.push(c), t.isSameOrAfter(n) && (v.push(c), n.add(24, "hour"));
-      const l = W.calculateDistance(c, f, !f.gcToPrevious);
-      let u = Math.round(l / w.speed * 1e5) / 1e5;
-      if (m + u < i) {
-        if (m += u, t.add(u, "hour"), delete a[b], F == null || F.debug(
-          `[%s] go to %j from %j with ${l}nm, and cost ${u} hours`,
-          h.requestId,
-          { lat: f.lat, lng: f.lng },
-          { lat: w.lat, lng: w.lng, etd: w.etd }
-        ), C += l, a.filter((I) => I).length <= 1) {
-          S = f, S.eta = t.utc().format(), S.distanceFromPrevious = l, S.distanceFromStart = Math.round((o + C) * 1e4) / 1e4, y.push(S), delete a[b + 1];
+      d = e.isAfter(M) ? !1 : d, c = await O.speedLoseAt(t, c, e, s, 0, d, r, m), p = p || c, c.important && l.push(c), e.isSameOrAfter(a) && (g.push(c), a.add(24, "hour"));
+      const h = W.calculateDistance(c, y, !y.gcToPrevious);
+      let u = Math.round(h / p.speed * 1e5) / 1e5;
+      if (f + u < i) {
+        if (f += u, e.add(u, "hour"), delete o[w], F == null || F.debug(
+          `[%s] go to %j from %j with ${h}nm, and cost ${u} hours`,
+          m.requestId,
+          { lat: y.lat, lng: y.lng },
+          { lat: p.lat, lng: p.lng, etd: p.etd }
+        ), C += h, o.filter((I) => I).length <= 1) {
+          S = y, S.eta = e.utc().format(), S.distanceFromPrevious = h, S.distanceFromStart = Math.round((n + C) * 1e4) / 1e4, l.push(S), delete o[w + 1];
           break;
         }
       } else {
-        u = i - m, t.add(u, "hour");
-        const I = J.roundPrecision(w.speed * u, 5);
-        S = W.calculateCoordinate(c, e.bearing, I, "nauticalmiles", !f.gcToPrevious), S.eta = t.utc().format(), a[b] = S, F == null || F.debug(
+        u = i - f, e.add(u, "hour");
+        const I = J.roundPrecision(p.speed * u, 5);
+        S = W.calculateCoordinate(c, t.bearing, I, "nauticalmiles", !y.gcToPrevious), S.eta = e.utc().format(), o[w] = S, F == null || F.debug(
           `[%s] go to %j from %j with ${I}nm, and cost ${u} hours`,
-          h.requestId,
+          m.requestId,
           { lat: S.lat, lng: S.lng },
           { lat: c.lat, lng: c.lng, etd: c.etd }
-        ), C += I, S.distanceFromPrevious = Math.round(C * 1e4) / 1e4, S.distanceFromStart = Math.round((o + C) * 1e4) / 1e4;
+        ), C += I, S.distanceFromPrevious = Math.round(C * 1e4) / 1e4, S.distanceFromStart = Math.round((n + C) * 1e4) / 1e4;
         break;
       }
     }
-    return { etd: t, from: w, to: S, next: a.filter((b) => b), wps: y, days: v };
+    return { etd: e, from: p, to: S, next: o.filter((w) => w), wps: l, days: g };
   }
   /**
    * 洋流影响因子
@@ -849,29 +849,29 @@ class O {
    * @param current 洋流要素
    * @param role  1: 船东, 2: 租家, 0: 未知
    */
-  static currentFactor(e, t, n = 0) {
-    const i = (e - (t == null ? void 0 : t.degree) || 0) / 180 * Math.PI;
+  static currentFactor(t, e, a = 0) {
+    const i = (t - (e == null ? void 0 : e.degree) || 0) / 180 * Math.PI;
     if (Math.abs(i) === Math.PI / 2)
       return 0;
-    let o = ((t == null ? void 0 : t.kts) || 0) * Math.cos(i);
-    return n & 2 ? o = Math.ceil(o * 100) / 100 : n & 1 ? o = Math.floor(o * 100) / 100 : o = Math.round(o * 100) / 100, Math.abs(o) > 5 ? 0 : o;
+    let n = ((e == null ? void 0 : e.kts) || 0) * Math.cos(i);
+    return a & 2 ? n = Math.ceil(n * 100) / 100 : a & 1 ? n = Math.floor(n * 100) / 100 : n = Math.round(n * 100) / 100, Math.abs(n) > 5 ? 0 : n;
   }
   /**
    * 风浪影响因子
    * @param props 船舶档案
    * @param wwc 气象要素
    */
-  static weatherFactor(e, t) {
-    var M, y, v, m, C, S, 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, (y = t == null ? void 0 : t.wind) == null ? void 0 : y.scale), d = O.vesselTagFactor(e.displacement, e.loadCondition, e.tag, (v = t == null ? void 0 : t.wind) == null ? void 0 : v.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 = (m = t == null ? void 0 : t.wave) == null ? void 0 : m.sig) == null ? void 0 : C.degree) % 360 || 0));
-    const h = O.waveHeightFactor(((w = (S = t == null ? void 0 : t.wave) == null ? void 0 : S.sig) == null ? void 0 : w.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;
+  static weatherFactor(t, e) {
+    var M, l, g, f, C, S, p;
+    F == null || F.debug("calculate weather factor via: %j", { ...t, ...e });
+    const a = O.blockCoefficient(t.displacement, t.lbp, t.breadthMoulded, t.draught), i = O.froudeNumber(t.speed, t.lbp), n = O.amendFactor(a, i, t.loadCondition);
+    let o = Math.abs(t.bearing % 360 - (((M = e == null ? void 0 : e.wind) == null ? void 0 : M.degree) % 360 || 0));
+    o = o > 180 ? 360 - o : o;
+    const s = O.directionFactor(o, (l = e == null ? void 0 : e.wind) == null ? void 0 : l.scale), d = O.vesselTagFactor(t.displacement, t.loadCondition, t.tag, (g = e == null ? void 0 : e.wind) == null ? void 0 : g.scale);
+    let r = s * n * d / 100 * t.speed;
+    r = Math.round(r * 1.943844 * 1e4) / 1e4 * -1, t.tag === "tugs" && Math.abs(r) > 1 && (r = r / (Math.abs(Math.round(r)) + 1)), F == null || F.debug("wind wx factor = %d", r), o = Math.abs(t.bearing % 360 - (((C = (f = e == null ? void 0 : e.wave) == null ? void 0 : f.sig) == null ? void 0 : C.degree) % 360 || 0));
+    const m = O.waveHeightFactor(((p = (S = e == null ? void 0 : e.wave) == null ? void 0 : S.sig) == null ? void 0 : p.height) ?? 1, o);
+    return F == null || F.debug("wave wx factor = %d", m), r = r * 0.4 + m, 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;
   }
   /**
    * 全程失速分析(走完航程)
@@ -885,79 +885,79 @@ class O {
    * @param useMeteo true 启用气象分析
    * @param useRouteParam
    */
-  static async analyseInstant(e, t, n, i, o, a = "", s = 0, d = !0, r = !1, h = {}) {
+  static async analyseInstant(t, e, a, i, n, o = "", s = 0, d = !0, r = !1, m = {}) {
     var z, G, Q, X, Z, $;
-    const M = g().valueOf();
-    e.lng = J.convertToStdLng(e.lng);
-    const { route: y, waypoints: v } = o.points, m = W.calculateSubRoute(e, y);
-    if (((z = m[0]) == null ? void 0 : z.length) <= 1)
+    const M = b().valueOf();
+    t.lng = J.convertToStdLng(t.lng);
+    const { route: l, waypoints: g } = n.points, f = W.calculateSubRoute(t, l);
+    if (((z = f[0]) == null ? void 0 : z.length) <= 1)
       return;
-    const { v0: C, label: S } = e.sog ? {
-      v0: e.sog,
-      label: e.label || "Other"
+    const { v0: C, label: S } = t.sog ? {
+      v0: t.sog,
+      label: t.label || "Other"
       /* Instruct */
     } : {
       v0: i.speed,
       label: "CP"
       /* Cp */
-    }, w = O.assembleProperties(n, i.loadCondition, C, 0), b = v.length ? W.calculateSubWaypoints(e, v) : [];
-    b.forEach((q) => q.important = !0);
+    }, p = O.assembleProperties(a, i.loadCondition, C, 0), w = g.length ? W.calculateSubWaypoints(t, g) : [];
+    w.forEach((q) => q.important = !0);
     const c = {
-      from: { ...e },
-      route: m,
-      waypoints: b,
+      from: { ...t },
+      route: f,
+      waypoints: w,
       v0: C,
       label: S
-    }, f = {
+    }, y = {
       hours: [],
       days: [],
       wps: []
     };
-    s || (W.calculateRouteDistance(m) / i.speed <= 72 ? s = 3 : s = 6);
-    let l = W.simplifyRouteToCoordinates(m, b, 0), u = 0, I = 0, k = 0, D = 0;
-    t = g(t).utc();
-    const Y = t.clone();
-    for (; l.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,
+    s || (W.calculateRouteDistance(f) / i.speed <= 72 ? s = 3 : s = 6);
+    let h = W.simplifyRouteToCoordinates(f, w, 0), u = 0, I = 0, k = 0, D = 0;
+    e = b(e).utc();
+    const Y = e.clone();
+    for (; h.length > 0; ) {
+      const q = s - e.hour() % s, V = Math.ceil(e.clone().add(q, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(e, "h", !0) * 1e4) / 1e4, x = await O.speedLoseInHoursStep(
+        p,
+        e,
         Y,
         V,
         u,
-        l,
-        a,
+        h,
+        o,
         d,
         r,
-        h
+        m
       );
-      (G = x.from) != null && G.speed && (f.hours.push(x.from), f.wps.push(...x.wps), f.days.push(...x.days)), l = x == null ? void 0 : x.next, l.length || f.hours.push(x == null ? void 0 : x.to), u += Math.round((((Q = x == null ? void 0 : x.to) == null ? void 0 : Q.distanceFromPrevious) ?? 0) * 1e4) / 1e4;
+      (G = x.from) != null && G.speed && (y.hours.push(x.from), y.wps.push(...x.wps), y.days.push(...x.days)), h = x == null ? void 0 : x.next, h.length || y.hours.push(x == null ? void 0 : x.to), u += Math.round((((Q = x == null ? void 0 : x.to) == null ? void 0 : Q.distanceFromPrevious) ?? 0) * 1e4) / 1e4;
     }
-    const j = f.hours;
+    const j = y.hours;
     for (let q = 0; q < j.length - 1; q++) {
-      const V = g(j[q + 1].eta).diff(j[q].etd, "hour", !0) || 1;
+      const V = b(j[q + 1].eta).diff(j[q].etd, "hour", !0) || 1;
       I += (j[q].wxFactor || 0) * V, k += (j[q].cFactor || 0) * V, D += V;
     }
-    (X = f.wps) == null || X.forEach((q, V) => {
-      q.positionTime = g.utc(q.etd || q.eta).unix();
-      const x = f.wps[V - 1];
+    (X = y.wps) == null || X.forEach((q, V) => {
+      q.positionTime = b.utc(q.etd || q.eta).unix();
+      const x = y.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);
+        const L = q.distanceFromStart - x.distanceFromStart, H = b(q.eta || q.etd).diff(b(x.etd || x.eta), "h", !0);
         q.avgSpd = Math.round(L / H * 100) / 100;
         const nt = W.calculateBearing(x, q);
         x.bearing = nt;
       }
-    }), f.wps = (Z = f.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 = f;
-    const P = f.hours.at(0), T = f.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(k / 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: U } = await this.calculateECA(c, i, h), st = J.roundPrecision(i.fo / 24 * (D - A), 3), at = J.roundPrecision(i.dgo / 24 * D, 3);
+    }), y.wps = (Z = y.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 = y;
+    const P = y.hours.at(0), T = y.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(I / D * 1e4) / 1e4, c.cFactor = Math.round(k / 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: U } = await this.calculateECA(c, i, m), st = J.roundPrecision(i.fo / 24 * (D - A), 3), at = J.roundPrecision(i.dgo / 24 * D, 3);
     c.extend = {
       eca: U,
       distanceInECA: N,
       hoursInECA: A,
       totalDgoConsInECA: R
     }, c.totalFoCons = st, c.totalDgoCons = at;
-    const tt = g().valueOf() - M, ot = (($ = f == null ? void 0 : f.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;
+    const tt = b().valueOf() - M, ot = (($ = y == null ? void 0 : y.hours) == null ? void 0 : $.length) || 1;
+    return F == null || F.info("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", m == null ? void 0 : m.requestId, tt, ot, Math.round(tt / ot * 1e3) / 1e3), c;
   }
   /**
    * 分段失速分析（最多走hours 小时）
@@ -972,43 +972,43 @@ class O {
    * @param useMeteo true 启用气象分析
    * @param useRouteParam
    */
-  static async analyseInstantWithThreshed(e, t, n, i, o, a, s, d = "", r = 3, h = !0, M = !1, y = {}) {
+  static async analyseInstantWithThreshed(t, e, a, i, n, o, s, d = "", r = 3, m = !0, M = !1, l = {}) {
     var Q, X, Z, $, q, V;
-    const v = g().valueOf();
-    e.lng = J.convertToStdLng(e.lng);
-    const { v0: m, label: C } = e.sog ? {
-      v0: e.sog,
-      label: e.label || "Other"
+    const g = b().valueOf();
+    t.lng = J.convertToStdLng(t.lng);
+    const { v0: f, label: C } = t.sog ? {
+      v0: t.sog,
+      label: t.label || "Other"
       /* Instruct */
     } : {
-      v0: o.speed,
+      v0: n.speed,
       label: "CP"
       /* Cp */
-    }, S = O.assembleProperties(i, o.loadCondition, m, 0), w = W.calculateSubRoute(e, a);
-    if (((Q = w[0]) == null ? void 0 : Q.length) <= 1)
+    }, S = O.assembleProperties(i, n.loadCondition, f, 0), p = W.calculateSubRoute(t, o);
+    if (((Q = p[0]) == null ? void 0 : Q.length) <= 1)
       return;
-    const b = s.length ? W.calculateSubWaypoints(e, s) : [];
-    b.forEach((x) => x.important = !0);
-    let c = W.simplifyRouteToCoordinates(w, b, 0), f = 0, l = 0, u = 0, I = 0;
+    const w = s.length ? W.calculateSubWaypoints(t, s) : [];
+    w.forEach((x) => x.important = !0);
+    let c = W.simplifyRouteToCoordinates(p, w, 0), y = 0, h = 0, u = 0, I = 0;
     const k = {
       hours: [],
       wps: [],
       days: []
     };
-    t = g(t).utc();
-    const D = t.clone();
+    e = b(e).utc();
+    const D = e.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;
-      L = t.clone().add(L, "h").isSameOrAfter(n) ? n.diff(t, "h", !0) * 1e4 / 1e4 : L;
-      const H = await O.speedLoseInHoursStep(S, t, D, L, f, c, d, h, M, y);
-      if ((X = H.from) != null && X.speed && (k.hours.push(H.from), H != null && H.wps && k.wps.push(...H.wps), k.days.push(...H.days)), c = H == null ? void 0 : H.next, c.length || k.hours.push(H == null ? void 0 : H.to), f += Math.round((((Z = H == null ? void 0 : H.to) == null ? void 0 : Z.distanceFromPrevious) ?? 0) * 1e4) / 1e4, !L)
+      const x = r - e.hour() % r;
+      let L = Math.ceil(e.clone().add(x, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(e, "h", !0) * 1e4) / 1e4;
+      L = e.clone().add(L, "h").isSameOrAfter(a) ? a.diff(e, "h", !0) * 1e4 / 1e4 : L;
+      const H = await O.speedLoseInHoursStep(S, e, D, L, y, c, d, m, M, l);
+      if ((X = H.from) != null && X.speed && (k.hours.push(H.from), H != null && H.wps && k.wps.push(...H.wps), k.days.push(...H.days)), c = H == null ? void 0 : H.next, c.length || k.hours.push(H == null ? void 0 : H.to), y += Math.round((((Z = H == null ? void 0 : H.to) == null ? void 0 : Z.distanceFromPrevious) ?? 0) * 1e4) / 1e4, !L)
         break;
     }
-    k.wps = ($ = k.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 = k.wps) == null || q.forEach((x, L) => {
+    k.wps = ($ = k.wps) == null ? void 0 : $.reduce((x, L) => (x.some((H) => Math.round(b(H.etd).unix() / 60) === Math.round(b(L.etd).unix() / 60)) || x.push(L), x), []), (q = k.wps) == null || q.forEach((x, L) => {
       const H = k.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);
+        const nt = x.distanceFromStart - H.distanceFromStart, dt = b(x.eta || x.etd).diff(b(H.etd || H.eta), "h", !0);
         x.avgSpd = Math.round(nt / dt * 100) / 100;
         const ut = W.calculateBearing(H, x);
         H.bearing = ut;
@@ -1016,16 +1016,16 @@ class O {
     });
     const Y = k.hours;
     for (let x = 0; x < Y.length - 1; x++) {
-      const L = g(Y[x + 1].eta).diff(Y[x].etd, "hour", !0);
-      l += Y[x].wxFactor * L, u += Y[x].cFactor * L, I += L;
+      const L = b(Y[x + 1].eta).diff(Y[x].etd, "hour", !0);
+      h += Y[x].wxFactor * L, u += Y[x].cFactor * L, I += L;
     }
-    const j = k.hours.at(0), P = k.hours.at(-1), T = await W.calculateRangeRoute(j, P, w), N = await W.calculateRangeWaypoints(j, P, w, b), A = {
+    const j = k.hours.at(0), P = k.hours.at(-1), T = await W.calculateRangeRoute(j, P, p), N = await W.calculateRangeWaypoints(j, P, p, w), A = {
       sample: k,
       distance: Math.round(((P == null ? void 0 : P.distanceFromStart) || 0) * 1e4) / 1e4,
       // 注意，可能会在first节点Drift,所有采用eta做为初始出发时间
-      etd: g(j.eta).utc().format(),
-      eta: g(P == null ? void 0 : P.eta).utc().format(),
-      wxFactor: Math.round(l / I * 1e4) / 1e4,
+      etd: b(j.eta).utc().format(),
+      eta: b(P == null ? void 0 : P.eta).utc().format(),
+      wxFactor: Math.round(h / I * 1e4) / 1e4,
       cFactor: Math.round(u / I * 1e4) / 1e4,
       avgSpeed: Math.round(((P == null ? void 0 : P.distanceFromStart) || 0) / I * 1e4) / 1e4,
       totalHrs: Math.round(I * 1e4) / 1e4,
@@ -1033,17 +1033,17 @@ class O {
       to: P,
       route: T,
       waypoints: N,
-      v0: m,
+      v0: f,
       label: C
-    }, { distanceInECA: R, hoursInECA: U, totalDgoConsInECA: st, eca: at } = await this.calculateECA(A, o, y), ct = J.roundPrecision(o.fo / 24 * (I - U), 3), tt = J.roundPrecision(o.dgo / 24 * I, 3);
+    }, { distanceInECA: R, hoursInECA: U, totalDgoConsInECA: st, eca: at } = await this.calculateECA(A, n, l), ct = J.roundPrecision(n.fo / 24 * (I - U), 3), tt = J.roundPrecision(n.dgo / 24 * I, 3);
     A.extend = {
       eca: at,
       distanceInECA: R,
       hoursInECA: U,
       totalDgoConsInECA: st
     }, A.totalDgoCons = tt, A.totalFoCons = ct;
-    const z = g().valueOf() - v, G = ((V = k == null ? void 0 : k.hours) == null ? void 0 : V.length) || 1;
-    return F == null || F.debug("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", y == null ? void 0 : y.requestId, z, G, Math.round(z / G * 1e3) / 1e3), A;
+    const z = b().valueOf() - g, G = ((V = k == null ? void 0 : k.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, G, Math.round(z / G * 1e3) / 1e3), A;
   }
   /**
    * 在指定航线条件下，基于多CP，动态计算最优成本(租金+油费)方案
@@ -1060,34 +1060,34 @@ class O {
    * @param lane 基础航线（重要转向点）
    * @param options
    */
-  static async analyseCost(e, t, n, i, o = {}) {
-    var w, b;
-    const a = g().valueOf(), s = [];
-    e.speedStep = e.speedStep || 3, e.alterStep = e.alterStep ?? 1;
+  static async analyseCost(t, e, a, i, n = {}) {
+    var p, w;
+    const o = b().valueOf(), s = [];
+    t.speedStep = t.speedStep || 3, t.alterStep = t.alterStep ?? 1;
     const d = W.calculateRouteDistance(i.route);
     let r = 0;
-    n.forEach((c) => {
-      const f = Math.ceil(d / c.speed / 24);
-      r = r < f ? f : r;
+    a.forEach((c) => {
+      const y = Math.ceil(d / c.speed / 24);
+      r = r < y ? y : r;
     }), r = r * 1.3;
-    const h = g.utc(e.etd).add(r ?? 14, "day");
+    const m = b.utc(t.etd).add(r ?? 14, "day");
     let M = 1;
-    for (const c of n) {
-      const f = JSON.parse(JSON.stringify(i.route)), l = JSON.parse(JSON.stringify(i.waypoints)), u = await O.analyseInstantWithThreshed(
-        { lat: e.lat, lng: e.lng },
-        e.etd,
-        h,
-        t,
+    for (const c of a) {
+      const y = JSON.parse(JSON.stringify(i.route)), h = JSON.parse(JSON.stringify(i.waypoints)), u = await O.analyseInstantWithThreshed(
+        { lat: t.lat, lng: t.lng },
+        t.etd,
+        m,
+        e,
         c,
-        f,
-        l,
-        e.meteoVendor,
-        e.speedStep,
-        e.useMeteo,
-        e.useRouteParam,
-        o
+        y,
+        h,
+        t.meteoVendor,
+        t.speedStep,
+        t.useMeteo,
+        t.useRouteParam,
+        n
       );
-      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(), {
+      u && (await O.calculateCost(u, c, t, n), s.push(u), F == null || F.info("[%s][L%d-%d] analyse from %s to %s cost: %j", n.requestId, 1, M, t.etd, m.format(), {
         cost: u.cost.total,
         hire: u.cost.hire,
         bunker: u.cost.bunker,
@@ -1096,23 +1096,23 @@ class O {
         cp: `${c.speed}/${c.fo}/${c.dgo}`
       })), M++;
     }
-    s.sort((c, f) => c.cost.total - f.cost.total);
-    const y = s.at(0), v = s.at(1), m = [];
-    if (m.push({ combined: !1, speeds: [y], cost: (w = y.cost) == null ? void 0 : w.total }), v) {
-      const c = y.cost.cp, f = v.cost.cp, l = g(y.eta), u = g(y.etd), I = l.diff(u, "days", !0);
+    s.sort((c, y) => c.cost.total - y.cost.total);
+    const l = s.at(0), g = s.at(1), f = [];
+    if (f.push({ combined: !1, speeds: [l], cost: (p = l.cost) == null ? void 0 : p.total }), g) {
+      const c = l.cost.cp, y = g.cost.cp, h = b(l.eta), u = b(l.etd), I = h.diff(u, "days", !0);
       let k = Math.ceil(I / 2);
-      k = k > 7 ? 7 : k < e.alterStep ? e.alterStep : k;
-      let D = 2, Y = { combined: !1, speeds: [v], cost: (b = v.cost) == null ? void 0 : b.total }, j;
-      for (; k >= e.alterStep; ) {
-        const P = await O.combinedAnalyse(e, t, h, [c, f], i, k, { ...o, level: D });
-        if (Y.cost > P.cost ? j ? (j == null ? void 0 : j.cost) > P.cost && (j = P) : (j = Y, Y = P) : (!j || (j == null ? void 0 : j.cost) > P.cost) && (j = P), k <= e.alterStep)
+      k = k > 7 ? 7 : k < t.alterStep ? t.alterStep : k;
+      let D = 2, Y = { combined: !1, speeds: [g], cost: (w = g.cost) == null ? void 0 : w.total }, j;
+      for (; k >= t.alterStep; ) {
+        const P = await O.combinedAnalyse(t, e, m, [c, y], i, k, { ...n, level: D });
+        if (Y.cost > P.cost ? j ? (j == null ? void 0 : j.cost) > P.cost && (j = P) : (j = Y, Y = P) : (!j || (j == null ? void 0 : j.cost) > P.cost) && (j = P), k <= t.alterStep)
           break;
         k = Math.ceil(k / 2), D += 1;
       }
-      m.push(Y), j && m.push(j);
+      f.push(Y), j && f.push(j);
     }
-    const S = g().valueOf() - a;
-    return F == null || F.info("[%s] analyse elapsed: %d ms", o == null ? void 0 : o.requestId, S), m.sort((c, f) => c.cost - f.cost);
+    const S = b().valueOf() - o;
+    return F == null || F.info("[%s] analyse elapsed: %d ms", n == null ? void 0 : n.requestId, S), f.sort((c, y) => c.cost - y.cost);
   }
   /**
    * 按步长多次减半，分别用7,4,2,1天步长及cpa,cpb交替计算各种组合下的成本
@@ -1124,24 +1124,24 @@ class O {
    * @param step 步长，7，4，2，1
    * @param options
    */
-  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((f, l) => f + l.cost.total, 0), h = d.reduce((f, l) => f + l.cost.hire, 0), M = d.reduce((f, l) => f + l.cost.bunker, 0), y = d.reduce((f, l) => f + l.distance, 0), v = d.reduce((f, l) => f + l.totalHrs, 0);
+  static async combinedAnalyse(t, e, a, i, n, o, s = {}) {
+    s.counter = 1, F == null || F.info("[%s][L%d] analyse with alternate cp in every %d days", s.requestId, s.level, o);
+    const d = await O.alternateAnalyse(t, e, a, i, 0, n, o, s), r = d.reduce((y, h) => y + h.cost.total, 0), m = d.reduce((y, h) => y + h.cost.hire, 0), M = d.reduce((y, h) => y + h.cost.bunker, 0), l = d.reduce((y, h) => y + h.distance, 0), g = d.reduce((y, h) => y + h.totalHrs, 0);
     F == null || F.info("[%s][L%d] cost with cpa/cpb turn: %j", s.requestId, s.level, {
       cost: r,
-      hire: h,
+      hire: m,
       bunker: M,
-      distance: y,
-      hours: v
+      distance: l,
+      hours: g
     });
-    const m = await O.alternateAnalyse(e, t, n, i, 1, o, a, s), C = m.reduce((f, l) => f + l.cost.total, 0), S = m.reduce((f, l) => f + l.cost.hire, 0), w = m.reduce((f, l) => f + l.cost.bunker, 0), b = m.reduce((f, l) => f + l.distance, 0), c = m.reduce((f, l) => f + l.totalHrs, 0);
+    const f = await O.alternateAnalyse(t, e, a, i, 1, n, o, s), C = f.reduce((y, h) => y + h.cost.total, 0), S = f.reduce((y, h) => y + h.cost.hire, 0), p = f.reduce((y, h) => y + h.cost.bunker, 0), w = f.reduce((y, h) => y + h.distance, 0), c = f.reduce((y, h) => y + h.totalHrs, 0);
     return F == null || F.info("[%s][L%d] cost with cpb/cpa turn: %j", s.requestId, s.level, {
       cost: C,
       hire: S,
-      bunker: w,
-      distance: b,
+      bunker: p,
+      distance: w,
       hours: c
-    }), r < C ? { combined: !0, cost: Math.round(r * 1e3) / 1e3, speeds: d, step: a } : { combined: !0, cost: Math.round(C * 1e3) / 1e3, speeds: m, step: a };
+    }), r < C ? { combined: !0, cost: Math.round(r * 1e3) / 1e3, speeds: d, step: o } : { combined: !0, cost: Math.round(C * 1e3) / 1e3, speeds: f, step: o };
   }
   /**
    * 基于cp索引，交替计算指定步长下的成本
@@ -1154,44 +1154,44 @@ class O {
    * @param step 步长，7，4，2，1
    * @param options
    */
-  static async alternateAnalyse(e, t, n, i, o, a, s, d = {}) {
-    var y, v;
-    let r = g.utc(e.etd);
-    const h = { lat: e.lat, lng: e.lng }, M = [];
-    for (; r.isBefore(n); ) {
-      const m = r.clone().utc().add(s, "day"), C = JSON.parse(JSON.stringify(a.route)), S = JSON.parse(JSON.stringify(a.waypoints)), w = i[o], b = await O.analyseInstantWithThreshed(
-        h,
-        r.utc().format(),
+  static async alternateAnalyse(t, e, a, i, n, o, s, d = {}) {
+    var l, g;
+    let r = b.utc(t.etd);
+    const m = { lat: t.lat, lng: t.lng }, M = [];
+    for (; r.isBefore(a); ) {
+      const f = r.clone().utc().add(s, "day"), C = JSON.parse(JSON.stringify(o.route)), S = JSON.parse(JSON.stringify(o.waypoints)), p = i[n], w = await O.analyseInstantWithThreshed(
         m,
-        t,
-        w,
+        r.utc().format(),
+        f,
+        e,
+        p,
         C,
         S,
-        e.meteoVendor,
-        e.speedStep,
-        e.useMeteo,
-        e.useRouteParam,
+        t.meteoVendor,
+        t.speedStep,
+        t.useMeteo,
+        t.useRouteParam,
         d
       );
-      b && (await O.calculateCost(b, w, e, d), F == null || F.info(
+      w && (await O.calculateCost(w, p, t, 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(),
-        m.utc().format(),
+        f.utc().format(),
         {
-          cost: b.cost.total,
-          hire: b.cost.hire,
-          bunker: b.cost.bunker,
-          distance: b.distance,
-          hours: b.totalHrs,
-          cp: `${w.speed}/${w.fo}/${w.dgo}`
+          cost: w.cost.total,
+          hire: w.cost.hire,
+          bunker: w.cost.bunker,
+          distance: w.distance,
+          hours: w.totalHrs,
+          cp: `${p.speed}/${p.fo}/${p.dgo}`
         }
       )), d.counter = d.counter + 1;
-      const c = (v = (y = b == null ? void 0 : b.sample) == null ? void 0 : y.hours) == null ? void 0 : v.at(-1);
+      const c = (g = (l = w == null ? void 0 : w.sample) == null ? void 0 : l.hours) == null ? void 0 : g.at(-1);
       if (c)
-        h.lat = c.lat, h.lng = c.lng, r = g(c.eta), M.push(b), o = o ? 0 : 1;
+        m.lat = c.lat, m.lng = c.lng, r = b(c.eta), M.push(w), n = n ? 0 : 1;
       else
         break;
     }
@@ -1204,37 +1204,37 @@ class O {
    * @param props
    * @param options
    */
-  static async calculateCost(e, t, n, i = {}) {
-    var o;
-    if (e) {
-      const a = Math.round(e.totalHrs / 24 * (n.dailyHire || 0) * (1 - (n.addComm || 0)) * 1e3) / 1e3, s = Math.round(e.totalFoCons * (n.priceFO || 0) * 1e3) / 1e3, d = Math.round((e.totalDgoCons + (((o = e.extend) == null ? void 0 : o.totalDgoConsInECA) || 0)) * (n.priceDGO || 0) * 1e3) / 1e3;
-      e.cost = {
-        total: Math.round((a + s + d) * 1e3) / 1e3,
-        hire: a,
-        bunker: Math.round((s + d) * 1e3) / 1e3,
-        cp: t
+  static async calculateCost(t, e, a, i = {}) {
+    var n;
+    if (t) {
+      const o = (a.addComm || 0) >= 1 ? (a.addComm || 0) / 100 : a.addComm || 0, s = Math.round(t.totalHrs / 24 * (a.dailyHire || 0) * (1 - o) * 1e3) / 1e3, d = Math.round(t.totalFoCons * (a.priceFO || 0) * 1e3) / 1e3, r = Math.round((t.totalDgoCons + (((n = t.extend) == null ? void 0 : n.totalDgoConsInECA) || 0)) * (a.priceDGO || 0) * 1e3) / 1e3;
+      t.cost = {
+        total: Math.round((s + d + r) * 1e3) / 1e3,
+        hire: s,
+        bunker: Math.round((d + r) * 1e3) / 1e3,
+        cp: e
       };
     }
-    return e;
+    return t;
   }
   /**
    * 计算单cp模式下的ECA属性
    */
-  static async calculateECA(e, t, n = {}) {
-    var d, r;
-    const i = await W.intersectInECA(e.route);
-    let o = 0, a = 0, s = 0;
-    e.sample.wps.forEach((h) => {
-      h.positionTime = g.utc(h.etd || h.eta).unix();
+  static async calculateECA(t, e, a = {}) {
+    var d, r, m, M;
+    const i = await W.intersectInECA((t == null ? void 0 : t.route) || []);
+    let n = 0, o = 0, s = 0;
+    (r = (d = t == null ? void 0 : t.sample) == null ? void 0 : d.wps) == null || r.forEach((l) => {
+      l.positionTime = b.utc(l.etd || l.eta).unix();
     });
-    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), y = await W.deadReckoningTime((r = h.waypoints) == null ? void 0 : r.at(-1), e.sample.wps);
-      h.in = M, h.out = y, h.totalHrs = J.roundPrecision((y.positionTime - M.positionTime) / 3600, 2), h.totalDgoCons = J.roundPrecision(t.fo / 24 * h.totalHrs, 3), a += h.totalHrs, s += h.totalDgoCons;
+    for (const l of i) {
+      n += l.distance;
+      const g = await W.deadReckoningTime((m = l.waypoints) == null ? void 0 : m.at(0), t.sample.wps), f = await W.deadReckoningTime((M = l.waypoints) == null ? void 0 : M.at(-1), t.sample.wps);
+      l.in = g, l.out = f, l.totalHrs = J.roundPrecision((f.positionTime - g.positionTime) / 3600, 2), l.totalDgoCons = J.roundPrecision(e.fo / 24 * l.totalHrs, 3), o += l.totalHrs, s += l.totalDgoCons;
     }
-    return o = J.roundPrecision(o, 3), a = J.roundPrecision(a, 3), s = J.roundPrecision(s, 3), {
-      distanceInECA: o,
-      hoursInECA: a,
+    return n = J.roundPrecision(n, 3), o = J.roundPrecision(o, 3), s = J.roundPrecision(s, 3), {
+      distanceInECA: n,
+      hoursInECA: o,
       totalDgoConsInECA: s,
       eca: i
     };
@@ -1244,84 +1244,84 @@ class O {
    * @param speeds
    * @param options
    */
-  static async mergeSpeeds(e, t = {}) {
-    var c, f;
-    const n = {
+  static async mergeSpeeds(t, e = {}) {
+    var c, y;
+    const a = {
       hours: [],
       wps: [],
       days: []
-    }, i = e.reduce((l, u) => l + u.distance, 0), o = e.reduce((l, u) => {
+    }, i = t.reduce((h, u) => h + u.distance, 0), n = t.reduce((h, u) => {
       var I;
-      return l + (((I = u.extend) == null ? void 0 : I.distanceInECA) || 0);
-    }, 0), a = e.reduce((l, u) => l + u.totalHrs, 0), s = e.reduce((l, u) => {
+      return h + (((I = u.extend) == null ? void 0 : I.distanceInECA) || 0);
+    }, 0), o = t.reduce((h, u) => h + u.totalHrs, 0), s = t.reduce((h, u) => {
       var I;
-      return l + (((I = u.extend) == null ? void 0 : I.hoursInECA) || 0);
-    }, 0), d = e.reduce((l, u) => {
+      return h + (((I = u.extend) == null ? void 0 : I.hoursInECA) || 0);
+    }, 0), d = t.reduce((h, u) => {
       var I;
-      return l + (((I = u.extend) == null ? void 0 : I.totalDgoConsInECA) || 0);
-    }, 0), r = e.reduce((l, u) => l + u.wxFactor * u.totalHrs / a, 0), h = e.reduce((l, u) => l + u.cFactor * u.totalHrs / a, 0), M = e.reduce((l, u) => l + u.totalFoCons, 0), y = e.reduce((l, u) => l + u.totalDgoCons, 0), v = e.reduce((l, u) => l + u.cost.total, 0), m = e.reduce((l, u) => l + u.cost.hire, 0), C = e.reduce((l, u) => l + u.cost.bunker, 0), S = [], w = [];
-    let b;
-    for (const l of e) {
-      w.push(...((c = l.extend) == null ? void 0 : c.eca) || []);
-      const u = l.sample.hours, I = l.sample.wps, k = l.sample.days, D = u.at(0);
-      b && (D.distanceFromPrevious = b.distanceFromPrevious, D.distanceFromStart = b.distanceFromStart, u.forEach((T, N) => {
-        N && (T.distanceFromStart = T.distanceFromStart + b.distanceFromStart);
-      }), I.at(0).distanceFromPrevious = b.distanceFromPrevious, I.at(0).distanceFromStart = b.distanceFromStart, I.forEach((T, N) => {
-        N && (T.distanceFromStart = T.distanceFromStart + b.distanceFromStart);
-      }), k.at(0).distanceFromPrevious = b.distanceFromPrevious, k.at(0).distanceFromStart = b.distanceFromStart, k.forEach((T, N) => {
-        N && (T.distanceFromStart = T.distanceFromStart + b.distanceFromStart);
-      })), D.cp = l.cost.cp;
-      const Y = [l.etd, l.eta], j = S.findIndex((T) => T.id === D.cp.id);
+      return h + (((I = u.extend) == null ? void 0 : I.totalDgoConsInECA) || 0);
+    }, 0), r = t.reduce((h, u) => h + u.wxFactor * u.totalHrs / o, 0), m = t.reduce((h, u) => h + u.cFactor * u.totalHrs / o, 0), M = t.reduce((h, u) => h + u.totalFoCons, 0), l = t.reduce((h, u) => h + u.totalDgoCons, 0), g = t.reduce((h, u) => h + u.cost.total, 0), f = t.reduce((h, u) => h + u.cost.hire, 0), C = t.reduce((h, u) => h + u.cost.bunker, 0), S = [], p = [];
+    let w;
+    for (const h of t) {
+      p.push(...((c = h.extend) == null ? void 0 : c.eca) || []);
+      const u = h.sample.hours, I = h.sample.wps, k = h.sample.days, D = u.at(0);
+      w && (D.distanceFromPrevious = w.distanceFromPrevious, D.distanceFromStart = w.distanceFromStart, u.forEach((T, N) => {
+        N && (T.distanceFromStart = T.distanceFromStart + w.distanceFromStart);
+      }), I.at(0).distanceFromPrevious = w.distanceFromPrevious, I.at(0).distanceFromStart = w.distanceFromStart, I.forEach((T, N) => {
+        N && (T.distanceFromStart = T.distanceFromStart + w.distanceFromStart);
+      }), k.at(0).distanceFromPrevious = w.distanceFromPrevious, k.at(0).distanceFromStart = w.distanceFromStart, k.forEach((T, N) => {
+        N && (T.distanceFromStart = T.distanceFromStart + w.distanceFromStart);
+      })), D.cp = h.cost.cp;
+      const Y = [h.etd, h.eta], j = S.findIndex((T) => T.id === D.cp.id);
       j === -1 ? (D.cp.segment = [Y], S.push(D.cp)) : S[j].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);
+        ((A = a.hours) == null ? void 0 : A.findIndex((R) => R.eta === T.eta)) === -1 && a.hours.push(T);
       }), I.forEach((T) => {
         var A;
-        ((A = n.wps) == null ? void 0 : A.findIndex((R) => R.eta === T.eta)) === -1 && n.wps.push(T);
+        ((A = a.wps) == null ? void 0 : A.findIndex((R) => R.eta === T.eta)) === -1 && a.wps.push(T);
       }), k.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);
+        ((A = a == null ? void 0 : a.days) == null ? void 0 : A.findIndex((R) => R.eta === T.eta)) === -1 && a.days.push(T);
       });
-      const P = (f = n.wps) == null ? void 0 : f.findIndex((T) => T.eta === D.eta);
-      P === -1 ? n.wps.push(D) : n.wps[P] = D, b = u.at(-1);
+      const P = (y = a.wps) == null ? void 0 : y.findIndex((T) => T.eta === D.eta);
+      P === -1 ? a.wps.push(D) : a.wps[P] = D, w = u.at(-1);
     }
-    return n.wps.sort((l, u) => {
-      g(l.etd).unix() - g(u.etd).unix();
-    }), n.wps.forEach((l, u) => {
-      const I = n.wps[u - 1];
+    return a.wps.sort((h, u) => {
+      b(h.etd).unix() - b(u.etd).unix();
+    }), a.wps.forEach((h, u) => {
+      const I = a.wps[u - 1];
       if (I) {
-        const k = l.distanceFromStart - (I.distanceFromStart || 0), D = g(l.eta || l.etd).diff(g(I.etd || I.eta), "hour", !0), Y = Math.round(k / D * 100) / 100;
-        l.avgSpd = Y;
-        const j = W.calculateBearing(I, l);
+        const k = h.distanceFromStart - (I.distanceFromStart || 0), D = b(h.eta || h.etd).diff(b(I.etd || I.eta), "hour", !0), Y = Math.round(k / D * 100) / 100;
+        h.avgSpd = Y;
+        const j = W.calculateBearing(I, h);
         I.bearing = j;
       }
     }), {
-      sample: n,
-      etd: e.at(0).etd,
-      eta: e.at(-1).eta,
-      from: e.at(0).from,
-      to: e.at(-1).to,
-      v0: e.at(0).v0,
+      sample: a,
+      etd: t.at(0).etd,
+      eta: t.at(-1).eta,
+      from: t.at(0).from,
+      to: t.at(-1).to,
+      v0: t.at(0).v0,
       label: "Combined",
       distance: Math.round(i * 1e4) / 1e4,
-      totalHrs: Math.round(a * 1e3) / 1e3,
-      avgSpeed: Math.round(i / a * 1e3) / 1e3,
+      totalHrs: Math.round(o * 1e3) / 1e3,
+      avgSpeed: Math.round(i / o * 1e3) / 1e3,
       wxFactor: Math.round(r * 1e3) / 1e3,
-      cFactor: Math.round(h * 1e3) / 1e3,
+      cFactor: Math.round(m * 1e3) / 1e3,
       totalFoCons: Math.round(M * 1e3) / 1e3,
-      totalDgoCons: Math.round(y * 1e3) / 1e3,
+      totalDgoCons: Math.round(l * 1e3) / 1e3,
       cost: {
-        total: Math.round(v * 1e3) / 1e3,
-        hire: Math.round(m * 1e3) / 1e3,
+        total: Math.round(g * 1e3) / 1e3,
+        hire: Math.round(f * 1e3) / 1e3,
         bunker: Math.round(C * 1e3) / 1e3
       },
       extend: {
         cps: S,
-        eca: w,
-        distanceInECA: Math.round(o * 1e4) / 1e4,
+        eca: p,
+        distanceInECA: Math.round(n * 1e4) / 1e4,
         hoursInECA: Math.round(s * 1e3) / 1e3,
         totalDgoConsInECA: Math.round(d * 1e3) / 1e3,
-        speeds: e
+        speeds: t
       }
     };
   }
@@ -1336,7 +1336,7 @@ export {
   xt as MyVesselImpl,
   jt as ShipxyImpl,
   O as SpeedHelper,
-  pt as SpeedLabel,
+  wt as SpeedLabel,
   gt as VesselTag,
   Tt as alertHelper
 };