@idm-plugin/vessel 3.4.7 → 3.4.8

package/dist/index.js

@@ -1,26 +1,26 @@
-var ft = Object.defineProperty;
-var yt = (D, s, t) => s in D ? ft(D, s, { enumerable: !0, configurable: !0, writable: !0, value: t }) : D[s] = t;
-var K = (D, s, t) => (yt(D, typeof s != "symbol" ? s + "" : s, t), t);
+var lt = Object.defineProperty;
+var mt = (x, e, t) => e in x ? lt(x, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : x[e] = t;
+var U = (x, e, t) => (mt(x, typeof e != "symbol" ? e + "" : e, t), t);
 import B from "got";
-import ht from "@log4js-node/log4js-api";
+import dt from "@log4js-node/log4js-api";
 import v from "moment";
-import { LaneHelper as V, LngLatHelper as z } from "@idm-plugin/geo2";
-import { MeteoHelper2 as Mt } from "@idm-plugin/meteo2";
-import { Meteo2Assist as ut } from "@idm-plugin/meteo";
+import { LaneHelper as W, LngLatHelper as z } from "@idm-plugin/geo2";
+import { MeteoHelper2 as ft } from "@idm-plugin/meteo2";
+import { Meteo2Assist as ct } from "@idm-plugin/meteo";
 let M;
 try {
-  M = ht.getLogger("vessel");
+  M = dt.getLogger("vessel");
 } catch {
 } finally {
 }
-class ot {
+class at {
   /**
    * 解析AIS状态码
    * @param status
    */
-  parseStatus(s) {
+  parseStatus(e) {
     let t, a;
-    switch (s) {
+    switch (e) {
       case 0:
         t = "在航（主机推动）", a = "Underway Using Engine";
         break;
@@ -54,12 +54,12 @@ class ot {
     return { labelCn: t, labelEn: a };
   }
 }
-class Nt extends ot {
+class Tt extends at {
   constructor(t, a) {
     super();
-    K(this, "clientId");
-    K(this, "clientSecret");
-    K(this, "token");
+    U(this, "clientId");
+    U(this, "clientSecret");
+    U(this, "token");
     this.clientId = t, this.clientSecret = a;
   }
   async authToken(t = {}) {
@@ -89,11 +89,11 @@ class Nt extends ot {
    * @param options
    */
   async suggest(t, a = {}) {
-    var e, r;
+    var s, r;
     await this.checkToken(a);
     const i = "https://market.myvessel.cn/sdc/v1/mkt/vessels/fuzzy", n = {
       headers: {
-        Authorization: `${(e = this.token) == null ? void 0 : e.tokenType} ${(r = this.token) == null ? void 0 : r.accessToken}`
+        Authorization: `${(s = this.token) == null ? void 0 : s.tokenType} ${(r = this.token) == null ? void 0 : r.accessToken}`
       },
       json: {
         kw: t,
@@ -122,14 +122,14 @@ class Nt extends ot {
   async search(t, a = {}) {
     var h, l;
     await this.checkToken(a);
-    const i = /^\d{7}$/.test(t.toString()), n = i ? "https://market.myvessel.cn/sdc/v1/mkt/vessels/detail/imo" : "https://market.myvessel.cn/sdc/v1/mkt/vessels/detail/mmsi", o = i ? { imo: t } : { mmsi: t }, e = {
+    const i = /^\d{7}$/.test(t.toString()), n = i ? "https://market.myvessel.cn/sdc/v1/mkt/vessels/detail/imo" : "https://market.myvessel.cn/sdc/v1/mkt/vessels/detail/mmsi", o = i ? { imo: t } : { mmsi: t }, s = {
       headers: {
         Authorization: `${(h = this.token) == null ? void 0 : h.tokenType} ${(l = this.token) == null ? void 0 : l.accessToken}`
       },
       searchParams: o
     };
-    M == null || M.info("[%s] fetch vessel from: %s - %j", a.requestId, n, e);
-    const r = await B.get(n, e).json();
+    M == null || M.info("[%s] fetch vessel from: %s - %j", a.requestId, n, s);
+    const r = await B.get(n, s).json();
     if (r.status !== 200)
       return M == null || M.warn("[%s] fetch suggest vessels failed: %j", a.requestId, { message: r.message, status: r.status, code: r.code }), {};
     {
@@ -162,11 +162,11 @@ class Nt extends ot {
     return {};
   }
   async archives(t, a = {}) {
-    var e, r;
+    var s, r;
     await this.checkToken(a);
     const i = "https://svc.data.myvessel.cn/sdc/v1/ship/info/batch", n = {
       headers: {
-        Authorization: `${(e = this.token) == null ? void 0 : e.tokenType} ${(r = this.token) == null ? void 0 : r.accessToken}`
+        Authorization: `${(s = this.token) == null ? void 0 : s.tokenType} ${(r = this.token) == null ? void 0 : r.accessToken}`
       },
       json: {
         mmsiList: typeof t == "number" ? [t] : t
@@ -189,38 +189,38 @@ class Nt extends ot {
     const o = await B.get(i, n).json();
     if (o.code)
       return M == null || M.warn("[%s] fetch realtime position failed: %j", a.requestId, { message: o.message, status: o.status, code: o.code }), o;
-    const e = o.data;
-    for (const l in e)
-      !isNaN(e[l]) && Number(e[l]) !== 1 / 0 && (e[l] = Number(e[l]));
-    if (e) {
-      const l = v(`${e.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    const s = o.data;
+    for (const l in s)
+      !isNaN(s[l]) && Number(s[l]) !== 1 / 0 && (s[l] = Number(s[l]));
+    if (s) {
+      const l = v(`${s.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
       return {
-        mmsi: e.mmsi,
-        name: e.vesselName || e.aisVesselName,
-        imo: e.imo,
-        callSign: e.callsign || e.aisCallSign,
-        lat: e.lat,
-        lng: e.lon,
-        length: e.length,
-        width: e.width,
-        draught: e.currDraught,
-        sog: e.sog,
-        cog: e.cog,
-        hdg: e.hdg,
-        rot: e.rot,
-        eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(e.eta) ? v.utc(e.eta).format() : void 0,
-        destination: e.dest,
+        mmsi: s.mmsi,
+        name: s.vesselName || s.aisVesselName,
+        imo: s.imo,
+        callSign: s.callsign || s.aisCallSign,
+        lat: s.lat,
+        lng: s.lon,
+        length: s.length,
+        width: s.width,
+        draught: s.currDraught,
+        sog: s.sog,
+        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) ? v.utc(s.eta).format() : void 0,
+        destination: s.dest,
         positionTime: l.unix(),
-        status: e.status,
-        labelCn: e.statusNameCn,
-        labelEn: e.statusNameEn,
-        vesselType: e.vesselTypeNameEn,
-        flag: e.flagCtryNameEn,
-        clasz: e.classSociety,
-        build: e.buildYear,
-        dwt: e.dwt,
-        grt: e.grt,
-        net: e.net,
+        status: s.status,
+        labelCn: s.statusNameCn,
+        labelEn: s.statusNameEn,
+        vesselType: s.vesselTypeNameEn,
+        flag: s.flagCtryNameEn,
+        clasz: s.classSociety,
+        build: s.buildYear,
+        dwt: s.dwt,
+        grt: s.grt,
+        net: s.net,
         method: "position",
         vendor: "myVessel",
         utc: l.utc().format()
@@ -236,10 +236,10 @@ class Nt extends ot {
    * @param excludeSeas  排除水域, [sea.code]
    * @param options { requiretId: '请求ID', useAIModel: '启用AI算法', withECA: '是否计算低硫区航行距离', withSpecial: '是否计算穿越的特战区列表和海盗区列表', draught: '最大吃水' }
    */
-  async calculateRoute(t, a, i, n, o, e = {}) {
+  async calculateRoute(t, a, i, n, o, s = {}) {
     var y, w, g;
     const r = v();
-    await this.checkToken(e);
+    await this.checkToken(s);
     const h = "https://svc.data.myvessel.cn/sdc/v1/routes/routing/nodes", l = {
       headers: {
         Authorization: `${(y = this.token) == null ? void 0 : y.tokenType} ${(w = this.token) == null ? void 0 : w.accessToken}`
@@ -253,16 +253,16 @@ class Nt extends ot {
           lon: a.lng,
           lat: a.lat
         },
-        maxDraught: e.draught || 10,
-        useAIModel: e.useAIModel || !1,
-        withECA: e.withECA || !1,
-        withSpecialRegion: e.withSpecial || !1
+        maxDraught: s.draught || 10,
+        useAIModel: s.useAIModel || !1,
+        withECA: s.withECA || !1,
+        withSpecialRegion: s.withSpecial || !1
       }
     };
-    i != null && i.length && (l.json.crossMonthList = i), n != null && n.length && (l.json.excludeNodes = n), o != null && o.length && (l.json.excludeSeaAreas = o), M == null || M.info("[%s] fetch route from: %s - %j", e.requestId, h, l);
+    i != null && i.length && (l.json.crossMonthList = i), n != null && n.length && (l.json.excludeNodes = n), o != null && o.length && (l.json.excludeSeaAreas = o), M == null || M.info("[%s] fetch route from: %s - %j", s.requestId, h, l);
     const d = await B.post(h, l).json();
     if (d.status !== 200)
-      return M == null || M.warn("[%s] fetch route failed: %j", e.requestId, { message: d.message, status: d.status, code: d.code }), {};
+      return M == null || M.warn("[%s] fetch route failed: %j", s.requestId, { message: d.message, status: d.status, code: d.code }), {};
     {
       const k = {
         status: "Success",
@@ -273,7 +273,7 @@ class Nt extends ot {
         route: [],
         distance: 0,
         memo: ""
-      }, { nodes: j, seas: p, tracks: b, specialRegions: f } = d.data;
+      }, { nodes: j, seas: b, tracks: p, specialRegions: f } = d.data;
       k.nodes = j == null ? void 0 : j.map((c) => ({
         code: c.nodeCode,
         nameEn: c.nameEn,
@@ -297,7 +297,7 @@ class Nt extends ot {
         isKey: c.isKeyNode,
         // 重要枢纽节点
         isHub: c.isHubNode
-      })), k.seas = p == null ? void 0 : p.map((c) => ({
+      })), k.seas = b == null ? void 0 : b.map((c) => ({
         code: c.mrgidSea,
         nameEn: c.nameEn,
         nameCn: c.nameCn,
@@ -326,23 +326,23 @@ class Nt extends ot {
             distance: I.length
           }))
         });
-      }), k.waypoints = b == null ? void 0 : b.map((c) => ({
+      }), k.waypoints = p == null ? void 0 : p.map((c) => ({
         lat: Math.round(c.lat * 1e5) / 1e5,
         lng: Math.round(c.lon * 1e5) / 1e5
-      })), (g = k.waypoints) != null && g.length && (k.waypoints = V.simplifyCoordinates(k.waypoints), k.route = V.divideAccordingToLng(k.waypoints), k.distance = V.calculateRouteDistance(k.route));
+      })), (g = k.waypoints) != null && g.length && (k.waypoints = W.simplifyCoordinates(k.waypoints), k.route = W.divideAccordingToLng(k.waypoints), k.distance = W.calculateRouteDistance(k.route));
       const m = v().diff(r, "second");
-      return k.memo = `time cost: ${m}s`, M.info("[%s] calculate route cost: %d seconds", e.requestId, m), k;
+      return k.memo = `time cost: ${m}s`, M.info("[%s] calculate route cost: %d seconds", s.requestId, m), k;
     }
   }
-  async trajectory(t, a, i, n, o = !0, e = {}) {
-    await this.checkToken(e);
-    const r = await this.realTimePosition(t, e), h = v(a), l = v(i), d = [];
+  async trajectory(t, a, i, n, o = !0, s = {}) {
+    await this.checkToken(s);
+    const r = await this.realTimePosition(t, s), h = v(a), l = v(i), d = [];
     for (; l.diff(h, "day", !0) > 30; )
-      await this.trajectoryIn30Day(t, h, h.clone().add(30, "day"), r, n, d, e), h.add(30, "day");
-    return await this.trajectoryIn30Day(t, h, l, r, n, d, e), d;
+      await this.trajectoryIn30Day(t, h, h.clone().add(30, "day"), r, n, d, s), h.add(30, "day");
+    return await this.trajectoryIn30Day(t, h, l, r, n, d, s), d;
   }
-  async trajectoryIn30Day(t, a, i, n, o, e, r = {}) {
-    var g, k, j, p, b;
+  async trajectoryIn30Day(t, a, i, n, o, s, r = {}) {
+    var g, k, j, b, p;
     const h = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/track", l = {
       headers: {
         Authorization: `${(g = this.token) == null ? void 0 : g.tokenType} ${(k = this.token) == null ? void 0 : k.accessToken}`
@@ -358,10 +358,10 @@ class Nt extends ot {
     if (d.code)
       return M == null || M.warn("[%s] fetch trajectory failed: %j", r.requestId, h, { message: d.message, status: d.status, code: d.code }), d;
     let y = -1;
-    const w = v(`${(p = (j = d.data) == null ? void 0 : j[0]) == null ? void 0 : p.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-    return (b = d.data) == null || b.forEach((f) => {
-      for (const Y in f)
-        !isNaN(f[Y]) && Number(f[Y]) !== 1 / 0 && (f[Y] = Number(f[Y]));
+    const w = v(`${(b = (j = d.data) == null ? void 0 : j[0]) == null ? void 0 : b.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    return (p = d.data) == null || p.forEach((f) => {
+      for (const P in f)
+        !isNaN(f[P]) && Number(f[P]) !== 1 / 0 && (f[P] = Number(f[P]));
       const u = v(`${f.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00"), m = f.status, { labelCn: c, labelEn: I } = this.parseStatus(m), C = {
         mmsi: f.mmsi,
         imo: n == null ? void 0 : n.imo,
@@ -381,14 +381,14 @@ class Nt extends ot {
         vendor: "myVessel",
         utc: u.utc().format()
       }, F = Math.floor(u.diff(w, "minute", !0) / (o || 1));
-      F !== y && (y = F, e.push(C));
-    }), e;
+      F !== y && (y = F, s.push(C));
+    }), s;
   }
 }
-class xt extends ot {
+class Ft extends at {
   constructor(t) {
     super();
-    K(this, "token");
+    U(this, "token");
     this.token = t;
   }
   async realTimePosition(t, a = {}) {
@@ -399,33 +399,33 @@ class xt extends ot {
       }
     }, o = await B.post(i, n).json();
     M == null || M.info("[%s] fetch realtime position from: %s - %j", a.requestId, i, n);
-    const e = o == null ? void 0 : o.list;
-    if (!e)
+    const s = o == null ? void 0 : o.list;
+    if (!s)
       return M == null || M.warn("[%s] fetch realtime position failed: %j", a.requestId, i, o), o;
-    for (const w in e)
-      !isNaN(e[w]) && Number(e[w]) !== 1 / 0 && (e[w] = Number(e[w]));
-    e.status = e.sp > 3 ? 0 : 1;
-    const r = e.status, { labelCn: h, labelEn: l } = this.parseStatus(r), d = v(`${e.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    for (const w in s)
+      !isNaN(s[w]) && Number(s[w]) !== 1 / 0 && (s[w] = Number(s[w]));
+    s.status = s.sp > 3 ? 0 : 1;
+    const r = s.status, { labelCn: h, labelEn: l } = this.parseStatus(r), d = v(`${s.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
     return {
-      mmsi: e.m,
-      name: e.n,
-      imo: e.imonumber,
-      callSign: e.callsign,
-      lat: Math.round(e.la / 60 * 1e5) / 1e5,
-      lng: Math.round(e.lo / 60 * 1e5) / 1e5,
-      length: e.l,
-      width: e.w,
-      draught: e.draught,
-      sog: e.sp,
-      cog: e.co,
-      hdg: e.h,
-      rot: isNaN(e.rot) ? 0 : e.rot,
-      eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(e.eta) ? v.utc(e.eta).format() : void 0,
-      destination: e.destination,
-      vesselType: e.type,
-      dwt: e.dwt,
-      build: e.buildyear,
-      flag: e.fn,
+      mmsi: s.m,
+      name: s.n,
+      imo: s.imonumber,
+      callSign: s.callsign,
+      lat: Math.round(s.la / 60 * 1e5) / 1e5,
+      lng: Math.round(s.lo / 60 * 1e5) / 1e5,
+      length: s.l,
+      width: s.w,
+      draught: s.draught,
+      sog: s.sp,
+      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) ? v.utc(s.eta).format() : void 0,
+      destination: s.destination,
+      vesselType: s.type,
+      dwt: s.dwt,
+      build: s.buildyear,
+      flag: s.fn,
       positionTime: d.unix(),
       utc: d.utc().format(),
       status: r,
@@ -451,7 +451,7 @@ class xt extends ot {
     M == null || M.info("[%s] fetch vessel props from: %s - %j", a.requestId, i, n), o instanceof Array && (o = o[0]);
     for (const r in o)
       !isNaN(o[r]) && Number(o[r]) !== 1 / 0 && (o[r] = Number(o[r]));
-    const e = {
+    const s = {
       mmsi: o.m,
       name: o.n,
       imo: o.i,
@@ -461,7 +461,7 @@ class xt extends ot {
       draught: o.dr,
       type: o.t
     };
-    return i = "https://www.hifleet.com/hifleetapi/sameShipSearch.do", o = await B.post(i, n).json(), M == null || M.info("[%s] search vessel dead weight from: %s - %j", a.requestId, i, n), o instanceof Array && (o = o[0]), o && (e.deadweight = Number(o.dwt)), e;
+    return i = "https://www.hifleet.com/hifleetapi/sameShipSearch.do", o = await B.post(i, n).json(), M == null || M.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, a = {}) {
     const i = "https://www.hifleet.com/hifleetapi/getShipSuggest.do", n = {
@@ -475,20 +475,20 @@ class xt extends ot {
       }
     }, o = await B.post(i, n).json();
     M == null || M.info("[%s] suggest vessel props from: %s - %j", a.requestId, i, n);
-    const e = [];
+    const s = [];
     for (const r of o)
-      e.push({
+      s.push({
         mmsi: !r.mmsi || isNaN(r.mmsi) ? null : Number(r.mmsi),
         name: r.name,
         callSign: r.callsign,
         imo: !r.imo || isNaN(r.imo) ? null : Number(r.imo),
         score: r._score
       });
-    return e.sort((r, h) => h.score - r.score), e;
+    return s.sort((r, h) => h.score - r.score), s;
   }
-  async trajectory(t, a, i, n, o = !0, e = {}) {
+  async trajectory(t, a, i, n, o = !0, s = {}) {
     var f, u, m;
-    const r = await this.realTimePosition(t, e);
+    const r = await this.realTimePosition(t, s);
     let h = v(a);
     const l = v(i), d = v();
     if (o) {
@@ -503,18 +503,18 @@ class xt extends ot {
         usertoken: this.token
       }
     }, w = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", g = await B.get(w, y).json();
-    M == null || M.info("[%s] fetch trajectory from: %s - %j", e.requestId, w, y);
+    M == null || M.info("[%s] fetch trajectory from: %s - %j", s.requestId, w, y);
     let k;
-    g && (k = ((u = (f = g.ships) == null ? void 0 : f.offors) == null ? void 0 : u.ship) || [], k.length || M == null || M.warn("[%s] fetch trajectory failed: %j", e.requestId, g));
+    g && (k = ((u = (f = g.ships) == null ? void 0 : f.offors) == null ? void 0 : u.ship) || [], k.length || M == null || M.warn("[%s] fetch trajectory failed: %j", s.requestId, g));
     const j = [];
-    let p = -1;
-    const b = v(`${(m = k == null ? void 0 : k[0]) == null ? void 0 : m.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    let b = -1;
+    const p = v(`${(m = k == null ? void 0 : k[0]) == null ? void 0 : m.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
     for (const c of k) {
       for (const H in c)
         !isNaN(c[H]) && Number(c[H]) !== 1 / 0 && (c[H] = Number(c[H]));
       const I = v(`${c.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
       c.status = c.sp > 4 ? 0 : 1;
-      const { labelEn: C, labelCn: F } = this.parseStatus(c.status), Y = {
+      const { labelEn: C, labelCn: F } = this.parseStatus(c.status), P = {
         mmsi: c.m,
         name: c.n,
         imo: r == null ? void 0 : r.imo,
@@ -531,16 +531,16 @@ class xt extends ot {
         labelEn: C,
         method: "trajectory",
         vendor: "hifleet"
-      }, A = Math.floor(I.diff(b, "minute", !0) / (n || 1));
-      A !== p && (p = A, j.push(Y));
+      }, D = Math.floor(I.diff(p, "minute", !0) / (n || 1));
+      D !== b && (b = D, j.push(P));
     }
     return j;
   }
 }
-class Dt extends ot {
+class Nt extends at {
   constructor(t) {
     super();
-    K(this, "token");
+    U(this, "token");
     this.token = t;
   }
   async realTimePosition(t, a = {}) {
@@ -553,36 +553,36 @@ class Dt extends ot {
     }, n = "https://api.shipxy.com/apicall/GetSingleShip", o = await B.get(n, i).json();
     if (M == null || M.info("[%s] fetch realtime position from: %s - %j", a.requestId, n, i), (o == null ? void 0 : o.status) !== 0)
       return o;
-    const e = o.data[0];
-    for (const y in e)
-      !isNaN(e[y]) && Number(e[y]) !== 1 / 0 && (e[y] = Number(e[y]));
-    const { labelCn: r, labelEn: h } = await this.parseStatus(e.navistat), l = v.unix(e.lasttime);
+    const s = o.data[0];
+    for (const y in s)
+      !isNaN(s[y]) && Number(s[y]) !== 1 / 0 && (s[y] = Number(s[y]));
+    const { labelCn: r, labelEn: h } = await this.parseStatus(s.navistat), l = v.unix(s.lasttime);
     return {
-      mmsi: e.ShipID,
-      name: e.name,
-      imo: e.imo,
-      callSign: e.callsign,
-      lat: Math.round(e.lat / 1e6 * 1e5) / 1e5,
-      lng: Math.round(e.lon / 1e6 * 1e5) / 1e5,
-      length: Math.round(e.length / 10 * 100) / 100,
-      width: Math.round(e.width / 10 * 100) / 100,
-      draught: Math.round(e.draught / 1e3 * 100) / 100,
-      sog: Math.round(e.sog * 3600 / 1e3 / 1852 * 100) / 100,
-      cog: Math.round(e.cog / 100 * 100) / 100,
-      hdg: Math.round(e.hdg / 100 * 100) / 100,
-      rot: Math.round(e.rot / 100 * 100) / 100,
-      positionTime: e.lasttime,
+      mmsi: s.ShipID,
+      name: s.name,
+      imo: s.imo,
+      callSign: s.callsign,
+      lat: Math.round(s.lat / 1e6 * 1e5) / 1e5,
+      lng: Math.round(s.lon / 1e6 * 1e5) / 1e5,
+      length: Math.round(s.length / 10 * 100) / 100,
+      width: Math.round(s.width / 10 * 100) / 100,
+      draught: Math.round(s.draught / 1e3 * 100) / 100,
+      sog: Math.round(s.sog * 3600 / 1e3 / 1852 * 100) / 100,
+      cog: Math.round(s.cog / 100 * 100) / 100,
+      hdg: Math.round(s.hdg / 100 * 100) / 100,
+      rot: Math.round(s.rot / 100 * 100) / 100,
+      positionTime: s.lasttime,
       utc: l.utc().format(),
-      status: e.navistat,
+      status: s.navistat,
       labelEn: h,
       labelCn: r,
       method: "position",
       vendor: "shipxy"
     };
   }
-  async trajectory(t, a, i, n, o = !0, e = {}) {
-    var b;
-    const r = await this.realTimePosition(t, e), h = v(a), l = v(i), d = "https://api.shipxy.com/apicall/GetShipTrack", y = {
+  async trajectory(t, a, i, n, o = !0, s = {}) {
+    var p;
+    const r = await this.realTimePosition(t, s), h = v(a), l = v(i), d = "https://api.shipxy.com/apicall/GetShipTrack", y = {
       searchParams: {
         id: t,
         k: this.token,
@@ -592,10 +592,10 @@ class Dt extends ot {
         etm: l.unix()
       }
     }, w = await B.get(d, y).json();
-    if (M == null || M.info("[%s] fetch trajectory from: %s - %j", e.requestId, d, y), (w == null ? void 0 : w.status) !== 0)
+    if (M == null || M.info("[%s] fetch trajectory from: %s - %j", s.requestId, d, y), (w == null ? void 0 : w.status) !== 0)
       return w;
-    const g = w == null ? void 0 : w.points, k = [], j = v.unix((b = g[0]) == null ? void 0 : b.utc);
-    let p = -1;
+    const g = w == null ? void 0 : w.points, k = [], j = v.unix((p = g[0]) == null ? void 0 : p.utc);
+    let b = -1;
     for (const f of g) {
       const u = v.unix(f.utc), m = {
         imo: r == null ? void 0 : r.imo,
@@ -609,15 +609,15 @@ class Dt extends ot {
         method: "trajectory",
         vendor: "shipxy"
       }, c = Math.floor(u.diff(j, "minute", !0) / (n || 1));
-      c !== p && (p = c, k.push(m));
+      c !== b && (b = c, k.push(m));
     }
     return k;
   }
 }
-class At extends ot {
+class xt extends at {
   constructor(t) {
     super();
-    K(this, "token");
+    U(this, "token");
     this.token = t;
   }
   async getShipId(t, a = {}) {
@@ -642,16 +642,16 @@ class At extends ot {
     }, n = "https://api3.myships.com/sp/ships/aissta", o = await B.post(n, i).json();
     if (M == null || M.info("[%s] fetch ship info from: %s - %j", a.requestId, n, i), o.code !== "0")
       return o;
-    const e = o.data;
-    let r = e.imo;
-    return t === "407170" && (r = "9198379", M == null || M.warn("[%s] ship(%s) imo error: %s, should be %s", a.requestId, t, e.imo, r)), {
-      mmsi: e.mmsi,
-      name: e.shipnameEn,
+    const s = o.data;
+    let r = s.imo;
+    return t === "407170" && (r = "9198379", M == null || M.warn("[%s] ship(%s) imo error: %s, should be %s", a.requestId, t, s.imo, r)), {
+      mmsi: s.mmsi,
+      name: s.shipnameEn,
       imo: r,
-      callSign: e.callSign,
-      length: e.length,
-      width: e.breadth,
-      draught: (e.draught || 100) / 10
+      callSign: s.callSign,
+      length: s.length,
+      width: s.breadth,
+      draught: (s.draught || 100) / 10
     };
   }
   async realTimePosition(t, a = {}) {
@@ -662,8 +662,8 @@ class At extends ot {
       json: {
         shipId: i
       }
-    }, e = "https://api3.myships.com/sp/ships/position/latest", r = await B.post(e, o).json();
-    M == null || M.info("[%s] fetch realtime position from: %s - %j", a.requestId, e, o);
+    }, s = "https://api3.myships.com/sp/ships/position/latest", r = await B.post(s, o).json();
+    M == null || M.info("[%s] fetch realtime position from: %s - %j", a.requestId, s, o);
     const h = r.data[0];
     for (const g in h)
       !isNaN(h[g]) && Number(h[g]) !== 1 / 0 && (h[g] = Number(h[g]));
@@ -686,13 +686,13 @@ class At extends ot {
       vendor: "myship"
     };
   }
-  async trajectory(t, a, i, n, o = !0, e = {}) {
+  async trajectory(t, a, i, n, o = !0, s = {}) {
     const r = v(a), h = v(i), l = await this.getShipId(t), d = await this.getShipInfo(l), y = [];
     for (; h.diff(r, "day", !0) > 30; )
       await this.trajectoryIn30Day(l, r.unix(), r.add(30, "day").unix(), d, t, n, y);
     return await this.trajectoryIn30Day(l, r.unix(), h.unix(), d, t, n, y), y;
   }
-  async trajectoryIn30Day(t, a, i, n, o, e, r, h = {}) {
+  async trajectoryIn30Day(t, a, i, n, o, s, r, h = {}) {
     var j;
     const l = {
       headers: {
@@ -707,38 +707,38 @@ class At extends ot {
     if (M == null || M.info("[%s] fetch trajectory from: %s - %j", h.requestId, d, l), y.code !== "0")
       return M == null || M.warn("[%s] invoke myship trajectory failed: %j", h.requestId, y), y;
     const w = y.data;
-    for (const p in w)
-      !isNaN(w[p]) && Number(w[p]) !== 1 / 0 && (w[p] = Number(w[p]));
+    for (const b in w)
+      !isNaN(w[b]) && Number(w[b]) !== 1 / 0 && (w[b] = Number(w[b]));
     const g = v.unix((j = w[0]) == null ? void 0 : j.posTime);
     let k = -1;
-    for (const p of w) {
-      const b = v.unix(p.posTime), f = {
+    for (const b of w) {
+      const p = v.unix(b.posTime), f = {
         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: b.unix(),
-        utc: b.utc().format(),
+        lat: Math.round(b.lat / 1e4 / 60 * 1e5) / 1e5,
+        lng: Math.round(b.lon / 1e4 / 60 * 1e5) / 1e5,
+        sog: Math.round(b.sog / 10 * 100) / 100,
+        cog: Math.round(b.cog / 10 * 100) / 100,
+        hdg: Math.round(b.heading * 100) / 100,
+        rot: Math.round(b.rot * 100) / 100,
+        positionTime: p.unix(),
+        utc: p.utc().format(),
         method: "trajectory",
         vendor: "myship"
-      }, u = Math.floor(b.diff(g, "minute", !0) / (e || 1));
+      }, u = Math.floor(p.diff(g, "minute", !0) / (s || 1));
       u !== k && (k = u, r.push(f));
     }
     return r;
   }
 }
-let _;
+let J;
 try {
-  _ = ht.getLogger("vessel");
+  J = dt.getLogger("vessel");
 } catch {
 } finally {
 }
-var gt = /* @__PURE__ */ ((D) => (D.NOTICE = "NOTICE", D.WARN = "WARN", D.HEAVY = "HEAVY", D.SEVERE = "SEVERE", D.ERROR = "ERROR", D.FATAL = "FATAL", D))(gt || {});
-class pt {
+var yt = /* @__PURE__ */ ((x) => (x.NOTICE = "NOTICE", x.WARN = "WARN", x.HEAVY = "HEAVY", x.SEVERE = "SEVERE", x.ERROR = "ERROR", x.FATAL = "FATAL", x))(yt || {});
+class Mt {
   /**
    * 解析告警规则, 多规则场景
    * @param rule
@@ -747,10 +747,10 @@ class pt {
    *
    * @param options
    */
-  parsePrinciple(s, t = {}) {
-    var e, r, h;
-    _ == null || _.debug("[%s] parse rule: %s", t.requestId, s);
-    const a = new RegExp("(?<=\\[)(.+)(?=])", "g"), i = s.match(a) ? (e = s.match(a)) == null ? void 0 : e[0] : void 0, n = i == null ? void 0 : i.split(";");
+  parsePrinciple(e, t = {}) {
+    var s, r, h;
+    J == null || J.debug("[%s] parse rule: %s", t.requestId, e);
+    const a = new RegExp("(?<=\\[)(.+)(?=])", "g"), i = e.match(a) ? (s = e.match(a)) == null ? void 0 : s[0] : void 0, n = i == null ? void 0 : i.split(";");
     if (!n)
       return;
     const o = {};
@@ -772,17 +772,17 @@ class pt {
    * @param rule
    * @param options
    */
-  parseRule(s, t = {}) {
+  parseRule(e, t = {}) {
     var o;
-    _ == null || _.debug("[%s] parse rule: %s", t.requestId, s), s = s.startsWith("[") ? s : `[${s}`, s = s.endsWith("]") ? s : `${s}]`;
-    const a = new RegExp("(?<=\\[)(.+?)(?=])", "g"), i = (o = s == null ? void 0 : s.match(a)) == null ? void 0 : o[0], n = i == null ? void 0 : i.split(",");
+    J == null || J.debug("[%s] parse rule: %s", t.requestId, e), e = e.startsWith("[") ? e : `[${e}`, e = e.endsWith("]") ? e : `${e}]`;
+    const a = new RegExp("(?<=\\[)(.+?)(?=])", "g"), i = (o = e == null ? void 0 : e.match(a)) == null ? void 0 : o[0], n = i == null ? void 0 : i.split(",");
     if (n) {
-      let e = n[3] === "Number.MAX_VALUE" ? 100 : Number(n[3]);
-      return e = isNaN(e) ? 1 : e, {
+      let s = n[3] === "Number.MAX_VALUE" ? 100 : Number(n[3]);
+      return s = isNaN(s) ? 1 : s, {
         operator: n[0],
         number: Number.isNaN(Number(n[1])) ? n[1] : Number(n[1]),
         level: n[2],
-        time: e,
+        time: s,
         key: n[4]
       };
     }
@@ -793,27 +793,27 @@ class pt {
    * @param principle 告警规则
    * @param options
    */
-  checkWeather(s, t, a = {}) {
-    var g, k, j, p, b, f, u, m, c, I, C, F, Y, A, H;
-    let i = 0, n = 0, o = 0, e = 0;
-    const r = Math.round(((k = (g = t == null ? void 0 : t.SEVERE) == null ? void 0 : g.sigWave) == null ? void 0 : k.number) * 1.6 * 100) / 100, h = (p = (j = t == null ? void 0 : t.SEVERE) == null ? void 0 : j.sigWave) == null ? void 0 : p.number, l = (f = (b = t == null ? void 0 : t.HEAVY) == null ? void 0 : b.sigWave) == null ? void 0 : f.number, d = Math.round((((m = (u = t == null ? void 0 : t.SEVERE) == null ? void 0 : u.wind) == null ? void 0 : m.number) + 2) * 100) / 100, y = (I = (c = t == null ? void 0 : t.SEVERE) == null ? void 0 : c.wind) == null ? void 0 : I.number, w = (F = (C = t == null ? void 0 : t.HEAVY) == null ? void 0 : C.wind) == null ? void 0 : F.number;
-    for (let E = 0; E < (s == null ? void 0 : s.length); E++) {
-      const N = s[E], O = (A = (Y = N == null ? void 0 : N.meteo) == null ? void 0 : Y.wave) == null ? void 0 : A.sig, R = (H = N == null ? void 0 : N.meteo) == null ? void 0 : H.wind, J = E ? v(N.eta).diff(v(s[E - 1].eta), "hour", !0) : 0;
-      e = J > e ? J : e, _ == null || _.debug("[%s] check sig.wave: %j", a.requestId, { ...O, dgThd4Wv: r, svThd4Wv: h, hvThd4Wv: l }), (O == null ? void 0 : O.height) >= r ? N.isDangerous = !0 : (O == null ? void 0 : O.height) >= h ? N.isSevere = !0 : (O == null ? void 0 : O.height) >= l && (N.isHeavy = !0), _ == null || _.debug("[%s] check wind: %j", a.requestId, { ...R, dgThd4Wd: d, svThd4Wd: y, hvThd4Wd: w }), (R == null ? void 0 : R.scale) >= d ? (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) === w && !N.isDangerous && !N.isSevere && (N.isHeavy = !0), i += N.isDangerous ? J : 0, n += N.isSevere ? J : 0, o += N.isHeavy ? J : 0;
+  checkWeather(e, t, a = {}) {
+    var g, k, j, b, p, f, u, m, c, I, C, F, P, D, H;
+    let i = 0, n = 0, o = 0, s = 0;
+    const r = Math.round(((k = (g = t == null ? void 0 : t.SEVERE) == null ? void 0 : g.sigWave) == null ? void 0 : k.number) * 1.6 * 100) / 100, h = (b = (j = t == null ? void 0 : t.SEVERE) == null ? void 0 : j.sigWave) == null ? void 0 : b.number, l = (f = (p = t == null ? void 0 : t.HEAVY) == null ? void 0 : p.sigWave) == null ? void 0 : f.number, d = Math.round((((m = (u = t == null ? void 0 : t.SEVERE) == null ? void 0 : u.wind) == null ? void 0 : m.number) + 2) * 100) / 100, y = (I = (c = t == null ? void 0 : t.SEVERE) == null ? void 0 : c.wind) == null ? void 0 : I.number, w = (F = (C = t == null ? void 0 : t.HEAVY) == null ? void 0 : C.wind) == null ? void 0 : F.number;
+    for (let T = 0; T < (e == null ? void 0 : e.length); T++) {
+      const N = e[T], O = (D = (P = N == null ? void 0 : N.meteo) == null ? void 0 : P.wave) == null ? void 0 : D.sig, R = (H = N == null ? void 0 : N.meteo) == null ? void 0 : H.wind, K = T ? v(N.eta).diff(v(e[T - 1].eta), "hour", !0) : 0;
+      s = K > s ? K : s, J == null || J.debug("[%s] check sig.wave: %j", a.requestId, { ...O, dgThd4Wv: r, svThd4Wv: h, hvThd4Wv: l }), (O == null ? void 0 : O.height) >= r ? N.isDangerous = !0 : (O == null ? void 0 : O.height) >= h ? N.isSevere = !0 : (O == null ? void 0 : O.height) >= l && (N.isHeavy = !0), J == null || J.debug("[%s] check wind: %j", a.requestId, { ...R, dgThd4Wd: d, svThd4Wd: y, hvThd4Wd: w }), (R == null ? void 0 : R.scale) >= d ? (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) === w && !N.isDangerous && !N.isSevere && (N.isHeavy = !0), i += N.isDangerous ? K : 0, n += N.isSevere ? K : 0, o += N.isHeavy ? K : 0;
     }
-    return i = Math.round(i * 100) / 100, n = Math.round(n * 100) / 100, o = Math.round(o * 100) / 100, e = Math.round(e), { sample: s, dangerous: i, severe: n, heavy: o, step: e < 3 ? 3 : e, wind: { dgThd4Wd: d, svThd4Wd: y, hvThd4Wd: w }, sig: { dgThd4Wv: r, svThd4Wv: h, hvThd4Wv: l } };
+    return i = Math.round(i * 100) / 100, n = Math.round(n * 100) / 100, o = Math.round(o * 100) / 100, s = Math.round(s), { sample: e, dangerous: i, severe: n, heavy: o, step: s < 3 ? 3 : s, wind: { dgThd4Wd: d, svThd4Wd: y, hvThd4Wd: w }, sig: { dgThd4Wv: r, svThd4Wv: h, hvThd4Wv: l } };
   }
 }
-const Pt = new pt();
-let T;
+const Dt = new Mt();
+let S;
 try {
-  T = ht.getLogger("vessel");
+  S = dt.getLogger("vessel");
 } catch {
 } finally {
 }
-const bt = new Mt("", !0);
-var vt = /* @__PURE__ */ ((D) => (D.common = "common", D.container = "container", D.tugs = "tugs", D))(vt || {}), wt = /* @__PURE__ */ ((D) => (D.Ballast = "Ballast", D.Laden = "Laden", D))(wt || {}), kt = /* @__PURE__ */ ((D) => (D.Cp = "CP", D.Perf = "Basis", D.Instruct = "Other", D))(kt || {});
-class W {
+const gt = new ft("", !0);
+var bt = /* @__PURE__ */ ((x) => (x.common = "common", x.container = "container", x.tugs = "tugs", x))(bt || {}), pt = /* @__PURE__ */ ((x) => (x.Ballast = "Ballast", x.Laden = "Laden", x))(pt || {}), vt = /* @__PURE__ */ ((x) => (x.Cp = "CP", x.Perf = "Basis", x.Instruct = "Other", x))(vt || {});
+class Y {
   /**
    * @see https://baike.baidu.com/item/%E6%96%B9%E5%BD%A2%E7%B3%BB%E6%95%B0/4965568?fr=aladdin
    * 方形系数（block coefficient）
@@ -826,11 +826,11 @@ class W {
    * @param draught 吃水 m
    * @return [0.55, 0.85]
    */
-  static blockCoefficient(s, t, a, i) {
-    let n = Math.round(s / (t * a * i) * 100) / 100;
+  static blockCoefficient(e, t, a, i) {
+    let n = Math.round(e / (t * 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], e = o.map((r) => Math.abs(r - n));
-    return o[e.indexOf(Math.min(...e))];
+    const o = [0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85], s = o.map((r) => Math.abs(r - 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
@@ -843,8 +843,8 @@ class W {
    * @param g 重力加速度 9.80 m/s^2
    * @return [0.05, 0.30]
    */
-  static froudeNumber(s, t, a = 9.8) {
-    let i = Math.round(Math.sqrt(s * s / (a * t)) * 100) / 100;
+  static froudeNumber(e, t, a = 9.8) {
+    let i = Math.round(Math.sqrt(e * e / (a * t)) * 100) / 100;
     return i = i < 0.05 ? 0.05 : i > 0.3 ? 0.3 : i, i;
   }
   /**
@@ -854,7 +854,7 @@ class W {
    * @param loadCondition
    * @private
    */
-  static amendFactor(s, t, a) {
+  static amendFactor(e, t, a) {
     const i = {
       0.55: [1.7, -1.4, -7.4],
       0.6: [2.2, -2.5, -9.7],
@@ -872,8 +872,8 @@ class W {
       0.75: [2.6, -12.5, -13.5],
       0.8: [3, -16.3, -21.6],
       0.85: [3.4, -20.9, 31.8]
-    }[s];
-    return a === "Laden" && (o = i[s]), o[0] + o[1] * t + o[2] * Math.pow(t, 2);
+    }[e];
+    return a === "Laden" && (o = i[e]), o[0] + o[1] * t + o[2] * Math.pow(t, 2);
   }
   /**
    * 失速方向因子
@@ -886,9 +886,9 @@ class W {
    * @param bn
    * @private
    */
-  static directionFactor(s, t = 0) {
+  static directionFactor(e, t = 0) {
     let a;
-    return s > 30 && s <= 60 ? a = (1.7 - 0.03 * Math.pow(t - 4, 2)) / 2 : s > 60 && s <= 150 ? a = (0.9 - 0.06 * Math.pow(t - 6, 2)) / 2 : s > 150 && s <= 180 ? a = (0.4 - 0.03 * Math.pow(t - 8, 2)) / 2 : a = 1, Math.round(a * 1e5) / 1e5;
+    return e > 30 && e <= 60 ? a = (1.7 - 0.03 * Math.pow(t - 4, 2)) / 2 : e > 60 && e <= 150 ? a = (0.9 - 0.06 * Math.pow(t - 6, 2)) / 2 : e > 150 && e <= 180 ? a = (0.4 - 0.03 * Math.pow(t - 8, 2)) / 2 : a = 1, Math.round(a * 1e5) / 1e5;
   }
   /**
    * 失速船型因子
@@ -902,9 +902,9 @@ class W {
    * @param kts
    * @private
    */
-  static vesselTagFactor(s, t, a, i) {
+  static vesselTagFactor(e, t, a, i) {
     let n;
-    return a === "container" ? n = 0.7 * i / 2 + Math.pow(i, 3) / (22 * Math.pow(s, 2 / 3)) : t === "Ballast" ? n = 0.7 * i / 2 + Math.pow(i, 3) / (2.7 * Math.pow(s, 2 / 3)) : n = 0.5 * i / 2 + Math.pow(i, 3) / (2.7 * Math.pow(s, 2 / 3)), n;
+    return a === "container" ? n = 0.7 * i / 2 + Math.pow(i, 3) / (22 * Math.pow(e, 2 / 3)) : t === "Ballast" ? n = 0.7 * i / 2 + Math.pow(i, 3) / (2.7 * Math.pow(e, 2 / 3)) : n = 0.5 * i / 2 + Math.pow(i, 3) / (2.7 * Math.pow(e, 2 / 3)), n;
   }
   /**
    * 浪高影响因子
@@ -912,10 +912,10 @@ class W {
    * @param beta 夹角
    * @private
    */
-  static waveHeightFactor(s, t) {
-    s = s < 3 ? s * 0.7 : s, s = s < 0 ? 0.2 : s, s = s > 6 ? s - 0.9 * (s - 6) : s, s = s > 9 ? 9 : s;
+  static waveHeightFactor(e, t) {
+    e = e < 3 ? e * 0.7 : e, e = e < 0 ? 0.2 : e, e = e > 6 ? e - 0.9 * (e - 6) : e, e = e > 9 ? 9 : e;
     let a;
-    return t > 30 && t <= 60 ? a = -0.6 : t > 60 && t <= 90 ? a = -0.4 : t > 90 && t <= 120 ? a = s < 3 ? 0.4 : -0.3 : t > 120 && t <= 150 ? a = s < 3 ? 0.6 : -0.5 : t > 150 && t <= 180 ? a = s < 3 ? 0.7 : -0.6 : a = -0.7, Math.round(a * (0.144 * Math.pow(s, 2) + 0.278 * s) * 1e4) / 1e4;
+    return t > 30 && t <= 60 ? a = -0.6 : t > 60 && t <= 90 ? a = -0.4 : t > 90 && t <= 120 ? a = e < 3 ? 0.4 : -0.3 : t > 120 && t <= 150 ? a = e < 3 ? 0.6 : -0.5 : t > 150 && t <= 180 ? a = e < 3 ? 0.7 : -0.6 : a = -0.7, Math.round(a * (0.144 * Math.pow(e, 2) + 0.278 * e) * 1e4) / 1e4;
   }
   /**
    * 组装船舶运行参数
@@ -925,18 +925,18 @@ class W {
    * @param bearing 方位角
    * @private
    */
-  static assembleProperties(s, t, a, i) {
+  static assembleProperties(e, t, a, i) {
     var y;
-    const n = s.lbp ?? s.length ?? s.lengthOverall ?? 198.9642, o = s.draught ?? 8, e = s.breadthMoulded ?? s.breadth ?? s.breadthExtreme ?? 32.4572, r = s.deadweight ?? 67035.7773, h = ((y = s == null ? void 0 : s.type) == null ? void 0 : y.toLowerCase()) || "common";
+    const n = e.lbp ?? e.length ?? e.lengthOverall ?? 198.9642, o = e.draught ?? 8, s = e.breadthMoulded ?? e.breadth ?? e.breadthExtreme ?? 32.4572, r = e.deadweight ?? 67035.7773, h = ((y = e == null ? void 0 : e.type) == null ? void 0 : y.toLowerCase()) || "common";
     return {
       tag: h.indexOf("container") > -1 ? "container" : h.indexOf("tugs") > -1 ? "tugs" : "common",
       lbp: n,
       loadCondition: t,
       draught: o,
-      breadthMoulded: e,
+      breadthMoulded: s,
       // 排水量（吨）= 载重量（吨）/ 1.025 + 吃水（米）× 船舶型宽（米）× 船舶型长（米）× 0.7
       // 其中，1.025是指海水的密度，吨是指公吨，吃水是指船舶的最大吃水深度。船舶型宽是指船舶的最大型宽，船舶型长是指船舶的设计型长。上述公式是针对常规船舶适用的，不同类型的船舶可能会有一些差异。
-      displacement: Math.round((r / 1.025 + o * e * n * 0.7) * 1e4) / 1e4,
+      displacement: Math.round((r / 1.025 + o * s * n * 0.7) * 1e4) / 1e4,
       // 换算为m/s
       speed: Math.round((a ?? 14.1382) * 1852 / 3600 * 1e4) / 1e4,
       bearing: i || 90
@@ -953,29 +953,29 @@ class W {
    * @param useRouteParam true 启用设置速度
    * @param options
    */
-  static async speedLoseAt(s, t, a, i = "", n = 2, o = !0, e = !1, r = {}) {
+  static async speedLoseAt(e, t, a, i = "", n = 2, o = !0, s = !1, r = {}) {
     let h;
-    if (t.velocity && e && (s.speed = z.roundPrecision(t.velocity * 1852 / 3600, 6)), o) {
+    if (t.velocity && s && (e.speed = z.roundPrecision(t.velocity * 1852 / 3600, 6)), o) {
       let l;
       try {
         i = (i == null ? void 0 : i.toUpperCase()) === "CMEMS" ? "ECMWF" : i, i = (i == null ? void 0 : i.toUpperCase()) === "METEO2" ? "best_match" : i;
-        const { weatherModels: g, marineModels: k } = await ut.autoPickMeteoModel(i), j = await bt.spotForecast(t.lat, t.lng, a.utc().format(), !1, !1, !0, {
+        const { weatherModels: g, marineModels: k } = await ct.autoPickMeteoModel(i), j = await gt.spotForecast(t.lat, t.lng, a.utc().format(), !1, !1, !0, {
           ...r,
           pastDays: 1,
           forecastDays: 1,
           weatherModels: g,
           marineModels: k
-        }), [p] = ut.pickHourly(j, a);
-        l = ut.toLegacy(p);
+        }), [b] = ct.pickHourly(j, a);
+        l = ct.toLegacy(b);
       } catch (g) {
-        T.warn("[%s] meteo2 spot(%j) forecast failed: %s", r.requestId, { ...t, eta: a.utc().format(), source: i }, g);
+        S.warn("[%s] meteo2 spot(%j) forecast failed: %s", r.requestId, { ...t, eta: a.utc().format(), source: i }, g);
       }
-      const d = W.currentFactor(s.bearing, l == null ? void 0 : l.current, n), y = W.weatherFactor(s, l, d), w = Math.round((s.speed * 1.943844 + y + d) * 100) / 100;
+      const d = Y.currentFactor(e.bearing, l == null ? void 0 : l.current, n), y = Y.weatherFactor(e, l, d), w = Math.round((e.speed * 1.943844 + y + d) * 100) / 100;
       h = {
         meteo: { ...l },
         wxFactor: y,
         cFactor: d,
-        speed: t.velocity && e ? t.velocity : w < 0 ? 1 : w,
+        speed: t.velocity && s ? t.velocity : w < 0 ? 1 : w,
         eta: a.utc().format(),
         etd: a.utc().format()
       };
@@ -983,7 +983,7 @@ class W {
       h = {
         wxFactor: 0,
         cFactor: 0,
-        speed: t.velocity && e ? t.velocity : Math.round(s.speed * 1.943844 * 100) / 100,
+        speed: t.velocity && s ? t.velocity : Math.round(e.speed * 1.943844 * 100) / 100,
         eta: a.utc().format(),
         etd: a.utc().format()
       };
@@ -1003,15 +1003,15 @@ class W {
    * @param options
    * @private
    */
-  static async speedLoseInHoursStep(s, t, a, i, n, o, e = "", r = !0, h = !1, l = {}) {
+  static async speedLoseInHoursStep(e, t, a, i, n, o, s = "", r = !0, h = !1, l = {}) {
     t.utc();
     const d = t.clone().add(14, "days"), y = [], w = [], g = [];
-    let k = 0, j = 0, p, b;
+    let k = 0, j = 0, b, p;
     for (let f = 0; f < o.length - 1; f++) {
       let u = o[f];
       u.distanceFromStart = Math.round((n + j) * 1e3) / 1e3;
       const m = o[f + 1];
-      if (s.bearing = V.calculateBearing(u, m, !m.gcToPrevious), u.bearing = s.bearing, u.suspend && h) {
+      if (e.bearing = W.calculateBearing(u, m, !m.gcToPrevious), u.bearing = e.bearing, u.suspend && h) {
         u.eta = u.eta || t.utc().format(), u.elapsed = u.elapsed ?? 0;
         const C = u.suspend - u.elapsed;
         if (i - k > C)
@@ -1020,36 +1020,36 @@ class W {
           const F = i - k;
           u.elapsed += F, t.add(F, "hour"), i = 0;
         }
-        if (T == null || T.info(`[%s] suspend ${u.elapsed} hours at %j, and remain ${i} hours need to go...`, l.requestId, u), i === 0)
-          return u.distanceFromPrevious = j, { etd: t, from: b || u, to: u, next: o.filter((F) => F), wps: y, days: w, all: g };
+        if (S == null || S.info(`[%s] suspend ${u.elapsed} hours at %j, and remain ${i} hours need to go...`, l.requestId, u), i === 0)
+          return u.distanceFromPrevious = j, { etd: t, from: p || u, to: u, next: o.filter((F) => F), wps: y, days: w, all: g };
       } else
         u.suspend = 0;
-      r = t.isAfter(d) ? !1 : r, u = await W.speedLoseAt(s, u, t, e, 0, r, h, l), g.push(u), b = b || u, u.important && y.push(u), t.isSameOrAfter(a) && (w.push(u), a.add(24, "hour"));
-      const c = V.calculateDistance(u, m, !m.gcToPrevious);
-      let I = Math.round(c / b.speed * 1e5) / 1e5;
+      r = t.isAfter(d) ? !1 : r, u = await Y.speedLoseAt(e, u, t, s, 0, r, h, l), g.push(u), p = p || u, u.important && y.push(u), t.isSameOrAfter(a) && (w.push(u), a.add(24, "hour"));
+      const c = W.calculateDistance(u, m, !m.gcToPrevious);
+      let I = Math.round(c / p.speed * 1e5) / 1e5;
       if (k + I < i) {
-        if (k += I, t.add(I, "hour"), delete o[f], T == null || T.debug(
+        if (k += I, t.add(I, "hour"), delete o[f], S == null || S.debug(
           `[%s] go to %j from %j with ${c}nm, and cost ${I} hours`,
           l.requestId,
           { lat: m.lat, lng: m.lng },
-          { lat: b.lat, lng: b.lng, etd: b.etd }
+          { lat: p.lat, lng: p.lng, etd: p.etd }
         ), j += c, o.filter((C) => C).length <= 1) {
-          p = m, p.eta = t.utc().format(), p.distanceFromPrevious = c, p.distanceFromStart = Math.round((n + j) * 1e4) / 1e4, y.push(p), g.push(p), delete o[f + 1];
+          b = m, b.eta = t.utc().format(), b.distanceFromPrevious = c, b.distanceFromStart = Math.round((n + j) * 1e4) / 1e4, y.push(b), g.push(b), delete o[f + 1];
           break;
         }
       } else {
         I = i - k, t.add(I, "hour");
-        const C = z.roundPrecision(b.speed * I, 5);
-        p = V.calculateCoordinate(u, s.bearing, C, "nauticalmiles", !m.gcToPrevious), p.eta = t.utc().format(), o[f] = p, T == null || T.debug(
+        const C = z.roundPrecision(p.speed * I, 5);
+        b = W.calculateCoordinate(u, e.bearing, C, "nauticalmiles", !m.gcToPrevious), b.eta = t.utc().format(), o[f] = b, S == null || S.debug(
           `[%s] go to %j from %j with ${C}nm, and cost ${I} hours`,
           l.requestId,
-          { lat: p.lat, lng: p.lng },
+          { lat: b.lat, lng: b.lng },
           { lat: u.lat, lng: u.lng, etd: u.etd }
-        ), j += C, p.distanceFromPrevious = Math.round(j * 1e4) / 1e4, p.distanceFromStart = Math.round((n + j) * 1e4) / 1e4;
+        ), j += C, b.distanceFromPrevious = Math.round(j * 1e4) / 1e4, b.distanceFromStart = Math.round((n + j) * 1e4) / 1e4;
         break;
       }
     }
-    return { etd: t, from: b, to: p, next: o.filter((f) => f), wps: y, days: w, all: g };
+    return { etd: t, from: p, to: b, next: o.filter((f) => f), wps: y, days: w, all: g };
   }
   /**
    * 洋流影响因子
@@ -1057,8 +1057,8 @@ class W {
    * @param current 洋流要素
    * @param role  1: 船东, 2: 租家, 0: 未知
    */
-  static currentFactor(s, t, a = 0) {
-    const i = (s - (t == null ? void 0 : t.degree) || 0) / 180 * Math.PI;
+  static currentFactor(e, t, a = 0) {
+    const i = (e - (t == null ? void 0 : t.degree) || 0) / 180 * Math.PI;
     if (Math.abs(i) === Math.PI / 2)
       return 0;
     let n = ((t == null ? void 0 : t.kts) || 0) * Math.cos(i);
@@ -1070,17 +1070,33 @@ class W {
    * @param wwc 气象要素
    * @param cFactor 洋流因子
    */
-  static weatherFactor(s, t, a = 0) {
-    var w, g, k, j, p, b, f;
-    T == null || T.debug("calculate weather factor via: %j", { ...s, ...t });
-    const i = W.blockCoefficient(s.displacement, s.lbp, s.breadthMoulded, s.draught), n = z.roundPrecision(a * 1852 / 3600, 6), o = W.froudeNumber(s.speed - n, s.lbp), e = W.amendFactor(i, o, s.loadCondition);
-    let r = Math.abs(s.bearing % 360 - (((w = t == null ? void 0 : t.wind) == null ? void 0 : w.degree) % 360 || 0));
+  static weatherFactor(e, t, a = 0) {
+    var w, g, k, j, b, p, f;
+    S == null || S.debug("calculate weather factor via: %j", { ...e, ...t });
+    const i = Y.blockCoefficient(e.displacement, e.lbp, e.breadthMoulded, e.draught), n = z.roundPrecision(a * 1852 / 3600, 6), o = Y.froudeNumber(e.speed - n, e.lbp), s = Y.amendFactor(i, o, e.loadCondition);
+    let r = Math.abs(e.bearing % 360 - (((w = t == null ? void 0 : t.wind) == null ? void 0 : w.degree) % 360 || 0));
     r = r > 180 ? 360 - r : r;
-    const h = W.directionFactor(r, (g = t == null ? void 0 : t.wind) == null ? void 0 : g.scale), l = W.vesselTagFactor(s.displacement, s.loadCondition, s.tag, (k = t == null ? void 0 : t.wind) == null ? void 0 : k.kts);
-    let d = h * e * l / 100 * (s.speed - n);
-    d = Math.round(d * 1.943844 * 1e4) / 1e4 * -1, s.tag === "tugs" && Math.abs(d) > 1 && (d = d / (Math.abs(Math.round(d)) + 1)), T == null || T.debug("wind wx factor = %d", d), r = Math.abs(s.bearing % 360 - (((p = (j = t == null ? void 0 : t.wave) == null ? void 0 : j.sig) == null ? void 0 : p.degree) % 360 || 0)), r = r > 180 ? 360 - r : r;
-    const y = W.waveHeightFactor(((f = (b = t == null ? void 0 : t.wave) == null ? void 0 : b.sig) == null ? void 0 : f.height) ?? 1, r);
-    return T == null || T.debug("wave wx factor = %d", y), d = Math.abs(d) > Math.abs(y) ? d : d * 0.3 + y * 0.7, T == null || T.debug("weather factor = %d", d), d = Math.abs(d) > 3 ? 3 * (Math.abs(d) / d) + Math.abs(d) / d * (Math.abs(d) - 2) * 0.1 : d, Math.round((d || 0) * 100) / 100;
+    const h = Y.directionFactor(r, (g = t == null ? void 0 : t.wind) == null ? void 0 : g.scale), l = Y.vesselTagFactor(e.displacement, e.loadCondition, e.tag, (k = t == null ? void 0 : t.wind) == null ? void 0 : k.kts);
+    let d = h * s * l / 100 * (e.speed - n);
+    d = Math.round(d * 1.943844 * 1e4) / 1e4 * -1, e.tag === "tugs" && Math.abs(d) > 1 && (d = d / (Math.abs(Math.round(d)) + 1)), S == null || S.debug("wind wx factor = %d", d), r = Math.abs(e.bearing % 360 - (((b = (j = t == null ? void 0 : t.wave) == null ? void 0 : j.sig) == null ? void 0 : b.degree) % 360 || 0)), r = r > 180 ? 360 - r : r;
+    const y = Y.waveHeightFactor(((f = (p = t == null ? void 0 : t.wave) == null ? void 0 : p.sig) == null ? void 0 : f.height) ?? 1, r);
+    return S == null || S.debug("wave wx factor = %d", y), d = Math.abs(d) > Math.abs(y) ? d : d * 0.3 + y * 0.7, S == null || S.debug("weather factor = %d", d), d = Math.abs(d) > 3 ? 3 * (Math.abs(d) / d) + Math.abs(d) / d * (Math.abs(d) - 2) * 0.1 : d, Math.round((d || 0) * 100) / 100;
+  }
+  /**
+   * 以12小时级别去掉重复的days
+   * @param days
+   * @param interval 12 hours
+   */
+  static async reduceDays(e, t = 12 * 60 * 60) {
+    return e = e == null ? void 0 : e.reduce((a, i) => (a.some((n) => Math.floor(n.positionTime / t) === Math.floor(i.positionTime / t)) || a.push(i), a), []), e;
+  }
+  /**
+   * 以分钟级别去掉重复的wps
+   * @param wps
+   * @param interval 1 minute
+   */
+  static async reduceWPS(e, t = 60) {
+    return e = e == null ? void 0 : e.reduce((a, i) => (a.some((n) => Math.floor(v(n.etd).unix() / t) === Math.floor(v(i.etd).unix() / t)) || a.push(i), a), []), e;
   }
   /**
    * 全程失速分析(走完航程)
@@ -1095,27 +1111,27 @@ class W {
    * @param useRouteParam
    * @param options
    */
-  static async analyseInstant(s, t, a, i, n, o = "", e = 0, r = !0, h = !1, l = {}) {
-    var U, G, X, Q, Z, $, tt, et;
+  static async analyseInstant(e, t, a, i, n, o = "", s = 0, r = !0, h = !1, l = {}) {
+    var _, G, X, Q, Z, $;
     const d = v().valueOf();
-    s.lng = z.convertToStdLng(s.lng);
-    const { route: y, waypoints: w } = n.points, g = V.calculateSubRoute(s, y);
-    if (((U = g[0]) == null ? void 0 : U.length) <= 1)
+    e.lng = z.convertToStdLng(e.lng);
+    const { route: y, waypoints: w } = n.points, g = W.calculateSubRoute(e, y);
+    if (((_ = g[0]) == null ? void 0 : _.length) <= 1)
       return;
-    const { v0: k, label: j } = s.sog ? {
-      v0: s.sog,
-      label: s.label || "Other"
+    const { v0: k, label: j } = e.sog ? {
+      v0: e.sog,
+      label: e.label || "Other"
       /* Instruct */
     } : {
       v0: i.speed,
       label: "CP"
       /* Cp */
-    }, p = W.assembleProperties(a, i.loadCondition, k, 0), b = w.length ? V.calculateSubWaypoints(s, w) : [];
-    b.forEach((x) => x.important = !0);
+    }, b = Y.assembleProperties(a, i.loadCondition, k, 0), p = w.length ? W.calculateSubWaypoints(e, w) : [];
+    p.forEach((A) => A.important = !0);
     const f = {
-      from: { ...s },
+      from: { ...e },
       route: g,
-      waypoints: b,
+      waypoints: p,
       v0: k,
       label: j
     }, u = {
@@ -1124,16 +1140,16 @@ class W {
       wps: [],
       all: []
     };
-    e || (V.calculateRouteDistance(g) / i.speed <= 72 ? e = 3 : e = 6);
-    let m = V.simplifyRouteToCoordinates(g, b, 0), c = 0, I = 0, C = 0, F = 0;
+    s || (W.calculateRouteDistance(g) / i.speed <= 72 ? s = 3 : s = 6);
+    let m = W.simplifyRouteToCoordinates(g, p, 0), c = 0, I = 0, C = 0, F = 0;
     t = v(t).utc();
-    const Y = t.clone();
+    const P = t.clone();
     for (; m.length > 0; ) {
-      const x = e - t.hour() % e, L = Math.ceil(t.clone().add(x, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4, S = await W.speedLoseInHoursStep(
-        p,
+      const A = s - t.hour() % s, V = Math.ceil(t.clone().add(A, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4, E = await Y.speedLoseInHoursStep(
+        b,
         t,
-        Y,
-        L,
+        P,
+        V,
         c,
         m,
         o,
@@ -1141,38 +1157,38 @@ class W {
         h,
         l
       );
-      if (u.all.push(...S.all), (G = S.from) != null && G.speed && (u.hours.push(S.from), u.wps.push(...S.wps), u.days.push(...S.days)), m = S == null ? void 0 : S.next, !m.length) {
-        const q = await W.speedLoseAt(p, S.to, v(S.to.eta), o, 0, r, h, l);
-        q.bearing = p.bearing, u.hours.push(q), u.all.push(q);
+      if (u.all.push(...E.all), (G = E.from) != null && G.speed && (u.hours.push(E.from), u.wps.push(...E.wps), u.days.push(...E.days)), m = E == null ? void 0 : E.next, !m.length) {
+        const L = await Y.speedLoseAt(b, E.to, v(E.to.eta), o, 0, r, h, l);
+        L.bearing = b.bearing, u.hours.push(L), u.all.push(L);
       }
-      c += Math.round((((X = S == null ? void 0 : S.to) == null ? void 0 : X.distanceFromPrevious) ?? 0) * 1e4) / 1e4;
+      c += Math.round((((X = E == null ? void 0 : E.to) == null ? void 0 : X.distanceFromPrevious) ?? 0) * 1e4) / 1e4;
     }
-    const A = u.hours;
-    for (let x = 0; x < A.length - 1; x++) {
-      const L = v(A[x + 1].eta).diff(A[x].etd, "hour", !0) || 1;
-      I += (A[x].wxFactor || 0) * L, C += (A[x].cFactor || 0) * L, F += L;
+    const D = u.hours;
+    for (let A = 0; A < D.length - 1; A++) {
+      const V = v(D[A + 1].eta).diff(D[A].etd, "hour", !0) || 1;
+      I += (D[A].wxFactor || 0) * V, C += (D[A].cFactor || 0) * V, F += V;
     }
-    const H = A.reduce((x, L) => x + (L.suspend || 0), 0);
-    (Q = u.wps) == null || Q.forEach((x, L) => {
-      x.positionTime = v.utc(x.etd || x.eta).unix();
-      const S = u.wps[L - 1];
-      if (S) {
-        const q = x.distanceFromStart - S.distanceFromStart, P = v(x.eta || x.etd).diff(v(S.etd || S.eta), "h", !0);
-        x.avgSpd = Math.round(q / P * 100) / 100, S.bearing = V.calculateBearing(S, x);
+    const H = D.reduce((A, V) => A + (V.suspend || 0), 0);
+    (Q = u.wps) == null || Q.forEach((A, V) => {
+      A.positionTime = v.utc(A.etd || A.eta).unix();
+      const E = u.wps[V - 1];
+      if (E) {
+        const L = A.distanceFromStart - E.distanceFromStart, q = v(A.eta || A.etd).diff(v(E.etd || E.eta), "h", !0);
+        A.avgSpd = Math.round(L / q * 100) / 100, E.bearing = W.calculateBearing(E, A);
       }
-    }), u.wps = (Z = u.wps) == null ? void 0 : Z.reduce((x, L) => (x.some((S) => Math.round(S.positionTime / 60) === Math.round(L.positionTime / 60)) || x.push(L), x), []), u.days = ($ = u.days) == null ? void 0 : $.reduce((x, L) => (x.some((S) => Math.round(S.positionTime / (60 * 60 * 12)) === Math.round(L.positionTime / (60 * 60 * 12))) || x.push(L), x), []), u.all = (tt = u.all) == null ? void 0 : tt.reduce((x, L) => (L.positionTime = v.utc(L.etd || L.eta).unix(), x.some((S) => Math.round(S.positionTime / 60) === Math.round(L.positionTime / 60)) || x.push(L), x), []), f.sample = u;
-    const E = u.hours.at(0), N = u.hours.at(-1);
-    f.distance = Math.round(N.distanceFromStart * 1e3) / 1e3, f.etd = v(E.eta).utc().format(), f.eta = v(N.eta).utc().format(), f.wxFactor = Math.round(I / F * 1e3) / 1e3, f.cFactor = Math.round(C / F * 1e3) / 1e3, f.avgSpeed = Math.round(N.distanceFromStart / F * 1e3) / 1e3, f.totalHrs = Math.round(F * 1e3) / 1e3, f.suspend = Math.round(H * 1e3) / 1e3;
-    const O = z.roundPrecision(i.dgo / 24 * H, 3), { distanceInECA: R, hoursInECA: J, totalDgoConsInECA: it, eca: st } = await this.calculateECA(f, i, l), at = z.roundPrecision(i.fo / 24 * (F - J), 3), rt = z.roundPrecision(i.dgo / 24 * F + O, 3);
+    }), u.wps = await Y.reduceWPS(u.wps), u.days = await Y.reduceDays(u.days), u.all = (Z = u.all) == null ? void 0 : Z.reduce((A, V) => (V.positionTime = v.utc(V.etd || V.eta).unix(), A.some((E) => Math.round(E.positionTime / 60) === Math.round(V.positionTime / 60)) || A.push(V), A), []), f.sample = u;
+    const T = u.hours.at(0), N = u.hours.at(-1);
+    f.distance = Math.round(N.distanceFromStart * 1e3) / 1e3, f.etd = v(T.eta).utc().format(), f.eta = v(N.eta).utc().format(), f.wxFactor = Math.round(I / F * 1e3) / 1e3, f.cFactor = Math.round(C / F * 1e3) / 1e3, f.avgSpeed = Math.round(N.distanceFromStart / F * 1e3) / 1e3, f.totalHrs = Math.round(F * 1e3) / 1e3, f.suspend = Math.round(H * 1e3) / 1e3;
+    const O = z.roundPrecision(i.dgo / 24 * H, 3), { distanceInECA: R, hoursInECA: K, totalDgoConsInECA: nt, eca: tt } = await this.calculateECA(f, i, l), et = z.roundPrecision(i.fo / 24 * (F - K), 3), ot = z.roundPrecision(i.dgo / 24 * F + O, 3);
     f.extend = {
-      eca: st,
+      eca: tt,
       distanceInECA: R,
-      hoursInECA: J,
-      totalDgoConsInECA: it,
+      hoursInECA: K,
+      totalDgoConsInECA: nt,
       totalDgoConsInSuspend: O
-    }, f.totalFoCons = at < 0 ? 0 : at, f.totalDgoCons = rt;
-    const nt = v().valueOf() - d, dt = ((et = u == null ? void 0 : u.hours) == null ? void 0 : et.length) || 1;
-    return T == null || T.info("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", l == null ? void 0 : l.requestId, nt, dt, Math.round(nt / dt * 1e3) / 1e3), f;
+    }, f.totalFoCons = et < 0 ? 0 : et, f.totalDgoCons = ot;
+    const st = v().valueOf() - d, rt = (($ = u == null ? void 0 : u.hours) == null ? void 0 : $.length) || 1;
+    return S == null || S.info("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", l == null ? void 0 : l.requestId, st, rt, Math.round(st / rt * 1e3) / 1e3), f;
   }
   /**
    * 分段失速分析（最多走hours 小时）
@@ -1189,24 +1205,24 @@ class W {
    * @param useRouteParam
    * @param options
    */
-  static async analyseInstantWithThreshed(s, t, a, i, n, o, e, r = "", h = 3, l = !0, d = !1, y = {}) {
-    var X, Q, Z, $, tt, et, x, L;
+  static async analyseInstantWithThreshed(e, t, a, i, n, o, s, r = "", h = 3, l = !0, d = !1, y = {}) {
+    var X, Q, Z, $, A, V;
     const w = v().valueOf();
-    s.lng = z.convertToStdLng(s.lng);
-    const { v0: g, label: k } = s.sog ? {
-      v0: s.sog,
-      label: s.label || "Other"
+    e.lng = z.convertToStdLng(e.lng);
+    const { v0: g, label: k } = e.sog ? {
+      v0: e.sog,
+      label: e.label || "Other"
       /* Instruct */
     } : {
       v0: n.speed,
       label: "CP"
       /* Cp */
-    }, j = W.assembleProperties(i, n.loadCondition, g, 0), p = V.calculateSubRoute(s, o);
-    if (((X = p[0]) == null ? void 0 : X.length) <= 1)
+    }, j = Y.assembleProperties(i, n.loadCondition, g, 0), b = W.calculateSubRoute(e, o);
+    if (((X = b[0]) == null ? void 0 : X.length) <= 1)
       return;
-    const b = e.length ? V.calculateSubWaypoints(s, e) : [];
-    b.forEach((S) => S.important = !0);
-    let f = V.simplifyRouteToCoordinates(p, b, 0), u = 0, m = 0, c = 0, I = 0;
+    const p = s.length ? W.calculateSubWaypoints(e, s) : [];
+    p.forEach((E) => E.important = !0);
+    let f = W.simplifyRouteToCoordinates(b, p, 0), u = 0, m = 0, c = 0, I = 0;
     const C = {
       hours: [],
       wps: [],
@@ -1216,52 +1232,52 @@ class W {
     t = v(t).utc();
     const F = t.clone();
     for (; f.length > 0; ) {
-      const S = h - t.hour() % h;
-      let q = Math.ceil(t.clone().add(S, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4;
-      q = t.clone().add(q, "h").isSameOrAfter(a) ? a.diff(t, "h", !0) * 1e4 / 1e4 : q;
-      const P = await W.speedLoseInHoursStep(j, t, F, q, u, f, r, l, d, y);
-      if (C.all.push(...P.all), (Q = P.from) != null && Q.speed && (C.hours.push(P.from), P != null && P.wps && C.wps.push(...P.wps), C.days.push(...P.days)), f = P == null ? void 0 : P.next, f.length || C.hours.push(P == null ? void 0 : P.to), u += Math.round((((Z = P == null ? void 0 : P.to) == null ? void 0 : Z.distanceFromPrevious) ?? 0) * 1e4) / 1e4, !q)
+      const E = h - t.hour() % h;
+      let L = Math.ceil(t.clone().add(E, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4;
+      L = t.clone().add(L, "h").isSameOrAfter(a) ? a.diff(t, "h", !0) * 1e4 / 1e4 : L;
+      const q = await Y.speedLoseInHoursStep(j, t, F, L, u, f, r, l, d, y);
+      if (C.all.push(...q.all), (Q = q.from) != null && Q.speed && (C.hours.push(q.from), q != null && q.wps && C.wps.push(...q.wps), C.days.push(...q.days)), f = q == null ? void 0 : q.next, f.length || C.hours.push(q == null ? void 0 : q.to), u += Math.round((((Z = q == null ? void 0 : q.to) == null ? void 0 : Z.distanceFromPrevious) ?? 0) * 1e4) / 1e4, !L)
         break;
     }
-    C.wps = ($ = C.wps) == null ? void 0 : $.reduce((S, q) => (S.some((P) => Math.round(v(P.etd).unix() / 60) === Math.round(v(q.etd).unix() / 60)) || S.push(q), S), []), C.days = (tt = C.days) == null ? void 0 : tt.reduce((S, q) => (S.some((P) => Math.round(P.positionTime / (60 * 60 * 12)) === Math.round(q.positionTime / (60 * 60 * 12))) || S.push(q), S), []), C.all = (et = C.all) == null ? void 0 : et.reduce((S, q) => (q.positionTime = v.utc(q.etd || q.eta).unix(), S.some((P) => Math.round(v(P.etd).unix() / 60) === Math.round(v(q.etd).unix() / 60)) || S.push(q), S), []), (x = C.wps) == null || x.forEach((S, q) => {
-      const P = C.wps[q - 1];
-      if (P) {
-        const lt = S.distanceFromStart - P.distanceFromStart, mt = v(S.eta || S.etd).diff(v(P.etd || P.eta), "h", !0);
-        P.bearing = V.calculateBearing(P, S), S.avgSpd = Math.round(lt / mt * 100) / 100;
+    C.wps = await Y.reduceWPS(C.wps), C.days = await Y.reduceDays(C.days), C.all = ($ = C.all) == null ? void 0 : $.reduce((E, L) => (L.positionTime = v.utc(L.etd || L.eta).unix(), E.some((q) => Math.round(v(q.etd).unix() / 60) === Math.round(v(L.etd).unix() / 60)) || E.push(L), E), []), (A = C.wps) == null || A.forEach((E, L) => {
+      const q = C.wps[L - 1];
+      if (q) {
+        const ut = E.distanceFromStart - q.distanceFromStart, ht = v(E.eta || E.etd).diff(v(q.etd || q.eta), "h", !0);
+        q.bearing = W.calculateBearing(q, E), E.avgSpd = Math.round(ut / ht * 100) / 100;
       }
     });
-    const Y = C.hours;
-    for (let S = 0; S < Y.length - 1; S++) {
-      const q = v(Y[S + 1].eta).diff(Y[S].etd, "hour", !0);
-      m += Y[S].wxFactor * q, c += Y[S].cFactor * q, I += q;
+    const P = C.hours;
+    for (let E = 0; E < P.length - 1; E++) {
+      const L = v(P[E + 1].eta).diff(P[E].etd, "hour", !0);
+      m += P[E].wxFactor * L, c += P[E].cFactor * L, I += L;
     }
-    const A = Y.reduce((S, q) => S + (q.suspend || 0), 0), H = C.hours.at(0), E = C.hours.at(-1), N = await V.calculateRangeRoute(H, E, p), O = await V.calculateRangeWaypoints(H, E, p, b), R = {
+    const D = P.reduce((E, L) => E + (L.suspend || 0), 0), H = C.hours.at(0), T = C.hours.at(-1), N = await W.calculateRangeRoute(H, T, b), O = await W.calculateRangeWaypoints(H, T, b, p), R = {
       sample: C,
-      distance: Math.round(((E == null ? void 0 : E.distanceFromStart) || 0) * 1e4) / 1e4,
+      distance: Math.round(((T == null ? void 0 : T.distanceFromStart) || 0) * 1e4) / 1e4,
       // 注意，可能会在first节点Drift,所有采用eta做为初始出发时间
       etd: v(H.eta).utc().format(),
-      eta: v(E == null ? void 0 : E.eta).utc().format(),
+      eta: v(T == null ? void 0 : T.eta).utc().format(),
       wxFactor: Math.round(m / I * 1e3) / 1e3,
       cFactor: Math.round(c / I * 1e3) / 1e3,
-      avgSpeed: Math.round(((E == null ? void 0 : E.distanceFromStart) || 0) / I * 1e3) / 1e3,
+      avgSpeed: Math.round(((T == null ? void 0 : T.distanceFromStart) || 0) / I * 1e3) / 1e3,
       totalHrs: Math.round(I * 1e3) / 1e3,
-      suspend: Math.round(A * 1e3) / 1e3,
+      suspend: Math.round(D * 1e3) / 1e3,
       from: H,
-      to: E,
+      to: T,
       route: N,
       waypoints: O,
       v0: g,
       label: k
-    }, J = z.roundPrecision(n.dgo / 24 * A, 3), { distanceInECA: it, hoursInECA: st, totalDgoConsInECA: at, eca: rt } = await this.calculateECA(R, n, y), ct = z.roundPrecision(n.fo / 24 * (I - st), 3), nt = z.roundPrecision(n.dgo / 24 * I + J, 3);
+    }, K = z.roundPrecision(n.dgo / 24 * D, 3), { distanceInECA: nt, hoursInECA: tt, totalDgoConsInECA: et, eca: ot } = await this.calculateECA(R, n, y), it = z.roundPrecision(n.fo / 24 * (I - tt), 3), st = z.roundPrecision(n.dgo / 24 * I + K, 3);
     R.extend = {
-      eca: rt,
-      distanceInECA: it,
-      hoursInECA: st,
-      totalDgoConsInECA: at,
-      totalDgoConsInSuspend: J
-    }, R.totalDgoCons = nt, R.totalFoCons = ct < 0 ? 0 : ct;
-    const U = v().valueOf() - w, G = ((L = C == null ? void 0 : C.hours) == null ? void 0 : L.length) || 1;
-    return T == null || T.debug("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", y == null ? void 0 : y.requestId, U, G, Math.round(U / G * 1e3) / 1e3), R;
+      eca: ot,
+      distanceInECA: nt,
+      hoursInECA: tt,
+      totalDgoConsInECA: et,
+      totalDgoConsInSuspend: K
+    }, R.totalDgoCons = st, R.totalFoCons = it < 0 ? 0 : it;
+    const _ = v().valueOf() - w, G = ((V = C == null ? void 0 : C.hours) == null ? void 0 : V.length) || 1;
+    return S == null || S.debug("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", y == null ? void 0 : y.requestId, _, G, Math.round(_ / G * 1e3) / 1e3), R;
   }
   /**
    * 在指定航线条件下，基于多CP，动态计算最优成本(租金+油费)方案
@@ -1278,34 +1294,34 @@ class W {
    * @param lane 基础航线（重要转向点）
    * @param options
    */
-  static async analyseCost(s, t, a, i, n = {}) {
-    var p, b;
-    const o = v().valueOf(), e = [];
-    s.speedStep = s.speedStep || 3, s.alterStep = s.alterStep ?? 1;
-    const r = V.calculateRouteDistance(i.route);
+  static async analyseCost(e, t, a, i, n = {}) {
+    var b, p;
+    const o = v().valueOf(), s = [];
+    e.speedStep = e.speedStep || 3, e.alterStep = e.alterStep ?? 1;
+    const r = W.calculateRouteDistance(i.route);
     let h = 0;
     a.forEach((f) => {
       const u = Math.ceil(r / f.speed / 24);
       h = h < u ? u : h;
     }), h = h * 1.3;
-    const l = v.utc(s.etd).add(h ?? 14, "day");
+    const l = v.utc(e.etd).add(h ?? 14, "day");
     let d = 1;
     for (const f of a) {
-      const u = JSON.parse(JSON.stringify(i.route)), m = JSON.parse(JSON.stringify(i.waypoints)), c = await W.analyseInstantWithThreshed(
-        { lat: s.lat, lng: s.lng },
-        s.etd,
+      const u = JSON.parse(JSON.stringify(i.route)), m = JSON.parse(JSON.stringify(i.waypoints)), c = await Y.analyseInstantWithThreshed(
+        { lat: e.lat, lng: e.lng },
+        e.etd,
         l,
         t,
         f,
         u,
         m,
-        s.meteoVendor,
-        s.speedStep,
-        s.useMeteo,
-        s.useRouteParam,
+        e.meteoVendor,
+        e.speedStep,
+        e.useMeteo,
+        e.useRouteParam,
         n
       );
-      c && (await W.calculateCost(c, f, s, n), e.push(c), T == null || T.info("[%s][L%d-%d] analyse from %s to %s cost: %j", n.requestId, 1, d, s.etd, l.format(), {
+      c && (await Y.calculateCost(c, f, e, n), s.push(c), S == null || S.info("[%s][L%d-%d] analyse from %s to %s cost: %j", n.requestId, 1, d, e.etd, l.format(), {
         cost: c.cost.total,
         hire: c.cost.hire,
         bunker: c.cost.bunker,
@@ -1314,23 +1330,23 @@ class W {
         cp: `${f.speed}/${f.fo}/${f.dgo}`
       })), d++;
     }
-    e.sort((f, u) => f.cost.total - u.cost.total);
-    const y = e.at(0), w = e.at(1), g = [];
-    if (g.push({ combined: !1, speeds: [y], cost: (p = y.cost) == null ? void 0 : p.total }), w) {
+    s.sort((f, u) => f.cost.total - u.cost.total);
+    const y = s.at(0), w = s.at(1), g = [];
+    if (g.push({ combined: !1, speeds: [y], cost: (b = y.cost) == null ? void 0 : b.total }), w) {
       const f = y.cost.cp, u = w.cost.cp, m = v(y.eta), c = v(y.etd), I = m.diff(c, "days", !0);
       let C = Math.ceil(I / 2);
-      C = C > 7 ? 7 : C < s.alterStep ? s.alterStep : C;
-      let F = 2, Y = { combined: !1, speeds: [w], cost: (b = w.cost) == null ? void 0 : b.total }, A;
-      for (; C >= s.alterStep; ) {
-        const H = await W.combinedAnalyse(s, t, l, [f, u], i, C, { ...n, level: F });
-        if (Y.cost > H.cost ? A ? (A == null ? void 0 : A.cost) > H.cost && (A = H) : (A = Y, Y = H) : (!A || (A == null ? void 0 : A.cost) > H.cost) && (A = H), C <= s.alterStep)
+      C = C > 7 ? 7 : C < e.alterStep ? e.alterStep : C;
+      let F = 2, P = { combined: !1, speeds: [w], cost: (p = w.cost) == null ? void 0 : p.total }, D;
+      for (; C >= e.alterStep; ) {
+        const H = await Y.combinedAnalyse(e, t, l, [f, u], i, C, { ...n, level: F });
+        if (P.cost > H.cost ? D ? (D == null ? void 0 : D.cost) > H.cost && (D = H) : (D = P, P = H) : (!D || (D == null ? void 0 : D.cost) > H.cost) && (D = H), C <= e.alterStep)
           break;
         C = Math.ceil(C / 2), F += 1;
       }
-      g.push(Y), A && g.push(A);
+      g.push(P), D && g.push(D);
     }
     const j = v().valueOf() - o;
-    return T == null || T.info("[%s] analyse elapsed: %d ms", n == null ? void 0 : n.requestId, j), g.sort((f, u) => f.cost - u.cost);
+    return S == null || S.info("[%s] analyse elapsed: %d ms", n == null ? void 0 : n.requestId, j), g.sort((f, u) => f.cost - u.cost);
   }
   /**
    * 按步长多次减半，分别用7,4,2,1天步长及cpa,cpb交替计算各种组合下的成本
@@ -1342,22 +1358,22 @@ class W {
    * @param step 步长，7，4，2，1
    * @param options
    */
-  static async combinedAnalyse(s, t, a, i, n, o, e = {}) {
-    e.counter = 1, T == null || T.info("[%s][L%d] analyse with alternate cp in every %d days", e.requestId, e.level, o);
-    const r = await W.alternateAnalyse(s, t, a, i, 0, n, o, e), h = r.reduce((u, m) => u + m.cost.total, 0), l = r.reduce((u, m) => u + m.cost.hire, 0), d = r.reduce((u, m) => u + m.cost.bunker, 0), y = r.reduce((u, m) => u + m.distance, 0), w = r.reduce((u, m) => u + m.totalHrs, 0);
-    T == null || T.info("[%s][L%d] cost with cpa/cpb turn: %j", e.requestId, e.level, {
+  static async combinedAnalyse(e, t, a, i, n, o, s = {}) {
+    s.counter = 1, S == null || S.info("[%s][L%d] analyse with alternate cp in every %d days", s.requestId, s.level, o);
+    const r = await Y.alternateAnalyse(e, t, a, i, 0, n, o, s), h = r.reduce((u, m) => u + m.cost.total, 0), l = r.reduce((u, m) => u + m.cost.hire, 0), d = r.reduce((u, m) => u + m.cost.bunker, 0), y = r.reduce((u, m) => u + m.distance, 0), w = r.reduce((u, m) => u + m.totalHrs, 0);
+    S == null || S.info("[%s][L%d] cost with cpa/cpb turn: %j", s.requestId, s.level, {
       cost: h,
       hire: l,
       bunker: d,
       distance: y,
       hours: w
     });
-    const g = await W.alternateAnalyse(s, t, a, i, 1, n, o, e), k = g.reduce((u, m) => u + m.cost.total, 0), j = g.reduce((u, m) => u + m.cost.hire, 0), p = g.reduce((u, m) => u + m.cost.bunker, 0), b = g.reduce((u, m) => u + m.distance, 0), f = g.reduce((u, m) => u + m.totalHrs, 0);
-    return T == null || T.info("[%s][L%d] cost with cpb/cpa turn: %j", e.requestId, e.level, {
+    const g = await Y.alternateAnalyse(e, t, a, i, 1, n, o, s), k = g.reduce((u, m) => u + m.cost.total, 0), j = g.reduce((u, m) => u + m.cost.hire, 0), b = g.reduce((u, m) => u + m.cost.bunker, 0), p = g.reduce((u, m) => u + m.distance, 0), f = g.reduce((u, m) => u + m.totalHrs, 0);
+    return S == null || S.info("[%s][L%d] cost with cpb/cpa turn: %j", s.requestId, s.level, {
       cost: k,
       hire: j,
-      bunker: p,
-      distance: b,
+      bunker: b,
+      distance: p,
       hours: f
     }), h < k ? { combined: !0, cost: Math.round(h * 1e3) / 1e3, speeds: r, step: o } : { combined: !0, cost: Math.round(k * 1e3) / 1e3, speeds: g, step: o };
   }
@@ -1372,26 +1388,26 @@ class W {
    * @param step 步长，7，4，2，1
    * @param options
    */
-  static async alternateAnalyse(s, t, a, i, n, o, e, r = {}) {
+  static async alternateAnalyse(e, t, a, i, n, o, s, r = {}) {
     var y, w;
-    let h = v.utc(s.etd);
-    const l = { lat: s.lat, lng: s.lng }, d = [];
+    let h = v.utc(e.etd);
+    const l = { lat: e.lat, lng: e.lng }, d = [];
     for (; h.isBefore(a); ) {
-      const g = h.clone().utc().add(e, "day"), k = JSON.parse(JSON.stringify(o.route)), j = JSON.parse(JSON.stringify(o.waypoints)), p = i[n], b = await W.analyseInstantWithThreshed(
+      const g = h.clone().utc().add(s, "day"), k = JSON.parse(JSON.stringify(o.route)), j = JSON.parse(JSON.stringify(o.waypoints)), b = i[n], p = await Y.analyseInstantWithThreshed(
         l,
         h.utc().format(),
         g,
         t,
-        p,
+        b,
         k,
         j,
-        s.meteoVendor,
-        s.speedStep,
-        s.useMeteo,
-        s.useRouteParam,
+        e.meteoVendor,
+        e.speedStep,
+        e.useMeteo,
+        e.useRouteParam,
         r
       );
-      b && (await W.calculateCost(b, p, s, r), T == null || T.info(
+      p && (await Y.calculateCost(p, b, e, r), S == null || S.info(
         "[%s][L%d-%d] analyse from %s to %s cost: %j",
         r.requestId,
         r.level,
@@ -1399,17 +1415,17 @@ class W {
         h.utc().format(),
         g.utc().format(),
         {
-          cost: b.cost.total,
-          hire: b.cost.hire,
-          bunker: b.cost.bunker,
-          distance: b.distance,
-          hours: b.totalHrs,
-          cp: `${p.speed}/${p.fo}/${p.dgo}`
+          cost: p.cost.total,
+          hire: p.cost.hire,
+          bunker: p.cost.bunker,
+          distance: p.distance,
+          hours: p.totalHrs,
+          cp: `${b.speed}/${b.fo}/${b.dgo}`
         }
       )), r.counter = r.counter + 1;
-      const f = (w = (y = b == null ? void 0 : b.sample) == null ? void 0 : y.hours) == null ? void 0 : w.at(-1);
+      const f = (w = (y = p == null ? void 0 : p.sample) == null ? void 0 : y.hours) == null ? void 0 : w.at(-1);
       if (f)
-        l.lat = f.lat, l.lng = f.lng, h = v(f.eta), d.push(b), n = n ? 0 : 1;
+        l.lat = f.lat, l.lng = f.lng, h = v(f.eta), d.push(p), n = n ? 0 : 1;
       else
         break;
     }
@@ -1422,40 +1438,40 @@ class W {
    * @param props
    * @param options
    */
-  static async calculateCost(s, t, a, i = {}) {
+  static async calculateCost(e, t, a, i = {}) {
     var n;
-    if (s) {
-      const o = (a.addComm || 0) >= 1 ? (a.addComm || 0) / 100 : a.addComm || 0, e = Math.round((a.dailyHire || 0) * (s.suspend || 0) / 24 * 1e3) / 1e3, r = Math.round(s.totalHrs / 24 * (a.dailyHire || 0) * (1 - o) * 1e3) / 1e3 + e, h = Math.round(s.totalFoCons * (a.priceFO || 0) * 1e3) / 1e3, l = Math.round((s.totalDgoCons + (((n = s.extend) == null ? void 0 : n.totalDgoConsInECA) || 0)) * (a.priceDGO || 0) * 1e3) / 1e3;
-      s.cost = {
+    if (e) {
+      const o = (a.addComm || 0) >= 1 ? (a.addComm || 0) / 100 : a.addComm || 0, s = Math.round((a.dailyHire || 0) * (e.suspend || 0) / 24 * 1e3) / 1e3, r = Math.round(e.totalHrs / 24 * (a.dailyHire || 0) * (1 - o) * 1e3) / 1e3 + s, h = Math.round(e.totalFoCons * (a.priceFO || 0) * 1e3) / 1e3, l = Math.round((e.totalDgoCons + (((n = e.extend) == null ? void 0 : n.totalDgoConsInECA) || 0)) * (a.priceDGO || 0) * 1e3) / 1e3;
+      e.cost = {
         total: Math.round((r + h + l) * 1e3) / 1e3,
         hire: Math.round(r * 1e3) / 1e3,
-        suspendHire: e,
+        suspendHire: s,
         bunker: Math.round((h + l) * 1e3) / 1e3,
         cp: t
       };
     }
-    return s;
+    return e;
   }
   /**
    * 计算单cp模式下的ECA属性
    *
    */
-  static async calculateECA(s, t, a = {}) {
+  static async calculateECA(e, t, a = {}) {
     var r, h, l, d;
-    const i = await V.intersectInECA((s == null ? void 0 : s.route) || []);
-    let n = 0, o = 0, e = 0;
-    (h = (r = s == null ? void 0 : s.sample) == null ? void 0 : r.wps) == null || h.forEach((y) => {
+    const i = await W.intersectInECA((e == null ? void 0 : e.route) || []);
+    let n = 0, o = 0, s = 0;
+    (h = (r = e == null ? void 0 : e.sample) == null ? void 0 : r.wps) == null || h.forEach((y) => {
       y.positionTime = v.utc(y.etd || y.eta).unix();
     });
     for (const y of i) {
       n += y.distance;
-      const w = await V.deadReckoningTime((l = y.waypoints) == null ? void 0 : l.at(0), s.sample.all || s.sample.wps), g = await V.deadReckoningTime((d = y.waypoints) == null ? void 0 : d.at(-1), s.sample.all || s.sample.wps);
-      y.in = w, y.out = g, y.totalHrs = z.roundPrecision((g.positionTime - w.positionTime) / 3600, 3), y.totalDgoCons = z.roundPrecision(t.fo / 24 * y.totalHrs, 3), o += y.totalHrs, e += y.totalDgoCons;
+      const w = await W.deadReckoningTime((l = y.waypoints) == null ? void 0 : l.at(0), e.sample.all || e.sample.wps), g = await W.deadReckoningTime((d = y.waypoints) == null ? void 0 : d.at(-1), e.sample.all || e.sample.wps);
+      y.in = w, y.out = g, y.totalHrs = z.roundPrecision((g.positionTime - w.positionTime) / 3600, 3), y.totalDgoCons = z.roundPrecision(t.fo / 24 * y.totalHrs, 3), o += y.totalHrs, s += y.totalDgoCons;
     }
-    return n = z.roundPrecision(n, 3), o = z.roundPrecision(o, 3), e = z.roundPrecision(e, 3), {
+    return n = z.roundPrecision(n, 3), o = z.roundPrecision(o, 3), s = z.roundPrecision(s, 3), {
       distanceInECA: n,
       hoursInECA: o,
-      totalDgoConsInECA: e,
+      totalDgoConsInECA: s,
       eca: i
     };
   }
@@ -1464,64 +1480,62 @@ class W {
    * @param speeds
    * @param options
    */
-  static async mergeSpeeds(s, t = {}) {
+  static async mergeSpeeds(e, t = {}) {
     var f, u;
     const a = {
       hours: [],
       wps: [],
       days: []
-    }, i = s.reduce((m, c) => m + c.distance, 0), n = s.reduce((m, c) => {
+    }, i = e.reduce((m, c) => m + c.distance, 0), n = e.reduce((m, c) => {
       var I;
       return m + (((I = c.extend) == null ? void 0 : I.distanceInECA) || 0);
-    }, 0), o = s.reduce((m, c) => m + c.totalHrs, 0), e = s.reduce((m, c) => {
+    }, 0), o = e.reduce((m, c) => m + c.totalHrs, 0), s = e.reduce((m, c) => {
       var I;
       return m + (((I = c.extend) == null ? void 0 : I.hoursInECA) || 0);
-    }, 0), r = s.reduce((m, c) => {
+    }, 0), r = e.reduce((m, c) => {
       var I;
       return m + (((I = c.extend) == null ? void 0 : I.totalDgoConsInECA) || 0);
-    }, 0), h = s.reduce((m, c) => m + c.wxFactor * c.totalHrs / o, 0), l = s.reduce((m, c) => m + c.cFactor * c.totalHrs / o, 0), d = s.reduce((m, c) => m + c.totalFoCons, 0), y = s.reduce((m, c) => m + c.totalDgoCons, 0), w = s.reduce((m, c) => m + c.cost.total, 0), g = s.reduce((m, c) => m + c.cost.hire, 0), k = s.reduce((m, c) => m + c.cost.bunker, 0), j = [], p = [];
-    let b;
-    for (const m of s) {
-      p.push(...((f = m.extend) == null ? void 0 : f.eca) || []);
+    }, 0), h = e.reduce((m, c) => m + c.wxFactor * c.totalHrs / o, 0), l = e.reduce((m, c) => m + c.cFactor * c.totalHrs / o, 0), d = e.reduce((m, c) => m + c.totalFoCons, 0), y = e.reduce((m, c) => m + c.totalDgoCons, 0), w = e.reduce((m, c) => m + c.cost.total, 0), g = e.reduce((m, c) => m + c.cost.hire, 0), k = e.reduce((m, c) => m + c.cost.bunker, 0), j = [], b = [];
+    let p;
+    for (const m of e) {
+      b.push(...((f = m.extend) == null ? void 0 : f.eca) || []);
       const c = m.sample.hours, I = m.sample.wps, C = m.sample.days, F = c.at(0);
-      b && (F.distanceFromPrevious = b.distanceFromPrevious, F.distanceFromStart = b.distanceFromStart, c.forEach((E, N) => {
-        N && (E.distanceFromStart = E.distanceFromStart + b.distanceFromStart);
-      }), I.at(0).distanceFromPrevious = b.distanceFromPrevious, I.at(0).distanceFromStart = b.distanceFromStart, I.forEach((E, N) => {
-        N && (E.distanceFromStart = E.distanceFromStart + b.distanceFromStart);
-      }), C.at(0).distanceFromPrevious = b.distanceFromPrevious, C.at(0).distanceFromStart = b.distanceFromStart, C.forEach((E, N) => {
-        N && (E.distanceFromStart = E.distanceFromStart + b.distanceFromStart);
+      p && (F.distanceFromPrevious = p.distanceFromPrevious, F.distanceFromStart = p.distanceFromStart, c.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);
+      }), C.at(0).distanceFromPrevious = p.distanceFromPrevious, C.at(0).distanceFromStart = p.distanceFromStart, C.forEach((T, N) => {
+        N && (T.distanceFromStart = T.distanceFromStart + p.distanceFromStart);
       })), F.cp = m.cost.cp;
-      const Y = [m.etd, m.eta], A = j.findIndex((E) => E.id === F.cp.id);
-      A === -1 ? (F.cp.segment = [Y], j.push(F.cp)) : j[A].segment.push(Y), c.forEach((E) => {
+      const P = [m.etd, m.eta], D = j.findIndex((T) => T.id === F.cp.id);
+      D === -1 ? (F.cp.segment = [P], j.push(F.cp)) : j[D].segment.push(P), c.forEach((T) => {
         var O;
-        ((O = a.hours) == null ? void 0 : O.findIndex((R) => R.eta === E.eta)) === -1 && a.hours.push(E);
-      }), I.forEach((E) => {
+        ((O = a.hours) == null ? void 0 : O.findIndex((R) => R.eta === T.eta)) === -1 && a.hours.push(T);
+      }), I.forEach((T) => {
         var O;
-        ((O = a.wps) == null ? void 0 : O.findIndex((R) => R.eta === E.eta)) === -1 && a.wps.push(E);
-      }), C.forEach((E) => {
+        ((O = a.wps) == null ? void 0 : O.findIndex((R) => R.eta === T.eta)) === -1 && a.wps.push(T);
+      }), C.forEach((T) => {
         var O;
-        ((O = a == null ? void 0 : a.days) == null ? void 0 : O.findIndex((R) => R.eta === E.eta)) === -1 && a.days.push(E);
+        ((O = a == null ? void 0 : a.days) == null ? void 0 : O.findIndex((R) => R.eta === T.eta)) === -1 && a.days.push(T);
       });
-      const H = (u = a.wps) == null ? void 0 : u.findIndex((E) => E.eta === F.eta);
-      H === -1 ? a.wps.push(F) : a.wps[H] = F, b = c.at(-1);
+      const H = (u = a.wps) == null ? void 0 : u.findIndex((T) => T.eta === F.eta);
+      H === -1 ? a.wps.push(F) : a.wps[H] = F, p = c.at(-1);
     }
-    return a.wps.sort((m, c) => {
-      v(m.etd).unix() - v(c.etd).unix();
-    }), a.wps.forEach((m, c) => {
+    return a.wps.sort((m, c) => v(m.etd).unix() - v(c.etd).unix()), a.wps.forEach((m, c) => {
       const I = a.wps[c - 1];
       if (I) {
-        const C = m.distanceFromStart - (I.distanceFromStart || 0), F = v(m.eta || m.etd).diff(v(I.etd || I.eta), "hour", !0), Y = Math.round(C / F * 100) / 100;
-        m.avgSpd = Y;
-        const A = V.calculateBearing(I, m);
-        I.bearing = A;
+        const C = m.distanceFromStart - (I.distanceFromStart || 0), F = v(m.eta || m.etd).diff(v(I.etd || I.eta), "hour", !0), P = Math.round(C / F * 100) / 100;
+        m.avgSpd = P;
+        const D = W.calculateBearing(I, m);
+        I.bearing = D;
       }
     }), {
       sample: a,
-      etd: s.at(0).etd,
-      eta: s.at(-1).eta,
-      from: s.at(0).from,
-      to: s.at(-1).to,
-      v0: s.at(0).v0,
+      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,
       label: "Combined",
       distance: Math.round(i * 1e3) / 1e3,
       totalHrs: Math.round(o * 1e3) / 1e3,
@@ -1537,26 +1551,26 @@ class W {
       },
       extend: {
         cps: j,
-        eca: p,
+        eca: b,
         distanceInECA: Math.round(n * 1e3) / 1e3,
-        hoursInECA: Math.round(e * 1e3) / 1e3,
+        hoursInECA: Math.round(s * 1e3) / 1e3,
         totalDgoConsInECA: Math.round(r * 1e3) / 1e3,
-        speeds: s
+        speeds: e
       }
     };
   }
 }
 export {
-  ot as AISImpl,
-  pt as AlertHelper,
-  gt as AlertLevel,
-  xt as HifleetImpl,
-  wt as LoadCondition,
-  At as MyShipImpl,
-  Nt as MyVesselImpl,
-  Dt as ShipxyImpl,
-  W as SpeedHelper,
-  kt as SpeedLabel,
-  vt as VesselTag,
-  Pt as alertHelper
+  at as AISImpl,
+  Mt as AlertHelper,
+  yt as AlertLevel,
+  Ft as HifleetImpl,
+  pt as LoadCondition,
+  xt as MyShipImpl,
+  Tt as MyVesselImpl,
+  Nt as ShipxyImpl,
+  Y as SpeedHelper,
+  vt as SpeedLabel,
+  bt as VesselTag,
+  Dt as alertHelper
 };