@idm-plugin/vessel 1.7.3 → 1.7.4

package/dist/index.js

@@ -1,12 +1,12 @@
 var dt = Object.defineProperty;
-var ut = (C, e, t) => e in C ? dt(C, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : C[e] = t;
-var G = (C, e, t) => (ut(C, typeof e != "symbol" ? e + "" : e, t), t);
+var ut = (x, e, t) => e in x ? dt(x, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : x[e] = t;
+var G = (x, e, t) => (ut(x, typeof e != "symbol" ? e + "" : e, t), t);
 import V from "got";
 import ot from "@log4js-node/log4js-api";
 import b from "moment";
 import { LngLatHelper as J, LaneHelper as W } from "@idm-plugin/geo2";
 import { MeteoHelper2 as ht, MeteoHelper as lt } from "@idm-plugin/meteo2";
-import { Meteo2Assist as ct } from "@idm-plugin/meteo";
+import { Meteo2Assist as rt } from "@idm-plugin/meteo";
 let g;
 try {
   g = ot.getLogger("vessel");
@@ -54,7 +54,7 @@ class tt {
     return { labelCn: t, labelEn: n };
   }
 }
-class xt extends tt {
+class Ct extends tt {
   constructor(t, n) {
     super();
     G(this, "clientId");
@@ -80,8 +80,8 @@ class xt extends tt {
     });
   }
   async realTimePosition(t, n = {}) {
-    var u, m, l;
-    (!this.token || b().diff(b(this.token.issuedAt), "seconds") > ((u = this.token) == null ? void 0 : u.expiresIn) - 300) && await this.authToken(n);
+    var h, m, l;
+    (!this.token || b().diff(b(this.token.issuedAt), "seconds") > ((h = this.token) == null ? void 0 : h.expiresIn) - 300) && await this.authToken(n);
     const i = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/location/unit", o = {
       headers: {
         Authorization: `${(m = this.token) == null ? void 0 : m.tokenType} ${(l = this.token) == null ? void 0 : l.accessToken}`
@@ -123,16 +123,16 @@ class xt extends tt {
   }
   async trajectory(t, n, i, o, a = !0, s = {}) {
     (!this.token || b().diff(b(this.token.issuedAt), "seconds") > this.token.expiresIn - 300) && await this.authToken(s);
-    const d = await this.realTimePosition(t, s), c = b(n), u = b(i), m = [];
-    for (; u.diff(c, "day", !0) > 30; )
-      await this.trajectoryIn30Day(t, c, c.clone().add(30, "day"), d, o, m, s), c.add(30, "day");
-    return await this.trajectoryIn30Day(t, c, u, d, o, m, s), m;
+    const d = await this.realTimePosition(t, s), r = b(n), h = b(i), m = [];
+    for (; h.diff(r, "day", !0) > 30; )
+      await this.trajectoryIn30Day(t, r, r.clone().add(30, "day"), d, o, m, s), r.add(30, "day");
+    return await this.trajectoryIn30Day(t, r, h, d, o, m, s), m;
   }
   async trajectoryIn30Day(t, n, i, o, a, s, d = {}) {
-    var f, x, F, w, v;
-    const c = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/track", u = {
+    var f, C, k, p, v;
+    const r = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/track", h = {
       headers: {
-        Authorization: `${(f = this.token) == null ? void 0 : f.tokenType} ${(x = this.token) == null ? void 0 : x.accessToken}`
+        Authorization: `${(f = this.token) == null ? void 0 : f.tokenType} ${(C = this.token) == null ? void 0 : C.accessToken}`
       },
       json: {
         mmsi: t,
@@ -140,39 +140,39 @@ class xt extends tt {
         endTime: i.utcOffset(8).format("YYYY-MM-DD HH:mm:ss")
       }
     };
-    g == null || g.info("[%s] fetch trajectory from: %s - %j", d.requestId, c, u);
-    const m = await V.post(c, u).json();
+    g == null || g.info("[%s] fetch trajectory from: %s - %j", d.requestId, r, h);
+    const m = await V.post(r, h).json();
     if (m.code)
-      return g == null || g.warn("[%s] fetch trajectory failed: %j", d.requestId, c, { message: m.message, status: m.status, code: m.code }), m;
+      return g == null || g.warn("[%s] fetch trajectory failed: %j", d.requestId, r, { message: m.message, status: m.status, code: m.code }), m;
     let l = -1;
-    const y = b(`${(w = (F = m.data) == null ? void 0 : F[0]) == null ? void 0 : w.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-    return (v = m.data) == null || v.forEach((r) => {
-      for (const Y in r)
-        !isNaN(r[Y]) && Number(r[Y]) !== 1 / 0 && (r[Y] = Number(r[Y]));
-      const p = b(`${r.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00"), M = r.status, { labelCn: h, labelEn: S } = this.parseStatus(M), k = {
-        mmsi: r.mmsi,
+    const y = b(`${(p = (k = m.data) == null ? void 0 : k[0]) == null ? void 0 : p.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    return (v = m.data) == null || v.forEach((c) => {
+      for (const Y in c)
+        !isNaN(c[Y]) && Number(c[Y]) !== 1 / 0 && (c[Y] = Number(c[Y]));
+      const w = b(`${c.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00"), M = c.status, { labelCn: u, labelEn: I } = this.parseStatus(M), F = {
+        mmsi: c.mmsi,
         imo: o == null ? void 0 : o.imo,
-        lat: r.lat,
-        lng: r.lon,
-        sog: r.sog,
-        cog: r.cog,
-        hdg: r.hdg,
-        draught: r.draught,
+        lat: c.lat,
+        lng: c.lon,
+        sog: c.sog,
+        cog: c.cog,
+        hdg: c.hdg,
+        draught: c.draught,
         status: M,
-        eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(r.eta) ? b(`${r.eta} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00").utc().format() : void 0,
-        destination: r.dest,
-        positionTime: p.unix(),
-        labelCn: h,
-        labelEn: S,
+        eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(c.eta) ? b(`${c.eta} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00").utc().format() : void 0,
+        destination: c.dest,
+        positionTime: w.unix(),
+        labelCn: u,
+        labelEn: I,
         method: "trajectory",
         vendor: "myVessel",
-        utc: p.utc().format()
-      }, P = Math.floor(p.diff(y, "minute", !0) / (a || 1));
-      P !== l && (l = P, s.push(k));
+        utc: w.utc().format()
+      }, D = Math.floor(w.diff(y, "minute", !0) / (a || 1));
+      D !== l && (l = D, s.push(F));
     }), s;
   }
 }
-class Ct extends tt {
+class xt extends tt {
   constructor(t) {
     super();
     G(this, "token");
@@ -192,7 +192,7 @@ class Ct extends tt {
     for (const y in s)
       !isNaN(s[y]) && Number(s[y]) !== 1 / 0 && (s[y] = Number(s[y]));
     s.status = s.sp > 3 ? 0 : 1;
-    const d = s.status, { labelCn: c, labelEn: u } = this.parseStatus(d), m = b(`${s.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    const d = s.status, { labelCn: r, labelEn: h } = this.parseStatus(d), m = b(`${s.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
     return {
       mmsi: s.m,
       name: s.n,
@@ -212,8 +212,8 @@ class Ct extends tt {
       positionTime: m.unix(),
       utc: m.utc().format(),
       status: d,
-      labelCn: c,
-      labelEn: u,
+      labelCn: r,
+      labelEn: h,
       method: "position",
       vendor: "hifleet"
     };
@@ -267,57 +267,57 @@ class Ct extends tt {
         imo: !d.imo || isNaN(d.imo) ? null : Number(d.imo),
         score: d._score
       });
-    return s.sort((d, c) => c.score - d.score), s;
+    return s.sort((d, r) => r.score - d.score), s;
   }
   async trajectory(t, n, i, o, a = !0, s = {}) {
-    var r, p, M;
+    var c, w, M;
     const d = await this.realTimePosition(t, s);
-    let c = b(n);
-    const u = b(i), m = b();
+    let r = b(n);
+    const h = b(i), m = b();
     if (a) {
-      let h = u.diff(c, "d", !0);
-      h < 0 ? c = u.clone().subtract(40, "d") : h < 30 ? c.subtract(10, "d") : h < 60 ? c.subtract(5, "d") : c = u.clone().subtract(80, "d"), h = m.diff(u, "d", !0), u.add(h > 10 ? 240 : h * 24, "h");
+      let u = h.diff(r, "d", !0);
+      u < 0 ? r = h.clone().subtract(40, "d") : u < 30 ? r.subtract(10, "d") : u < 60 ? r.subtract(5, "d") : r = h.clone().subtract(80, "d"), u = m.diff(h, "d", !0), h.add(u > 10 ? 240 : u * 24, "h");
     }
     const l = {
       searchParams: {
-        endtime: u.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
-        starttime: c.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
+        endtime: h.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
+        starttime: r.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
         mmsi: t,
         usertoken: this.token
       }
     }, y = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", f = await V.get(y, l).json();
     g == null || g.info("[%s] fetch trajectory from: %s - %j", s.requestId, y, l);
-    let x;
-    f && (x = ((p = (r = f.ships) == null ? void 0 : r.offors) == null ? void 0 : p.ship) || [], x.length || g == null || g.warn("[%s] fetch trajectory failed: %j", s.requestId, f));
-    const F = [];
-    let w = -1;
-    const v = b(`${(M = x == null ? void 0 : x[0]) == null ? void 0 : M.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-    for (const h of x) {
-      for (const D in h)
-        !isNaN(h[D]) && Number(h[D]) !== 1 / 0 && (h[D] = Number(h[D]));
-      const S = b(`${h.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-      h.status = h.sp > 4 ? 0 : 1;
-      const { labelEn: k, labelCn: P } = this.parseStatus(h.status), Y = {
-        mmsi: h.m,
-        name: h.n,
+    let C;
+    f && (C = ((w = (c = f.ships) == null ? void 0 : c.offors) == null ? void 0 : w.ship) || [], C.length || g == null || g.warn("[%s] fetch trajectory failed: %j", s.requestId, f));
+    const k = [];
+    let p = -1;
+    const v = b(`${(M = C == null ? void 0 : C[0]) == null ? void 0 : M.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    for (const u of C) {
+      for (const P in u)
+        !isNaN(u[P]) && Number(u[P]) !== 1 / 0 && (u[P] = Number(u[P]));
+      const I = b(`${u.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+      u.status = u.sp > 4 ? 0 : 1;
+      const { labelEn: F, labelCn: D } = this.parseStatus(u.status), Y = {
+        mmsi: u.m,
+        name: u.n,
         imo: d == null ? void 0 : d.imo,
-        lat: h.la,
-        lng: h.lo,
-        draught: h.draught,
-        sog: h.sp,
-        cog: h.co,
-        hdg: h.hdg,
-        positionTime: S.unix(),
-        utc: S.utc().format(),
-        status: h.status,
-        labelCn: P,
-        labelEn: k,
+        lat: u.la,
+        lng: u.lo,
+        draught: u.draught,
+        sog: u.sp,
+        cog: u.co,
+        hdg: u.hdg,
+        positionTime: I.unix(),
+        utc: I.utc().format(),
+        status: u.status,
+        labelCn: D,
+        labelEn: F,
         method: "trajectory",
         vendor: "hifleet"
-      }, E = Math.floor(S.diff(v, "minute", !0) / (o || 1));
-      E !== w && (w = E, F.push(Y));
+      }, E = Math.floor(I.diff(v, "minute", !0) / (o || 1));
+      E !== p && (p = E, k.push(Y));
     }
-    return F;
+    return k;
   }
 }
 class jt extends tt {
@@ -339,7 +339,7 @@ class jt extends tt {
     const s = a.data[0];
     for (const l in s)
       !isNaN(s[l]) && Number(s[l]) !== 1 / 0 && (s[l] = Number(s[l]));
-    const { labelCn: d, labelEn: c } = await this.parseStatus(s.navistat), u = b.unix(s.lasttime);
+    const { labelCn: d, labelEn: r } = await this.parseStatus(s.navistat), h = b.unix(s.lasttime);
     return {
       mmsi: s.ShipID,
       name: s.name,
@@ -355,9 +355,9 @@ class jt extends tt {
       hdg: Math.round(s.hdg / 100 * 100) / 100,
       rot: Math.round(s.rot / 100 * 100) / 100,
       positionTime: s.lasttime,
-      utc: u.utc().format(),
+      utc: h.utc().format(),
       status: s.navistat,
-      labelEn: c,
+      labelEn: r,
       labelCn: d,
       method: "position",
       vendor: "shipxy"
@@ -365,36 +365,36 @@ class jt extends tt {
   }
   async trajectory(t, n, i, o, a = !0, s = {}) {
     var v;
-    const d = await this.realTimePosition(t, s), c = b(n), u = b(i), m = "https://api.shipxy.com/apicall/GetShipTrack", l = {
+    const d = await this.realTimePosition(t, s), r = b(n), h = b(i), m = "https://api.shipxy.com/apicall/GetShipTrack", l = {
       searchParams: {
         id: t,
         k: this.token,
         enc: 1,
         cut: 0,
-        btm: c.unix(),
-        etm: u.unix()
+        btm: r.unix(),
+        etm: h.unix()
       }
     }, y = await V.get(m, l).json();
     if (g == null || g.info("[%s] fetch trajectory from: %s - %j", s.requestId, m, l), (y == null ? void 0 : y.status) !== 0)
       return y;
-    const f = y == null ? void 0 : y.points, x = [], F = b.unix((v = f[0]) == null ? void 0 : v.utc);
-    let w = -1;
-    for (const r of f) {
-      const p = b.unix(r.utc), M = {
+    const f = y == null ? void 0 : y.points, C = [], k = b.unix((v = f[0]) == null ? void 0 : v.utc);
+    let p = -1;
+    for (const c of f) {
+      const w = b.unix(c.utc), M = {
         imo: d == null ? void 0 : d.imo,
         mmsi: t,
-        sog: Math.round(r.sog * 3600 / 1e3 / 1852 * 100) / 100,
-        cog: Math.round(r.cog / 100 * 100) / 100,
-        lat: Math.round(r.lat / 1e6 * 1e5) / 1e5,
-        lng: Math.round(r.lon / 1e6 * 1e5) / 1e5,
-        positionTime: p.unix(),
-        utc: p.utc().format(),
+        sog: Math.round(c.sog * 3600 / 1e3 / 1852 * 100) / 100,
+        cog: Math.round(c.cog / 100 * 100) / 100,
+        lat: Math.round(c.lat / 1e6 * 1e5) / 1e5,
+        lng: Math.round(c.lon / 1e6 * 1e5) / 1e5,
+        positionTime: w.unix(),
+        utc: w.utc().format(),
         method: "trajectory",
         vendor: "shipxy"
-      }, h = Math.floor(p.diff(F, "minute", !0) / (o || 1));
-      h !== w && (w = h, x.push(M));
+      }, u = Math.floor(w.diff(k, "minute", !0) / (o || 1));
+      u !== p && (p = u, C.push(M));
     }
-    return x;
+    return C;
   }
 }
 class Et extends tt {
@@ -447,37 +447,37 @@ class Et extends tt {
       }
     }, s = "https://api3.myships.com/sp/ships/position/latest", d = await V.post(s, a).json();
     g == null || g.info("[%s] fetch realtime position from: %s - %j", n.requestId, s, a);
-    const c = d.data[0];
-    for (const f in c)
-      !isNaN(c[f]) && Number(c[f]) !== 1 / 0 && (c[f] = Number(c[f]));
-    const { labelCn: u, labelEn: m } = await this.parseStatus(c.aisNavStatus), l = b.unix(c.posTime);
+    const r = d.data[0];
+    for (const f in r)
+      !isNaN(r[f]) && Number(r[f]) !== 1 / 0 && (r[f] = Number(r[f]));
+    const { labelCn: h, labelEn: m } = await this.parseStatus(r.aisNavStatus), l = b.unix(r.posTime);
     return {
       ...o,
       mmsi: t,
-      lat: Math.round(c.lat / 1e4 / 60 * 1e5) / 1e5,
-      lng: Math.round(c.lon / 1e4 / 60 * 1e5) / 1e5,
-      sog: Math.round(c.sog / 10 * 100) / 100,
-      cog: Math.round(c.cog / 10 * 100) / 100,
-      hdg: Math.round(c.heading * 100) / 100,
-      rot: Math.round(c.rot * 100) / 100,
-      positionTime: c.posTime,
+      lat: Math.round(r.lat / 1e4 / 60 * 1e5) / 1e5,
+      lng: Math.round(r.lon / 1e4 / 60 * 1e5) / 1e5,
+      sog: Math.round(r.sog / 10 * 100) / 100,
+      cog: Math.round(r.cog / 10 * 100) / 100,
+      hdg: Math.round(r.heading * 100) / 100,
+      rot: Math.round(r.rot * 100) / 100,
+      positionTime: r.posTime,
       utc: l.utc().format(),
-      status: c.aisNavStatus,
+      status: r.aisNavStatus,
       labelEn: m,
-      labelCn: u,
+      labelCn: h,
       method: "position",
       vendor: "myship"
     };
   }
   async trajectory(t, n, i, o, a = !0, s = {}) {
-    const d = b(n), c = b(i), u = await this.getShipId(t), m = await this.getShipInfo(u), l = [];
-    for (; c.diff(d, "day", !0) > 30; )
-      await this.trajectoryIn30Day(u, d.unix(), d.add(30, "day").unix(), m, t, o, l);
-    return await this.trajectoryIn30Day(u, d.unix(), c.unix(), m, t, o, l), l;
+    const d = b(n), r = b(i), h = await this.getShipId(t), m = await this.getShipInfo(h), l = [];
+    for (; r.diff(d, "day", !0) > 30; )
+      await this.trajectoryIn30Day(h, d.unix(), d.add(30, "day").unix(), m, t, o, l);
+    return await this.trajectoryIn30Day(h, d.unix(), r.unix(), m, t, o, l), l;
   }
-  async trajectoryIn30Day(t, n, i, o, a, s, d, c = {}) {
-    var F;
-    const u = {
+  async trajectoryIn30Day(t, n, i, o, a, s, d, r = {}) {
+    var k;
+    const h = {
       headers: {
         appKey: this.token
       },
@@ -486,30 +486,30 @@ class Et extends tt {
         startTime: n,
         endTime: i
       }
-    }, m = "https://api3.myships.com/sp/ships/position/history", l = await V.post(m, u).json();
-    if (g == null || g.info("[%s] fetch trajectory from: %s - %j", c.requestId, m, u), l.code !== "0")
-      return g == null || g.warn("[%s] invoke myship trajectory failed: %j", c.requestId, l), l;
+    }, m = "https://api3.myships.com/sp/ships/position/history", l = await V.post(m, h).json();
+    if (g == null || g.info("[%s] fetch trajectory from: %s - %j", r.requestId, m, h), l.code !== "0")
+      return g == null || g.warn("[%s] invoke myship trajectory failed: %j", r.requestId, l), l;
     const y = l.data;
-    for (const w in y)
-      !isNaN(y[w]) && Number(y[w]) !== 1 / 0 && (y[w] = Number(y[w]));
-    const f = b.unix((F = y[0]) == null ? void 0 : F.posTime);
-    let x = -1;
-    for (const w of y) {
-      const v = b.unix(w.posTime), r = {
+    for (const p in y)
+      !isNaN(y[p]) && Number(y[p]) !== 1 / 0 && (y[p] = Number(y[p]));
+    const f = b.unix((k = y[0]) == null ? void 0 : k.posTime);
+    let C = -1;
+    for (const p of y) {
+      const v = b.unix(p.posTime), c = {
         imo: o == null ? void 0 : o.imo,
         mmsi: a,
-        lat: Math.round(w.lat / 1e4 / 60 * 1e5) / 1e5,
-        lng: Math.round(w.lon / 1e4 / 60 * 1e5) / 1e5,
-        sog: Math.round(w.sog / 10 * 100) / 100,
-        cog: Math.round(w.cog / 10 * 100) / 100,
-        hdg: Math.round(w.heading * 100) / 100,
-        rot: Math.round(w.rot * 100) / 100,
+        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: v.unix(),
         utc: v.utc().format(),
         method: "trajectory",
         vendor: "myship"
-      }, p = Math.floor(v.diff(f, "minute", !0) / (s || 1));
-      p !== x && (x = p, d.push(r));
+      }, w = Math.floor(v.diff(f, "minute", !0) / (s || 1));
+      w !== C && (C = w, d.push(c));
     }
     return d;
   }
@@ -520,7 +520,7 @@ try {
 } catch {
 } finally {
 }
-var ft = /* @__PURE__ */ ((C) => (C.NOTICE = "NOTICE", C.WARN = "WARN", C.HEAVY = "HEAVY", C.SEVERE = "SEVERE", C.ERROR = "ERROR", C.FATAL = "FATAL", C))(ft || {});
+var ft = /* @__PURE__ */ ((x) => (x.NOTICE = "NOTICE", x.WARN = "WARN", x.HEAVY = "HEAVY", x.SEVERE = "SEVERE", x.ERROR = "ERROR", x.FATAL = "FATAL", x))(ft || {});
 class mt {
   /**
    * 解析告警规则, 多规则场景
@@ -531,15 +531,15 @@ class mt {
    * @param options
    */
   parsePrinciple(e, t = {}) {
-    var s, d, c;
+    var s, d, r;
     B == null || B.info("[%s] parse rule: %s", t.requestId, e);
     const n = new RegExp("(?<=\\[)(.+)(?=])", "g"), i = e.match(n) ? (s = e.match(n)) == null ? void 0 : s[0] : void 0, o = i == null ? void 0 : i.split(";");
     if (!o)
       return;
     const a = {};
-    for (let u = 0; u < (o == null ? void 0 : o.length); u++) {
-      const m = (c = (d = o[u].match(n)) == null ? void 0 : d[0]) == null ? void 0 : c.split("],");
-      if (u === 0 && !m)
+    for (let h = 0; h < (o == null ? void 0 : o.length); h++) {
+      const m = (r = (d = o[h].match(n)) == null ? void 0 : d[0]) == null ? void 0 : r.split("],");
+      if (h === 0 && !m)
         a.scope = o[0];
       else if (m)
         for (let l = 0, y = m.length; l < y; l++) {
@@ -575,25 +575,25 @@ class mt {
    * @param options
    */
   checkWeather(e, t, n = {}) {
-    var f, x, F, w, v, r, p, M, h, S, k, P, Y, E, D;
+    var f, C, k, p, v, c, w, M, u, I, F, D, Y, E, P;
     let i = 0, o = 0, a = 0, s = 0;
-    const d = Math.round(((x = (f = t == null ? void 0 : t.SEVERE) == null ? void 0 : f.sigWave) == null ? void 0 : x.number) * 1.6 * 100) / 100, c = (w = (F = t == null ? void 0 : t.SEVERE) == null ? void 0 : F.sigWave) == null ? void 0 : w.number, u = (r = (v = t == null ? void 0 : t.HEAVY) == null ? void 0 : v.sigWave) == null ? void 0 : r.number, m = Math.round((((M = (p = t == null ? void 0 : t.SEVERE) == null ? void 0 : p.wind) == null ? void 0 : M.number) + 2) * 100) / 100, l = (S = (h = t == null ? void 0 : t.SEVERE) == null ? void 0 : h.wind) == null ? void 0 : S.number, y = (P = (k = t == null ? void 0 : t.HEAVY) == null ? void 0 : k.wind) == null ? void 0 : P.number;
+    const d = Math.round(((C = (f = t == null ? void 0 : t.SEVERE) == null ? void 0 : f.sigWave) == null ? void 0 : C.number) * 1.6 * 100) / 100, r = (p = (k = t == null ? void 0 : t.SEVERE) == null ? void 0 : k.sigWave) == null ? void 0 : p.number, h = (c = (v = t == null ? void 0 : t.HEAVY) == null ? void 0 : v.sigWave) == null ? void 0 : c.number, m = Math.round((((M = (w = t == null ? void 0 : t.SEVERE) == null ? void 0 : w.wind) == null ? void 0 : M.number) + 2) * 100) / 100, l = (I = (u = t == null ? void 0 : t.SEVERE) == null ? void 0 : u.wind) == null ? void 0 : I.number, y = (D = (F = t == null ? void 0 : t.HEAVY) == null ? void 0 : F.wind) == null ? void 0 : D.number;
     for (let N = 0; N < (e == null ? void 0 : e.length); N++) {
-      const j = e[N], A = (E = (Y = j == null ? void 0 : j.meteo) == null ? void 0 : Y.wave) == null ? void 0 : E.sig, R = (D = j == null ? void 0 : j.meteo) == null ? void 0 : D.wind, K = N ? b(j.eta).diff(b(e[N - 1].eta), "hour", !0) : 0;
-      s = K > s ? K : s, B == null || B.info("[%s] check sig.wave: %j", n.requestId, { ...A, dgThd4Wv: d, svThd4Wv: c, hvThd4Wv: u }), (A == null ? void 0 : A.height) >= d ? j.isDangerous = !0 : (A == null ? void 0 : A.height) >= c ? j.isSevere = !0 : (A == null ? void 0 : A.height) >= u && (j.isHeavy = !0), B == null || B.info("[%s] check wind: %j", n.requestId, { ...R, dgThd4Wd: m, svThd4Wd: l, hvThd4Wd: y }), (R == null ? void 0 : R.scale) >= m ? (j.isDangerous = !0, delete j.isSevere, delete j.isHeavy) : (R == null ? void 0 : R.scale) > l ? (j.isDangerous || (j.isSevere = !0), delete j.isHeavy) : (R == null ? void 0 : R.scale) === y && !j.isDangerous && !j.isSevere && (j.isHeavy = !0), i += j.isDangerous ? K : 0, o += j.isSevere ? K : 0, a += j.isHeavy ? K : 0;
+      const j = e[N], A = (E = (Y = j == null ? void 0 : j.meteo) == null ? void 0 : Y.wave) == null ? void 0 : E.sig, R = (P = j == null ? void 0 : j.meteo) == null ? void 0 : P.wind, K = N ? b(j.eta).diff(b(e[N - 1].eta), "hour", !0) : 0;
+      s = K > s ? K : s, B == null || B.info("[%s] check sig.wave: %j", n.requestId, { ...A, dgThd4Wv: d, svThd4Wv: r, hvThd4Wv: h }), (A == null ? void 0 : A.height) >= d ? j.isDangerous = !0 : (A == null ? void 0 : A.height) >= r ? j.isSevere = !0 : (A == null ? void 0 : A.height) >= h && (j.isHeavy = !0), B == null || B.info("[%s] check wind: %j", n.requestId, { ...R, dgThd4Wd: m, svThd4Wd: l, hvThd4Wd: y }), (R == null ? void 0 : R.scale) >= m ? (j.isDangerous = !0, delete j.isSevere, delete j.isHeavy) : (R == null ? void 0 : R.scale) > l ? (j.isDangerous || (j.isSevere = !0), delete j.isHeavy) : (R == null ? void 0 : R.scale) === y && !j.isDangerous && !j.isSevere && (j.isHeavy = !0), i += j.isDangerous ? K : 0, o += j.isSevere ? K : 0, a += j.isHeavy ? K : 0;
     }
-    return i = Math.round(i * 100) / 100, o = Math.round(o * 100) / 100, a = Math.round(a * 100) / 100, s = Math.round(s), { sample: e, dangerous: i, severe: o, heavy: a, step: s < 3 ? 3 : s, wind: { dgThd4Wd: m, svThd4Wd: l, hvThd4Wd: y }, sig: { dgThd4Wv: d, svThd4Wv: c, hvThd4Wv: u } };
+    return i = Math.round(i * 100) / 100, o = Math.round(o * 100) / 100, a = Math.round(a * 100) / 100, s = Math.round(s), { sample: e, dangerous: i, severe: o, heavy: a, step: s < 3 ? 3 : s, wind: { dgThd4Wd: m, svThd4Wd: l, hvThd4Wd: y }, sig: { dgThd4Wv: d, svThd4Wv: r, hvThd4Wv: h } };
   }
 }
 const Nt = new mt();
-let I;
+let S;
 try {
-  I = ot.getLogger("vessel");
+  S = ot.getLogger("vessel");
 } catch {
 } finally {
 }
 const yt = new ht("", !0);
-var Mt = /* @__PURE__ */ ((C) => (C.common = "common", C.container = "container", C.tugs = "tugs", C))(Mt || {}), gt = /* @__PURE__ */ ((C) => (C.Ballast = "Ballast", C.Laden = "Laden", C))(gt || {}), bt = /* @__PURE__ */ ((C) => (C.Cp = "CP", C.Perf = "Basis", C.Instruct = "Other", C))(bt || {});
+var Mt = /* @__PURE__ */ ((x) => (x.common = "common", x.container = "container", x.tugs = "tugs", x))(Mt || {}), gt = /* @__PURE__ */ ((x) => (x.Ballast = "Ballast", x.Laden = "Laden", x))(gt || {}), bt = /* @__PURE__ */ ((x) => (x.Cp = "CP", x.Perf = "Basis", x.Instruct = "Other", x))(bt || {});
 class O {
   /**
    * @see https://baike.baidu.com/item/%E6%96%B9%E5%BD%A2%E7%B3%BB%E6%95%B0/4965568?fr=aladdin
@@ -707,9 +707,9 @@ class O {
    */
   static assembleProperties(e, t, n, i) {
     var l;
-    const o = e.lbp ?? e.length ?? e.lengthOverall ?? 198.9642, a = e.draught ?? 8, s = e.breadthMoulded ?? e.breadth ?? e.breadthExtreme ?? 32.4572, d = e.deadweight ?? 67035.7773, c = ((l = e == null ? void 0 : e.type) == null ? void 0 : l.toLowerCase()) || "common";
+    const o = e.lbp ?? e.length ?? e.lengthOverall ?? 198.9642, a = e.draught ?? 8, s = e.breadthMoulded ?? e.breadth ?? e.breadthExtreme ?? 32.4572, d = e.deadweight ?? 67035.7773, r = ((l = e == null ? void 0 : e.type) == null ? void 0 : l.toLowerCase()) || "common";
     return {
-      tag: c.indexOf("container") > -1 ? "container" : c.indexOf("tugs") > -1 ? "tugs" : "common",
+      tag: r.indexOf("container") > -1 ? "container" : r.indexOf("tugs") > -1 ? "tugs" : "common",
       lbp: o,
       loadCondition: t,
       draught: a,
@@ -733,21 +733,21 @@ class O {
    * @param useRouteParam true 启用设置速度
    */
   static async speedLoseAt(e, t, n, i = "", o = 2, a = !0, s = !1, d = {}) {
-    let c;
+    let r;
     if (t.velocity && s && (e.speed = J.roundPrecision(t.velocity * 1852 / 3600, 6)), a) {
-      let u;
+      let h;
       if (d.meteo2)
         try {
-          const f = await yt.spotForecast(t.lat, t.lng, n.utc().format(), !1, !1, !0, d), [x] = ct.pickHourly(f, n);
-          u = ct.toLegacy(x);
+          const f = await yt.spotForecast(t.lat, t.lng, n.utc().format(), !1, !1, !0, d), [C] = rt.pickHourly(f, n);
+          h = rt.toLegacy(C);
         } catch (f) {
-          I.warn("[%s] meteo2 spot(%j) forecast failed: %s", d.requestId, { ...t, eta: n.utc().format() }, f);
+          S.warn("[%s] meteo2 spot(%j) forecast failed: %s", d.requestId, { ...t, eta: n.utc().format() }, f);
         }
       else
-        u = await lt.queryPointFactor(t.lng, t.lat, n.valueOf(), "wind,wave,current,watertemp", i, d);
-      const m = O.weatherFactor(e, u), l = O.currentFactor(e.bearing, u == null ? void 0 : u.current, o), y = Math.round((e.speed * 1.943844 + m + l) * 100) / 100;
-      c = {
-        meteo: { ...u },
+        h = await lt.queryPointFactor(t.lng, t.lat, n.valueOf(), "wind,wave,current,watertemp", i, d);
+      const m = O.weatherFactor(e, h), l = O.currentFactor(e.bearing, h == null ? void 0 : h.current, o), y = Math.round((e.speed * 1.943844 + m + l) * 100) / 100;
+      r = {
+        meteo: { ...h },
         wxFactor: m,
         cFactor: l,
         speed: t.velocity && s ? t.velocity : y < 0 ? 1 : y,
@@ -755,14 +755,14 @@ class O {
         etd: n.utc().format()
       };
     } else
-      c = {
+      r = {
         wxFactor: 0,
         cFactor: 0,
         speed: t.velocity && s ? t.velocity : Math.round((e.speed * 1.943844 + 0 + 0) * 100) / 100,
         eta: n.utc().format(),
         etd: n.utc().format()
       };
-    return delete t.meteo, delete t.wxFactor, delete t.cFactor, delete t.speed, delete t.etd, { ...c, ...t };
+    return delete t.meteo, delete t.wxFactor, delete t.cFactor, delete t.speed, delete t.etd, { ...r, ...t };
   }
   /**
    * 基于步长计算失速样本
@@ -777,53 +777,53 @@ class O {
    * @param useRouteParam true 启用航线上设置的参数 { suspend: 停留时长（小时）, velocity: 速度（kts）}
    * @private
    */
-  static async speedLoseInHoursStep(e, t, n, i, o, a, s = "", d = !0, c = !1, u = {}) {
+  static async speedLoseInHoursStep(e, t, n, i, o, a, s = "", d = !0, r = !1, h = {}) {
     t.utc();
     const m = t.clone().add(14, "days"), l = [], y = [];
-    let f = 0, x = 0, F, w;
+    let f = 0, C = 0, k, p;
     for (let v = 0; v < a.length - 1; v++) {
-      let r = a[v];
-      r.distanceFromStart = Math.round((o + x) * 1e4) / 1e4;
-      const p = a[v + 1];
-      if (e.bearing = W.calculateBearing(r, p, !p.gcToPrevious), r.bearing = e.bearing, r.suspend && c) {
-        r.eta = r.eta || t.utc().format(), r.elapsed = r.elapsed ?? 0;
-        const S = r.suspend - r.elapsed;
-        if (i - f > S)
-          i = i - f - S, t.add(S, "hour"), r.elapsed = r.suspend;
+      let c = a[v];
+      c.distanceFromStart = Math.round((o + C) * 1e4) / 1e4;
+      const w = a[v + 1];
+      if (e.bearing = W.calculateBearing(c, w, !w.gcToPrevious), c.bearing = e.bearing, c.suspend && r) {
+        c.eta = c.eta || t.utc().format(), c.elapsed = c.elapsed ?? 0;
+        const I = c.suspend - c.elapsed;
+        if (i - f > I)
+          i = i - f - I, t.add(I, "hour"), c.elapsed = c.suspend;
         else {
-          const k = i - f;
-          r.elapsed += k, t.add(k, "hour"), i = 0;
+          const F = i - f;
+          c.elapsed += F, t.add(F, "hour"), i = 0;
         }
-        if (I == null || I.info(`[%s] suspend ${r.elapsed} hours at %j, and remain ${i} hours need to go...`, u.requestId, r), i === 0)
-          return r.distanceFromPrevious = x, { etd: t, from: w || r, to: r, next: a.filter((k) => k), wps: l, days: y };
+        if (S == null || S.info(`[%s] suspend ${c.elapsed} hours at %j, and remain ${i} hours need to go...`, h.requestId, c), i === 0)
+          return c.distanceFromPrevious = C, { etd: t, from: p || c, to: c, next: a.filter((F) => F), wps: l, days: y };
       } else
-        r.suspend = 0;
-      d = t.isAfter(m) ? !1 : d, r = await O.speedLoseAt(e, r, t, s, 0, d, c, u), w = w || r, r.important && l.push(r), t.isSameOrAfter(n) && (y.push(r), n.add(24, "hour"));
-      const M = W.calculateDistance(r, p, !p.gcToPrevious);
-      let h = Math.round(M / w.speed * 1e5) / 1e5;
-      if (f + h < i) {
-        if (f += h, t.add(h, "hour"), delete a[v], I == null || I.debug(
-          `[%s] go to %j from %j with ${M}nm, and cost ${h} hours`,
-          u.requestId,
-          { lat: p.lat, lng: p.lng },
-          { lat: w.lat, lng: w.lng, etd: w.etd }
-        ), x += M, a.filter((S) => S).length <= 1) {
-          F = p, F.eta = t.utc().format(), F.distanceFromPrevious = M, F.distanceFromStart = Math.round((o + x) * 1e4) / 1e4, l.push(F), delete a[v + 1];
+        c.suspend = 0;
+      d = t.isAfter(m) ? !1 : d, c = await O.speedLoseAt(e, c, t, s, 0, d, r, h), p = p || c, c.important && l.push(c), t.isSameOrAfter(n) && (y.push(c), n.add(24, "hour"));
+      const M = W.calculateDistance(c, w, !w.gcToPrevious);
+      let u = Math.round(M / p.speed * 1e5) / 1e5;
+      if (f + u < i) {
+        if (f += u, t.add(u, "hour"), delete a[v], S == null || S.debug(
+          `[%s] go to %j from %j with ${M}nm, and cost ${u} hours`,
+          h.requestId,
+          { lat: w.lat, lng: w.lng },
+          { lat: p.lat, lng: p.lng, etd: p.etd }
+        ), C += M, a.filter((I) => I).length <= 1) {
+          k = w, k.eta = t.utc().format(), k.distanceFromPrevious = M, k.distanceFromStart = Math.round((o + C) * 1e4) / 1e4, l.push(k), delete a[v + 1];
           break;
         }
       } else {
-        h = i - f, t.add(h, "hour");
-        const S = J.roundPrecision(w.speed * h, 5);
-        F = W.calculateCoordinate(r, e.bearing, S, "nauticalmiles", !p.gcToPrevious), F.eta = t.utc().format(), a[v] = F, I == null || I.debug(
-          `[%s] go to %j from %j with ${S}nm, and cost ${h} hours`,
-          u.requestId,
-          { lat: F.lat, lng: F.lng },
-          { lat: r.lat, lng: r.lng, etd: r.etd }
-        ), x += S, F.distanceFromPrevious = Math.round(x * 1e4) / 1e4, F.distanceFromStart = Math.round((o + x) * 1e4) / 1e4;
+        u = i - f, t.add(u, "hour");
+        const I = J.roundPrecision(p.speed * u, 5);
+        k = W.calculateCoordinate(c, e.bearing, I, "nauticalmiles", !w.gcToPrevious), k.eta = t.utc().format(), a[v] = k, S == null || S.debug(
+          `[%s] go to %j from %j with ${I}nm, and cost ${u} hours`,
+          h.requestId,
+          { lat: k.lat, lng: k.lng },
+          { lat: c.lat, lng: c.lng, etd: c.etd }
+        ), C += I, k.distanceFromPrevious = Math.round(C * 1e4) / 1e4, k.distanceFromStart = Math.round((o + C) * 1e4) / 1e4;
         break;
       }
     }
-    return { etd: t, from: w, to: F, next: a.filter((v) => v), wps: l, days: y };
+    return { etd: t, from: p, to: k, next: a.filter((v) => v), wps: l, days: y };
   }
   /**
    * 洋流影响因子
@@ -844,16 +844,16 @@ class O {
    * @param wwc 气象要素
    */
   static weatherFactor(e, t) {
-    var m, l, y, f, x, F, w;
-    I == null || I.debug("calculate weather factor via: %j", { ...e, ...t });
+    var m, l, y, f, C, k, p;
+    S == null || S.debug("calculate weather factor via: %j", { ...e, ...t });
     const n = O.blockCoefficient(e.displacement, e.lbp, e.breadthMoulded, e.draught), i = O.froudeNumber(e.speed, e.lbp), o = O.amendFactor(n, i, e.loadCondition);
     let a = Math.abs(e.bearing % 360 - (((m = t == null ? void 0 : t.wind) == null ? void 0 : m.degree) % 360 || 0));
     a = a > 180 ? 360 - a : a;
     const s = O.directionFactor(a, (l = t == null ? void 0 : t.wind) == null ? void 0 : l.scale), d = O.vesselTagFactor(e.displacement, e.loadCondition, e.tag, (y = t == null ? void 0 : t.wind) == null ? void 0 : y.scale);
-    let c = s * o * d / 100 * e.speed;
-    c = Math.round(c * 1.943844 * 1e4) / 1e4 * -1, e.tag === "tugs" && Math.abs(c) > 1 && (c = c / (Math.abs(Math.round(c)) + 1)), I == null || I.debug("wind wx factor = %d", c), a = Math.abs(e.bearing % 360 - (((x = (f = t == null ? void 0 : t.wave) == null ? void 0 : f.sig) == null ? void 0 : x.degree) % 360 || 0));
-    const u = O.waveHeightFactor(((w = (F = t == null ? void 0 : t.wave) == null ? void 0 : F.sig) == null ? void 0 : w.height) ?? 1, a);
-    return I == null || I.debug("wave wx factor = %d", u), c = c * 0.4 + u, I == null || I.debug("weather factor = %d", c), c = Math.abs(c) > 4 ? 4 * (Math.abs(c) / c) + Math.abs(c) / c * (Math.abs(c) - 4) * 0.1 : c, Math.round((c || 0) * 100) / 100;
+    let r = s * o * d / 100 * e.speed;
+    r = Math.round(r * 1.943844 * 1e4) / 1e4 * -1, e.tag === "tugs" && Math.abs(r) > 1 && (r = r / (Math.abs(Math.round(r)) + 1)), S == null || S.debug("wind wx factor = %d", r), a = Math.abs(e.bearing % 360 - (((C = (f = t == null ? void 0 : t.wave) == null ? void 0 : f.sig) == null ? void 0 : C.degree) % 360 || 0));
+    const h = O.waveHeightFactor(((p = (k = t == null ? void 0 : t.wave) == null ? void 0 : k.sig) == null ? void 0 : p.height) ?? 1, a);
+    return S == null || S.debug("wave wx factor = %d", h), r = r * 0.4 + h, S == null || S.debug("weather factor = %d", r), r = Math.abs(r) > 4 ? 4 * (Math.abs(r) / r) + Math.abs(r) / r * (Math.abs(r) - 4) * 0.1 : r, Math.round((r || 0) * 100) / 100;
   }
   /**
    * 全程失速分析(走完航程)
@@ -867,14 +867,14 @@ class O {
    * @param useMeteo true 启用气象分析
    * @param useRouteParam
    */
-  static async analyseInstant(e, t, n, i, o, a = "", s = 0, d = !0, c = !1, u = {}) {
+  static async analyseInstant(e, t, n, i, o, a = "", s = 0, d = !0, r = !1, h = {}) {
     var z, U, Q, X, Z;
     const m = b().valueOf();
     e.lng = J.convertToStdLng(e.lng);
     const { route: l, waypoints: y } = o.points, f = W.calculateSubRoute(e, l);
     if (((z = f[0]) == null ? void 0 : z.length) <= 1)
       return;
-    const { v0: x, label: F } = e.sog ? {
+    const { v0: C, label: k } = e.sog ? {
       v0: e.sog,
       label: "Other"
       /* Instruct */
@@ -882,60 +882,60 @@ class O {
       v0: i.speed,
       label: "CP"
       /* Cp */
-    }, w = O.assembleProperties(n, i.loadCondition, x, 0), v = y.length ? W.calculateSubWaypoints(e, y) : [];
+    }, p = O.assembleProperties(n, i.loadCondition, C, 0), v = y.length ? W.calculateSubWaypoints(e, y) : [];
     v.forEach((H) => H.important = !0);
-    const r = {
+    const c = {
       from: { ...e },
       route: f,
       waypoints: v,
-      v0: x,
-      label: F
-    }, p = {
+      v0: C,
+      label: k
+    }, w = {
       hours: [],
       days: [],
       wps: []
     };
     s || (W.calculateRouteDistance(f) / i.speed <= 72 ? s = 3 : s = 6);
-    let M = W.simplifyRouteToCoordinates(f, v, 0), h = 0, S = 0, k = 0, P = 0;
+    let M = W.simplifyRouteToCoordinates(f, v, 0), u = 0, I = 0, F = 0, D = 0;
     t = b(t).utc();
     const Y = t.clone();
     for (; M.length > 0; ) {
       const H = s - t.hour() % s, _ = Math.ceil(t.clone().add(H, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4, T = await O.speedLoseInHoursStep(
-        w,
+        p,
         t,
         Y,
         _,
-        h,
+        u,
         M,
         a,
         d,
-        c,
-        u
+        r,
+        h
       );
-      (U = T.from) != null && U.speed && (p.hours.push(T.from), p.wps.push(...T.wps), p.days.push(...T.days)), M = T == null ? void 0 : T.next, M.length || p.hours.push(T == null ? void 0 : T.to), h += Math.round((((Q = T == null ? void 0 : T.to) == null ? void 0 : Q.distanceFromPrevious) ?? 0) * 1e4) / 1e4;
+      (U = T.from) != null && U.speed && (w.hours.push(T.from), w.wps.push(...T.wps), w.days.push(...T.days)), M = T == null ? void 0 : T.next, M.length || w.hours.push(T == null ? void 0 : T.to), u += Math.round((((Q = T == null ? void 0 : T.to) == null ? void 0 : Q.distanceFromPrevious) ?? 0) * 1e4) / 1e4;
     }
-    const E = p.hours;
+    const E = w.hours;
     for (let H = 0; H < E.length - 1; H++) {
       const _ = b(E[H + 1].eta).diff(E[H].etd, "hour", !0) || 1;
-      S += (E[H].wxFactor || 0) * _, k += (E[H].cFactor || 0) * _, P += _;
+      I += (E[H].wxFactor || 0) * _, F += (E[H].cFactor || 0) * _, D += _;
     }
-    (X = p.wps) == null || X.forEach((H, _) => {
+    (X = w.wps) == null || X.forEach((H, _) => {
       if (H.positionTime = b.utc(H.etd || H.eta).unix(), _) {
-        const T = p.wps[_ - 1], L = H.distanceFromStart - T.distanceFromStart, q = b(H.eta).diff(b(T.etd), "h", !0);
+        const T = w.wps[_ - 1], L = H.distanceFromStart - T.distanceFromStart, q = b(H.eta).diff(b(T.etd), "h", !0);
         q < 0.5 ? H.avgSpd = T.speed : H.avgSpd = Math.round(L / q * 100) / 100;
       }
-    }), r.sample = p;
-    const D = p.hours.at(0), N = p.hours.at(-1);
-    r.distance = Math.round(N.distanceFromStart * 1e4) / 1e4, r.etd = b(D.eta).utc().format(), r.eta = b(N.eta).utc().format(), r.wxFactor = Math.round(S / P * 1e4) / 1e4, r.cFactor = Math.round(k / P * 1e4) / 1e4, r.avgSpeed = Math.round(N.distanceFromStart / P * 1e4) / 1e4, r.totalHrs = Math.round(P * 1e4) / 1e4;
-    const { distanceInECA: j, hoursInECA: A, totalDgoConsInECA: R, eca: K } = await this.calculateECA(r, i, u), et = J.roundPrecision(i.fo / 24 * (P - A), 3), st = J.roundPrecision(i.dgo / 24 * P, 3);
-    r.extend = {
+    }), c.sample = w;
+    const P = w.hours.at(0), N = w.hours.at(-1);
+    c.distance = Math.round(N.distanceFromStart * 1e4) / 1e4, c.etd = b(P.eta).utc().format(), c.eta = b(N.eta).utc().format(), c.wxFactor = Math.round(I / D * 1e4) / 1e4, c.cFactor = Math.round(F / D * 1e4) / 1e4, c.avgSpeed = Math.round(N.distanceFromStart / D * 1e4) / 1e4, c.totalHrs = Math.round(D * 1e4) / 1e4;
+    const { distanceInECA: j, hoursInECA: A, totalDgoConsInECA: R, eca: K } = await this.calculateECA(c, i, h), et = J.roundPrecision(i.fo / 24 * (D - A), 3), st = J.roundPrecision(i.dgo / 24 * D, 3);
+    c.extend = {
       eca: K,
       distanceInECA: j,
       hoursInECA: A,
       totalDgoConsInECA: R
-    }, r.totalFoCons = et, r.totalDgoCons = st;
-    const $ = b().valueOf() - m, at = ((Z = p == null ? void 0 : p.hours) == null ? void 0 : Z.length) || 1;
-    return I == null || I.info("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", u == null ? void 0 : u.requestId, $, at, Math.round($ / at * 1e3) / 1e3), r;
+    }, c.totalFoCons = et, c.totalDgoCons = st;
+    const $ = b().valueOf() - m, at = ((Z = w == null ? void 0 : w.hours) == null ? void 0 : Z.length) || 1;
+    return S == null || S.info("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", h == null ? void 0 : h.requestId, $, at, Math.round($ / at * 1e3) / 1e3), c;
   }
   /**
    * 分段失速分析（最多走hours 小时）
@@ -950,11 +950,11 @@ class O {
    * @param useMeteo true 启用气象分析
    * @param useRouteParam
    */
-  static async analyseInstantWithThreshed(e, t, n, i, o, a, s, d = "", c = 3, u = !0, m = !1, l = {}) {
+  static async analyseInstantWithThreshed(e, t, n, i, o, a, s, d = "", r = 3, h = !0, m = !1, l = {}) {
     var Q, X, Z, H, _;
     const y = b().valueOf();
     e.lng = J.convertToStdLng(e.lng);
-    const { v0: f, label: x } = e.sog ? {
+    const { v0: f, label: C } = e.sog ? {
       v0: e.sog,
       label: "Other"
       /* Instruct */
@@ -962,63 +962,63 @@ class O {
       v0: o.speed,
       label: "CP"
       /* Cp */
-    }, F = O.assembleProperties(i, o.loadCondition, f, 0), w = W.calculateSubRoute(e, a);
-    if (((Q = w[0]) == null ? void 0 : Q.length) <= 1)
+    }, k = O.assembleProperties(i, o.loadCondition, f, 0), p = W.calculateSubRoute(e, a);
+    if (((Q = p[0]) == null ? void 0 : Q.length) <= 1)
       return;
     const v = s.length ? W.calculateSubWaypoints(e, s) : [];
     v.forEach((T) => T.important = !0);
-    let r = W.simplifyRouteToCoordinates(w, v, 0), p = 0, M = 0, h = 0, S = 0;
-    const k = {
+    let c = W.simplifyRouteToCoordinates(p, v, 0), w = 0, M = 0, u = 0, I = 0;
+    const F = {
       hours: [],
       wps: [],
       days: []
     };
     t = b(t).utc();
-    const P = t.clone();
-    for (; r.length > 0; ) {
-      const T = c - t.hour() % c;
+    const D = t.clone();
+    for (; c.length > 0; ) {
+      const T = r - t.hour() % r;
       let L = Math.ceil(t.clone().add(T, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4;
       L = t.clone().add(L, "h").isSameOrAfter(n) ? n.diff(t, "h", !0) * 1e4 / 1e4 : L;
-      const q = await O.speedLoseInHoursStep(F, t, P, L, p, r, d, u, m, l);
-      if ((X = q.from) != null && X.speed && (k.hours.push(q.from), q != null && q.wps && k.wps.push(...q.wps), k.days.push(...q.days)), r = q == null ? void 0 : q.next, r.length || k.hours.push(q == null ? void 0 : q.to), p += Math.round((((Z = q == null ? void 0 : q.to) == null ? void 0 : Z.distanceFromPrevious) ?? 0) * 1e4) / 1e4, !L)
+      const q = await O.speedLoseInHoursStep(k, t, D, L, w, c, d, h, m, l);
+      if ((X = q.from) != null && X.speed && (F.hours.push(q.from), q != null && q.wps && F.wps.push(...q.wps), F.days.push(...q.days)), c = q == null ? void 0 : q.next, c.length || F.hours.push(q == null ? void 0 : q.to), w += Math.round((((Z = q == null ? void 0 : q.to) == null ? void 0 : Z.distanceFromPrevious) ?? 0) * 1e4) / 1e4, !L)
         break;
     }
-    (H = k.wps) == null || H.forEach((T, L) => {
+    (H = F.wps) == null || H.forEach((T, L) => {
       if (L) {
-        const q = k.wps[L - 1], rt = T.distanceFromStart - q.distanceFromStart, it = b(T.eta).diff(b(q.etd), "h", !0);
-        it < 0.5 ? T.avgSpd = q.speed : T.avgSpd = Math.round(rt / it * 100) / 100;
+        const q = F.wps[L - 1], ct = T.distanceFromStart - q.distanceFromStart, it = b(T.eta).diff(b(q.etd), "h", !0);
+        it < 0.5 ? T.avgSpd = q.speed : T.avgSpd = Math.round(ct / it * 100) / 100;
       }
     });
-    const Y = k.hours;
+    const Y = F.hours;
     for (let T = 0; T < Y.length - 1; T++) {
       const L = b(Y[T + 1].eta).diff(Y[T].etd, "hour", !0);
-      M += Y[T].wxFactor * L, h += Y[T].cFactor * L, S += L;
+      M += Y[T].wxFactor * L, u += Y[T].cFactor * L, I += L;
     }
-    const E = k.hours.at(0), D = k.hours.at(-1), N = await W.calculateRangeRoute(E, D, w), j = await W.calculateRangeWaypoints(E, D, w, v), A = {
-      sample: k,
-      distance: Math.round(((D == null ? void 0 : D.distanceFromStart) || 0) * 1e4) / 1e4,
+    const E = F.hours.at(0), P = F.hours.at(-1), N = await W.calculateRangeRoute(E, P, p), j = await W.calculateRangeWaypoints(E, P, p, v), A = {
+      sample: F,
+      distance: Math.round(((P == null ? void 0 : P.distanceFromStart) || 0) * 1e4) / 1e4,
       // 注意，可能会在first节点Drift,所有采用eta做为初始出发时间
       etd: b(E.eta).utc().format(),
-      eta: b(D == null ? void 0 : D.eta).utc().format(),
-      wxFactor: Math.round(M / S * 1e4) / 1e4,
-      cFactor: Math.round(h / S * 1e4) / 1e4,
-      avgSpeed: Math.round(((D == null ? void 0 : D.distanceFromStart) || 0) / S * 1e4) / 1e4,
-      totalHrs: Math.round(S * 1e4) / 1e4,
+      eta: b(P == null ? void 0 : P.eta).utc().format(),
+      wxFactor: Math.round(M / I * 1e4) / 1e4,
+      cFactor: Math.round(u / I * 1e4) / 1e4,
+      avgSpeed: Math.round(((P == null ? void 0 : P.distanceFromStart) || 0) / I * 1e4) / 1e4,
+      totalHrs: Math.round(I * 1e4) / 1e4,
       from: E,
-      to: D,
+      to: P,
       route: N,
       waypoints: j,
       v0: f,
-      label: x
-    }, { distanceInECA: R, hoursInECA: K, totalDgoConsInECA: et, eca: st } = await this.calculateECA(A, o, l), nt = J.roundPrecision(o.fo / 24 * (S - K), 3), $ = J.roundPrecision(o.dgo / 24 * S, 3);
+      label: C
+    }, { distanceInECA: R, hoursInECA: K, totalDgoConsInECA: et, eca: st } = await this.calculateECA(A, o, l), nt = J.roundPrecision(o.fo / 24 * (I - K), 3), $ = J.roundPrecision(o.dgo / 24 * I, 3);
     A.extend = {
       eca: st,
       distanceInECA: R,
       hoursInECA: K,
       totalDgoConsInECA: et
     }, A.totalDgoCons = $, A.totalFoCons = nt;
-    const z = b().valueOf() - y, U = ((_ = k == null ? void 0 : k.hours) == null ? void 0 : _.length) || 1;
-    return I == null || I.debug("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", l == null ? void 0 : l.requestId, z, U, Math.round(z / U * 1e3) / 1e3), A;
+    const z = b().valueOf() - y, U = ((_ = F == null ? void 0 : F.hours) == null ? void 0 : _.length) || 1;
+    return S == null || S.debug("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", l == null ? void 0 : l.requestId, z, U, Math.round(z / U * 1e3) / 1e3), A;
   }
   /**
    * 在指定航线条件下，基于多CP，动态计算最优成本(租金+油费)方案
@@ -1036,25 +1036,25 @@ class O {
    * @param options
    */
   static async analyseCost(e, t, n, i, o = {}) {
-    var w, v;
+    var p, v;
     const a = b().valueOf(), s = [];
     o.meteo2 = o.meteo2 || !0, e.speedStep = e.speedStep || 3, e.alterStep = e.alterStep ?? 1;
     const d = W.calculateRouteDistance(i.route);
-    let c = 0;
-    n.forEach((r) => {
-      const p = Math.ceil(d / r.speed / 24);
-      c = c < p ? p : c;
-    }), c = c * 1.3;
-    const u = b.utc(e.etd).add(c ?? 14, "day");
+    let r = 0;
+    n.forEach((c) => {
+      const w = Math.ceil(d / c.speed / 24);
+      r = r < w ? w : r;
+    }), r = r * 1.3;
+    const h = b.utc(e.etd).add(r ?? 14, "day");
     let m = 1;
-    for (const r of n) {
-      const p = JSON.parse(JSON.stringify(i.route)), M = JSON.parse(JSON.stringify(i.waypoints)), h = await O.analyseInstantWithThreshed(
+    for (const c of n) {
+      const w = JSON.parse(JSON.stringify(i.route)), M = JSON.parse(JSON.stringify(i.waypoints)), u = await O.analyseInstantWithThreshed(
         { lat: e.lat, lng: e.lng },
         e.etd,
-        u,
+        h,
         t,
-        r,
-        p,
+        c,
+        w,
         M,
         e.meteoVendor,
         e.speedStep,
@@ -1062,30 +1062,30 @@ class O {
         e.useRouteParam,
         o
       );
-      h && (await O.calculateCost(h, r, e, o), s.push(h), I == null || I.info("[%s][L%d-%d] analyse from %s to %s cost: %j", o.requestId, 1, m, e.etd, u.format(), {
-        cost: h.cost.total,
-        distance: h.distance,
-        hours: h.totalHrs,
-        cp: `${r.speed}/${r.fo}/${r.dgo}`
+      u && (await O.calculateCost(u, c, e, o), s.push(u), S == null || S.info("[%s][L%d-%d] analyse from %s to %s cost: %j", o.requestId, 1, m, e.etd, h.format(), {
+        cost: u.cost.total,
+        distance: u.distance,
+        hours: u.totalHrs,
+        cp: `${c.speed}/${c.fo}/${c.dgo}`
       })), m++;
     }
-    s.sort((r, p) => r.cost.total - p.cost.total);
+    s.sort((c, w) => c.cost.total - w.cost.total);
     const l = s.at(0), y = s.at(1), f = [];
-    if (f.push({ combined: !1, speeds: [l], cost: (w = l.cost) == null ? void 0 : w.total }), y) {
-      const r = l.cost.cp, p = y.cost.cp, M = b(l.eta), h = b(l.etd), S = M.diff(h, "days", !0);
-      let k = Math.ceil(S / 2);
-      k = k > 7 ? 7 : k < e.alterStep ? e.alterStep : k;
-      let P = 2, Y = { combined: !1, speeds: [y], cost: (v = y.cost) == null ? void 0 : v.total }, E;
-      for (; k >= e.alterStep; ) {
-        const D = await O.combinedAnalyse(e, t, u, [r, p], i, k, { ...o, level: P });
-        if (Y.cost > D.cost ? E ? (E == null ? void 0 : E.cost) > D.cost && (E = D) : (E = Y, Y = D) : (!E || (E == null ? void 0 : E.cost) > D.cost) && (E = D), k <= e.alterStep)
+    if (f.push({ combined: !1, speeds: [l], cost: (p = l.cost) == null ? void 0 : p.total }), y) {
+      const c = l.cost.cp, w = y.cost.cp, M = b(l.eta), u = b(l.etd), I = M.diff(u, "days", !0);
+      let F = Math.ceil(I / 2);
+      F = F > 7 ? 7 : F < e.alterStep ? e.alterStep : F;
+      let D = 2, Y = { combined: !1, speeds: [y], cost: (v = y.cost) == null ? void 0 : v.total }, E;
+      for (; F >= e.alterStep; ) {
+        const P = await O.combinedAnalyse(e, t, h, [c, w], i, F, { ...o, level: D });
+        if (Y.cost > P.cost ? E ? (E == null ? void 0 : E.cost) > P.cost && (E = P) : (E = Y, Y = P) : (!E || (E == null ? void 0 : E.cost) > P.cost) && (E = P), F <= e.alterStep)
           break;
-        k = Math.ceil(k / 2), P += 1;
+        F = Math.ceil(F / 2), D += 1;
       }
       f.push(Y), E && f.push(E);
     }
-    const F = b().valueOf() - a;
-    return I == null || I.info("[%s] analyse elapsed: %d ms", o == null ? void 0 : o.requestId, F), f.sort((r, p) => r.cost - p.cost);
+    const k = b().valueOf() - a;
+    return S == null || S.info("[%s] analyse elapsed: %d ms", o == null ? void 0 : o.requestId, k), f.sort((c, w) => c.cost - w.cost);
   }
   /**
    * 按步长多次减半，分别用7,4,2,1天步长及cpa,cpb交替计算各种组合下的成本
@@ -1098,11 +1098,11 @@ class O {
    * @param options
    */
   static async combinedAnalyse(e, t, n, i, o, a, s = {}) {
-    s.counter = 1, I == null || I.info("[%s][L%d] analyse with alternate cp in every %d days", s.requestId, s.level, a);
-    const d = await O.alternateAnalyse(e, t, n, i, 0, o, a, s), c = d.reduce((l, y) => l + y.cost.total, 0);
-    I == null || I.info("[%s][L%d] cost with cpa/cpb turn: %d", s.requestId, s.level, c);
-    const u = await O.alternateAnalyse(e, t, n, i, 1, o, a, s), m = u.reduce((l, y) => l + y.cost.total, 0);
-    return I == null || I.info("[%s][L%d] cost with cpb/cpa turn: %d", s.requestId, s.level, m), c < m ? { combined: !0, cost: Math.round(c * 1e3) / 1e3, speeds: d, step: a } : { combined: !0, cost: Math.round(m * 1e3) / 1e3, speeds: u, step: a };
+    s.counter = 1, S == null || S.info("[%s][L%d] analyse with alternate cp in every %d days", s.requestId, s.level, a);
+    const d = await O.alternateAnalyse(e, t, n, i, 0, o, a, s), r = d.reduce((l, y) => l + y.cost.total, 0);
+    S == null || S.info("[%s][L%d] cost with cpa/cpb turn: %d", s.requestId, s.level, r);
+    const h = await O.alternateAnalyse(e, t, n, i, 1, o, a, s), m = h.reduce((l, y) => l + y.cost.total, 0);
+    return S == null || S.info("[%s][L%d] cost with cpb/cpa turn: %d", s.requestId, s.level, m), r < m ? { combined: !0, cost: Math.round(r * 1e3) / 1e3, speeds: d, step: a } : { combined: !0, cost: Math.round(m * 1e3) / 1e3, speeds: h, step: a };
   }
   /**
    * 基于cp索引，交替计算指定步长下的成本
@@ -1117,35 +1117,35 @@ class O {
    */
   static async alternateAnalyse(e, t, n, i, o, a, s, d = {}) {
     var l, y;
-    let c = b.utc(e.etd);
-    const u = { lat: e.lat, lng: e.lng }, m = [];
-    for (; c.isBefore(n); ) {
-      const f = c.clone().utc().add(s, "day"), x = JSON.parse(JSON.stringify(a.route)), F = JSON.parse(JSON.stringify(a.waypoints)), w = i[o], v = await O.analyseInstantWithThreshed(
-        u,
-        c.utc().format(),
+    let r = b.utc(e.etd);
+    const h = { lat: e.lat, lng: e.lng }, m = [];
+    for (; r.isBefore(n); ) {
+      const f = r.clone().utc().add(s, "day"), C = JSON.parse(JSON.stringify(a.route)), k = JSON.parse(JSON.stringify(a.waypoints)), p = i[o], v = await O.analyseInstantWithThreshed(
+        h,
+        r.utc().format(),
         f,
         t,
-        w,
-        x,
-        F,
+        p,
+        C,
+        k,
         e.meteoVendor,
         e.speedStep,
         e.useMeteo,
         e.useRouteParam,
         d
       );
-      v && (await O.calculateCost(v, w, e, d), I == null || I.info(
+      v && (await O.calculateCost(v, p, e, d), S == null || S.info(
         "[%s][L%d-%d] analyse from %s to %s cost: %j",
         d.requestId,
         d.level,
         d.counter,
-        c.utc().format(),
+        r.utc().format(),
         f.utc().format(),
-        { cost: v.cost.total, distance: v.distance, hours: v.totalHrs, cp: `${w.speed}/${w.fo}/${w.dgo}` }
+        { cost: v.cost.total, distance: v.distance, hours: v.totalHrs, cp: `${p.speed}/${p.fo}/${p.dgo}` }
       )), d.counter = d.counter + 1;
-      const r = (y = (l = v == null ? void 0 : v.sample) == null ? void 0 : l.hours) == null ? void 0 : y.at(-1);
-      if (r)
-        u.lat = r.lat, u.lng = r.lng, c = b(r.eta), m.push(v), o = o ? 0 : 1;
+      const c = (y = (l = v == null ? void 0 : v.sample) == null ? void 0 : l.hours) == null ? void 0 : y.at(-1);
+      if (c)
+        h.lat = c.lat, h.lng = c.lng, r = b(c.eta), m.push(v), o = o ? 0 : 1;
       else
         break;
     }
@@ -1175,16 +1175,16 @@ class O {
    * 计算单cp模式下的ECA属性
    */
   static async calculateECA(e, t, n = {}) {
-    var d, c;
+    var d, r;
     const i = await W.intersectInECA(e.route);
     let o = 0, a = 0, s = 0;
-    e.sample.wps.forEach((u) => {
-      u.positionTime = b.utc(u.etd || u.eta).unix();
+    e.sample.wps.forEach((h) => {
+      h.positionTime = b.utc(h.etd || h.eta).unix();
     });
-    for (const u of i) {
-      o += u.distance;
-      const m = await W.deadReckoningTime((d = u.waypoints) == null ? void 0 : d.at(0), e.sample.wps), l = await W.deadReckoningTime((c = u.waypoints) == null ? void 0 : c.at(-1), e.sample.wps);
-      u.in = m, u.out = l, u.totalHrs = J.roundPrecision((l.positionTime - m.positionTime) / 3600, 2), u.totalDgoCons = J.roundPrecision(t.fo / 24 * u.totalHrs, 3), a += u.totalHrs, s += u.totalDgoCons;
+    for (const h of i) {
+      o += h.distance;
+      const m = await W.deadReckoningTime((d = h.waypoints) == null ? void 0 : d.at(0), e.sample.wps), l = await W.deadReckoningTime((r = h.waypoints) == null ? void 0 : r.at(-1), e.sample.wps);
+      h.in = m, h.out = l, h.totalHrs = J.roundPrecision((l.positionTime - m.positionTime) / 3600, 2), h.totalDgoCons = J.roundPrecision(t.fo / 24 * h.totalHrs, 3), a += h.totalHrs, s += h.totalDgoCons;
     }
     return o = J.roundPrecision(o, 3), a = J.roundPrecision(a, 3), s = J.roundPrecision(s, 3), {
       distanceInECA: o,
@@ -1199,48 +1199,56 @@ class O {
    * @param options
    */
   static async mergeSpeeds(e, t = {}) {
-    var r, p;
+    var c, w;
     const n = {
       hours: [],
       wps: [],
       days: []
-    }, i = e.reduce((M, h) => M + h.distance, 0), o = e.reduce((M, h) => {
-      var S;
-      return M + (((S = h.extend) == null ? void 0 : S.distanceInECA) || 0);
-    }, 0), a = e.reduce((M, h) => M + h.totalHrs, 0), s = e.reduce((M, h) => {
-      var S;
-      return M + (((S = h.extend) == null ? void 0 : S.hoursInECA) || 0);
-    }, 0), d = e.reduce((M, h) => {
-      var S;
-      return M + (((S = h.extend) == null ? void 0 : S.totalDgoConsInECA) || 0);
-    }, 0), c = e.reduce((M, h) => M + h.wxFactor * h.totalHrs / a, 0), u = e.reduce((M, h) => M + h.cFactor * h.totalHrs / a, 0), m = e.reduce((M, h) => M + h.totalFoCons, 0), l = e.reduce((M, h) => M + h.totalDgoCons, 0), y = e.reduce((M, h) => M + h.cost.total, 0), f = e.reduce((M, h) => M + h.cost.hire, 0), x = e.reduce((M, h) => M + h.cost.bunker, 0), F = [], w = [];
+    }, i = e.reduce((M, u) => M + u.distance, 0), o = e.reduce((M, u) => {
+      var I;
+      return M + (((I = u.extend) == null ? void 0 : I.distanceInECA) || 0);
+    }, 0), a = e.reduce((M, u) => M + u.totalHrs, 0), s = e.reduce((M, u) => {
+      var I;
+      return M + (((I = u.extend) == null ? void 0 : I.hoursInECA) || 0);
+    }, 0), d = e.reduce((M, u) => {
+      var I;
+      return M + (((I = u.extend) == null ? void 0 : I.totalDgoConsInECA) || 0);
+    }, 0), r = e.reduce((M, u) => M + u.wxFactor * u.totalHrs / a, 0), h = e.reduce((M, u) => M + u.cFactor * u.totalHrs / a, 0), m = e.reduce((M, u) => M + u.totalFoCons, 0), l = e.reduce((M, u) => M + u.totalDgoCons, 0), y = e.reduce((M, u) => M + u.cost.total, 0), f = e.reduce((M, u) => M + u.cost.hire, 0), C = e.reduce((M, u) => M + u.cost.bunker, 0), k = [], p = [];
     let v;
     for (const M of e) {
-      w.push(...((r = M.extend) == null ? void 0 : r.eca) || []);
-      const h = M.sample.hours, S = M.sample.wps, k = M.sample.days, P = h.at(0);
-      v && (P.distanceFromPrevious = v.distanceFromPrevious, P.distanceFromStart = v.distanceFromStart, h.forEach((N, j) => {
+      p.push(...((c = M.extend) == null ? void 0 : c.eca) || []);
+      const u = M.sample.hours, I = M.sample.wps, F = M.sample.days, D = u.at(0);
+      v && (D.distanceFromPrevious = v.distanceFromPrevious, D.distanceFromStart = v.distanceFromStart, u.forEach((N, j) => {
         j && (N.distanceFromStart = N.distanceFromStart + v.distanceFromStart);
-      }), S.at(0).distanceFromPrevious = v.distanceFromPrevious, S.at(0).distanceFromStart = v.distanceFromStart, S.forEach((N, j) => {
+      }), I.at(0).distanceFromPrevious = v.distanceFromPrevious, I.at(0).distanceFromStart = v.distanceFromStart, I.forEach((N, j) => {
         j && (N.distanceFromStart = N.distanceFromStart + v.distanceFromStart);
-      }), k.at(0).distanceFromPrevious = v.distanceFromPrevious, k.at(0).distanceFromStart = v.distanceFromStart, k.forEach((N, j) => {
+      }), F.at(0).distanceFromPrevious = v.distanceFromPrevious, F.at(0).distanceFromStart = v.distanceFromStart, F.forEach((N, j) => {
         j && (N.distanceFromStart = N.distanceFromStart + v.distanceFromStart);
-      })), P.cp = M.cost.cp;
-      const Y = [M.etd, M.eta], E = F.findIndex((N) => N.id === P.cp.id);
-      E === -1 ? (P.cp.segment = [Y], F.push(P.cp)) : F[E].segment.push(Y), h.forEach((N) => {
+      })), D.cp = M.cost.cp;
+      const Y = [M.etd, M.eta], E = k.findIndex((N) => N.id === D.cp.id);
+      E === -1 ? (D.cp.segment = [Y], k.push(D.cp)) : k[E].segment.push(Y), u.forEach((N) => {
         var A;
         ((A = n.hours) == null ? void 0 : A.findIndex((R) => R.eta === N.eta)) === -1 && n.hours.push(N);
-      }), S.forEach((N) => {
+      }), I.forEach((N) => {
         var A;
         ((A = n.wps) == null ? void 0 : A.findIndex((R) => R.eta === N.eta)) === -1 && n.wps.push(N);
-      }), k.forEach((N) => {
+      }), F.forEach((N) => {
         var A;
         ((A = n == null ? void 0 : n.days) == null ? void 0 : A.findIndex((R) => R.eta === N.eta)) === -1 && n.days.push(N);
       });
-      const D = (p = n.wps) == null ? void 0 : p.findIndex((N) => N.eta === P.eta);
-      D === -1 ? n.wps.push(P) : n.wps[D] = P, v = h.at(-1);
+      const P = (w = n.wps) == null ? void 0 : w.findIndex((N) => N.eta === D.eta);
+      P === -1 ? n.wps.push(D) : n.wps[P] = D, v = u.at(-1);
     }
-    return n.wps.sort((M, h) => {
-      b(M.etd).unix() - b(h.etd).unix();
+    return n.wps.sort((M, u) => {
+      b(M.etd).unix() - b(u.etd).unix();
+    }), n.wps.forEach((M, u) => {
+      if (!M.avgSpd) {
+        let I;
+        if (u === 0 ? I = n.wps.at(1) : I = n.wps.at(u + 1), I) {
+          const F = I.distanceFromStart - (M.distanceFromStart || 0), D = b(I.etd || I.eta).diff(b(M.etd || I.eta), "hour", !0), Y = Math.round(F / D * 100) / 100;
+          M.avgSpd = Y;
+        }
+      }
     }), {
       sample: n,
       etd: e.at(0).etd,
@@ -1252,18 +1260,18 @@ class O {
       distance: Math.round(i * 1e4) / 1e4,
       totalHrs: Math.round(a * 1e3) / 1e3,
       avgSpeed: Math.round(i / a * 1e3) / 1e3,
-      wxFactor: Math.round(c / a * 1e3) / 1e3,
-      cFactor: Math.round(u / a * 1e3) / 1e3,
+      wxFactor: Math.round(r / a * 1e3) / 1e3,
+      cFactor: Math.round(h / a * 1e3) / 1e3,
       totalFoCons: Math.round(m * 1e3) / 1e3,
       totalDgoCons: Math.round(l * 1e3) / 1e3,
       cost: {
         total: Math.round(y * 1e3) / 1e3,
         hire: Math.round(f * 1e3) / 1e3,
-        bunker: Math.round(x * 1e3) / 1e3
+        bunker: Math.round(C * 1e3) / 1e3
       },
       extend: {
-        cps: F,
-        eca: w,
+        cps: k,
+        eca: p,
         distanceInECA: Math.round(o * 1e4) / 1e4,
         hoursInECA: Math.round(s * 1e3) / 1e3,
         totalDgoConsInECA: Math.round(d * 1e3) / 1e3,
@@ -1276,10 +1284,10 @@ export {
   tt as AISImpl,
   mt as AlertHelper,
   ft as AlertLevel,
-  Ct as HifleetImpl,
+  xt as HifleetImpl,
   gt as LoadCondition,
   Et as MyShipImpl,
-  xt as MyVesselImpl,
+  Ct as MyVesselImpl,
   jt as ShipxyImpl,
   O as SpeedHelper,
   bt as SpeedLabel,