@idm-plugin/vessel 3.4.2 → 3.4.3

package/dist/index.js

@@ -1,26 +1,26 @@
-var ht = Object.defineProperty;
-var lt = (E, s, t) => s in E ? ht(E, s, { enumerable: !0, configurable: !0, writable: !0, value: t }) : E[s] = t;
-var U = (E, s, t) => (lt(E, typeof s != "symbol" ? s + "" : s, t), t);
+var mt = Object.defineProperty;
+var ft = (N, e, t) => e in N ? mt(N, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : N[e] = t;
+var U = (N, e, t) => (ft(N, typeof e != "symbol" ? e + "" : e, t), t);
 import B from "got";
-import ct from "@log4js-node/log4js-api";
-import v from "moment";
+import ut from "@log4js-node/log4js-api";
+import p from "moment";
 import { LngLatHelper as z, LaneHelper as V } from "@idm-plugin/geo2";
-import { MeteoHelper2 as mt } from "@idm-plugin/meteo2";
-import { Meteo2Assist as rt } from "@idm-plugin/meteo";
+import { MeteoHelper2 as yt } from "@idm-plugin/meteo2";
+import { Meteo2Assist as dt } from "@idm-plugin/meteo";
 let y;
 try {
-  y = ct.getLogger("vessel");
+  y = ut.getLogger("vessel");
 } catch {
 } finally {
 }
-class at {
+class nt {
   /**
    * 解析AIS状态码
    * @param status
    */
-  parseStatus(s) {
+  parseStatus(e) {
     let t, a;
-    switch (s) {
+    switch (e) {
       case 0:
         t = "在航（主机推动）", a = "Underway Using Engine";
         break;
@@ -54,7 +54,7 @@ class at {
     return { labelCn: t, labelEn: a };
   }
 }
-class Tt extends at {
+class Et extends nt {
   constructor(t, a) {
     super();
     U(this, "clientId");
@@ -76,12 +76,12 @@ class Tt extends at {
       expiresIn: n.expires_in,
       scope: n.scope,
       jti: n.jti,
-      issuedAt: v().utc().format()
+      issuedAt: p().utc().format()
     });
   }
   async checkToken(t = {}) {
     var a;
-    return (!this.token || v().diff(v(this.token.issuedAt), "seconds") > (((a = this.token) == null ? void 0 : a.expiresIn) || 0) - 300) && await this.authToken(t), this.token;
+    return (!this.token || p().diff(p(this.token.issuedAt), "seconds") > (((a = this.token) == null ? void 0 : a.expiresIn) || 0) - 300) && await this.authToken(t), this.token;
   }
   /**
    * 模糊查询
@@ -89,11 +89,11 @@ class Tt extends at {
    * @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 Tt extends at {
   async search(t, a = {}) {
     var d, h;
     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: `${(d = this.token) == null ? void 0 : d.tokenType} ${(h = this.token) == null ? void 0 : h.accessToken}`
       },
       searchParams: o
     };
-    y == null || y.info("[%s] fetch vessel from: %s - %j", a.requestId, n, e);
-    const r = await B.get(n, e).json();
+    y == null || y.info("[%s] fetch vessel from: %s - %j", a.requestId, n, s);
+    const r = await B.get(n, s).json();
     if (r.status !== 200)
       return y == null || y.warn("[%s] fetch suggest vessels failed: %j", a.requestId, { message: r.message, status: r.status, code: r.code }), {};
     {
@@ -162,11 +162,11 @@ class Tt extends at {
     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 Tt extends at {
     const o = await B.get(i, n).json();
     if (o.code)
       return y == null || y.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 h in e)
-      !isNaN(e[h]) && Number(e[h]) !== 1 / 0 && (e[h] = Number(e[h]));
-    if (e) {
-      const h = v(`${e.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    const s = o.data;
+    for (const h in s)
+      !isNaN(s[h]) && Number(s[h]) !== 1 / 0 && (s[h] = Number(s[h]));
+    if (s) {
+      const h = p(`${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) ? p.utc(s.eta).format() : void 0,
+        destination: s.dest,
         positionTime: h.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: h.utc().format()
@@ -250,18 +250,18 @@ class Tt extends at {
       }
     };
     y == null || y.info("[%s] fetch route from: %s - %j", i.requestId, n, o);
-    const e = await B.post(n, o).json();
-    return e.status !== 200 ? (y == null || y.warn("[%s] fetch route failed: %j", i.requestId, { message: e.message, status: e.status, code: e.code }), {}) : e.data;
+    const s = await B.post(n, o).json();
+    return s.status !== 200 ? (y == null || y.warn("[%s] fetch route failed: %j", i.requestId, { message: s.message, status: s.status, code: s.code }), {}) : s.data;
   }
-  async trajectory(t, a, i, n, o = !0, e = {}) {
-    await this.checkToken(e);
-    const r = await this.realTimePosition(t, e), d = v(a), h = v(i), c = [];
+  async trajectory(t, a, i, n, o = !0, s = {}) {
+    await this.checkToken(s);
+    const r = await this.realTimePosition(t, s), d = p(a), h = p(i), c = [];
     for (; h.diff(d, "day", !0) > 30; )
-      await this.trajectoryIn30Day(t, d, d.clone().add(30, "day"), r, n, c, e), d.add(30, "day");
-    return await this.trajectoryIn30Day(t, d, h, r, n, c, e), c;
+      await this.trajectoryIn30Day(t, d, d.clone().add(30, "day"), r, n, c, s), d.add(30, "day");
+    return await this.trajectoryIn30Day(t, d, h, r, n, c, s), c;
   }
-  async trajectoryIn30Day(t, a, i, n, o, e, r = {}) {
-    var b, j, T, g, p;
+  async trajectoryIn30Day(t, a, i, n, o, s, r = {}) {
+    var b, j, F, g, v;
     const d = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/track", h = {
       headers: {
         Authorization: `${(b = this.token) == null ? void 0 : b.tokenType} ${(j = this.token) == null ? void 0 : j.accessToken}`
@@ -277,11 +277,11 @@ class Tt extends at {
     if (c.code)
       return y == null || y.warn("[%s] fetch trajectory failed: %j", r.requestId, d, { message: c.message, status: c.status, code: c.code }), c;
     let M = -1;
-    const w = v(`${(g = (T = c.data) == null ? void 0 : T[0]) == null ? void 0 : g.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-    return (p = c.data) == null || p.forEach((f) => {
-      for (const H in f)
-        !isNaN(f[H]) && Number(f[H]) !== 1 / 0 && (f[H] = Number(f[H]));
-      const u = v(`${f.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00"), l = f.status, { labelCn: m, labelEn: I } = this.parseStatus(l), k = {
+    const w = p(`${(g = (F = c.data) == null ? void 0 : F[0]) == null ? void 0 : g.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    return (v = c.data) == null || v.forEach((f) => {
+      for (const q in f)
+        !isNaN(f[q]) && Number(f[q]) !== 1 / 0 && (f[q] = Number(f[q]));
+      const u = p(`${f.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00"), l = f.status, { labelCn: m, labelEn: I } = this.parseStatus(l), k = {
         mmsi: f.mmsi,
         imo: n == null ? void 0 : n.imo,
         lat: f.lat,
@@ -291,7 +291,7 @@ class Tt extends at {
         hdg: f.hdg,
         draught: f.draught,
         status: l,
-        eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(f.eta) ? v(`${f.eta} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00").utc().format() : void 0,
+        eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(f.eta) ? p(`${f.eta} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00").utc().format() : void 0,
         destination: f.dest,
         positionTime: u.unix(),
         labelCn: m,
@@ -299,12 +299,12 @@ class Tt extends at {
         method: "trajectory",
         vendor: "myVessel",
         utc: u.utc().format()
-      }, F = Math.floor(u.diff(w, "minute", !0) / (o || 1));
-      F !== M && (M = F, e.push(k));
-    }), e;
+      }, E = Math.floor(u.diff(w, "minute", !0) / (o || 1));
+      E !== M && (M = E, s.push(k));
+    }), s;
   }
 }
-class Ft extends at {
+class xt extends nt {
   constructor(t) {
     super();
     U(this, "token");
@@ -318,33 +318,33 @@ class Ft extends at {
       }
     }, o = await B.post(i, n).json();
     y == null || y.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 y == null || y.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: d, labelEn: h } = this.parseStatus(r), c = 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: d, labelEn: h } = this.parseStatus(r), c = p(`${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) ? p.utc(s.eta).format() : void 0,
+      destination: s.destination,
+      vesselType: s.type,
+      dwt: s.dwt,
+      build: s.buildyear,
+      flag: s.fn,
       positionTime: c.unix(),
       utc: c.utc().format(),
       status: r,
@@ -370,7 +370,7 @@ class Ft extends at {
     y == null || y.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,
@@ -380,7 +380,7 @@ class Ft extends at {
       draught: o.dr,
       type: o.t
     };
-    return i = "https://www.hifleet.com/hifleetapi/sameShipSearch.do", o = await B.post(i, n).json(), y == null || y.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(), y == null || y.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 = {
@@ -394,22 +394,22 @@ class Ft extends at {
       }
     }, o = await B.post(i, n).json();
     y == null || y.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, d) => d.score - r.score), e;
+    return s.sort((r, d) => d.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, l;
-    const r = await this.realTimePosition(t, e);
-    let d = v(a);
-    const h = v(i), c = v();
+    const r = await this.realTimePosition(t, s);
+    let d = p(a);
+    const h = p(i), c = p();
     if (o) {
       let m = h.diff(d, "d", !0);
       m < 0 ? d = h.clone().subtract(40, "d") : m < 30 ? d.subtract(10, "d") : m < 60 ? d.subtract(5, "d") : d = h.clone().subtract(80, "d"), m = c.diff(h, "d", !0), h.add(m > 10 ? 240 : m * 24, "h");
@@ -422,18 +422,18 @@ class Ft extends at {
         usertoken: this.token
       }
     }, w = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", b = await B.get(w, M).json();
-    y == null || y.info("[%s] fetch trajectory from: %s - %j", e.requestId, w, M);
+    y == null || y.info("[%s] fetch trajectory from: %s - %j", s.requestId, w, M);
     let j;
-    b && (j = ((u = (f = b.ships) == null ? void 0 : f.offors) == null ? void 0 : u.ship) || [], j.length || y == null || y.warn("[%s] fetch trajectory failed: %j", e.requestId, b));
-    const T = [];
+    b && (j = ((u = (f = b.ships) == null ? void 0 : f.offors) == null ? void 0 : u.ship) || [], j.length || y == null || y.warn("[%s] fetch trajectory failed: %j", s.requestId, b));
+    const F = [];
     let g = -1;
-    const p = v(`${(l = j == null ? void 0 : j[0]) == null ? void 0 : l.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    const v = p(`${(l = j == null ? void 0 : j[0]) == null ? void 0 : l.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
     for (const m of j) {
-      for (const A in m)
-        !isNaN(m[A]) && Number(m[A]) !== 1 / 0 && (m[A] = Number(m[A]));
-      const I = v(`${m.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+      for (const H in m)
+        !isNaN(m[H]) && Number(m[H]) !== 1 / 0 && (m[H] = Number(m[H]));
+      const I = p(`${m.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
       m.status = m.sp > 4 ? 0 : 1;
-      const { labelEn: k, labelCn: F } = this.parseStatus(m.status), H = {
+      const { labelEn: k, labelCn: E } = this.parseStatus(m.status), q = {
         mmsi: m.m,
         name: m.n,
         imo: r == null ? void 0 : r.imo,
@@ -446,17 +446,17 @@ class Ft extends at {
         positionTime: I.unix(),
         utc: I.utc().format(),
         status: m.status,
-        labelCn: F,
+        labelCn: E,
         labelEn: k,
         method: "trajectory",
         vendor: "hifleet"
-      }, x = Math.floor(I.diff(p, "minute", !0) / (n || 1));
-      x !== g && (g = x, T.push(H));
+      }, D = Math.floor(I.diff(v, "minute", !0) / (n || 1));
+      D !== g && (g = D, F.push(q));
     }
-    return T;
+    return F;
   }
 }
-class Et extends at {
+class Nt extends nt {
   constructor(t) {
     super();
     U(this, "token");
@@ -472,36 +472,36 @@ class Et extends at {
     }, n = "https://api.shipxy.com/apicall/GetSingleShip", o = await B.get(n, i).json();
     if (y == null || y.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 M in e)
-      !isNaN(e[M]) && Number(e[M]) !== 1 / 0 && (e[M] = Number(e[M]));
-    const { labelCn: r, labelEn: d } = await this.parseStatus(e.navistat), h = v.unix(e.lasttime);
+    const s = o.data[0];
+    for (const M in s)
+      !isNaN(s[M]) && Number(s[M]) !== 1 / 0 && (s[M] = Number(s[M]));
+    const { labelCn: r, labelEn: d } = await this.parseStatus(s.navistat), h = p.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: h.utc().format(),
-      status: e.navistat,
+      status: s.navistat,
       labelEn: d,
       labelCn: r,
       method: "position",
       vendor: "shipxy"
     };
   }
-  async trajectory(t, a, i, n, o = !0, e = {}) {
-    var p;
-    const r = await this.realTimePosition(t, e), d = v(a), h = v(i), c = "https://api.shipxy.com/apicall/GetShipTrack", M = {
+  async trajectory(t, a, i, n, o = !0, s = {}) {
+    var v;
+    const r = await this.realTimePosition(t, s), d = p(a), h = p(i), c = "https://api.shipxy.com/apicall/GetShipTrack", M = {
       searchParams: {
         id: t,
         k: this.token,
@@ -511,12 +511,12 @@ class Et extends at {
         etm: h.unix()
       }
     }, w = await B.get(c, M).json();
-    if (y == null || y.info("[%s] fetch trajectory from: %s - %j", e.requestId, c, M), (w == null ? void 0 : w.status) !== 0)
+    if (y == null || y.info("[%s] fetch trajectory from: %s - %j", s.requestId, c, M), (w == null ? void 0 : w.status) !== 0)
       return w;
-    const b = w == null ? void 0 : w.points, j = [], T = v.unix((p = b[0]) == null ? void 0 : p.utc);
+    const b = w == null ? void 0 : w.points, j = [], F = p.unix((v = b[0]) == null ? void 0 : v.utc);
     let g = -1;
     for (const f of b) {
-      const u = v.unix(f.utc), l = {
+      const u = p.unix(f.utc), l = {
         imo: r == null ? void 0 : r.imo,
         mmsi: t,
         sog: Math.round(f.sog * 3600 / 1e3 / 1852 * 100) / 100,
@@ -527,13 +527,13 @@ class Et extends at {
         utc: u.utc().format(),
         method: "trajectory",
         vendor: "shipxy"
-      }, m = Math.floor(u.diff(T, "minute", !0) / (n || 1));
+      }, m = Math.floor(u.diff(F, "minute", !0) / (n || 1));
       m !== g && (g = m, j.push(l));
     }
     return j;
   }
 }
-class xt extends at {
+class Dt extends nt {
   constructor(t) {
     super();
     U(this, "token");
@@ -561,16 +561,16 @@ class xt extends at {
     }, n = "https://api3.myships.com/sp/ships/aissta", o = await B.post(n, i).json();
     if (y == null || y.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", y == null || y.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", y == null || y.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 = {}) {
@@ -581,12 +581,12 @@ class xt extends at {
       json: {
         shipId: i
       }
-    }, e = "https://api3.myships.com/sp/ships/position/latest", r = await B.post(e, o).json();
-    y == null || y.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();
+    y == null || y.info("[%s] fetch realtime position from: %s - %j", a.requestId, s, o);
     const d = r.data[0];
     for (const b in d)
       !isNaN(d[b]) && Number(d[b]) !== 1 / 0 && (d[b] = Number(d[b]));
-    const { labelCn: h, labelEn: c } = await this.parseStatus(d.aisNavStatus), M = v.unix(d.posTime);
+    const { labelCn: h, labelEn: c } = await this.parseStatus(d.aisNavStatus), M = p.unix(d.posTime);
     return {
       ...n,
       mmsi: t,
@@ -605,14 +605,14 @@ class xt extends at {
       vendor: "myship"
     };
   }
-  async trajectory(t, a, i, n, o = !0, e = {}) {
-    const r = v(a), d = v(i), h = await this.getShipId(t), c = await this.getShipInfo(h), M = [];
+  async trajectory(t, a, i, n, o = !0, s = {}) {
+    const r = p(a), d = p(i), h = await this.getShipId(t), c = await this.getShipInfo(h), M = [];
     for (; d.diff(r, "day", !0) > 30; )
       await this.trajectoryIn30Day(h, r.unix(), r.add(30, "day").unix(), c, t, n, M);
     return await this.trajectoryIn30Day(h, r.unix(), d.unix(), c, t, n, M), M;
   }
-  async trajectoryIn30Day(t, a, i, n, o, e, r, d = {}) {
-    var T;
+  async trajectoryIn30Day(t, a, i, n, o, s, r, d = {}) {
+    var F;
     const h = {
       headers: {
         appKey: this.token
@@ -628,10 +628,10 @@ class xt extends at {
     const w = M.data;
     for (const g in w)
       !isNaN(w[g]) && Number(w[g]) !== 1 / 0 && (w[g] = Number(w[g]));
-    const b = v.unix((T = w[0]) == null ? void 0 : T.posTime);
+    const b = p.unix((F = w[0]) == null ? void 0 : F.posTime);
     let j = -1;
     for (const g of w) {
-      const p = v.unix(g.posTime), f = {
+      const v = p.unix(g.posTime), f = {
         imo: n == null ? void 0 : n.imo,
         mmsi: o,
         lat: Math.round(g.lat / 1e4 / 60 * 1e5) / 1e5,
@@ -640,11 +640,11 @@ class xt extends at {
         cog: Math.round(g.cog / 10 * 100) / 100,
         hdg: Math.round(g.heading * 100) / 100,
         rot: Math.round(g.rot * 100) / 100,
-        positionTime: p.unix(),
-        utc: p.utc().format(),
+        positionTime: v.unix(),
+        utc: v.utc().format(),
         method: "trajectory",
         vendor: "myship"
-      }, u = Math.floor(p.diff(b, "minute", !0) / (e || 1));
+      }, u = Math.floor(v.diff(b, "minute", !0) / (s || 1));
       u !== j && (j = u, r.push(f));
     }
     return r;
@@ -652,12 +652,12 @@ class xt extends at {
 }
 let _;
 try {
-  _ = ct.getLogger("vessel");
+  _ = ut.getLogger("vessel");
 } catch {
 } finally {
 }
-var ft = /* @__PURE__ */ ((E) => (E.NOTICE = "NOTICE", E.WARN = "WARN", E.HEAVY = "HEAVY", E.SEVERE = "SEVERE", E.ERROR = "ERROR", E.FATAL = "FATAL", E))(ft || {});
-class yt {
+var Mt = /* @__PURE__ */ ((N) => (N.NOTICE = "NOTICE", N.WARN = "WARN", N.HEAVY = "HEAVY", N.SEVERE = "SEVERE", N.ERROR = "ERROR", N.FATAL = "FATAL", N))(Mt || {});
+class bt {
   /**
    * 解析告警规则, 多规则场景
    * @param rule
@@ -666,10 +666,10 @@ class yt {
    *
    * @param options
    */
-  parsePrinciple(s, t = {}) {
-    var e, r, d;
-    _ == 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, d;
+    _ == null || _.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 = {};
@@ -691,17 +691,17 @@ class yt {
    * @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(",");
+    _ == null || _.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]
       };
     }
@@ -712,27 +712,27 @@ class yt {
    * @param principle 告警规则
    * @param options
    */
-  checkWeather(s, t, a = {}) {
-    var b, j, T, g, p, f, u, l, m, I, k, F, H, x, A;
-    let i = 0, n = 0, o = 0, e = 0;
-    const r = Math.round(((j = (b = t == null ? void 0 : t.SEVERE) == null ? void 0 : b.sigWave) == null ? void 0 : j.number) * 1.6 * 100) / 100, d = (g = (T = t == null ? void 0 : t.SEVERE) == null ? void 0 : T.sigWave) == null ? void 0 : g.number, h = (f = (p = t == null ? void 0 : t.HEAVY) == null ? void 0 : p.sigWave) == null ? void 0 : f.number, c = Math.round((((l = (u = t == null ? void 0 : t.SEVERE) == null ? void 0 : u.wind) == null ? void 0 : l.number) + 2) * 100) / 100, M = (I = (m = t == null ? void 0 : t.SEVERE) == null ? void 0 : m.wind) == null ? void 0 : I.number, w = (F = (k = t == null ? void 0 : t.HEAVY) == null ? void 0 : k.wind) == null ? void 0 : F.number;
-    for (let D = 0; D < (s == null ? void 0 : s.length); D++) {
-      const N = s[D], Y = (x = (H = N == null ? void 0 : N.meteo) == null ? void 0 : H.wave) == null ? void 0 : x.sig, L = (A = N == null ? void 0 : N.meteo) == null ? void 0 : A.wind, J = D ? v(N.eta).diff(v(s[D - 1].eta), "hour", !0) : 0;
-      e = J > e ? J : e, _ == null || _.debug("[%s] check sig.wave: %j", a.requestId, { ...Y, dgThd4Wv: r, svThd4Wv: d, hvThd4Wv: h }), (Y == null ? void 0 : Y.height) >= r ? N.isDangerous = !0 : (Y == null ? void 0 : Y.height) >= d ? N.isSevere = !0 : (Y == null ? void 0 : Y.height) >= h && (N.isHeavy = !0), _ == null || _.debug("[%s] check wind: %j", a.requestId, { ...L, dgThd4Wd: c, svThd4Wd: M, hvThd4Wd: w }), (L == null ? void 0 : L.scale) >= c ? (N.isDangerous = !0, delete N.isSevere, delete N.isHeavy) : (L == null ? void 0 : L.scale) > M ? (N.isDangerous || (N.isSevere = !0), delete N.isHeavy) : (L == null ? void 0 : L.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 b, j, F, g, v, f, u, l, m, I, k, E, q, D, H;
+    let i = 0, n = 0, o = 0, s = 0;
+    const r = Math.round(((j = (b = t == null ? void 0 : t.SEVERE) == null ? void 0 : b.sigWave) == null ? void 0 : j.number) * 1.6 * 100) / 100, d = (g = (F = t == null ? void 0 : t.SEVERE) == null ? void 0 : F.sigWave) == null ? void 0 : g.number, h = (f = (v = t == null ? void 0 : t.HEAVY) == null ? void 0 : v.sigWave) == null ? void 0 : f.number, c = Math.round((((l = (u = t == null ? void 0 : t.SEVERE) == null ? void 0 : u.wind) == null ? void 0 : l.number) + 2) * 100) / 100, M = (I = (m = t == null ? void 0 : t.SEVERE) == null ? void 0 : m.wind) == null ? void 0 : I.number, w = (E = (k = t == null ? void 0 : t.HEAVY) == null ? void 0 : k.wind) == null ? void 0 : E.number;
+    for (let T = 0; T < (e == null ? void 0 : e.length); T++) {
+      const x = e[T], O = (D = (q = x == null ? void 0 : x.meteo) == null ? void 0 : q.wave) == null ? void 0 : D.sig, R = (H = x == null ? void 0 : x.meteo) == null ? void 0 : H.wind, J = T ? p(x.eta).diff(p(e[T - 1].eta), "hour", !0) : 0;
+      s = J > s ? J : s, _ == null || _.debug("[%s] check sig.wave: %j", a.requestId, { ...O, dgThd4Wv: r, svThd4Wv: d, hvThd4Wv: h }), (O == null ? void 0 : O.height) >= r ? x.isDangerous = !0 : (O == null ? void 0 : O.height) >= d ? x.isSevere = !0 : (O == null ? void 0 : O.height) >= h && (x.isHeavy = !0), _ == null || _.debug("[%s] check wind: %j", a.requestId, { ...R, dgThd4Wd: c, svThd4Wd: M, hvThd4Wd: w }), (R == null ? void 0 : R.scale) >= c ? (x.isDangerous = !0, delete x.isSevere, delete x.isHeavy) : (R == null ? void 0 : R.scale) > M ? (x.isDangerous || (x.isSevere = !0), delete x.isHeavy) : (R == null ? void 0 : R.scale) === w && !x.isDangerous && !x.isSevere && (x.isHeavy = !0), i += x.isDangerous ? J : 0, n += x.isSevere ? J : 0, o += x.isHeavy ? J : 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: c, svThd4Wd: M, hvThd4Wd: w }, sig: { dgThd4Wv: r, svThd4Wv: d, hvThd4Wv: h } };
+    return i = Math.round(i * 100) / 100, n = Math.round(n * 100) / 100, o = Math.round(o * 100) / 100, s = Math.round(s), { sample: e, dangerous: i, severe: n, heavy: o, step: s < 3 ? 3 : s, wind: { dgThd4Wd: c, svThd4Wd: M, hvThd4Wd: w }, sig: { dgThd4Wv: r, svThd4Wv: d, hvThd4Wv: h } };
   }
 }
-const Nt = new yt();
+const At = new bt();
 let C;
 try {
-  C = ct.getLogger("vessel");
+  C = ut.getLogger("vessel");
 } catch {
 } finally {
 }
-const Mt = new mt("", !0);
-var bt = /* @__PURE__ */ ((E) => (E.common = "common", E.container = "container", E.tugs = "tugs", E))(bt || {}), gt = /* @__PURE__ */ ((E) => (E.Ballast = "Ballast", E.Laden = "Laden", E))(gt || {}), vt = /* @__PURE__ */ ((E) => (E.Cp = "CP", E.Perf = "Basis", E.Instruct = "Other", E))(vt || {});
-class R {
+const gt = new yt("", !0);
+var pt = /* @__PURE__ */ ((N) => (N.common = "common", N.container = "container", N.tugs = "tugs", N))(pt || {}), vt = /* @__PURE__ */ ((N) => (N.Ballast = "Ballast", N.Laden = "Laden", N))(vt || {}), wt = /* @__PURE__ */ ((N) => (N.Cp = "CP", N.Perf = "Basis", N.Instruct = "Other", N))(wt || {});
+class W {
   /**
    * @see https://baike.baidu.com/item/%E6%96%B9%E5%BD%A2%E7%B3%BB%E6%95%B0/4965568?fr=aladdin
    * 方形系数（block coefficient）
@@ -745,11 +745,11 @@ class R {
    * @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
@@ -762,8 +762,8 @@ class R {
    * @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;
   }
   /**
@@ -773,7 +773,7 @@ class R {
    * @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],
@@ -791,8 +791,8 @@ class R {
       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);
   }
   /**
    * 失速方向因子
@@ -805,9 +805,9 @@ class R {
    * @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;
   }
   /**
    * 失速船型因子
@@ -821,9 +821,9 @@ class R {
    * @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;
   }
   /**
    * 浪高影响因子
@@ -831,10 +831,10 @@ class R {
    * @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;
   }
   /**
    * 组装船舶运行参数
@@ -844,18 +844,18 @@ class R {
    * @param bearing 方位角
    * @private
    */
-  static assembleProperties(s, t, a, i) {
+  static assembleProperties(e, t, a, i) {
     var M;
-    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, d = ((M = s == null ? void 0 : s.type) == null ? void 0 : M.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, d = ((M = e == null ? void 0 : e.type) == null ? void 0 : M.toLowerCase()) || "common";
     return {
       tag: d.indexOf("container") > -1 ? "container" : d.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
@@ -872,29 +872,29 @@ class R {
    * @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 d;
-    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 h;
       try {
         i = (i == null ? void 0 : i.toUpperCase()) === "CMEMS" ? "ECMWF" : i, i = (i == null ? void 0 : i.toUpperCase()) === "METEO2" ? "best_match" : i;
-        const { weatherModels: b, marineModels: j } = await rt.autoPickMeteoModel(i), T = await Mt.spotForecast(t.lat, t.lng, a.utc().format(), !1, !1, !0, {
+        const { weatherModels: b, marineModels: j } = await dt.autoPickMeteoModel(i), F = await gt.spotForecast(t.lat, t.lng, a.utc().format(), !1, !1, !0, {
           ...r,
           pastDays: 1,
           forecastDays: 1,
           weatherModels: b,
           marineModels: j
-        }), [g] = rt.pickHourly(T, a);
-        h = rt.toLegacy(g);
+        }), [g] = dt.pickHourly(F, a);
+        h = dt.toLegacy(g);
       } catch (b) {
         C.warn("[%s] meteo2 spot(%j) forecast failed: %s", r.requestId, { ...t, eta: a.utc().format(), source: i }, b);
       }
-      const c = R.currentFactor(s.bearing, h == null ? void 0 : h.current, n), M = R.weatherFactor(s, h, c), w = Math.round((s.speed * 1.943844 + M + c) * 100) / 100;
+      const c = W.currentFactor(e.bearing, h == null ? void 0 : h.current, n), M = W.weatherFactor(e, h, c), w = Math.round((e.speed * 1.943844 + M + c) * 100) / 100;
       d = {
         meteo: { ...h },
         wxFactor: M,
         cFactor: c,
-        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()
       };
@@ -902,7 +902,7 @@ class R {
       d = {
         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()
       };
@@ -922,53 +922,53 @@ class R {
    * @param options
    * @private
    */
-  static async speedLoseInHoursStep(s, t, a, i, n, o, e = "", r = !0, d = !1, h = {}) {
+  static async speedLoseInHoursStep(e, t, a, i, n, o, s = "", r = !0, d = !1, h = {}) {
     t.utc();
     const c = t.clone().add(14, "days"), M = [], w = [], b = [];
-    let j = 0, T = 0, g, p;
+    let j = 0, F = 0, g, v;
     for (let f = 0; f < o.length - 1; f++) {
       let u = o[f];
-      u.distanceFromStart = Math.round((n + T) * 1e3) / 1e3;
+      u.distanceFromStart = Math.round((n + F) * 1e3) / 1e3;
       const l = o[f + 1];
-      if (s.bearing = V.calculateBearing(u, l, !l.gcToPrevious), u.bearing = s.bearing, u.suspend && d) {
+      if (e.bearing = V.calculateBearing(u, l, !l.gcToPrevious), u.bearing = e.bearing, u.suspend && d) {
         u.eta = u.eta || t.utc().format(), u.elapsed = u.elapsed ?? 0;
         const k = u.suspend - u.elapsed;
         if (i - j > k)
           i = i - j - k, t.add(k, "hour"), u.elapsed = u.suspend;
         else {
-          const F = i - j;
-          u.elapsed += F, t.add(F, "hour"), i = 0;
+          const E = i - j;
+          u.elapsed += E, t.add(E, "hour"), i = 0;
         }
         if (C == null || C.info(`[%s] suspend ${u.elapsed} hours at %j, and remain ${i} hours need to go...`, h.requestId, u), i === 0)
-          return u.distanceFromPrevious = T, { etd: t, from: p || u, to: u, next: o.filter((F) => F), wps: M, days: w, all: b };
+          return u.distanceFromPrevious = F, { etd: t, from: v || u, to: u, next: o.filter((E) => E), wps: M, days: w, all: b };
       } else
         u.suspend = 0;
-      r = t.isAfter(c) ? !1 : r, u = await R.speedLoseAt(s, u, t, e, 0, r, d, h), b.push(u), p = p || u, u.important && M.push(u), t.isSameOrAfter(a) && (w.push(u), a.add(24, "hour"));
+      r = t.isAfter(c) ? !1 : r, u = await W.speedLoseAt(e, u, t, s, 0, r, d, h), b.push(u), v = v || u, u.important && M.push(u), t.isSameOrAfter(a) && (w.push(u), a.add(24, "hour"));
       const m = V.calculateDistance(u, l, !l.gcToPrevious);
-      let I = Math.round(m / p.speed * 1e5) / 1e5;
+      let I = Math.round(m / v.speed * 1e5) / 1e5;
       if (j + I < i) {
         if (j += I, t.add(I, "hour"), delete o[f], C == null || C.debug(
           `[%s] go to %j from %j with ${m}nm, and cost ${I} hours`,
           h.requestId,
           { lat: l.lat, lng: l.lng },
-          { lat: p.lat, lng: p.lng, etd: p.etd }
-        ), T += m, o.filter((k) => k).length <= 1) {
-          g = l, g.eta = t.utc().format(), g.distanceFromPrevious = m, g.distanceFromStart = Math.round((n + T) * 1e4) / 1e4, M.push(g), b.push(g), delete o[f + 1];
+          { lat: v.lat, lng: v.lng, etd: v.etd }
+        ), F += m, o.filter((k) => k).length <= 1) {
+          g = l, g.eta = t.utc().format(), g.distanceFromPrevious = m, g.distanceFromStart = Math.round((n + F) * 1e4) / 1e4, M.push(g), b.push(g), delete o[f + 1];
           break;
         }
       } else {
         I = i - j, t.add(I, "hour");
-        const k = z.roundPrecision(p.speed * I, 5);
-        g = V.calculateCoordinate(u, s.bearing, k, "nauticalmiles", !l.gcToPrevious), g.eta = t.utc().format(), o[f] = g, C == null || C.debug(
+        const k = z.roundPrecision(v.speed * I, 5);
+        g = V.calculateCoordinate(u, e.bearing, k, "nauticalmiles", !l.gcToPrevious), g.eta = t.utc().format(), o[f] = g, C == null || C.debug(
           `[%s] go to %j from %j with ${k}nm, and cost ${I} hours`,
           h.requestId,
           { lat: g.lat, lng: g.lng },
           { lat: u.lat, lng: u.lng, etd: u.etd }
-        ), T += k, g.distanceFromPrevious = Math.round(T * 1e4) / 1e4, g.distanceFromStart = Math.round((n + T) * 1e4) / 1e4;
+        ), F += k, g.distanceFromPrevious = Math.round(F * 1e4) / 1e4, g.distanceFromStart = Math.round((n + F) * 1e4) / 1e4;
         break;
       }
     }
-    return { etd: t, from: p, to: g, next: o.filter((f) => f), wps: M, days: w, all: b };
+    return { etd: t, from: v, to: g, next: o.filter((f) => f), wps: M, days: w, all: b };
   }
   /**
    * 洋流影响因子
@@ -976,8 +976,8 @@ class R {
    * @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);
@@ -989,16 +989,16 @@ class R {
    * @param wwc 气象要素
    * @param cFactor 洋流因子
    */
-  static weatherFactor(s, t, a = 0) {
-    var w, b, j, T, g, p, f;
-    C == null || C.debug("calculate weather factor via: %j", { ...s, ...t });
-    const i = R.blockCoefficient(s.displacement, s.lbp, s.breadthMoulded, s.draught), n = z.roundPrecision(a * 1852 / 3600, 6), o = R.froudeNumber(s.speed - n, s.lbp), e = R.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, b, j, F, g, v, f;
+    C == null || C.debug("calculate weather factor via: %j", { ...e, ...t });
+    const i = W.blockCoefficient(e.displacement, e.lbp, e.breadthMoulded, e.draught), n = z.roundPrecision(a * 1852 / 3600, 6), o = W.froudeNumber(e.speed - n, e.lbp), s = W.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 d = R.directionFactor(r, (b = t == null ? void 0 : t.wind) == null ? void 0 : b.scale), h = R.vesselTagFactor(s.displacement, s.loadCondition, s.tag, (j = t == null ? void 0 : t.wind) == null ? void 0 : j.kts);
-    let c = d * e * h / 100 * (s.speed - n);
-    c = Math.round(c * 1.943844 * 1e4) / 1e4 * -1, s.tag === "tugs" && Math.abs(c) > 1 && (c = c / (Math.abs(Math.round(c)) + 1)), C == null || C.debug("wind wx factor = %d", c), r = Math.abs(s.bearing % 360 - (((g = (T = t == null ? void 0 : t.wave) == null ? void 0 : T.sig) == null ? void 0 : g.degree) % 360 || 0)), r = r > 180 ? 360 - r : r;
-    const M = R.waveHeightFactor(((f = (p = t == null ? void 0 : t.wave) == null ? void 0 : p.sig) == null ? void 0 : f.height) ?? 1, r);
+    const d = W.directionFactor(r, (b = t == null ? void 0 : t.wind) == null ? void 0 : b.scale), h = W.vesselTagFactor(e.displacement, e.loadCondition, e.tag, (j = t == null ? void 0 : t.wind) == null ? void 0 : j.kts);
+    let c = d * s * h / 100 * (e.speed - n);
+    c = Math.round(c * 1.943844 * 1e4) / 1e4 * -1, e.tag === "tugs" && Math.abs(c) > 1 && (c = c / (Math.abs(Math.round(c)) + 1)), C == null || C.debug("wind wx factor = %d", c), r = Math.abs(e.bearing % 360 - (((g = (F = t == null ? void 0 : t.wave) == null ? void 0 : F.sig) == null ? void 0 : g.degree) % 360 || 0)), r = r > 180 ? 360 - r : r;
+    const M = W.waveHeightFactor(((f = (v = t == null ? void 0 : t.wave) == null ? void 0 : v.sig) == null ? void 0 : f.height) ?? 1, r);
     return C == null || C.debug("wave wx factor = %d", M), c = Math.abs(c) > Math.abs(M) ? c : c * 0.3 + M * 0.7, C == null || C.debug("weather factor = %d", c), c = Math.abs(c) > 3 ? 3 * (Math.abs(c) / c) + Math.abs(c) / c * (Math.abs(c) - 2) * 0.1 : c, Math.round((c || 0) * 100) / 100;
   }
   /**
@@ -1014,45 +1014,45 @@ class R {
    * @param useRouteParam
    * @param options
    */
-  static async analyseInstant(s, t, a, i, n, o = "", e = 0, r = !0, d = !1, h = {}) {
+  static async analyseInstant(e, t, a, i, n, o = "", s = 0, r = !0, d = !1, h = {}) {
     var K, G, X, Q, Z, $, tt;
-    const c = v().valueOf();
-    s.lng = z.convertToStdLng(s.lng);
-    const { route: M, waypoints: w } = n.points, b = V.calculateSubRoute(s, M);
+    const c = p().valueOf();
+    e.lng = z.convertToStdLng(e.lng);
+    const { route: M, waypoints: w } = n.points, b = V.calculateSubRoute(e, M);
     if (((K = b[0]) == null ? void 0 : K.length) <= 1)
       return;
-    const { v0: j, label: T } = s.sog ? {
-      v0: s.sog,
-      label: s.label || "Other"
+    const { v0: j, label: F } = e.sog ? {
+      v0: e.sog,
+      label: e.label || "Other"
       /* Instruct */
     } : {
       v0: i.speed,
       label: "CP"
       /* Cp */
-    }, g = R.assembleProperties(a, i.loadCondition, j, 0), p = w.length ? V.calculateSubWaypoints(s, w) : [];
-    p.forEach((q) => q.important = !0);
+    }, g = W.assembleProperties(a, i.loadCondition, j, 0), v = w.length ? V.calculateSubWaypoints(e, w) : [];
+    v.forEach((A) => A.important = !0);
     const f = {
-      from: { ...s },
+      from: { ...e },
       route: b,
-      waypoints: p,
+      waypoints: v,
       v0: j,
-      label: T
+      label: F
     }, u = {
       hours: [],
       days: [],
       wps: [],
       all: []
     };
-    e || (V.calculateRouteDistance(b) / i.speed <= 72 ? e = 3 : e = 6);
-    let l = V.simplifyRouteToCoordinates(b, p, 0), m = 0, I = 0, k = 0, F = 0;
-    t = v(t).utc();
-    const H = t.clone();
+    s || (V.calculateRouteDistance(b) / i.speed <= 72 ? s = 3 : s = 6);
+    let l = V.simplifyRouteToCoordinates(b, v, 0), m = 0, I = 0, k = 0, E = 0;
+    t = p(t).utc();
+    const q = t.clone();
     for (; l.length > 0; ) {
-      const q = e - t.hour() % e, W = Math.ceil(t.clone().add(q, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4, S = await R.speedLoseInHoursStep(
+      const A = s - t.hour() % s, L = Math.ceil(t.clone().add(A, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4, S = await W.speedLoseInHoursStep(
         g,
         t,
-        H,
-        W,
+        q,
+        L,
         m,
         l,
         o,
@@ -1061,35 +1061,37 @@ class R {
         h
       );
       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)), l = S == null ? void 0 : S.next, !l.length) {
-        const O = await R.speedLoseAt(g, S.to, v(S.to.eta), o, 0, r, d, h);
-        O.bearing = g.bearing, u.hours.push(O), u.all.push(O);
+        const Y = await W.speedLoseAt(g, S.to, p(S.to.eta), o, 0, r, d, h);
+        Y.bearing = g.bearing, u.hours.push(Y), u.all.push(Y);
       }
       m += Math.round((((X = S == null ? void 0 : S.to) == null ? void 0 : X.distanceFromPrevious) ?? 0) * 1e4) / 1e4;
     }
-    const x = u.hours;
-    for (let q = 0; q < x.length - 1; q++) {
-      const W = v(x[q + 1].eta).diff(x[q].etd, "hour", !0) || 1;
-      I += (x[q].wxFactor || 0) * W, k += (x[q].cFactor || 0) * W, F += W;
+    const D = u.hours;
+    for (let A = 0; A < D.length - 1; A++) {
+      const L = p(D[A + 1].eta).diff(D[A].etd, "hour", !0) || 1;
+      I += (D[A].wxFactor || 0) * L, k += (D[A].cFactor || 0) * L, E += L;
     }
-    (Q = u.wps) == null || Q.forEach((q, W) => {
-      q.positionTime = v.utc(q.etd || q.eta).unix();
-      const S = u.wps[W - 1];
+    const H = D.reduce((A, L) => A + (L.suspend || 0), 0);
+    (Q = u.wps) == null || Q.forEach((A, L) => {
+      A.positionTime = p.utc(A.etd || A.eta).unix();
+      const S = u.wps[L - 1];
       if (S) {
-        const O = q.distanceFromStart - S.distanceFromStart, P = v(q.eta || q.etd).diff(v(S.etd || S.eta), "h", !0);
-        q.avgSpd = Math.round(O / P * 100) / 100, S.bearing = V.calculateBearing(S, q);
+        const Y = A.distanceFromStart - S.distanceFromStart, P = p(A.eta || A.etd).diff(p(S.etd || S.eta), "h", !0);
+        A.avgSpd = Math.round(Y / P * 100) / 100, S.bearing = V.calculateBearing(S, A);
       }
-    }), u.wps = (Z = u.wps) == null ? void 0 : Z.reduce((q, W) => (q.some((S) => Math.round(S.positionTime / 60) === Math.round(W.positionTime / 60)) || q.push(W), q), []), u.all = ($ = u.all) == null ? void 0 : $.reduce((q, W) => (W.positionTime = v.utc(W.etd || W.eta).unix(), q.some((S) => Math.round(S.positionTime / 60) === Math.round(W.positionTime / 60)) || q.push(W), q), []), f.sample = u;
-    const A = u.hours.at(0), D = u.hours.at(-1);
-    f.distance = Math.round(D.distanceFromStart * 1e3) / 1e3, f.etd = v(A.eta).utc().format(), f.eta = v(D.eta).utc().format(), f.wxFactor = Math.round(I / F * 1e3) / 1e3, f.cFactor = Math.round(k / F * 1e3) / 1e3, f.avgSpeed = Math.round(D.distanceFromStart / F * 1e3) / 1e3, f.totalHrs = Math.round(F * 1e3) / 1e3;
-    const { distanceInECA: N, hoursInECA: Y, totalDgoConsInECA: L, eca: J } = await this.calculateECA(f, i, h), et = z.roundPrecision(i.fo / 24 * (F - Y), 3), nt = z.roundPrecision(i.dgo / 24 * F, 3);
+    }), u.wps = (Z = u.wps) == null ? void 0 : Z.reduce((A, L) => (A.some((S) => Math.round(S.positionTime / 60) === Math.round(L.positionTime / 60)) || A.push(L), A), []), u.all = ($ = u.all) == null ? void 0 : $.reduce((A, L) => (L.positionTime = p.utc(L.etd || L.eta).unix(), A.some((S) => Math.round(S.positionTime / 60) === Math.round(L.positionTime / 60)) || A.push(L), A), []), f.sample = u;
+    const T = u.hours.at(0), x = u.hours.at(-1);
+    f.distance = Math.round(x.distanceFromStart * 1e3) / 1e3, f.etd = p(T.eta).utc().format(), f.eta = p(x.eta).utc().format(), f.wxFactor = Math.round(I / E * 1e3) / 1e3, f.cFactor = Math.round(k / E * 1e3) / 1e3, f.avgSpeed = Math.round(x.distanceFromStart / E * 1e3) / 1e3, f.totalHrs = Math.round(E * 1e3) / 1e3, f.suspend = Math.round(H * 1e3) / 1e3;
+    const O = z.roundPrecision(i.dgo / 24 * H, 3), { distanceInECA: R, hoursInECA: J, totalDgoConsInECA: ot, eca: et } = await this.calculateECA(f, i, h), st = z.roundPrecision(i.fo / 24 * (E - J), 3), it = z.roundPrecision(i.dgo / 24 * E + O, 3);
     f.extend = {
-      eca: J,
-      distanceInECA: N,
-      hoursInECA: Y,
-      totalDgoConsInECA: L
-    }, f.totalFoCons = et < 0 ? 0 : et, f.totalDgoCons = nt;
-    const st = v().valueOf() - c, it = ((tt = u == null ? void 0 : u.hours) == null ? void 0 : tt.length) || 1;
-    return C == null || C.info("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", h == null ? void 0 : h.requestId, st, it, Math.round(st / it * 1e3) / 1e3), f;
+      eca: et,
+      distanceInECA: R,
+      hoursInECA: J,
+      totalDgoConsInECA: ot,
+      totalDgoConsInSuspend: O
+    }, f.totalFoCons = st < 0 ? 0 : st, f.totalDgoCons = it;
+    const at = p().valueOf() - c, ct = ((tt = u == null ? void 0 : u.hours) == null ? void 0 : tt.length) || 1;
+    return C == null || C.info("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", h == null ? void 0 : h.requestId, at, ct, Math.round(at / ct * 1e3) / 1e3), f;
   }
   /**
    * 分段失速分析（最多走hours 小时）
@@ -1106,77 +1108,79 @@ class R {
    * @param useRouteParam
    * @param options
    */
-  static async analyseInstantWithThreshed(s, t, a, i, n, o, e, r = "", d = 3, h = !0, c = !1, M = {}) {
-    var X, Q, Z, $, tt, q, W;
-    const w = v().valueOf();
-    s.lng = z.convertToStdLng(s.lng);
-    const { v0: b, label: j } = s.sog ? {
-      v0: s.sog,
-      label: s.label || "Other"
+  static async analyseInstantWithThreshed(e, t, a, i, n, o, s, r = "", d = 3, h = !0, c = !1, M = {}) {
+    var X, Q, Z, $, tt, A, L;
+    const w = p().valueOf();
+    e.lng = z.convertToStdLng(e.lng);
+    const { v0: b, label: j } = e.sog ? {
+      v0: e.sog,
+      label: e.label || "Other"
       /* Instruct */
     } : {
       v0: n.speed,
       label: "CP"
       /* Cp */
-    }, T = R.assembleProperties(i, n.loadCondition, b, 0), g = V.calculateSubRoute(s, o);
+    }, F = W.assembleProperties(i, n.loadCondition, b, 0), g = V.calculateSubRoute(e, o);
     if (((X = g[0]) == null ? void 0 : X.length) <= 1)
       return;
-    const p = e.length ? V.calculateSubWaypoints(s, e) : [];
-    p.forEach((S) => S.important = !0);
-    let f = V.simplifyRouteToCoordinates(g, p, 0), u = 0, l = 0, m = 0, I = 0;
+    const v = s.length ? V.calculateSubWaypoints(e, s) : [];
+    v.forEach((S) => S.important = !0);
+    let f = V.simplifyRouteToCoordinates(g, v, 0), u = 0, l = 0, m = 0, I = 0;
     const k = {
       hours: [],
       wps: [],
       days: [],
       all: []
     };
-    t = v(t).utc();
-    const F = t.clone();
+    t = p(t).utc();
+    const E = t.clone();
     for (; f.length > 0; ) {
       const S = d - t.hour() % d;
-      let O = Math.ceil(t.clone().add(S, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4;
-      O = t.clone().add(O, "h").isSameOrAfter(a) ? a.diff(t, "h", !0) * 1e4 / 1e4 : O;
-      const P = await R.speedLoseInHoursStep(T, t, F, O, u, f, r, h, c, M);
-      if (k.all.push(...P.all), (Q = P.from) != null && Q.speed && (k.hours.push(P.from), P != null && P.wps && k.wps.push(...P.wps), k.days.push(...P.days)), f = P == null ? void 0 : P.next, f.length || k.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, !O)
+      let Y = Math.ceil(t.clone().add(S, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4;
+      Y = t.clone().add(Y, "h").isSameOrAfter(a) ? a.diff(t, "h", !0) * 1e4 / 1e4 : Y;
+      const P = await W.speedLoseInHoursStep(F, t, E, Y, u, f, r, h, c, M);
+      if (k.all.push(...P.all), (Q = P.from) != null && Q.speed && (k.hours.push(P.from), P != null && P.wps && k.wps.push(...P.wps), k.days.push(...P.days)), f = P == null ? void 0 : P.next, f.length || k.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, !Y)
         break;
     }
-    k.wps = ($ = k.wps) == null ? void 0 : $.reduce((S, O) => (S.some((P) => Math.round(v(P.etd).unix() / 60) === Math.round(v(O.etd).unix() / 60)) || S.push(O), S), []), k.all = (tt = k.all) == null ? void 0 : tt.reduce((S, O) => (O.positionTime = v.utc(O.etd || O.eta).unix(), S.some((P) => Math.round(v(P.etd).unix() / 60) === Math.round(v(O.etd).unix() / 60)) || S.push(O), S), []), (q = k.wps) == null || q.forEach((S, O) => {
-      const P = k.wps[O - 1];
+    k.wps = ($ = k.wps) == null ? void 0 : $.reduce((S, Y) => (S.some((P) => Math.round(p(P.etd).unix() / 60) === Math.round(p(Y.etd).unix() / 60)) || S.push(Y), S), []), k.all = (tt = k.all) == null ? void 0 : tt.reduce((S, Y) => (Y.positionTime = p.utc(Y.etd || Y.eta).unix(), S.some((P) => Math.round(p(P.etd).unix() / 60) === Math.round(p(Y.etd).unix() / 60)) || S.push(Y), S), []), (A = k.wps) == null || A.forEach((S, Y) => {
+      const P = k.wps[Y - 1];
       if (P) {
-        const dt = S.distanceFromStart - P.distanceFromStart, ut = v(S.eta || S.etd).diff(v(P.etd || P.eta), "h", !0);
-        S.avgSpd = Math.round(dt / ut * 100) / 100, P.bearing = V.calculateBearing(P, S);
+        const ht = S.distanceFromStart - P.distanceFromStart, lt = p(S.eta || S.etd).diff(p(P.etd || P.eta), "h", !0);
+        S.avgSpd = Math.round(ht / lt * 100) / 100, P.bearing = V.calculateBearing(P, S);
       }
     });
-    const H = k.hours;
-    for (let S = 0; S < H.length - 1; S++) {
-      const O = v(H[S + 1].eta).diff(H[S].etd, "hour", !0);
-      l += H[S].wxFactor * O, m += H[S].cFactor * O, I += O;
+    const q = k.hours;
+    for (let S = 0; S < q.length - 1; S++) {
+      const Y = p(q[S + 1].eta).diff(q[S].etd, "hour", !0);
+      l += q[S].wxFactor * Y, m += q[S].cFactor * Y, I += Y;
     }
-    const x = k.hours.at(0), A = k.hours.at(-1), D = await V.calculateRangeRoute(x, A, g), N = await V.calculateRangeWaypoints(x, A, g, p), Y = {
+    const D = q.reduce((S, Y) => S + (Y.suspend || 0), 0), H = k.hours.at(0), T = k.hours.at(-1), x = await V.calculateRangeRoute(H, T, g), O = await V.calculateRangeWaypoints(H, T, g, v), R = {
       sample: k,
-      distance: Math.round(((A == null ? void 0 : A.distanceFromStart) || 0) * 1e4) / 1e4,
+      distance: Math.round(((T == null ? void 0 : T.distanceFromStart) || 0) * 1e4) / 1e4,
       // 注意，可能会在first节点Drift,所有采用eta做为初始出发时间
-      etd: v(x.eta).utc().format(),
-      eta: v(A == null ? void 0 : A.eta).utc().format(),
+      etd: p(H.eta).utc().format(),
+      eta: p(T == null ? void 0 : T.eta).utc().format(),
       wxFactor: Math.round(l / I * 1e3) / 1e3,
       cFactor: Math.round(m / I * 1e3) / 1e3,
-      avgSpeed: Math.round(((A == null ? void 0 : A.distanceFromStart) || 0) / I * 1e3) / 1e3,
+      avgSpeed: Math.round(((T == null ? void 0 : T.distanceFromStart) || 0) / I * 1e3) / 1e3,
       totalHrs: Math.round(I * 1e3) / 1e3,
-      from: x,
-      to: A,
-      route: D,
-      waypoints: N,
+      suspend: Math.round(D * 1e3) / 1e3,
+      from: H,
+      to: T,
+      route: x,
+      waypoints: O,
       v0: b,
       label: j
-    }, { distanceInECA: L, hoursInECA: J, totalDgoConsInECA: et, eca: nt } = await this.calculateECA(Y, n, M), ot = z.roundPrecision(n.fo / 24 * (I - J), 3), st = z.roundPrecision(n.dgo / 24 * I, 3);
-    Y.extend = {
-      eca: nt,
-      distanceInECA: L,
-      hoursInECA: J,
-      totalDgoConsInECA: et
-    }, Y.totalDgoCons = st, Y.totalFoCons = ot < 0 ? 0 : ot;
-    const K = v().valueOf() - w, G = ((W = k == null ? void 0 : k.hours) == null ? void 0 : W.length) || 1;
-    return C == null || C.debug("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", M == null ? void 0 : M.requestId, K, G, Math.round(K / G * 1e3) / 1e3), Y;
+    }, J = z.roundPrecision(n.dgo / 24 * D, 3), { distanceInECA: ot, hoursInECA: et, totalDgoConsInECA: st, eca: it } = await this.calculateECA(R, n, M), rt = z.roundPrecision(n.fo / 24 * (I - et), 3), at = z.roundPrecision(n.dgo / 24 * I + J, 3);
+    R.extend = {
+      eca: it,
+      distanceInECA: ot,
+      hoursInECA: et,
+      totalDgoConsInECA: st,
+      totalDgoConsInSuspend: J
+    }, R.totalDgoCons = at, R.totalFoCons = rt < 0 ? 0 : rt;
+    const K = p().valueOf() - w, G = ((L = k == null ? void 0 : k.hours) == null ? void 0 : L.length) || 1;
+    return C == null || C.debug("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", M == null ? void 0 : M.requestId, K, G, Math.round(K / G * 1e3) / 1e3), R;
   }
   /**
    * 在指定航线条件下，基于多CP，动态计算最优成本(租金+油费)方案
@@ -1193,34 +1197,34 @@ class R {
    * @param lane 基础航线（重要转向点）
    * @param options
    */
-  static async analyseCost(s, t, a, i, n = {}) {
-    var g, p;
-    const o = v().valueOf(), e = [];
-    s.speedStep = s.speedStep || 3, s.alterStep = s.alterStep ?? 1;
+  static async analyseCost(e, t, a, i, n = {}) {
+    var g, v;
+    const o = p().valueOf(), s = [];
+    e.speedStep = e.speedStep || 3, e.alterStep = e.alterStep ?? 1;
     const r = V.calculateRouteDistance(i.route);
     let d = 0;
     a.forEach((f) => {
       const u = Math.ceil(r / f.speed / 24);
       d = d < u ? u : d;
     }), d = d * 1.3;
-    const h = v.utc(s.etd).add(d ?? 14, "day");
+    const h = p.utc(e.etd).add(d ?? 14, "day");
     let c = 1;
     for (const f of a) {
-      const u = JSON.parse(JSON.stringify(i.route)), l = JSON.parse(JSON.stringify(i.waypoints)), m = await R.analyseInstantWithThreshed(
-        { lat: s.lat, lng: s.lng },
-        s.etd,
+      const u = JSON.parse(JSON.stringify(i.route)), l = JSON.parse(JSON.stringify(i.waypoints)), m = await W.analyseInstantWithThreshed(
+        { lat: e.lat, lng: e.lng },
+        e.etd,
         h,
         t,
         f,
         u,
         l,
-        s.meteoVendor,
-        s.speedStep,
-        s.useMeteo,
-        s.useRouteParam,
+        e.meteoVendor,
+        e.speedStep,
+        e.useMeteo,
+        e.useRouteParam,
         n
       );
-      m && (await R.calculateCost(m, f, s, n), e.push(m), C == null || C.info("[%s][L%d-%d] analyse from %s to %s cost: %j", n.requestId, 1, c, s.etd, h.format(), {
+      m && (await W.calculateCost(m, f, e, n), s.push(m), C == null || C.info("[%s][L%d-%d] analyse from %s to %s cost: %j", n.requestId, 1, c, e.etd, h.format(), {
         cost: m.cost.total,
         hire: m.cost.hire,
         bunker: m.cost.bunker,
@@ -1229,23 +1233,23 @@ class R {
         cp: `${f.speed}/${f.fo}/${f.dgo}`
       })), c++;
     }
-    e.sort((f, u) => f.cost.total - u.cost.total);
-    const M = e.at(0), w = e.at(1), b = [];
+    s.sort((f, u) => f.cost.total - u.cost.total);
+    const M = s.at(0), w = s.at(1), b = [];
     if (b.push({ combined: !1, speeds: [M], cost: (g = M.cost) == null ? void 0 : g.total }), w) {
-      const f = M.cost.cp, u = w.cost.cp, l = v(M.eta), m = v(M.etd), I = l.diff(m, "days", !0);
+      const f = M.cost.cp, u = w.cost.cp, l = p(M.eta), m = p(M.etd), I = l.diff(m, "days", !0);
       let k = Math.ceil(I / 2);
-      k = k > 7 ? 7 : k < s.alterStep ? s.alterStep : k;
-      let F = 2, H = { combined: !1, speeds: [w], cost: (p = w.cost) == null ? void 0 : p.total }, x;
-      for (; k >= s.alterStep; ) {
-        const A = await R.combinedAnalyse(s, t, h, [f, u], i, k, { ...n, level: F });
-        if (H.cost > A.cost ? x ? (x == null ? void 0 : x.cost) > A.cost && (x = A) : (x = H, H = A) : (!x || (x == null ? void 0 : x.cost) > A.cost) && (x = A), k <= s.alterStep)
+      k = k > 7 ? 7 : k < e.alterStep ? e.alterStep : k;
+      let E = 2, q = { combined: !1, speeds: [w], cost: (v = w.cost) == null ? void 0 : v.total }, D;
+      for (; k >= e.alterStep; ) {
+        const H = await W.combinedAnalyse(e, t, h, [f, u], i, k, { ...n, level: E });
+        if (q.cost > H.cost ? D ? (D == null ? void 0 : D.cost) > H.cost && (D = H) : (D = q, q = H) : (!D || (D == null ? void 0 : D.cost) > H.cost) && (D = H), k <= e.alterStep)
           break;
-        k = Math.ceil(k / 2), F += 1;
+        k = Math.ceil(k / 2), E += 1;
       }
-      b.push(H), x && b.push(x);
+      b.push(q), D && b.push(D);
     }
-    const T = v().valueOf() - o;
-    return C == null || C.info("[%s] analyse elapsed: %d ms", n == null ? void 0 : n.requestId, T), b.sort((f, u) => f.cost - u.cost);
+    const F = p().valueOf() - o;
+    return C == null || C.info("[%s] analyse elapsed: %d ms", n == null ? void 0 : n.requestId, F), b.sort((f, u) => f.cost - u.cost);
   }
   /**
    * 按步长多次减半，分别用7,4,2,1天步长及cpa,cpb交替计算各种组合下的成本
@@ -1257,22 +1261,22 @@ class R {
    * @param step 步长，7，4，2，1
    * @param options
    */
-  static async combinedAnalyse(s, t, a, i, n, o, e = {}) {
-    e.counter = 1, C == null || C.info("[%s][L%d] analyse with alternate cp in every %d days", e.requestId, e.level, o);
-    const r = await R.alternateAnalyse(s, t, a, i, 0, n, o, e), d = r.reduce((u, l) => u + l.cost.total, 0), h = r.reduce((u, l) => u + l.cost.hire, 0), c = r.reduce((u, l) => u + l.cost.bunker, 0), M = r.reduce((u, l) => u + l.distance, 0), w = r.reduce((u, l) => u + l.totalHrs, 0);
-    C == null || C.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, C == null || C.info("[%s][L%d] analyse with alternate cp in every %d days", s.requestId, s.level, o);
+    const r = await W.alternateAnalyse(e, t, a, i, 0, n, o, s), d = r.reduce((u, l) => u + l.cost.total, 0), h = r.reduce((u, l) => u + l.cost.hire, 0), c = r.reduce((u, l) => u + l.cost.bunker, 0), M = r.reduce((u, l) => u + l.distance, 0), w = r.reduce((u, l) => u + l.totalHrs, 0);
+    C == null || C.info("[%s][L%d] cost with cpa/cpb turn: %j", s.requestId, s.level, {
       cost: d,
       hire: h,
       bunker: c,
       distance: M,
       hours: w
     });
-    const b = await R.alternateAnalyse(s, t, a, i, 1, n, o, e), j = b.reduce((u, l) => u + l.cost.total, 0), T = b.reduce((u, l) => u + l.cost.hire, 0), g = b.reduce((u, l) => u + l.cost.bunker, 0), p = b.reduce((u, l) => u + l.distance, 0), f = b.reduce((u, l) => u + l.totalHrs, 0);
-    return C == null || C.info("[%s][L%d] cost with cpb/cpa turn: %j", e.requestId, e.level, {
+    const b = await W.alternateAnalyse(e, t, a, i, 1, n, o, s), j = b.reduce((u, l) => u + l.cost.total, 0), F = b.reduce((u, l) => u + l.cost.hire, 0), g = b.reduce((u, l) => u + l.cost.bunker, 0), v = b.reduce((u, l) => u + l.distance, 0), f = b.reduce((u, l) => u + l.totalHrs, 0);
+    return C == null || C.info("[%s][L%d] cost with cpb/cpa turn: %j", s.requestId, s.level, {
       cost: j,
-      hire: T,
+      hire: F,
       bunker: g,
-      distance: p,
+      distance: v,
       hours: f
     }), d < j ? { combined: !0, cost: Math.round(d * 1e3) / 1e3, speeds: r, step: o } : { combined: !0, cost: Math.round(j * 1e3) / 1e3, speeds: b, step: o };
   }
@@ -1287,26 +1291,26 @@ class R {
    * @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 M, w;
-    let d = v.utc(s.etd);
-    const h = { lat: s.lat, lng: s.lng }, c = [];
+    let d = p.utc(e.etd);
+    const h = { lat: e.lat, lng: e.lng }, c = [];
     for (; d.isBefore(a); ) {
-      const b = d.clone().utc().add(e, "day"), j = JSON.parse(JSON.stringify(o.route)), T = JSON.parse(JSON.stringify(o.waypoints)), g = i[n], p = await R.analyseInstantWithThreshed(
+      const b = d.clone().utc().add(s, "day"), j = JSON.parse(JSON.stringify(o.route)), F = JSON.parse(JSON.stringify(o.waypoints)), g = i[n], v = await W.analyseInstantWithThreshed(
         h,
         d.utc().format(),
         b,
         t,
         g,
         j,
-        T,
-        s.meteoVendor,
-        s.speedStep,
-        s.useMeteo,
-        s.useRouteParam,
+        F,
+        e.meteoVendor,
+        e.speedStep,
+        e.useMeteo,
+        e.useRouteParam,
         r
       );
-      p && (await R.calculateCost(p, g, s, r), C == null || C.info(
+      v && (await W.calculateCost(v, g, e, r), C == null || C.info(
         "[%s][L%d-%d] analyse from %s to %s cost: %j",
         r.requestId,
         r.level,
@@ -1314,17 +1318,17 @@ class R {
         d.utc().format(),
         b.utc().format(),
         {
-          cost: p.cost.total,
-          hire: p.cost.hire,
-          bunker: p.cost.bunker,
-          distance: p.distance,
-          hours: p.totalHrs,
+          cost: v.cost.total,
+          hire: v.cost.hire,
+          bunker: v.cost.bunker,
+          distance: v.distance,
+          hours: v.totalHrs,
           cp: `${g.speed}/${g.fo}/${g.dgo}`
         }
       )), r.counter = r.counter + 1;
-      const f = (w = (M = p == null ? void 0 : p.sample) == null ? void 0 : M.hours) == null ? void 0 : w.at(-1);
+      const f = (w = (M = v == null ? void 0 : v.sample) == null ? void 0 : M.hours) == null ? void 0 : w.at(-1);
       if (f)
-        h.lat = f.lat, h.lng = f.lng, d = v(f.eta), c.push(p), n = n ? 0 : 1;
+        h.lat = f.lat, h.lng = f.lng, d = p(f.eta), c.push(v), n = n ? 0 : 1;
       else
         break;
     }
@@ -1337,39 +1341,39 @@ class R {
    * @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(s.totalHrs / 24 * (a.dailyHire || 0) * (1 - o) * 1e3) / 1e3, r = Math.round(s.totalFoCons * (a.priceFO || 0) * 1e3) / 1e3, d = Math.round((s.totalDgoCons + (((n = s.extend) == null ? void 0 : n.totalDgoConsInECA) || 0)) * (a.priceDGO || 0) * 1e3) / 1e3;
-      s.cost = {
-        total: Math.round((e + r + d) * 1e3) / 1e3,
-        hire: e,
-        bunker: Math.round((r + d) * 1e3) / 1e3,
+    if (e) {
+      const o = (a.addComm || 0) >= 1 ? (a.addComm || 0) / 100 : a.addComm || 0, s = (a.dailyHire || 0) * e.suspend / 24, r = Math.round(s + e.totalHrs / 24 * (a.dailyHire || 0) * (1 - o) * 1e3) / 1e3, d = Math.round(e.totalFoCons * (a.priceFO || 0) * 1e3) / 1e3, h = Math.round((e.totalDgoCons + (((n = e.extend) == null ? void 0 : n.totalDgoConsInECA) || 0)) * (a.priceDGO || 0) * 1e3) / 1e3;
+      e.cost = {
+        total: Math.round((r + d + h) * 1e3) / 1e3,
+        hire: r,
+        bunker: Math.round((d + h) * 1e3) / 1e3,
         cp: t
       };
     }
-    return s;
+    return e;
   }
   /**
    * 计算单cp模式下的ECA属性
    *
    */
-  static async calculateECA(s, t, a = {}) {
+  static async calculateECA(e, t, a = {}) {
     var r, d, h, c;
-    const i = await V.intersectInECA((s == null ? void 0 : s.route) || []);
-    let n = 0, o = 0, e = 0;
-    (d = (r = s == null ? void 0 : s.sample) == null ? void 0 : r.wps) == null || d.forEach((M) => {
-      M.positionTime = v.utc(M.etd || M.eta).unix();
+    const i = await V.intersectInECA((e == null ? void 0 : e.route) || []);
+    let n = 0, o = 0, s = 0;
+    (d = (r = e == null ? void 0 : e.sample) == null ? void 0 : r.wps) == null || d.forEach((M) => {
+      M.positionTime = p.utc(M.etd || M.eta).unix();
     });
     for (const M of i) {
       n += M.distance;
-      const w = await V.deadReckoningTime((h = M.waypoints) == null ? void 0 : h.at(0), s.sample.all || s.sample.wps), b = await V.deadReckoningTime((c = M.waypoints) == null ? void 0 : c.at(-1), s.sample.all || s.sample.wps);
-      M.in = w, M.out = b, M.totalHrs = z.roundPrecision((b.positionTime - w.positionTime) / 3600, 3), M.totalDgoCons = z.roundPrecision(t.fo / 24 * M.totalHrs, 3), o += M.totalHrs, e += M.totalDgoCons;
+      const w = await V.deadReckoningTime((h = M.waypoints) == null ? void 0 : h.at(0), e.sample.all || e.sample.wps), b = await V.deadReckoningTime((c = M.waypoints) == null ? void 0 : c.at(-1), e.sample.all || e.sample.wps);
+      M.in = w, M.out = b, M.totalHrs = z.roundPrecision((b.positionTime - w.positionTime) / 3600, 3), M.totalDgoCons = z.roundPrecision(t.fo / 24 * M.totalHrs, 3), o += M.totalHrs, s += M.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
     };
   }
@@ -1378,64 +1382,64 @@ class R {
    * @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((l, m) => l + m.distance, 0), n = s.reduce((l, m) => {
+    }, i = e.reduce((l, m) => l + m.distance, 0), n = e.reduce((l, m) => {
       var I;
       return l + (((I = m.extend) == null ? void 0 : I.distanceInECA) || 0);
-    }, 0), o = s.reduce((l, m) => l + m.totalHrs, 0), e = s.reduce((l, m) => {
+    }, 0), o = e.reduce((l, m) => l + m.totalHrs, 0), s = e.reduce((l, m) => {
       var I;
       return l + (((I = m.extend) == null ? void 0 : I.hoursInECA) || 0);
-    }, 0), r = s.reduce((l, m) => {
+    }, 0), r = e.reduce((l, m) => {
       var I;
       return l + (((I = m.extend) == null ? void 0 : I.totalDgoConsInECA) || 0);
-    }, 0), d = s.reduce((l, m) => l + m.wxFactor * m.totalHrs / o, 0), h = s.reduce((l, m) => l + m.cFactor * m.totalHrs / o, 0), c = s.reduce((l, m) => l + m.totalFoCons, 0), M = s.reduce((l, m) => l + m.totalDgoCons, 0), w = s.reduce((l, m) => l + m.cost.total, 0), b = s.reduce((l, m) => l + m.cost.hire, 0), j = s.reduce((l, m) => l + m.cost.bunker, 0), T = [], g = [];
-    let p;
-    for (const l of s) {
+    }, 0), d = e.reduce((l, m) => l + m.wxFactor * m.totalHrs / o, 0), h = e.reduce((l, m) => l + m.cFactor * m.totalHrs / o, 0), c = e.reduce((l, m) => l + m.totalFoCons, 0), M = e.reduce((l, m) => l + m.totalDgoCons, 0), w = e.reduce((l, m) => l + m.cost.total, 0), b = e.reduce((l, m) => l + m.cost.hire, 0), j = e.reduce((l, m) => l + m.cost.bunker, 0), F = [], g = [];
+    let v;
+    for (const l of e) {
       g.push(...((f = l.extend) == null ? void 0 : f.eca) || []);
-      const m = l.sample.hours, I = l.sample.wps, k = l.sample.days, F = m.at(0);
-      p && (F.distanceFromPrevious = p.distanceFromPrevious, F.distanceFromStart = p.distanceFromStart, m.forEach((D, N) => {
-        N && (D.distanceFromStart = D.distanceFromStart + p.distanceFromStart);
-      }), I.at(0).distanceFromPrevious = p.distanceFromPrevious, I.at(0).distanceFromStart = p.distanceFromStart, I.forEach((D, N) => {
-        N && (D.distanceFromStart = D.distanceFromStart + p.distanceFromStart);
-      }), k.at(0).distanceFromPrevious = p.distanceFromPrevious, k.at(0).distanceFromStart = p.distanceFromStart, k.forEach((D, N) => {
-        N && (D.distanceFromStart = D.distanceFromStart + p.distanceFromStart);
-      })), F.cp = l.cost.cp;
-      const H = [l.etd, l.eta], x = T.findIndex((D) => D.id === F.cp.id);
-      x === -1 ? (F.cp.segment = [H], T.push(F.cp)) : T[x].segment.push(H), m.forEach((D) => {
-        var Y;
-        ((Y = a.hours) == null ? void 0 : Y.findIndex((L) => L.eta === D.eta)) === -1 && a.hours.push(D);
-      }), I.forEach((D) => {
-        var Y;
-        ((Y = a.wps) == null ? void 0 : Y.findIndex((L) => L.eta === D.eta)) === -1 && a.wps.push(D);
-      }), k.forEach((D) => {
-        var Y;
-        ((Y = a == null ? void 0 : a.days) == null ? void 0 : Y.findIndex((L) => L.eta === D.eta)) === -1 && a.days.push(D);
+      const m = l.sample.hours, I = l.sample.wps, k = l.sample.days, E = m.at(0);
+      v && (E.distanceFromPrevious = v.distanceFromPrevious, E.distanceFromStart = v.distanceFromStart, m.forEach((T, x) => {
+        x && (T.distanceFromStart = T.distanceFromStart + v.distanceFromStart);
+      }), I.at(0).distanceFromPrevious = v.distanceFromPrevious, I.at(0).distanceFromStart = v.distanceFromStart, I.forEach((T, x) => {
+        x && (T.distanceFromStart = T.distanceFromStart + v.distanceFromStart);
+      }), k.at(0).distanceFromPrevious = v.distanceFromPrevious, k.at(0).distanceFromStart = v.distanceFromStart, k.forEach((T, x) => {
+        x && (T.distanceFromStart = T.distanceFromStart + v.distanceFromStart);
+      })), E.cp = l.cost.cp;
+      const q = [l.etd, l.eta], D = F.findIndex((T) => T.id === E.cp.id);
+      D === -1 ? (E.cp.segment = [q], F.push(E.cp)) : F[D].segment.push(q), m.forEach((T) => {
+        var O;
+        ((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 === T.eta)) === -1 && a.wps.push(T);
+      }), k.forEach((T) => {
+        var O;
+        ((O = a == null ? void 0 : a.days) == null ? void 0 : O.findIndex((R) => R.eta === T.eta)) === -1 && a.days.push(T);
       });
-      const A = (u = a.wps) == null ? void 0 : u.findIndex((D) => D.eta === F.eta);
-      A === -1 ? a.wps.push(F) : a.wps[A] = F, p = m.at(-1);
+      const H = (u = a.wps) == null ? void 0 : u.findIndex((T) => T.eta === E.eta);
+      H === -1 ? a.wps.push(E) : a.wps[H] = E, v = m.at(-1);
     }
     return a.wps.sort((l, m) => {
-      v(l.etd).unix() - v(m.etd).unix();
+      p(l.etd).unix() - p(m.etd).unix();
     }), a.wps.forEach((l, m) => {
       const I = a.wps[m - 1];
       if (I) {
-        const k = l.distanceFromStart - (I.distanceFromStart || 0), F = v(l.eta || l.etd).diff(v(I.etd || I.eta), "hour", !0), H = Math.round(k / F * 100) / 100;
-        l.avgSpd = H;
-        const x = V.calculateBearing(I, l);
-        I.bearing = x;
+        const k = l.distanceFromStart - (I.distanceFromStart || 0), E = p(l.eta || l.etd).diff(p(I.etd || I.eta), "hour", !0), q = Math.round(k / E * 100) / 100;
+        l.avgSpd = q;
+        const D = V.calculateBearing(I, l);
+        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,
@@ -1450,27 +1454,27 @@ class R {
         bunker: Math.round(j * 1e3) / 1e3
       },
       extend: {
-        cps: T,
+        cps: F,
         eca: g,
         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 {
-  at as AISImpl,
-  yt as AlertHelper,
-  ft as AlertLevel,
-  Ft as HifleetImpl,
-  gt as LoadCondition,
-  xt as MyShipImpl,
-  Tt as MyVesselImpl,
-  Et as ShipxyImpl,
-  R as SpeedHelper,
-  vt as SpeedLabel,
-  bt as VesselTag,
-  Nt as alertHelper
+  nt as AISImpl,
+  bt as AlertHelper,
+  Mt as AlertLevel,
+  xt as HifleetImpl,
+  vt as LoadCondition,
+  Dt as MyShipImpl,
+  Et as MyVesselImpl,
+  Nt as ShipxyImpl,
+  W as SpeedHelper,
+  wt as SpeedLabel,
+  pt as VesselTag,
+  At as alertHelper
 };