@idm-plugin/vessel 2.0.9 → 2.1.0

package/dist/index.js

@@ -7,9 +7,9 @@ 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 w;
+let v;
 try {
-  w = rt.getLogger("vessel");
+  v = rt.getLogger("vessel");
 } catch {
 } finally {
 }
@@ -19,80 +19,80 @@ class et {
    * @param status
    */
   parseStatus(t) {
-    let e, n;
+    let e, a;
     switch (t) {
       case 0:
-        e = "在航（主机推动）", n = "Underway Using Engine";
+        e = "在航（主机推动）", a = "Underway Using Engine";
         break;
       case 1:
-        e = "锚泊", n = "Anchored";
+        e = "锚泊", a = "Anchored";
         break;
       case 2:
-        e = "失控", n = "Not operated";
+        e = "失控", a = "Not operated";
         break;
       case 3:
-        e = "操纵受限", n = "Limited airworthiness";
+        e = "操纵受限", a = "Limited airworthiness";
         break;
       case 4:
-        e = "吃水受限", n = "Limited by ship's draft";
+        e = "吃水受限", a = "Limited by ship's draft";
         break;
       case 5:
-        e = "靠泊", n = "Mooring";
+        e = "靠泊", a = "Mooring";
         break;
       case 6:
-        e = "搁浅", n = "Stranded";
+        e = "搁浅", a = "Stranded";
         break;
       case 7:
-        e = "捕捞作业", n = "Engaged in fishing";
+        e = "捕捞作业", a = "Engaged in fishing";
         break;
       case 8:
-        e = "靠帆船提供动力", n = "Sailing";
+        e = "靠帆船提供动力", a = "Sailing";
         break;
       default:
-        e = "未定义", n = "Undefined";
+        e = "未定义", a = "Undefined";
     }
-    return { labelCn: e, labelEn: n };
+    return { labelCn: e, labelEn: a };
   }
 }
 class xt extends et {
-  constructor(e, n) {
+  constructor(e, a) {
     super();
     K(this, "clientId");
     K(this, "clientSecret");
     K(this, "token");
-    this.clientId = e, this.clientSecret = n;
+    this.clientId = e, this.clientSecret = a;
   }
   async authToken(e = {}) {
-    const n = "https://svc.data.myvessel.cn/ada/oauth/token", i = {
+    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();
-    w == null || w.info("[%s] fetch access token from: %s - %j", e.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,
+    }, 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(e, n = {}) {
+  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(n);
-    const i = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/location/unit", o = {
+    (!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} ${(m = this.token) == null ? void 0 : m.accessToken}`
       },
       searchParams: { mmsi: e }
     };
-    w == null || w.info("[%s] fetch realtime position from: %s - %j", n.requestId, i, o);
-    const a = await B.get(i, o).json();
-    if (a.code)
-      return w == null || w.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) {
@@ -131,37 +131,37 @@ class xt extends et {
     } else
       return {};
   }
-  async trajectory(e, n, i, o, a = !0, s = {}) {
+  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(n), m = b(i), M = [];
+    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, o, M, s), r.add(30, "day");
-    return await this.trajectoryIn30Day(e, r, m, d, o, M, s), M;
+      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(e, n, i, o, a, s, d = {}) {
-    var f, C, S, v, p;
+  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: `${(f = this.token) == null ? void 0 : f.tokenType} ${(C = this.token) == null ? void 0 : C.accessToken}`
       },
       json: {
         mmsi: e,
-        startTime: n.utcOffset(8).format("YYYY-MM-DD HH:mm:ss"),
+        startTime: a.utcOffset(8).format("YYYY-MM-DD HH:mm:ss"),
         endTime: i.utcOffset(8).format("YYYY-MM-DD HH:mm:ss")
       }
     };
-    w == null || w.info("[%s] fetch trajectory from: %s - %j", d.requestId, r, m);
+    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 w == null || w.warn("[%s] fetch trajectory failed: %j", d.requestId, r, { message: M.message, status: M.status, code: M.code }), M;
+      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(`${(v = (S = M.data) == null ? void 0 : S[0]) == null ? void 0 : v.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-    return (p = M.data) == null || p.forEach((c) => {
+    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 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,
@@ -177,7 +177,7 @@ class xt extends et {
         method: "trajectory",
         vendor: "myVessel",
         utc: y.utc().format()
-      }, D = Math.floor(y.diff(g, "minute", !0) / (a || 1));
+      }, D = Math.floor(y.diff(g, "minute", !0) / (o || 1));
       D !== l && (l = D, s.push(k));
     }), s;
   }
@@ -188,17 +188,17 @@ class Et extends et {
     K(this, "token");
     this.token = e;
   }
-  async realTimePosition(e, 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: e,
         usertoken: this.token
       }
-    }, a = await B.post(i, o).json();
-    w == null || w.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 w == null || w.warn("[%s] fetch realtime position failed: %j", n.requestId, i, a), a;
+      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;
@@ -232,9 +232,9 @@ class Et extends et {
       vendor: "hifleet"
     };
   }
-  async search(e, n = {}) {
+  async search(e, a = {}) {
     let i = "https://www.hifleet.com/hifleetapi/searchVesselOL.do";
-    const o = {
+    const n = {
       searchParams: {
         keyword: e
       },
@@ -244,24 +244,24 @@ class Et extends et {
         Host: "www.hifleet.com"
       }
     };
-    let a = await B.post(i, o).json();
-    w == null || w.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(), w == null || w.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(e, 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: e
       },
@@ -270,10 +270,10 @@ class Et extends et {
         Origin: "https://www.hifleet.com",
         Host: "www.hifleet.com"
       }
-    }, a = await B.post(i, o).json();
-    w == null || w.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,12 +283,12 @@ class Et extends et {
       });
     return s.sort((d, r) => r.score - d.score), s;
   }
-  async trajectory(e, n, i, o, a = !0, s = {}) {
+  async trajectory(e, a, i, n, o = !0, s = {}) {
     var c, y, h;
     const d = await this.realTimePosition(e, s);
-    let r = b(n);
+    let r = b(a);
     const m = b(i), M = b();
-    if (a) {
+    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");
     }
@@ -300,12 +300,12 @@ class Et extends et {
         usertoken: this.token
       }
     }, g = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", f = await B.get(g, l).json();
-    w == null || w.info("[%s] fetch trajectory from: %s - %j", s.requestId, g, l);
+    v == null || v.info("[%s] fetch trajectory from: %s - %j", s.requestId, g, l);
     let C;
-    f && (C = ((y = (c = f.ships) == null ? void 0 : c.offors) == null ? void 0 : y.ship) || [], C.length || w == null || w.warn("[%s] fetch trajectory failed: %j", s.requestId, f));
+    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 v = -1;
-    const p = b(`${(h = C == null ? void 0 : C[0]) == null ? void 0 : h.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]));
@@ -328,8 +328,8 @@ class Et extends et {
         labelEn: k,
         method: "trajectory",
         vendor: "hifleet"
-      }, j = Math.floor(I.diff(p, "minute", !0) / (o || 1));
-      j !== v && (v = j, S.push(Y));
+      }, j = Math.floor(I.diff(w, "minute", !0) / (n || 1));
+      j !== p && (p = j, S.push(Y));
     }
     return S;
   }
@@ -340,17 +340,17 @@ class jt extends et {
     K(this, "token");
     this.token = e;
   }
-  async realTimePosition(e, n = {}) {
+  async realTimePosition(e, a = {}) {
     const i = {
       searchParams: {
         id: e,
         k: this.token,
         enc: 1
       }
-    }, o = "https://api.shipxy.com/apicall/GetSingleShip", a = await B.get(o, i).json();
-    if (w == null || w.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];
+    }, 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);
@@ -377,9 +377,9 @@ class jt extends et {
       vendor: "shipxy"
     };
   }
-  async trajectory(e, n, i, o, a = !0, s = {}) {
-    var p;
-    const d = await this.realTimePosition(e, s), r = b(n), m = b(i), M = "https://api.shipxy.com/apicall/GetShipTrack", l = {
+  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: e,
         k: this.token,
@@ -389,10 +389,10 @@ class jt extends et {
         etm: m.unix()
       }
     }, g = await B.get(M, l).json();
-    if (w == null || w.info("[%s] fetch trajectory from: %s - %j", s.requestId, M, l), (g == null ? void 0 : g.status) !== 0)
+    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((p = f[0]) == null ? void 0 : p.utc);
-    let v = -1;
+    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,
@@ -405,8 +405,8 @@ class jt extends et {
         utc: y.utc().format(),
         method: "trajectory",
         vendor: "shipxy"
-      }, u = Math.floor(y.diff(S, "minute", !0) / (o || 1));
-      u !== v && (v = u, C.push(h));
+      }, u = Math.floor(y.diff(S, "minute", !0) / (n || 1));
+      u !== p && (p = u, C.push(h));
     }
     return C;
   }
@@ -417,7 +417,7 @@ class Nt extends et {
     K(this, "token");
     this.token = e;
   }
-  async getShipId(e, n = {}) {
+  async getShipId(e, a = {}) {
     const i = {
       headers: {
         appKey: this.token
@@ -425,10 +425,10 @@ class Nt extends et {
       json: {
         mmsiList: e
       }
-    }, o = "https://api3.myships.com/sp/ships/getShipIdByMMSI", a = await B.post(o, i).json();
-    return w == null || w.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(e, n = {}) {
+  async getShipInfo(e, a = {}) {
     const i = {
       headers: {
         appKey: this.token
@@ -436,12 +436,12 @@ class Nt extends et {
       json: {
         shipId: e
       }
-    }, o = "https://api3.myships.com/sp/ships/aissta", a = await B.post(o, i).json();
-    if (w == null || w.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 e === "407170" && (d = "9198379", w == null || w.warn("[%s] ship(%s) imo error: %s, should be %s", n.requestId, e, 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,22 +451,22 @@ class Nt extends et {
       draught: (s.draught || 100) / 10
     };
   }
-  async realTimePosition(e, n = {}) {
-    const i = await this.getShipId(e, 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();
-    w == null || w.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 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,
+      ...n,
       mmsi: e,
       lat: Math.round(r.lat / 1e4 / 60 * 1e5) / 1e5,
       lng: Math.round(r.lon / 1e4 / 60 * 1e5) / 1e5,
@@ -483,13 +483,13 @@ class Nt extends et {
       vendor: "myship"
     };
   }
-  async trajectory(e, n, i, o, a = !0, s = {}) {
-    const d = b(n), r = b(i), m = await this.getShipId(e), M = await this.getShipInfo(m), l = [];
+  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(m, d.unix(), d.add(30, "day").unix(), M, e, o, l);
-    return await this.trajectoryIn30Day(m, d.unix(), r.unix(), M, e, o, l), l;
+      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(e, n, i, o, a, s, d, r = {}) {
+  async trajectoryIn30Day(e, a, i, n, o, s, d, r = {}) {
     var S;
     const m = {
       headers: {
@@ -497,32 +497,32 @@ class Nt extends et {
       },
       json: {
         shipId: e,
-        startTime: n,
+        startTime: a,
         endTime: i
       }
     }, M = "https://api3.myships.com/sp/ships/position/history", l = await B.post(M, m).json();
-    if (w == null || w.info("[%s] fetch trajectory from: %s - %j", r.requestId, M, m), l.code !== "0")
-      return w == null || w.warn("[%s] invoke myship trajectory failed: %j", r.requestId, l), l;
+    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 v in g)
-      !isNaN(g[v]) && Number(g[v]) !== 1 / 0 && (g[v] = Number(g[v]));
+    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 v of g) {
-      const p = b.unix(v.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: p.unix(),
-        utc: p.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"
-      }, y = Math.floor(p.diff(f, "minute", !0) / (s || 1));
+      }, y = Math.floor(w.diff(f, "minute", !0) / (s || 1));
       y !== C && (C = y, d.push(c));
     }
     return d;
@@ -547,21 +547,21 @@ class yt {
   parsePrinciple(t, e = {}) {
     var s, d, r;
     _ == null || _.info("[%s] parse rule: %s", e.requestId, t);
-    const n = new RegExp("(?<=\\[)(.+)(?=])", "g"), i = t.match(n) ? (s = t.match(n)) == null ? void 0 : s[0] : void 0, o = i == null ? void 0 : i.split(";");
-    if (!o)
+    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 m = 0; m < (o == null ? void 0 : o.length); m++) {
-      const M = (r = (d = o[m].match(n)) == null ? void 0 : d[0]) == null ? void 0 : r.split("],");
+    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)
-        a.scope = o[0];
+        o.scope = n[0];
       else if (M)
         for (let l = 0, g = M.length; l < g; l++) {
           const f = this.parseRule(M[l]);
-          f && (a[f.level] ? f.key ? a[f.level][f == null ? void 0 : f.key] = f : a[f.level] = f : f.key ? a[f.level] = { [f == null ? void 0 : f.key]: f } : a[f.level] = f);
+          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;
   }
   /**
    * 解析单一告警规则
@@ -570,16 +570,16 @@ class yt {
    * @param options
    */
   parseRule(t, e = {}) {
-    var a;
+    var o;
     _ == null || _.debug("[%s] parse rule: %s", e.requestId, t), t = t.startsWith("[") ? t : `[${t}`, t = t.endsWith("]") ? t : `${t}]`;
-    const n = new RegExp("(?<=\\[)(.+?)(?=])", "g"), i = (a = t == null ? void 0 : t.match(n)) == null ? void 0 : a[0], o = i == null ? void 0 : i.split(",");
-    if (o)
+    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(t, e, n = {}) {
-    var f, C, S, v, p, c, y, h, u, I, k, D, Y, j, P;
-    let i = 0, o = 0, a = 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 = (v = (S = e == null ? void 0 : e.SEVERE) == null ? void 0 : S.sigWave) == null ? void 0 : v.number, m = (c = (p = e == null ? void 0 : e.HEAVY) == null ? void 0 : p.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;
+  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", n.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", n.requestId, { ...R, dgThd4Wd: M, svThd4Wd: l, hvThd4Wd: g }), (R == null ? void 0 : R.scale) >= M ? (N.isDangerous = !0, delete N.isSevere, delete N.isHeavy) : (R == null ? void 0 : R.scale) > l ? (N.isDangerous || (N.isSevere = !0), delete N.isHeavy) : (R == null ? void 0 : R.scale) === g && !N.isDangerous && !N.isSevere && (N.isHeavy = !0), i += N.isDangerous ? U : 0, o += N.isSevere ? U : 0, a += N.isHeavy ? U : 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: t, dangerous: i, severe: o, heavy: a, step: s < 3 ? 3 : s, wind: { dgThd4Wd: M, svThd4Wd: l, hvThd4Wd: g }, sig: { dgThd4Wv: d, svThd4Wv: r, hvThd4Wv: m } };
+    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(t, e, n, i) {
-    let o = Math.round(t / (e * 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(t, e, n = 9.8) {
-    let i = Math.round(Math.sqrt(t * t / (n * e)) * 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(t, e, 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],
@@ -668,7 +668,7 @@ class O {
       0.8: [3, -16.3, -21.6],
       0.85: [3.4, -20.9, 31.8]
     }[t];
-    return n === "Laden" && (a = i[t]), a[0] + a[1] * e + a[2] * Math.pow(e, 2);
+    return a === "Laden" && (o = i[t]), o[0] + o[1] * e + o[2] * Math.pow(e, 2);
   }
   /**
    * 失速方向因子
@@ -682,8 +682,8 @@ class O {
    * @private
    */
   static directionFactor(t, e = 0) {
-    let n;
-    return t > 30 && t <= 60 ? n = (1.7 - 0.03 * Math.pow(e - 4, 2)) / 2 : t > 60 && t <= 150 ? n = (0.9 - 0.06 * Math.pow(e - 6, 2)) / 2 : t > 150 && t <= 180 ? n = (0.4 - 0.03 * Math.pow(e - 8, 2)) / 2 : n = 1, Math.round(n * 1e5) / 1e5;
+    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,10 +696,10 @@ class O {
    * @param bn
    * @private
    */
-  static vesselTagFactor(t, e, 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(t, 2 / 3)) : e === "Ballast" ? o = 0.7 * i + Math.pow(i, 6.5) / (2.7 * Math.pow(t, 2 / 3)) : o = 0.5 * i + Math.pow(i, 6.5) / (2.7 * Math.pow(t, 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;
   }
   /**
    * 浪高影响因子
@@ -708,8 +708,8 @@ class O {
    */
   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 n;
-    return e > 30 && e <= 60 ? n = -0.6 : e > 60 && e <= 90 ? n = -0.4 : e > 90 && e <= 120 ? n = t < 3 ? 0.4 : -0.3 : e > 120 && e <= 150 ? n = t < 3 ? 0.6 : -0.5 : e > 150 && e <= 180 ? n = t < 3 ? 0.7 : -0.6 : n = -0.7, Math.round(n * (0.144 * Math.pow(t, 2) + 0.178 * t) * 1e4) / 1e4;
+    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(t, e, n, i) {
+  static assembleProperties(t, e, a, i) {
     var l;
-    const o = t.lbp ?? t.length ?? t.lengthOverall ?? 198.9642, a = 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";
+    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,
+      lbp: n,
       loadCondition: e,
-      draught: a,
+      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,39 +746,39 @@ class O {
    * @param useMeteo true 启用气象分析
    * @param useRouteParam true 启用设置速度
    */
-  static async speedLoseAt(t, e, 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 (e.velocity && s && (t.speed = J.roundPrecision(e.velocity * 1852 / 3600, 6)), a) {
+    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: f, marineModels: C } = await it.autoPickMeteoModel(i), S = await Mt.spotForecast(e.lat, e.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: f,
           marineModels: C
-        }), [v] = it.pickHourly(S, n);
-        m = it.toLegacy(v);
+        }), [p] = it.pickHourly(S, a);
+        m = it.toLegacy(p);
       } catch (f) {
-        F.warn("[%s] meteo2 spot(%j) forecast failed: %s", d.requestId, { ...e, eta: n.utc().format(), source: i }, f);
+        F.warn("[%s] meteo2 spot(%j) forecast failed: %s", d.requestId, { ...e, eta: a.utc().format(), source: i }, f);
       }
-      const M = O.weatherFactor(t, m), l = O.currentFactor(t.bearing, m == null ? void 0 : m.current, o), g = Math.round((t.speed * 1.943844 + M + l) * 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: { ...m },
         wxFactor: M,
         cFactor: l,
         speed: e.velocity && s ? e.velocity : g < 0 ? 1 : g,
-        eta: n.utc().format(),
-        etd: n.utc().format()
+        eta: a.utc().format(),
+        etd: a.utc().format()
       };
     } else
       r = {
         wxFactor: 0,
         cFactor: 0,
         speed: e.velocity && s ? e.velocity : Math.round((t.speed * 1.943844 + 0 + 0) * 100) / 100,
-        eta: n.utc().format(),
-        etd: n.utc().format()
+        eta: a.utc().format(),
+        etd: a.utc().format()
       };
     return delete e.meteo, delete e.wxFactor, delete e.cFactor, delete e.speed, delete e.etd, { ...r, ...e };
   }
@@ -795,14 +795,14 @@ class O {
    * @param useRouteParam true 启用航线上设置的参数 { suspend: 停留时长（小时）, velocity: 速度（kts）}
    * @private
    */
-  static async speedLoseInHoursStep(t, e, n, i, o, a, s = "", d = !0, r = !1, m = {}) {
+  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, v;
-    for (let p = 0; p < a.length - 1; p++) {
-      let c = a[p];
-      c.distanceFromStart = Math.round((o + C) * 1e4) / 1e4;
-      const y = a[p + 1];
+    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;
@@ -813,35 +813,35 @@ class O {
           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...`, m.requestId, c), i === 0)
-          return c.distanceFromPrevious = C, { etd: e, from: v || c, to: c, next: a.filter((k) => k), wps: l, days: g };
+          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 = e.isAfter(M) ? !1 : d, c = await O.speedLoseAt(t, c, e, s, 0, d, r, m), v = v || c, c.important && l.push(c), e.isSameOrAfter(n) && (g.push(c), n.add(24, "hour"));
+      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 / v.speed * 1e5) / 1e5;
+      let u = Math.round(h / p.speed * 1e5) / 1e5;
       if (f + u < i) {
-        if (f += u, e.add(u, "hour"), delete a[p], F == null || F.debug(
+        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: v.lat, lng: v.lng, etd: v.etd }
-        ), C += h, a.filter((I) => I).length <= 1) {
-          S = y, S.eta = e.utc().format(), S.distanceFromPrevious = h, S.distanceFromStart = Math.round((o + C) * 1e4) / 1e4, l.push(S), delete a[p + 1];
+          { 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 - f, e.add(u, "hour");
-        const I = J.roundPrecision(v.speed * u, 5);
-        S = W.calculateCoordinate(c, t.bearing, I, "nauticalmiles", !y.gcToPrevious), S.eta = e.utc().format(), a[p] = S, F == null || F.debug(
+        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`,
           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: e, from: v, to: S, next: a.filter((p) => p), wps: l, days: g };
+    return { etd: e, from: p, to: S, next: o.filter((w) => w), wps: l, days: g };
   }
   /**
    * 洋流影响因子
@@ -849,12 +849,12 @@ class O {
    * @param current 洋流要素
    * @param role  1: 船东, 2: 租家, 0: 未知
    */
-  static currentFactor(t, e, n = 0) {
+  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 = ((e == null ? void 0 : e.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;
   }
   /**
    * 风浪影响因子
@@ -862,15 +862,15 @@ class O {
    * @param wwc 气象要素
    */
   static weatherFactor(t, e) {
-    var M, l, g, f, C, S, v;
+    var M, l, g, f, C, S, p;
     F == null || F.debug("calculate weather factor via: %j", { ...t, ...e });
-    const n = O.blockCoefficient(t.displacement, t.lbp, t.breadthMoulded, t.draught), i = O.froudeNumber(t.speed, t.lbp), o = O.amendFactor(n, i, t.loadCondition);
-    let a = Math.abs(t.bearing % 360 - (((M = e == null ? void 0 : e.wind) == null ? void 0 : M.degree) % 360 || 0));
-    a = a > 180 ? 360 - a : a;
-    const s = O.directionFactor(a, (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 * o * 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), a = 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(((v = (S = e == null ? void 0 : e.wave) == null ? void 0 : S.sig) == null ? void 0 : v.height) ?? 1, a);
+    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,11 +885,11 @@ class O {
    * @param useMeteo true 启用气象分析
    * @param useRouteParam
    */
-  static async analyseInstant(t, e, n, i, o, a = "", s = 0, d = !0, r = !1, m = {}) {
+  static async analyseInstant(t, e, a, i, n, o = "", s = 0, d = !0, r = !1, m = {}) {
     var z, G, Q, X, Z, $;
     const M = b().valueOf();
     t.lng = J.convertToStdLng(t.lng);
-    const { route: l, waypoints: g } = o.points, f = W.calculateSubRoute(t, l);
+    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 } = t.sog ? {
@@ -900,12 +900,12 @@ class O {
       v0: i.speed,
       label: "CP"
       /* Cp */
-    }, v = O.assembleProperties(n, i.loadCondition, C, 0), p = g.length ? W.calculateSubWaypoints(t, g) : [];
-    p.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: { ...t },
       route: f,
-      waypoints: p,
+      waypoints: w,
       v0: C,
       label: S
     }, y = {
@@ -914,18 +914,18 @@ class O {
       wps: []
     };
     s || (W.calculateRouteDistance(f) / i.speed <= 72 ? s = 3 : s = 6);
-    let h = W.simplifyRouteToCoordinates(f, p, 0), u = 0, I = 0, k = 0, D = 0;
+    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(
-        v,
+        p,
         e,
         Y,
         V,
         u,
         h,
-        a,
+        o,
         d,
         r,
         m
@@ -972,7 +972,7 @@ class O {
    * @param useMeteo true 启用气象分析
    * @param useRouteParam
    */
-  static async analyseInstantWithThreshed(t, e, n, i, o, a, s, d = "", r = 3, m = !0, M = !1, l = {}) {
+  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 g = b().valueOf();
     t.lng = J.convertToStdLng(t.lng);
@@ -981,15 +981,15 @@ class O {
       label: t.label || "Other"
       /* Instruct */
     } : {
-      v0: o.speed,
+      v0: n.speed,
       label: "CP"
       /* Cp */
-    }, S = O.assembleProperties(i, o.loadCondition, f, 0), v = W.calculateSubRoute(t, a);
-    if (((Q = v[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 p = s.length ? W.calculateSubWaypoints(t, s) : [];
-    p.forEach((x) => x.important = !0);
-    let c = W.simplifyRouteToCoordinates(v, p, 0), y = 0, h = 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: [],
@@ -1000,7 +1000,7 @@ class O {
     for (; c.length > 0; ) {
       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(n) ? n.diff(e, "h", !0) * 1e4 / 1e4 : L;
+      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;
@@ -1019,7 +1019,7 @@ class O {
       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, v), N = await W.calculateRangeWaypoints(j, P, v, p), 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做为初始出发时间
@@ -1035,7 +1035,7 @@ class O {
       waypoints: N,
       v0: f,
       label: C
-    }, { distanceInECA: R, hoursInECA: U, totalDgoConsInECA: st, eca: at } = await this.calculateECA(A, o, l), 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,
@@ -1060,19 +1060,19 @@ class O {
    * @param lane 基础航线（重要转向点）
    * @param options
    */
-  static async analyseCost(t, e, n, i, o = {}) {
-    var v, p;
-    const a = b().valueOf(), s = [];
+  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) => {
+    a.forEach((c) => {
       const y = Math.ceil(d / c.speed / 24);
       r = r < y ? y : r;
     }), r = r * 1.3;
     const m = b.utc(t.etd).add(r ?? 14, "day");
     let M = 1;
-    for (const c of n) {
+    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,
@@ -1085,9 +1085,9 @@ class O {
         t.speedStep,
         t.useMeteo,
         t.useRouteParam,
-        o
+        n
       );
-      u && (await O.calculateCost(u, c, t, o), s.push(u), F == null || F.info("[%s][L%d-%d] analyse from %s to %s cost: %j", o.requestId, 1, M, t.etd, m.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,
@@ -1098,21 +1098,21 @@ class O {
     }
     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: (v = l.cost) == null ? void 0 : v.total }), g) {
+    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 < t.alterStep ? t.alterStep : k;
-      let D = 2, Y = { combined: !1, speeds: [g], cost: (p = g.cost) == null ? void 0 : p.total }, j;
+      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, { ...o, level: D });
+        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;
       }
       f.push(Y), j && f.push(j);
     }
-    const S = b().valueOf() - a;
-    return F == null || F.info("[%s] analyse elapsed: %d ms", o == null ? void 0 : o.requestId, S), f.sort((c, y) => c.cost - y.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,9 +1124,9 @@ class O {
    * @param step 步长，7，4，2，1
    * @param options
    */
-  static async combinedAnalyse(t, e, 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(t, e, n, i, 0, o, a, 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);
+  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: m,
@@ -1134,14 +1134,14 @@ class O {
       distance: l,
       hours: g
     });
-    const f = await O.alternateAnalyse(t, e, n, i, 1, o, a, s), C = f.reduce((y, h) => y + h.cost.total, 0), S = f.reduce((y, h) => y + h.cost.hire, 0), v = f.reduce((y, h) => y + h.cost.bunker, 0), p = f.reduce((y, h) => y + h.distance, 0), c = f.reduce((y, h) => y + h.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: v,
-      distance: p,
+      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: f, 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,17 +1154,17 @@ class O {
    * @param step 步长，7，4，2，1
    * @param options
    */
-  static async alternateAnalyse(t, e, n, i, o, a, s, d = {}) {
+  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(n); ) {
-      const f = r.clone().utc().add(s, "day"), C = JSON.parse(JSON.stringify(a.route)), S = JSON.parse(JSON.stringify(a.waypoints)), v = i[o], p = await O.analyseInstantWithThreshed(
+    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,
         r.utc().format(),
         f,
         e,
-        v,
+        p,
         C,
         S,
         t.meteoVendor,
@@ -1173,7 +1173,7 @@ class O {
         t.useRouteParam,
         d
       );
-      p && (await O.calculateCost(p, v, t, 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,
@@ -1181,17 +1181,17 @@ class O {
         r.utc().format(),
         f.utc().format(),
         {
-          cost: p.cost.total,
-          hire: p.cost.hire,
-          bunker: p.cost.bunker,
-          distance: p.distance,
-          hours: p.totalHrs,
-          cp: `${v.speed}/${v.fo}/${v.dgo}`
+          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 = (g = (l = p == null ? void 0 : p.sample) == null ? void 0 : l.hours) == null ? void 0 : g.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)
-        m.lat = c.lat, m.lng = c.lng, r = b(c.eta), M.push(p), 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,14 +1204,14 @@ class O {
    * @param props
    * @param options
    */
-  static async calculateCost(t, e, n, i = {}) {
-    var o;
+  static async calculateCost(t, e, a, i = {}) {
+    var n;
     if (t) {
-      const a = Math.round(t.totalHrs / 24 * (n.dailyHire || 0) * (1 - (n.addComm || 0)) * 1e3) / 1e3, s = Math.round(t.totalFoCons * (n.priceFO || 0) * 1e3) / 1e3, d = Math.round((t.totalDgoCons + (((o = t.extend) == null ? void 0 : o.totalDgoConsInECA) || 0)) * (n.priceDGO || 0) * 1e3) / 1e3;
+      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((a + s + d) * 1e3) / 1e3,
-        hire: a,
-        bunker: Math.round((s + d) * 1e3) / 1e3,
+        total: Math.round((s + d + r) * 1e3) / 1e3,
+        hire: s,
+        bunker: Math.round((d + r) * 1e3) / 1e3,
         cp: e
       };
     }
@@ -1220,21 +1220,21 @@ class O {
   /**
    * 计算单cp模式下的ECA属性
    */
-  static async calculateECA(t, e, n = {}) {
+  static async calculateECA(t, e, a = {}) {
     var d, r, m, M;
     const i = await W.intersectInECA((t == null ? void 0 : t.route) || []);
-    let o = 0, a = 0, s = 0;
+    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 l of i) {
-      o += l.distance;
+      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), a += l.totalHrs, s += l.totalDgoCons;
+      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
     };
@@ -1246,49 +1246,49 @@ class O {
    */
   static async mergeSpeeds(t, e = {}) {
     var c, y;
-    const n = {
+    const a = {
       hours: [],
       wps: [],
       days: []
-    }, i = t.reduce((h, u) => h + u.distance, 0), o = t.reduce((h, u) => {
+    }, i = t.reduce((h, u) => h + u.distance, 0), n = t.reduce((h, u) => {
       var I;
       return h + (((I = u.extend) == null ? void 0 : I.distanceInECA) || 0);
-    }, 0), a = t.reduce((h, u) => h + u.totalHrs, 0), s = t.reduce((h, u) => {
+    }, 0), o = t.reduce((h, u) => h + u.totalHrs, 0), s = t.reduce((h, u) => {
       var I;
       return h + (((I = u.extend) == null ? void 0 : I.hoursInECA) || 0);
     }, 0), d = t.reduce((h, u) => {
       var I;
       return h + (((I = u.extend) == null ? void 0 : I.totalDgoConsInECA) || 0);
-    }, 0), r = t.reduce((h, u) => h + u.wxFactor * u.totalHrs / a, 0), m = t.reduce((h, u) => h + u.cFactor * u.totalHrs / a, 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 = [], v = [];
-    let p;
+    }, 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) {
-      v.push(...((c = h.extend) == null ? void 0 : c.eca) || []);
+      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);
-      p && (D.distanceFromPrevious = p.distanceFromPrevious, D.distanceFromStart = p.distanceFromStart, u.forEach((T, N) => {
-        N && (T.distanceFromStart = T.distanceFromStart + p.distanceFromStart);
-      }), I.at(0).distanceFromPrevious = p.distanceFromPrevious, I.at(0).distanceFromStart = p.distanceFromStart, I.forEach((T, N) => {
-        N && (T.distanceFromStart = T.distanceFromStart + p.distanceFromStart);
-      }), k.at(0).distanceFromPrevious = p.distanceFromPrevious, k.at(0).distanceFromStart = p.distanceFromStart, k.forEach((T, N) => {
-        N && (T.distanceFromStart = T.distanceFromStart + p.distanceFromStart);
+      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 = (y = n.wps) == null ? void 0 : y.findIndex((T) => T.eta === D.eta);
-      P === -1 ? n.wps.push(D) : n.wps[P] = D, p = 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((h, u) => {
+    return a.wps.sort((h, u) => {
       b(h.etd).unix() - b(u.etd).unix();
-    }), n.wps.forEach((h, u) => {
-      const I = n.wps[u - 1];
+    }), a.wps.forEach((h, u) => {
+      const I = a.wps[u - 1];
       if (I) {
         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;
@@ -1296,7 +1296,7 @@ class O {
         I.bearing = j;
       }
     }), {
-      sample: n,
+      sample: a,
       etd: t.at(0).etd,
       eta: t.at(-1).eta,
       from: t.at(0).from,
@@ -1304,8 +1304,8 @@ class O {
       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(m * 1e3) / 1e3,
       totalFoCons: Math.round(M * 1e3) / 1e3,
@@ -1317,8 +1317,8 @@ class O {
       },
       extend: {
         cps: S,
-        eca: v,
-        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: 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
 };