@idm-plugin/vessel 1.6.8 → 1.7.0

package/dist/index.js

@@ -1,15 +1,15 @@
 var st = Object.defineProperty;
-var at = (Y, e, t) => e in Y ? st(Y, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : Y[e] = t;
-var Z = (Y, e, t) => (at(Y, typeof e != "symbol" ? e + "" : e, t), t);
+var at = (j, e, t) => e in j ? st(j, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : j[e] = t;
+var Z = (j, e, t) => (at(j, typeof e != "symbol" ? e + "" : e, t), t);
 import R from "got";
 import Q from "@log4js-node/log4js-api";
-import w from "moment";
+import p from "moment";
 import { LngLatHelper as z, LaneHelper as B } from "@idm-plugin/geo";
 import { MeteoHelper2 as ot, MeteoHelper as nt } from "@idm-plugin/meteo2";
 import { Meteo2Assist as tt } from "@idm-plugin/meteo";
-let g;
+let b;
 try {
-  g = Q.getLogger("vessel");
+  b = Q.getLogger("vessel");
 } catch {
 } finally {
 }
@@ -70,32 +70,32 @@ class vt extends U {
         grant_type: "client_credentials"
       }
     }, a = await R.post(o, i).json();
-    g == null || g.info("[%s] fetch access token from: %s - %j", t.requestId, o, a), a.error || (this.token = {
+    b == null || b.info("[%s] fetch access token from: %s - %j", t.requestId, o, a), a.error || (this.token = {
       accessToken: a.access_token,
       tokenType: a.token_type,
       expiresIn: a.expires_in,
       scope: a.scope,
       jti: a.jti,
-      issuedAt: w().utc().format()
+      issuedAt: p().utc().format()
     });
   }
   async realTimePosition(t, o = {}) {
-    var h, y, l;
-    (!this.token || w().diff(w(this.token.issuedAt), "seconds") > ((h = this.token) == null ? void 0 : h.expiresIn) - 300) && await this.authToken(o);
+    var u, y, h;
+    (!this.token || p().diff(p(this.token.issuedAt), "seconds") > ((u = this.token) == null ? void 0 : u.expiresIn) - 300) && await this.authToken(o);
     const i = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/location/unit", a = {
       headers: {
-        Authorization: `${(y = this.token) == null ? void 0 : y.tokenType} ${(l = this.token) == null ? void 0 : l.accessToken}`
+        Authorization: `${(y = this.token) == null ? void 0 : y.tokenType} ${(h = this.token) == null ? void 0 : h.accessToken}`
       },
       searchParams: { mmsi: t }
     };
-    g == null || g.info("[%s] fetch realtime position from: %s - %j", o.requestId, i, a);
+    b == null || b.info("[%s] fetch realtime position from: %s - %j", o.requestId, i, a);
     const n = await R.get(i, a).json();
     if (n.code)
-      return g == null || g.warn("[%s] fetch realtime position failed: %j", o.requestId, i, { message: n.message, status: n.status, code: n.code }), n;
+      return b == null || b.warn("[%s] fetch realtime position failed: %j", o.requestId, i, { message: n.message, status: n.status, code: n.code }), n;
     const s = n.data;
     for (const f in s)
       !isNaN(s[f]) && Number(s[f]) !== 1 / 0 && (s[f] = Number(s[f]));
-    const d = w(`${s.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    const d = p(`${s.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
     return {
       mmsi: s.mmsi,
       name: s.vesselName,
@@ -110,7 +110,7 @@ class vt extends U {
       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) ? w.utc(s.eta).format() : void 0,
+      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: d.unix(),
       status: s.status,
@@ -122,17 +122,17 @@ class vt extends U {
     };
   }
   async trajectory(t, o, i, a, n = !0, s = {}) {
-    (!this.token || w().diff(w(this.token.issuedAt), "seconds") > this.token.expiresIn - 300) && await this.authToken(s);
-    const d = await this.realTimePosition(t, s), r = w(o), h = w(i), y = [];
-    for (; h.diff(r, "day", !0) > 30; )
+    (!this.token || p().diff(p(this.token.issuedAt), "seconds") > this.token.expiresIn - 300) && await this.authToken(s);
+    const d = await this.realTimePosition(t, s), r = p(o), u = p(i), y = [];
+    for (; u.diff(r, "day", !0) > 30; )
       await this.trajectoryIn30Day(t, r, r.clone().add(30, "day"), d, a, y, s), r.add(30, "day");
-    return await this.trajectoryIn30Day(t, r, h, d, a, y, s), y;
+    return await this.trajectoryIn30Day(t, r, u, d, a, y, s), y;
   }
   async trajectoryIn30Day(t, o, i, a, n, s, d = {}) {
-    var u, b, k, v, p;
-    const r = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/track", h = {
+    var l, m, M, g, I;
+    const r = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/track", u = {
       headers: {
-        Authorization: `${(u = this.token) == null ? void 0 : u.tokenType} ${(b = this.token) == null ? void 0 : b.accessToken}`
+        Authorization: `${(l = this.token) == null ? void 0 : l.tokenType} ${(m = this.token) == null ? void 0 : m.accessToken}`
       },
       json: {
         mmsi: t,
@@ -140,16 +140,16 @@ class vt extends U {
         endTime: i.utcOffset(8).format("YYYY-MM-DD HH:mm:ss")
       }
     };
-    g == null || g.info("[%s] fetch trajectory from: %s - %j", d.requestId, r, h);
-    const y = await R.post(r, h).json();
+    b == null || b.info("[%s] fetch trajectory from: %s - %j", d.requestId, r, u);
+    const y = await R.post(r, u).json();
     if (y.code)
-      return g == null || g.warn("[%s] fetch trajectory failed: %j", d.requestId, r, { message: y.message, status: y.status, code: y.code }), y;
-    let l = -1;
-    const f = w(`${(v = (k = y.data) == null ? void 0 : k[0]) == null ? void 0 : v.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-    return (p = y.data) == null || p.forEach((c) => {
-      for (const q in c)
-        !isNaN(c[q]) && Number(c[q]) !== 1 / 0 && (c[q] = Number(c[q]));
-      const M = w(`${c.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00"), N = c.status, { labelCn: m, labelEn: S } = this.parseStatus(N), j = {
+      return b == null || b.warn("[%s] fetch trajectory failed: %j", d.requestId, r, { message: y.message, status: y.status, code: y.code }), y;
+    let h = -1;
+    const f = p(`${(g = (M = y.data) == null ? void 0 : M[0]) == null ? void 0 : g.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    return (I = y.data) == null || I.forEach((c) => {
+      for (const T in c)
+        !isNaN(c[T]) && Number(c[T]) !== 1 / 0 && (c[T] = Number(c[T]));
+      const w = p(`${c.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00"), N = c.status, { labelCn: v, labelEn: S } = this.parseStatus(N), Y = {
         mmsi: c.mmsi,
         imo: a == null ? void 0 : a.imo,
         lat: c.lat,
@@ -159,16 +159,16 @@ class vt extends U {
         hdg: c.hdg,
         draught: c.draught,
         status: N,
-        eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(c.eta) ? w(`${c.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(c.eta) ? p(`${c.eta} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00").utc().format() : void 0,
         destination: c.dest,
-        positionTime: M.unix(),
-        labelCn: m,
+        positionTime: w.unix(),
+        labelCn: v,
         labelEn: S,
         method: "trajectory",
         vendor: "myVessel",
-        utc: M.utc().format()
-      }, C = Math.floor(M.diff(f, "minute", !0) / (n || 1));
-      C !== l && (l = C, s.push(j));
+        utc: w.utc().format()
+      }, F = Math.floor(w.diff(f, "minute", !0) / (n || 1));
+      F !== h && (h = F, s.push(Y));
     }), s;
   }
 }
@@ -185,14 +185,14 @@ class wt extends U {
         usertoken: this.token
       }
     }, n = await R.post(i, a).json();
-    g == null || g.info("[%s] fetch realtime position from: %s - %j", o.requestId, i, a);
+    b == null || b.info("[%s] fetch realtime position from: %s - %j", o.requestId, i, a);
     const s = n == null ? void 0 : n.list;
     if (!s)
-      return g == null || g.warn("[%s] fetch realtime position failed: %j", o.requestId, i, n), n;
+      return b == null || b.warn("[%s] fetch realtime position failed: %j", o.requestId, i, n), n;
     for (const f in s)
       !isNaN(s[f]) && Number(s[f]) !== 1 / 0 && (s[f] = Number(s[f]));
     s.status = s.sp > 3 ? 0 : 1;
-    const d = s.status, { labelCn: r, labelEn: h } = this.parseStatus(d), y = w(`${s.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    const d = s.status, { labelCn: r, labelEn: u } = this.parseStatus(d), y = p(`${s.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
     return {
       mmsi: s.m,
       name: s.n,
@@ -207,13 +207,13 @@ class wt extends U {
       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) ? w.utc(s.eta).format() : void 0,
+      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,
       positionTime: y.unix(),
       utc: y.utc().format(),
       status: d,
       labelCn: r,
-      labelEn: h,
+      labelEn: u,
       method: "position",
       vendor: "hifleet"
     };
@@ -231,7 +231,7 @@ class wt extends U {
       }
     };
     let n = await R.post(i, a).json();
-    g == null || g.info("[%s] fetch vessel props from: %s - %j", o.requestId, i, a), n instanceof Array && (n = n[0]);
+    b == null || b.info("[%s] fetch vessel props from: %s - %j", o.requestId, i, a), n instanceof Array && (n = n[0]);
     for (const d in n)
       !isNaN(n[d]) && Number(n[d]) !== 1 / 0 && (n[d] = Number(n[d]));
     const s = {
@@ -244,7 +244,7 @@ class wt extends U {
       draught: n.dr,
       type: n.t
     };
-    return i = "https://www.hifleet.com/hifleetapi/sameShipSearch.do", n = await R.post(i, a).json(), g == null || g.info("[%s] search vessel dead weight from: %s - %j", o.requestId, i, a), n instanceof Array && (n = n[0]), n && (s.deadweight = Number(n.dwt)), s;
+    return i = "https://www.hifleet.com/hifleetapi/sameShipSearch.do", n = await R.post(i, a).json(), b == null || b.info("[%s] search vessel dead weight from: %s - %j", o.requestId, i, a), n instanceof Array && (n = n[0]), n && (s.deadweight = Number(n.dwt)), s;
   }
   async suggest(t, o = {}) {
     const i = "https://www.hifleet.com/hifleetapi/getShipSuggest.do", a = {
@@ -257,7 +257,7 @@ class wt extends U {
         Host: "www.hifleet.com"
       }
     }, n = await R.post(i, a).json();
-    g == null || g.info("[%s] suggest vessel props from: %s - %j", o.requestId, i, a);
+    b == null || b.info("[%s] suggest vessel props from: %s - %j", o.requestId, i, a);
     const s = [];
     for (const d of n)
       s.push({
@@ -270,54 +270,54 @@ class wt extends U {
     return s.sort((d, r) => r.score - d.score), s;
   }
   async trajectory(t, o, i, a, n = !0, s = {}) {
-    var c, M, N;
+    var c, w, N;
     const d = await this.realTimePosition(t, s);
-    let r = w(o);
-    const h = w(i), y = w();
+    let r = p(o);
+    const u = p(i), y = p();
     if (n) {
-      let m = h.diff(r, "d", !0);
-      m < 0 ? r = h.clone().subtract(40, "d") : m < 30 ? r.subtract(10, "d") : m < 60 ? r.subtract(5, "d") : r = h.clone().subtract(80, "d"), m = y.diff(h, "d", !0), h.add(m > 10 ? 240 : m * 24, "h");
+      let v = u.diff(r, "d", !0);
+      v < 0 ? r = u.clone().subtract(40, "d") : v < 30 ? r.subtract(10, "d") : v < 60 ? r.subtract(5, "d") : r = u.clone().subtract(80, "d"), v = y.diff(u, "d", !0), u.add(v > 10 ? 240 : v * 24, "h");
     }
-    const l = {
+    const h = {
       searchParams: {
-        endtime: h.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
+        endtime: u.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
       }
-    }, f = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", u = await R.get(f, l).json();
-    g == null || g.info("[%s] fetch trajectory from: %s - %j", s.requestId, f, l);
-    let b;
-    u && (b = ((M = (c = u.ships) == null ? void 0 : c.offors) == null ? void 0 : M.ship) || [], b.length || g == null || g.warn("[%s] fetch trajectory failed: %j", s.requestId, u));
-    const k = [];
-    let v = -1;
-    const p = w(`${(N = b == null ? void 0 : b[0]) == null ? void 0 : N.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-    for (const m of b) {
-      for (const D in m)
-        !isNaN(m[D]) && Number(m[D]) !== 1 / 0 && (m[D] = Number(m[D]));
-      const S = w(`${m.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-      m.status = m.sp > 4 ? 0 : 1;
-      const { labelEn: j, labelCn: C } = this.parseStatus(m.status), q = {
-        mmsi: m.m,
-        name: m.n,
+    }, f = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", l = await R.get(f, h).json();
+    b == null || b.info("[%s] fetch trajectory from: %s - %j", s.requestId, f, h);
+    let m;
+    l && (m = ((w = (c = l.ships) == null ? void 0 : c.offors) == null ? void 0 : w.ship) || [], m.length || b == null || b.warn("[%s] fetch trajectory failed: %j", s.requestId, l));
+    const M = [];
+    let g = -1;
+    const I = p(`${(N = m == null ? void 0 : m[0]) == null ? void 0 : N.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    for (const v of m) {
+      for (const H in v)
+        !isNaN(v[H]) && Number(v[H]) !== 1 / 0 && (v[H] = Number(v[H]));
+      const S = p(`${v.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+      v.status = v.sp > 4 ? 0 : 1;
+      const { labelEn: Y, labelCn: F } = this.parseStatus(v.status), T = {
+        mmsi: v.m,
+        name: v.n,
         imo: d == null ? void 0 : d.imo,
-        lat: m.la,
-        lng: m.lo,
-        draught: m.draught,
-        sog: m.sp,
-        cog: m.co,
-        hdg: m.hdg,
+        lat: v.la,
+        lng: v.lo,
+        draught: v.draught,
+        sog: v.sp,
+        cog: v.co,
+        hdg: v.hdg,
         positionTime: S.unix(),
         utc: S.utc().format(),
-        status: m.status,
-        labelCn: C,
-        labelEn: j,
+        status: v.status,
+        labelCn: F,
+        labelEn: Y,
         method: "trajectory",
         vendor: "hifleet"
-      }, T = Math.floor(S.diff(p, "minute", !0) / (a || 1));
-      T !== v && (v = T, k.push(q));
+      }, D = Math.floor(S.diff(I, "minute", !0) / (a || 1));
+      D !== g && (g = D, M.push(T));
     }
-    return k;
+    return M;
   }
 }
 class pt extends U {
@@ -334,12 +334,12 @@ class pt extends U {
         enc: 1
       }
     }, a = "https://api.shipxy.com/apicall/GetSingleShip", n = await R.get(a, i).json();
-    if (g == null || g.info("[%s] fetch realtime position from: %s - %j", o.requestId, a, i), (n == null ? void 0 : n.status) !== 0)
+    if (b == null || b.info("[%s] fetch realtime position from: %s - %j", o.requestId, a, i), (n == null ? void 0 : n.status) !== 0)
       return n;
     const s = n.data[0];
-    for (const l in s)
-      !isNaN(s[l]) && Number(s[l]) !== 1 / 0 && (s[l] = Number(s[l]));
-    const { labelCn: d, labelEn: r } = await this.parseStatus(s.navistat), h = w.unix(s.lasttime);
+    for (const h in s)
+      !isNaN(s[h]) && Number(s[h]) !== 1 / 0 && (s[h] = Number(s[h]));
+    const { labelCn: d, labelEn: r } = await this.parseStatus(s.navistat), u = p.unix(s.lasttime);
     return {
       mmsi: s.ShipID,
       name: s.name,
@@ -355,7 +355,7 @@ class pt extends U {
       hdg: Math.round(s.hdg / 100 * 100) / 100,
       rot: Math.round(s.rot / 100 * 100) / 100,
       positionTime: s.lasttime,
-      utc: h.utc().format(),
+      utc: u.utc().format(),
       status: s.navistat,
       labelEn: r,
       labelCn: d,
@@ -364,37 +364,37 @@ class pt extends U {
     };
   }
   async trajectory(t, o, i, a, n = !0, s = {}) {
-    var p;
-    const d = await this.realTimePosition(t, s), r = w(o), h = w(i), y = "https://api.shipxy.com/apicall/GetShipTrack", l = {
+    var I;
+    const d = await this.realTimePosition(t, s), r = p(o), u = p(i), y = "https://api.shipxy.com/apicall/GetShipTrack", h = {
       searchParams: {
         id: t,
         k: this.token,
         enc: 1,
         cut: 0,
         btm: r.unix(),
-        etm: h.unix()
+        etm: u.unix()
       }
-    }, f = await R.get(y, l).json();
-    if (g == null || g.info("[%s] fetch trajectory from: %s - %j", s.requestId, y, l), (f == null ? void 0 : f.status) !== 0)
+    }, f = await R.get(y, h).json();
+    if (b == null || b.info("[%s] fetch trajectory from: %s - %j", s.requestId, y, h), (f == null ? void 0 : f.status) !== 0)
       return f;
-    const u = f == null ? void 0 : f.points, b = [], k = w.unix((p = u[0]) == null ? void 0 : p.utc);
-    let v = -1;
-    for (const c of u) {
-      const M = w.unix(c.utc), N = {
+    const l = f == null ? void 0 : f.points, m = [], M = p.unix((I = l[0]) == null ? void 0 : I.utc);
+    let g = -1;
+    for (const c of l) {
+      const w = p.unix(c.utc), N = {
         imo: d == null ? void 0 : d.imo,
         mmsi: t,
         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: M.unix(),
-        utc: M.utc().format(),
+        positionTime: w.unix(),
+        utc: w.utc().format(),
         method: "trajectory",
         vendor: "shipxy"
-      }, m = Math.floor(M.diff(k, "minute", !0) / (a || 1));
-      m !== v && (v = m, b.push(N));
+      }, v = Math.floor(w.diff(M, "minute", !0) / (a || 1));
+      v !== g && (g = v, m.push(N));
     }
-    return b;
+    return m;
   }
 }
 class It extends U {
@@ -412,7 +412,7 @@ class It extends U {
         mmsiList: t
       }
     }, a = "https://api3.myships.com/sp/ships/getShipIdByMMSI", n = await R.post(a, i).json();
-    return g == null || g.info("[%s] fetch ship id from: %s - %j", o.requestId, a, i), n.code !== "0" ? n : n.data[0].shipId;
+    return b == null || b.info("[%s] fetch ship id from: %s - %j", o.requestId, a, i), n.code !== "0" ? n : n.data[0].shipId;
   }
   async getShipInfo(t, o = {}) {
     const i = {
@@ -423,11 +423,11 @@ class It extends U {
         shipId: t
       }
     }, a = "https://api3.myships.com/sp/ships/aissta", n = await R.post(a, i).json();
-    if (g == null || g.info("[%s] fetch ship info from: %s - %j", o.requestId, a, i), n.code !== "0")
+    if (b == null || b.info("[%s] fetch ship info from: %s - %j", o.requestId, a, i), n.code !== "0")
       return n;
     const s = n.data;
     let d = s.imo;
-    return t === "407170" && (d = "9198379", g == null || g.warn("[%s] ship(%s) imo error: %s, should be %s", o.requestId, t, s.imo, d)), {
+    return t === "407170" && (d = "9198379", b == null || b.warn("[%s] ship(%s) imo error: %s, should be %s", o.requestId, t, s.imo, d)), {
       mmsi: s.mmsi,
       name: s.shipnameEn,
       imo: d,
@@ -446,11 +446,11 @@ class It extends U {
         shipId: i
       }
     }, s = "https://api3.myships.com/sp/ships/position/latest", d = await R.post(s, n).json();
-    g == null || g.info("[%s] fetch realtime position from: %s - %j", o.requestId, s, n);
+    b == null || b.info("[%s] fetch realtime position from: %s - %j", o.requestId, s, n);
     const r = d.data[0];
-    for (const u in r)
-      !isNaN(r[u]) && Number(r[u]) !== 1 / 0 && (r[u] = Number(r[u]));
-    const { labelCn: h, labelEn: y } = await this.parseStatus(r.aisNavStatus), l = w.unix(r.posTime);
+    for (const l in r)
+      !isNaN(r[l]) && Number(r[l]) !== 1 / 0 && (r[l] = Number(r[l]));
+    const { labelCn: u, labelEn: y } = await this.parseStatus(r.aisNavStatus), h = p.unix(r.posTime);
     return {
       ...a,
       mmsi: t,
@@ -461,23 +461,23 @@ class It extends U {
       hdg: Math.round(r.heading * 100) / 100,
       rot: Math.round(r.rot * 100) / 100,
       positionTime: r.posTime,
-      utc: l.utc().format(),
+      utc: h.utc().format(),
       status: r.aisNavStatus,
       labelEn: y,
-      labelCn: h,
+      labelCn: u,
       method: "position",
       vendor: "myship"
     };
   }
   async trajectory(t, o, i, a, n = !0, s = {}) {
-    const d = w(o), r = w(i), h = await this.getShipId(t), y = await this.getShipInfo(h), l = [];
+    const d = p(o), r = p(i), u = await this.getShipId(t), y = await this.getShipInfo(u), h = [];
     for (; r.diff(d, "day", !0) > 30; )
-      await this.trajectoryIn30Day(h, d.unix(), d.add(30, "day").unix(), y, t, a, l);
-    return await this.trajectoryIn30Day(h, d.unix(), r.unix(), y, t, a, l), l;
+      await this.trajectoryIn30Day(u, d.unix(), d.add(30, "day").unix(), y, t, a, h);
+    return await this.trajectoryIn30Day(u, d.unix(), r.unix(), y, t, a, h), h;
   }
   async trajectoryIn30Day(t, o, i, a, n, s, d, r = {}) {
-    var k;
-    const h = {
+    var M;
+    const u = {
       headers: {
         appKey: this.token
       },
@@ -486,30 +486,30 @@ class It extends U {
         startTime: o,
         endTime: i
       }
-    }, y = "https://api3.myships.com/sp/ships/position/history", l = await R.post(y, h).json();
-    if (g == null || g.info("[%s] fetch trajectory from: %s - %j", r.requestId, y, h), l.code !== "0")
-      return g == null || g.warn("[%s] invoke myship trajectory failed: %j", r.requestId, l), l;
-    const f = l.data;
-    for (const v in f)
-      !isNaN(f[v]) && Number(f[v]) !== 1 / 0 && (f[v] = Number(f[v]));
-    const u = w.unix((k = f[0]) == null ? void 0 : k.posTime);
-    let b = -1;
-    for (const v of f) {
-      const p = w.unix(v.posTime), c = {
+    }, y = "https://api3.myships.com/sp/ships/position/history", h = await R.post(y, u).json();
+    if (b == null || b.info("[%s] fetch trajectory from: %s - %j", r.requestId, y, u), h.code !== "0")
+      return b == null || b.warn("[%s] invoke myship trajectory failed: %j", r.requestId, h), h;
+    const f = h.data;
+    for (const g in f)
+      !isNaN(f[g]) && Number(f[g]) !== 1 / 0 && (f[g] = Number(f[g]));
+    const l = p.unix((M = f[0]) == null ? void 0 : M.posTime);
+    let m = -1;
+    for (const g of f) {
+      const I = p.unix(g.posTime), c = {
         imo: a == null ? void 0 : a.imo,
         mmsi: n,
-        lat: Math.round(v.lat / 1e4 / 60 * 1e5) / 1e5,
-        lng: Math.round(v.lon / 1e4 / 60 * 1e5) / 1e5,
-        sog: Math.round(v.sog / 10 * 100) / 100,
-        cog: Math.round(v.cog / 10 * 100) / 100,
-        hdg: Math.round(v.heading * 100) / 100,
-        rot: Math.round(v.rot * 100) / 100,
-        positionTime: p.unix(),
-        utc: p.utc().format(),
+        lat: Math.round(g.lat / 1e4 / 60 * 1e5) / 1e5,
+        lng: Math.round(g.lon / 1e4 / 60 * 1e5) / 1e5,
+        sog: Math.round(g.sog / 10 * 100) / 100,
+        cog: Math.round(g.cog / 10 * 100) / 100,
+        hdg: Math.round(g.heading * 100) / 100,
+        rot: Math.round(g.rot * 100) / 100,
+        positionTime: I.unix(),
+        utc: I.utc().format(),
         method: "trajectory",
         vendor: "myship"
-      }, M = Math.floor(p.diff(u, "minute", !0) / (s || 1));
-      M !== b && (b = M, d.push(c));
+      }, w = Math.floor(I.diff(l, "minute", !0) / (s || 1));
+      w !== m && (m = w, d.push(c));
     }
     return d;
   }
@@ -520,7 +520,7 @@ try {
 } catch {
 } finally {
 }
-var it = /* @__PURE__ */ ((Y) => (Y.NOTICE = "NOTICE", Y.WARN = "WARN", Y.HEAVY = "HEAVY", Y.SEVERE = "SEVERE", Y.ERROR = "ERROR", Y.FATAL = "FATAL", Y))(it || {});
+var it = /* @__PURE__ */ ((j) => (j.NOTICE = "NOTICE", j.WARN = "WARN", j.HEAVY = "HEAVY", j.SEVERE = "SEVERE", j.ERROR = "ERROR", j.FATAL = "FATAL", j))(it || {});
 class rt {
   /**
    * 解析告警规则, 多规则场景
@@ -537,14 +537,14 @@ class rt {
     if (!a)
       return;
     const n = {};
-    for (let h = 0; h < (a == null ? void 0 : a.length); h++) {
-      const y = (r = (d = a[h].match(o)) == null ? void 0 : d[0]) == null ? void 0 : r.split("],");
-      if (h === 0 && !y)
+    for (let u = 0; u < (a == null ? void 0 : a.length); u++) {
+      const y = (r = (d = a[u].match(o)) == null ? void 0 : d[0]) == null ? void 0 : r.split("],");
+      if (u === 0 && !y)
         n.scope = a[0];
       else if (y)
-        for (let l = 0, f = y.length; l < f; l++) {
-          const u = this.parseRule(y[l]);
-          u && (n[u.level] ? u.key ? n[u.level][u == null ? void 0 : u.key] = u : n[u.level] = u : u.key ? n[u.level] = { [u == null ? void 0 : u.key]: u } : n[u.level] = u);
+        for (let h = 0, f = y.length; h < f; h++) {
+          const l = this.parseRule(y[h]);
+          l && (n[l.level] ? l.key ? n[l.level][l == null ? void 0 : l.key] = l : n[l.level] = l : l.key ? n[l.level] = { [l == null ? void 0 : l.key]: l } : n[l.level] = l);
         }
     }
     return n;
@@ -575,26 +575,26 @@ class rt {
    * @param options
    */
   checkWeather(e, t, o = {}) {
-    var u, b, k, v, p, c, M, N, m, S, j, C, q, T, D;
+    var l, m, M, g, I, c, w, N, v, S, Y, F, T, D, H;
     let i = 0, a = 0, n = 0, s = 0;
-    const d = Math.round(((b = (u = t == null ? void 0 : t.SEVERE) == null ? void 0 : u.sigWave) == null ? void 0 : b.number) * 1.6 * 100) / 100, r = (v = (k = t == null ? void 0 : t.SEVERE) == null ? void 0 : k.sigWave) == null ? void 0 : v.number, h = (c = (p = t == null ? void 0 : t.HEAVY) == null ? void 0 : p.sigWave) == null ? void 0 : c.number, y = Math.round((((N = (M = t == null ? void 0 : t.SEVERE) == null ? void 0 : M.wind) == null ? void 0 : N.number) + 2) * 100) / 100, l = (S = (m = t == null ? void 0 : t.SEVERE) == null ? void 0 : m.wind) == null ? void 0 : S.number, f = (C = (j = t == null ? void 0 : t.HEAVY) == null ? void 0 : j.wind) == null ? void 0 : C.number;
+    const d = Math.round(((m = (l = t == null ? void 0 : t.SEVERE) == null ? void 0 : l.sigWave) == null ? void 0 : m.number) * 1.6 * 100) / 100, r = (g = (M = t == null ? void 0 : t.SEVERE) == null ? void 0 : M.sigWave) == null ? void 0 : g.number, u = (c = (I = t == null ? void 0 : t.HEAVY) == null ? void 0 : I.sigWave) == null ? void 0 : c.number, y = Math.round((((N = (w = t == null ? void 0 : t.SEVERE) == null ? void 0 : w.wind) == null ? void 0 : N.number) + 2) * 100) / 100, h = (S = (v = t == null ? void 0 : t.SEVERE) == null ? void 0 : v.wind) == null ? void 0 : S.number, f = (F = (Y = t == null ? void 0 : t.HEAVY) == null ? void 0 : Y.wind) == null ? void 0 : F.number;
     for (let V = 0; V < (e == null ? void 0 : e.length); V++) {
-      const H = e[V], P = (T = (q = H == null ? void 0 : H.meteo) == null ? void 0 : q.wave) == null ? void 0 : T.sig, A = (D = H == null ? void 0 : H.meteo) == null ? void 0 : D.wind, J = V ? w(H.eta).diff(w(e[V - 1].eta), "hour", !0) : 0;
-      s = J > s ? J : s, W == null || W.info("[%s] check sig.wave: %j", o.requestId, { ...P, dgThd4Wv: d, svThd4Wv: r, hvThd4Wv: h }), (P == null ? void 0 : P.height) >= d ? H.isDangerous = !0 : (P == null ? void 0 : P.height) >= r ? H.isSevere = !0 : (P == null ? void 0 : P.height) >= h && (H.isHeavy = !0), W == null || W.info("[%s] check wind: %j", o.requestId, { ...A, dgThd4Wd: y, svThd4Wd: l, hvThd4Wd: f }), (A == null ? void 0 : A.scale) >= y ? (H.isDangerous = !0, delete H.isSevere, delete H.isHeavy) : (A == null ? void 0 : A.scale) > l ? (H.isDangerous || (H.isSevere = !0), delete H.isHeavy) : (A == null ? void 0 : A.scale) === f && !H.isDangerous && !H.isSevere && (H.isHeavy = !0), i += H.isDangerous ? J : 0, a += H.isSevere ? J : 0, n += H.isHeavy ? J : 0;
+      const E = e[V], P = (D = (T = E == null ? void 0 : E.meteo) == null ? void 0 : T.wave) == null ? void 0 : D.sig, A = (H = E == null ? void 0 : E.meteo) == null ? void 0 : H.wind, J = V ? p(E.eta).diff(p(e[V - 1].eta), "hour", !0) : 0;
+      s = J > s ? J : s, W == null || W.info("[%s] check sig.wave: %j", o.requestId, { ...P, dgThd4Wv: d, svThd4Wv: r, hvThd4Wv: u }), (P == null ? void 0 : P.height) >= d ? E.isDangerous = !0 : (P == null ? void 0 : P.height) >= r ? E.isSevere = !0 : (P == null ? void 0 : P.height) >= u && (E.isHeavy = !0), W == null || W.info("[%s] check wind: %j", o.requestId, { ...A, dgThd4Wd: y, svThd4Wd: h, hvThd4Wd: f }), (A == null ? void 0 : A.scale) >= y ? (E.isDangerous = !0, delete E.isSevere, delete E.isHeavy) : (A == null ? void 0 : A.scale) > h ? (E.isDangerous || (E.isSevere = !0), delete E.isHeavy) : (A == null ? void 0 : A.scale) === f && !E.isDangerous && !E.isSevere && (E.isHeavy = !0), i += E.isDangerous ? J : 0, a += E.isSevere ? J : 0, n += E.isHeavy ? J : 0;
     }
-    return i = Math.round(i * 100) / 100, a = Math.round(a * 100) / 100, n = Math.round(n * 100) / 100, s = Math.round(s), { sample: e, dangerous: i, severe: a, heavy: n, step: s < 3 ? 3 : s, wind: { dgThd4Wd: y, svThd4Wd: l, hvThd4Wd: f }, sig: { dgThd4Wv: d, svThd4Wv: r, hvThd4Wv: h } };
+    return i = Math.round(i * 100) / 100, a = Math.round(a * 100) / 100, n = Math.round(n * 100) / 100, s = Math.round(s), { sample: e, dangerous: i, severe: a, heavy: n, step: s < 3 ? 3 : s, wind: { dgThd4Wd: y, svThd4Wd: h, hvThd4Wd: f }, sig: { dgThd4Wv: d, svThd4Wv: r, hvThd4Wv: u } };
   }
 }
 const kt = new rt();
-let I;
+let k;
 try {
-  I = Q.getLogger("vessel");
+  k = Q.getLogger("vessel");
 } catch {
 } finally {
 }
 const ct = new ot("", !0);
-var dt = /* @__PURE__ */ ((Y) => (Y.common = "common", Y.container = "container", Y.tugs = "tugs", Y))(dt || {}), ut = /* @__PURE__ */ ((Y) => (Y.Ballast = "Ballast", Y.Laden = "Laden", Y))(ut || {}), ht = /* @__PURE__ */ ((Y) => (Y.Cp = "CP", Y.Perf = "Basis", Y.Instruct = "Other", Y))(ht || {});
-class E {
+var dt = /* @__PURE__ */ ((j) => (j.common = "common", j.container = "container", j.tugs = "tugs", j))(dt || {}), ut = /* @__PURE__ */ ((j) => (j.Ballast = "Ballast", j.Laden = "Laden", j))(ut || {}), ht = /* @__PURE__ */ ((j) => (j.Cp = "CP", j.Perf = "Basis", j.Instruct = "Other", j))(ht || {});
+class C {
   /**
    * @see https://baike.baidu.com/item/%E6%96%B9%E5%BD%A2%E7%B3%BB%E6%95%B0/4965568?fr=aladdin
    * 方形系数（block coefficient）
@@ -706,8 +706,8 @@ class E {
    * @private
    */
   static assembleProperties(e, t, o, i) {
-    var l;
-    const a = e.lbp ?? e.length ?? e.lengthOverall ?? 198.9642, n = 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";
+    var h;
+    const a = e.lbp ?? e.length ?? e.lengthOverall ?? 198.9642, n = e.draught ?? 8, s = e.breadthMoulded ?? e.breadth ?? e.breadthExtreme ?? 32.4572, d = e.deadweight ?? 67035.7773, r = ((h = e == null ? void 0 : e.type) == null ? void 0 : h.toLowerCase()) || "common";
     return {
       tag: r.indexOf("container") > -1 ? "container" : r.indexOf("tugs") > -1 ? "tugs" : "common",
       lbp: a,
@@ -735,21 +735,21 @@ class E {
   static async speedLoseAt(e, t, o, i = "", a = 2, n = !0, s = !1, d = {}) {
     let r;
     if (t.velocity && s && (e.speed = z.roundPrecision(t.velocity * 1852 / 3600, 6)), n) {
-      let h;
+      let u;
       if (d.meteo2)
         try {
-          const u = await ct.spotForecast(t.lat, t.lng, o.utc().format(), !1, !1, !0, d), [b] = tt.pickHourly(u, o);
-          h = tt.toLegacy(b);
-        } catch (u) {
-          I.warn("[%s] meteo2 spot(%j) forecast failed: %s", d.requestId, { ...t, eta: o.utc().format() }, u);
+          const l = await ct.spotForecast(t.lat, t.lng, o.utc().format(), !1, !1, !0, d), [m] = tt.pickHourly(l, o);
+          u = tt.toLegacy(m);
+        } catch (l) {
+          k.warn("[%s] meteo2 spot(%j) forecast failed: %s", d.requestId, { ...t, eta: o.utc().format() }, l);
         }
       else
-        h = await nt.queryPointFactor(t.lng, t.lat, o.valueOf(), "wind,wave,current,watertemp", i, d);
-      const y = E.weatherFactor(e, h), l = E.currentFactor(e.bearing, h == null ? void 0 : h.current, a), f = Math.round((e.speed * 1.943844 + y + l) * 100) / 100;
+        u = await nt.queryPointFactor(t.lng, t.lat, o.valueOf(), "wind,wave,current,watertemp", i, d);
+      const y = C.weatherFactor(e, u), h = C.currentFactor(e.bearing, u == null ? void 0 : u.current, a), f = Math.round((e.speed * 1.943844 + y + h) * 100) / 100;
       r = {
-        meteo: { ...h },
+        meteo: { ...u },
         wxFactor: y,
-        cFactor: l,
+        cFactor: h,
         speed: t.velocity && s ? t.velocity : f < 0 ? 1 : f,
         eta: o.utc().format("YYYY-MM-DDTHH:mm[Z]"),
         etd: o.utc().format("YYYY-MM-DDTHH:mm[Z]")
@@ -777,53 +777,53 @@ class E {
    * @param useRouteParam true 启用航线上设置的参数 { suspend: 停留时长（小时）, velocity: 速度（kts）}
    * @private
    */
-  static async speedLoseInHoursStep(e, t, o, i, a, n, s = "", d = !0, r = !1, h = {}) {
+  static async speedLoseInHoursStep(e, t, o, i, a, n, s = "", d = !0, r = !1, u = {}) {
     t.utc();
-    const y = t.clone().add(14, "days"), l = [], f = [];
-    let u = 0, b = 0, k, v;
-    for (let p = 0; p < n.length - 1; p++) {
-      let c = n[p];
-      c.distanceFromStart = Math.round((a + b) * 1e4) / 1e4;
-      const M = n[p + 1];
-      if (e.bearing = B.calculateBearing(c, M, !M.gcToPrevious), c.bearing = e.bearing, c.suspend && r) {
+    const y = t.clone().add(14, "days"), h = [], f = [];
+    let l = 0, m = 0, M, g;
+    for (let I = 0; I < n.length - 1; I++) {
+      let c = n[I];
+      c.distanceFromStart = Math.round((a + m) * 1e4) / 1e4;
+      const w = n[I + 1];
+      if (e.bearing = B.calculateBearing(c, w, !w.gcToPrevious), c.bearing = e.bearing, c.suspend && r) {
         c.eta = c.eta || t.format("YYYY-MM-DDTHH:mm[Z]"), c.elapsed = c.elapsed ?? 0;
         const S = c.suspend - c.elapsed;
-        if (i - u > S)
-          i = i - u - S, t.add(S, "hour"), c.elapsed = c.suspend;
+        if (i - l > S)
+          i = i - l - S, t.add(S, "hour"), c.elapsed = c.suspend;
         else {
-          const j = i - u;
-          c.elapsed += j, t.add(j, "hour"), i = 0;
+          const Y = i - l;
+          c.elapsed += Y, t.add(Y, "hour"), i = 0;
         }
-        if (I == null || I.info(`[%s] suspend ${c.elapsed} hours at %j, and remain ${i} hours need to go...`, h.requestId, c), i === 0)
-          return c.distanceFromPrevious = b, { etd: t, from: v || c, to: c, next: n.filter((j) => j), wps: l, days: f };
+        if (k == null || k.info(`[%s] suspend ${c.elapsed} hours at %j, and remain ${i} hours need to go...`, u.requestId, c), i === 0)
+          return c.distanceFromPrevious = m, { etd: t, from: g || c, to: c, next: n.filter((Y) => Y), wps: h, days: f };
       } else
         c.suspend = 0;
-      d = t.isAfter(y) ? !1 : d, c = await E.speedLoseAt(e, c, t, s, 0, d, r, h), v = v || c, c.important && l.push(c), t.isSameOrAfter(o) && (f.push(c), o.add(24, "hour"));
-      const N = B.calculateDistance(c, M, !M.gcToPrevious);
-      let m = Math.ceil(N / v.speed * 1e4) / 1e4;
-      if (u + m < i) {
-        if (u += m, t.add(m, "hour"), delete n[p], I == null || I.debug(
-          `[%s] go to %j from %j with ${N}nm, and cost ${m} hours`,
-          h.requestId,
-          { lat: M.lat, lng: M.lng },
-          { lat: v.lat, lng: v.lng, etd: v.etd }
-        ), b += N, n.filter((S) => S).length <= 1) {
-          k = M, k.eta = t.format("YYYY-MM-DDTHH:mm[Z]"), k.distanceFromPrevious = N, k.distanceFromStart = Math.round((a + b) * 1e4) / 1e4, l.push(k), delete n[p + 1];
+      d = t.isAfter(y) ? !1 : d, c = await C.speedLoseAt(e, c, t, s, 0, d, r, u), g = g || c, c.important && h.push(c), t.isSameOrAfter(o) && (f.push(c), o.add(24, "hour"));
+      const N = B.calculateDistance(c, w, !w.gcToPrevious);
+      let v = Math.ceil(N / g.speed * 1e4) / 1e4;
+      if (l + v < i) {
+        if (l += v, t.add(v, "hour"), delete n[I], k == null || k.debug(
+          `[%s] go to %j from %j with ${N}nm, and cost ${v} hours`,
+          u.requestId,
+          { lat: w.lat, lng: w.lng },
+          { lat: g.lat, lng: g.lng, etd: g.etd }
+        ), m += N, n.filter((S) => S).length <= 1) {
+          M = w, M.eta = t.format("YYYY-MM-DDTHH:mm[Z]"), M.distanceFromPrevious = N, M.distanceFromStart = Math.round((a + m) * 1e4) / 1e4, h.push(M), delete n[I + 1];
           break;
         }
       } else {
-        m = i - u, t.add(m, "hour");
-        const S = z.roundPrecision(v.speed * m, 4);
-        k = B.calculateCoordinate(c, e.bearing, S, "nauticalmiles", !M.gcToPrevious), k.eta = t.format("YYYY-MM-DDTHH:mm[Z]"), n[p] = k, I == null || I.debug(
-          `[%s] go to %j from %j with ${S}nm, and cost ${m} hours`,
-          h.requestId,
-          { lat: k.lat, lng: k.lng },
+        v = i - l, t.add(v, "hour");
+        const S = z.roundPrecision(g.speed * v, 4);
+        M = B.calculateCoordinate(c, e.bearing, S, "nauticalmiles", !w.gcToPrevious), M.eta = t.format("YYYY-MM-DDTHH:mm[Z]"), n[I] = M, k == null || k.debug(
+          `[%s] go to %j from %j with ${S}nm, and cost ${v} hours`,
+          u.requestId,
+          { lat: M.lat, lng: M.lng },
           { lat: c.lat, lng: c.lng, etd: c.etd }
-        ), b += S, k.distanceFromPrevious = Math.round(b * 1e4) / 1e4, k.distanceFromStart = Math.round((a + b) * 1e4) / 1e4;
+        ), m += S, M.distanceFromPrevious = Math.round(m * 1e4) / 1e4, M.distanceFromStart = Math.round((a + m) * 1e4) / 1e4;
         break;
       }
     }
-    return { etd: t, from: v, to: k, next: n.filter((p) => p), wps: l, days: f };
+    return { etd: t, from: g, to: M, next: n.filter((I) => I), wps: h, days: f };
   }
   /**
    * 洋流影响因子
@@ -844,16 +844,16 @@ class E {
    * @param wwc 气象要素
    */
   static weatherFactor(e, t) {
-    var y, l, f, u, b, k, v;
-    I == null || I.debug("calculate weather factor via: %j", { ...e, ...t });
-    const o = E.blockCoefficient(e.displacement, e.lbp, e.breadthMoulded, e.draught), i = E.froudeNumber(e.speed, e.lbp), a = E.amendFactor(o, i, e.loadCondition);
+    var y, h, f, l, m, M, g;
+    k == null || k.debug("calculate weather factor via: %j", { ...e, ...t });
+    const o = C.blockCoefficient(e.displacement, e.lbp, e.breadthMoulded, e.draught), i = C.froudeNumber(e.speed, e.lbp), a = C.amendFactor(o, i, e.loadCondition);
     let n = Math.abs(e.bearing % 360 - (((y = t == null ? void 0 : t.wind) == null ? void 0 : y.degree) % 360 || 0));
     n = n > 180 ? 360 - n : n;
-    const s = E.directionFactor(n, (l = t == null ? void 0 : t.wind) == null ? void 0 : l.scale), d = E.vesselTagFactor(e.displacement, e.loadCondition, e.tag, (f = t == null ? void 0 : t.wind) == null ? void 0 : f.scale);
+    const s = C.directionFactor(n, (h = t == null ? void 0 : t.wind) == null ? void 0 : h.scale), d = C.vesselTagFactor(e.displacement, e.loadCondition, e.tag, (f = t == null ? void 0 : t.wind) == null ? void 0 : f.scale);
     let r = s * a * 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)), I == null || I.debug("wind wx factor = %d", r), n = Math.abs(e.bearing % 360 - (((b = (u = t == null ? void 0 : t.wave) == null ? void 0 : u.sig) == null ? void 0 : b.degree) % 360 || 0));
-    const h = E.waveHeightFactor(((v = (k = t == null ? void 0 : t.wave) == null ? void 0 : k.sig) == null ? void 0 : v.height) ?? 1, n);
-    return I == null || I.debug("wave wx factor = %d", h), r = r * 0.4 + h, I == null || I.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;
+    r = Math.round(r * 1.943844 * 1e4) / 1e4 * -1, e.tag === "tugs" && Math.abs(r) > 1 && (r = r / (Math.abs(Math.round(r)) + 1)), k == null || k.debug("wind wx factor = %d", r), n = Math.abs(e.bearing % 360 - (((m = (l = t == null ? void 0 : t.wave) == null ? void 0 : l.sig) == null ? void 0 : m.degree) % 360 || 0));
+    const u = C.waveHeightFactor(((g = (M = t == null ? void 0 : t.wave) == null ? void 0 : M.sig) == null ? void 0 : g.height) ?? 1, n);
+    return k == null || k.debug("wave wx factor = %d", u), r = r * 0.4 + u, k == null || k.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 E {
    * @param useMeteo true 启用气象分析
    * @param useRouteParam
    */
-  static async analyseInstant(e, t, o, i, a, n = "", s = 0, d = !0, r = !1, h = {}) {
+  static async analyseInstant(e, t, o, i, a, n = "", s = 0, d = !0, r = !1, u = {}) {
     var J, _, K, G, L;
-    const y = w().valueOf();
+    const y = p().valueOf();
     e.lng = z.convertToStdLng(e.lng);
-    const { route: l, waypoints: f } = a.points, u = B.calculateSubRoute(e, l);
-    if (((J = u[0]) == null ? void 0 : J.length) <= 1)
+    const { route: h, waypoints: f } = a.points, l = B.calculateSubRoute(e, h);
+    if (((J = l[0]) == null ? void 0 : J.length) <= 1)
       return;
-    const { v0: b, label: k } = e.sog ? {
+    const { v0: m, label: M } = e.sog ? {
       v0: e.sog,
       label: "Other"
       /* Instruct */
@@ -882,46 +882,46 @@ class E {
       v0: i.speed,
       label: "CP"
       /* Cp */
-    }, v = E.assembleProperties(o, i.loadCondition, b, 0), p = f.length ? B.calculateSubWaypoints(e, f) : [];
-    p.forEach((x) => x.important = !0);
+    }, g = C.assembleProperties(o, i.loadCondition, m, 0), I = f.length ? B.calculateSubWaypoints(e, f) : [];
+    I.forEach((x) => x.important = !0);
     const c = {
       from: { ...e },
-      route: u,
-      waypoints: p,
-      v0: b,
-      label: k
-    }, M = {
+      route: l,
+      waypoints: I,
+      v0: m,
+      label: M
+    }, w = {
       hours: [],
       days: [],
       wps: []
     };
-    s || (B.calculateRouteDistance(u) / i.speed <= 72 ? s = 3 : s = 6);
-    let N = B.simplifyRouteToCoordinates(u, p, 0), m = 0, S = 0, j = 0, C = 0;
-    t = w(t).utc();
-    const q = t.clone();
+    s || (B.calculateRouteDistance(l) / i.speed <= 72 ? s = 3 : s = 6);
+    let N = B.simplifyRouteToCoordinates(l, I, 0), v = 0, S = 0, Y = 0, F = 0;
+    t = p(t).utc();
+    const T = t.clone();
     for (; N.length > 0; ) {
-      const x = s - t.hour() % s, F = Math.ceil(t.clone().add(x, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4, O = await E.speedLoseInHoursStep(
-        v,
+      const x = s - t.hour() % s, q = Math.ceil(t.clone().add(x, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4, O = await C.speedLoseInHoursStep(
+        g,
         t,
+        T,
         q,
-        F,
-        m,
+        v,
         N,
         n,
         d,
         r,
-        h
+        u
       );
-      (_ = O.from) != null && _.speed && (M.hours.push(O.from), M.wps.push(...O.wps), M.days.push(...O.days)), N = O == null ? void 0 : O.next, N.length || M.hours.push(O == null ? void 0 : O.to), m += Math.round((((K = O == null ? void 0 : O.to) == null ? void 0 : K.distanceFromPrevious) ?? 0) * 1e4) / 1e4;
+      (_ = O.from) != null && _.speed && (w.hours.push(O.from), w.wps.push(...O.wps), w.days.push(...O.days)), N = O == null ? void 0 : O.next, N.length || w.hours.push(O == null ? void 0 : O.to), v += Math.round((((K = O == null ? void 0 : O.to) == null ? void 0 : K.distanceFromPrevious) ?? 0) * 1e4) / 1e4;
     }
-    const T = M.hours;
-    for (let x = 0; x < T.length - 1; x++) {
-      const F = w(T[x + 1].eta).diff(T[x].etd, "hour", !0) || 1;
-      S += (T[x].wxFactor || 0) * F, j += (T[x].cFactor || 0) * F, C += F;
+    const D = w.hours;
+    for (let x = 0; x < D.length - 1; x++) {
+      const q = p(D[x + 1].eta).diff(D[x].etd, "hour", !0) || 1;
+      S += (D[x].wxFactor || 0) * q, Y += (D[x].cFactor || 0) * q, F += q;
     }
-    (G = M.wps) == null || G.forEach((x, F) => {
-      if (F) {
-        const O = M.wps[F - 1], et = x.distanceFromStart - O.distanceFromStart, X = w(x.eta).diff(w(O.etd), "h", !0);
+    (G = w.wps) == null || G.forEach((x, q) => {
+      if (q) {
+        const O = w.wps[q - 1], et = x.distanceFromStart - O.distanceFromStart, X = p(x.eta).diff(p(O.etd), "h", !0);
         if (X < 1)
           x.avgSpd = O.speed;
         else {
@@ -930,11 +930,11 @@ class E {
           x.avgSpd = x.avgSpd > $ ? $ : x.avgSpd;
         }
       }
-    }), c.sample = M;
-    const D = M.hours.at(0), V = M.hours.at(-1);
-    c.distance = Math.round(V.distanceFromStart * 1e4) / 1e4, c.etd = w(D.eta).utc().format(), c.eta = w(V.eta).utc().format(), c.wxFactor = Math.round(S / C * 1e4) / 1e4, c.cFactor = Math.round(j / C * 1e4) / 1e4, c.avgSpeed = Math.round(V.distanceFromStart / C * 1e4) / 1e4, c.totalHrs = Math.round(C * 1e4) / 1e4, c.totalFoCons = Math.round((i == null ? void 0 : i.fo) / 24 * c.totalHrs * 1e3) / 1e3, c.totalDgoCons = Math.round((i == null ? void 0 : i.dgo) / 24 * c.totalHrs * 1e3) / 1e3;
-    const P = w().valueOf() - y, A = ((L = M == null ? void 0 : M.hours) == null ? void 0 : L.length) || 1;
-    return I == null || I.info("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", h == null ? void 0 : h.requestId, P, A, Math.round(P / A * 1e3) / 1e3), c;
+    }), c.sample = w;
+    const H = w.hours.at(0), V = w.hours.at(-1);
+    c.distance = Math.round(V.distanceFromStart * 1e4) / 1e4, c.etd = p(H.eta).utc().format(), c.eta = p(V.eta).utc().format(), c.wxFactor = Math.round(S / F * 1e4) / 1e4, c.cFactor = Math.round(Y / F * 1e4) / 1e4, c.avgSpeed = Math.round(V.distanceFromStart / F * 1e4) / 1e4, c.totalHrs = Math.round(F * 1e4) / 1e4, c.totalFoCons = Math.round((i == null ? void 0 : i.fo) / 24 * c.totalHrs * 1e3) / 1e3, c.totalDgoCons = Math.round((i == null ? void 0 : i.dgo) / 24 * c.totalHrs * 1e3) / 1e3;
+    const P = p().valueOf() - y, A = ((L = w == null ? void 0 : w.hours) == null ? void 0 : L.length) || 1;
+    return k == null || k.info("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", u == null ? void 0 : u.requestId, P, A, Math.round(P / A * 1e3) / 1e3), c;
   }
   /**
    * 分段失速分析（最多走hours 小时）
@@ -949,11 +949,11 @@ class E {
    * @param useMeteo true 启用气象分析
    * @param useRouteParam
    */
-  static async analyseInstantWithThreshed(e, t, o, i, a, n, s, d = "", r = 3, h = !0, y = !1, l = {}) {
+  static async analyseInstantWithThreshed(e, t, o, i, a, n, s, d = "", r = 3, u = !0, y = !1, h = {}) {
     var J, _, K, G;
-    const f = w().valueOf();
+    const f = p().valueOf();
     e.lng = z.convertToStdLng(e.lng);
-    const { v0: u, label: b } = e.sog ? {
+    const { v0: l, label: m } = e.sog ? {
       v0: e.sog,
       label: "Other"
       /* Instruct */
@@ -961,52 +961,52 @@ class E {
       v0: a.speed,
       label: "CP"
       /* Cp */
-    }, k = E.assembleProperties(i, a.loadCondition, u, 0), v = B.calculateSubRoute(e, n);
-    if (((J = v[0]) == null ? void 0 : J.length) <= 1)
+    }, M = C.assembleProperties(i, a.loadCondition, l, 0), g = B.calculateSubRoute(e, n);
+    if (((J = g[0]) == null ? void 0 : J.length) <= 1)
       return;
-    const p = s.length ? B.calculateSubWaypoints(e, s) : [];
-    p.forEach((L) => L.important = !0);
-    let c = B.simplifyRouteToCoordinates(v, p, 0), M = 0, N = 0, m = 0, S = 0;
-    const j = {
+    const I = s.length ? B.calculateSubWaypoints(e, s) : [];
+    I.forEach((L) => L.important = !0);
+    let c = B.simplifyRouteToCoordinates(g, I, 0), w = 0, N = 0, v = 0, S = 0;
+    const Y = {
       hours: [],
       wps: [],
       days: []
     };
-    t = w(t).utc();
-    const C = t.clone();
+    t = p(t).utc();
+    const F = t.clone();
     for (; c.length > 0; ) {
       const L = r - t.hour() % r;
       let x = Math.ceil(t.clone().add(L, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4;
       x = t.clone().add(x, "h").isSameOrAfter(o) ? o.diff(t, "h", !0) * 1e4 / 1e4 : x;
-      const F = await E.speedLoseInHoursStep(k, t, C, x, M, c, d, h, y, l);
-      if ((_ = F.from) != null && _.speed && (j.hours.push(F.from), F != null && F.wps && j.wps.push(...F.wps), j.days.push(...F.days)), c = F == null ? void 0 : F.next, c.length || j.hours.push(F == null ? void 0 : F.to), M += Math.round((((K = F == null ? void 0 : F.to) == null ? void 0 : K.distanceFromPrevious) ?? 0) * 1e4) / 1e4, !x)
+      const q = await C.speedLoseInHoursStep(M, t, F, x, w, c, d, u, y, h);
+      if ((_ = q.from) != null && _.speed && (Y.hours.push(q.from), q != null && q.wps && Y.wps.push(...q.wps), Y.days.push(...q.days)), c = q == null ? void 0 : q.next, c.length || Y.hours.push(q == null ? void 0 : q.to), w += Math.round((((K = q == null ? void 0 : q.to) == null ? void 0 : K.distanceFromPrevious) ?? 0) * 1e4) / 1e4, !x)
         break;
     }
-    const q = j.hours;
-    for (let L = 0; L < q.length - 1; L++) {
-      const x = w(q[L + 1].eta).diff(q[L].etd, "hour", !0);
-      N += q[L].wxFactor * x, m += q[L].cFactor * x, S += x;
+    const T = Y.hours;
+    for (let L = 0; L < T.length - 1; L++) {
+      const x = p(T[L + 1].eta).diff(T[L].etd, "hour", !0);
+      N += T[L].wxFactor * x, v += T[L].cFactor * x, S += x;
     }
-    const T = j.hours.at(0), D = j.hours.at(-1), V = {
-      sample: j,
-      distance: Math.round(((D == null ? void 0 : D.distanceFromStart) || 0) * 1e4) / 1e4,
+    const D = Y.hours.at(0), H = Y.hours.at(-1), V = {
+      sample: Y,
+      distance: Math.round(((H == null ? void 0 : H.distanceFromStart) || 0) * 1e4) / 1e4,
       // 注意，可能会在first节点Drift,所有采用eta做为初始出发时间
-      etd: w(T.eta).utc().format(),
-      eta: w(D == null ? void 0 : D.eta).utc().format(),
+      etd: p(D.eta).utc().format(),
+      eta: p(H == null ? void 0 : H.eta).utc().format(),
       wxFactor: Math.round(N / S * 1e4) / 1e4,
-      cFactor: Math.round(m / S * 1e4) / 1e4,
-      avgSpeed: Math.round(((D == null ? void 0 : D.distanceFromStart) || 0) / S * 1e4) / 1e4,
+      cFactor: Math.round(v / S * 1e4) / 1e4,
+      avgSpeed: Math.round(((H == null ? void 0 : H.distanceFromStart) || 0) / S * 1e4) / 1e4,
       totalHrs: Math.round(S * 1e4) / 1e4,
       totalFoCons: Math.round((a == null ? void 0 : a.fo) / 24 * S * 1e3) / 1e3,
       totalDgoCons: Math.round((a == null ? void 0 : a.dgo) / 24 * S * 1e3) / 1e3,
-      from: T,
-      to: D,
-      route: v,
-      waypoints: p,
-      v0: u,
-      label: b
-    }, P = w().valueOf() - f, A = ((G = j == null ? void 0 : j.hours) == null ? void 0 : G.length) || 1;
-    return I == null || I.debug("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", l == null ? void 0 : l.requestId, P, A, Math.round(P / A * 1e3) / 1e3), V;
+      from: D,
+      to: H,
+      route: g,
+      waypoints: I,
+      v0: l,
+      label: m
+    }, P = p().valueOf() - f, A = ((G = Y == null ? void 0 : Y.hours) == null ? void 0 : G.length) || 1;
+    return k == null || k.debug("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", h == null ? void 0 : h.requestId, P, A, Math.round(P / A * 1e3) / 1e3), V;
   }
   /**
    * 在指定航线条件下，基于多CP，动态计算最优成本(租金+油费)方案
@@ -1024,25 +1024,25 @@ class E {
    * @param options
    */
   static async analyseCost(e, t, o, i, a = {}) {
-    var v, p;
-    const n = w().valueOf(), s = [];
+    var g, I;
+    const n = p().valueOf(), s = [];
     a.meteo2 = a.meteo2 || !0, e.speedStep = e.speedStep || 3, e.alterStep = e.alterStep ?? 1;
     const d = B.calculateRouteDistance(i.route);
     let r = 0;
     o.forEach((c) => {
-      const M = Math.ceil(d / c.speed / 24);
-      r = r < M ? M : r;
+      const w = Math.ceil(d / c.speed / 24);
+      r = r < w ? w : r;
     }), r = r * 1.3;
-    const h = w.utc(e.etd).add(r ?? 14, "day");
+    const u = p.utc(e.etd).add(r ?? 14, "day");
     let y = 1;
     for (const c of o) {
-      const M = JSON.parse(JSON.stringify(i.route)), N = JSON.parse(JSON.stringify(i.waypoints)), m = await E.analyseInstantWithThreshed(
+      const w = JSON.parse(JSON.stringify(i.route)), N = JSON.parse(JSON.stringify(i.waypoints)), v = await C.analyseInstantWithThreshed(
         { lat: e.lat, lng: e.lng },
         e.etd,
-        h,
+        u,
         t,
         c,
-        M,
+        w,
         N,
         e.meteoVendor,
         e.speedStep,
@@ -1050,30 +1050,30 @@ class E {
         e.useRouteParam,
         a
       );
-      m && (await E.calculateCost(m, c, e, a), s.push(m), I == null || I.info("[%s][L%d-%d] analyse from %s to %s cost: %j", a.requestId, 1, y, e.etd, h.format(), {
-        cost: m.cost.total,
-        distance: m.distance,
-        hours: m.totalHrs,
+      v && (await C.calculateCost(v, c, e, a), s.push(v), k == null || k.info("[%s][L%d-%d] analyse from %s to %s cost: %j", a.requestId, 1, y, e.etd, u.format(), {
+        cost: v.cost.total,
+        distance: v.distance,
+        hours: v.totalHrs,
         cp: `${c.speed}/${c.fo}/${c.dgo}`
       })), y++;
     }
-    s.sort((c, M) => c.cost.total - M.cost.total);
-    const l = s.at(0), f = s.at(1), u = [];
-    if (u.push({ combined: !1, speeds: [l], cost: (v = l.cost) == null ? void 0 : v.total }), f) {
-      const c = l.cost.cp, M = f.cost.cp, N = w(l.eta), m = w(l.etd), S = N.diff(m, "days", !0);
-      let j = Math.ceil(S / 2);
-      j = j > 7 ? 7 : j < e.alterStep ? e.alterStep : j;
-      let C = 2, q = { combined: !1, speeds: [f], cost: (p = f.cost) == null ? void 0 : p.total }, T;
-      for (; j >= e.alterStep; ) {
-        const D = await E.combinedAnalyse(e, t, h, [c, M], i, j, { ...a, level: C });
-        if (q.cost > D.cost ? T ? (T == null ? void 0 : T.cost) > D.cost && (T = D) : (T = q, q = D) : (!T || (T == null ? void 0 : T.cost) > D.cost) && (T = D), j <= e.alterStep)
+    s.sort((c, w) => c.cost.total - w.cost.total);
+    const h = s.at(0), f = s.at(1), l = [];
+    if (l.push({ combined: !1, speeds: [h], cost: (g = h.cost) == null ? void 0 : g.total }), f) {
+      const c = h.cost.cp, w = f.cost.cp, N = p(h.eta), v = p(h.etd), S = N.diff(v, "days", !0);
+      let Y = Math.ceil(S / 2);
+      Y = Y > 7 ? 7 : Y < e.alterStep ? e.alterStep : Y;
+      let F = 2, T = { combined: !1, speeds: [f], cost: (I = f.cost) == null ? void 0 : I.total }, D;
+      for (; Y >= e.alterStep; ) {
+        const H = await C.combinedAnalyse(e, t, u, [c, w], i, Y, { ...a, level: F });
+        if (T.cost > H.cost ? D ? (D == null ? void 0 : D.cost) > H.cost && (D = H) : (D = T, T = H) : (!D || (D == null ? void 0 : D.cost) > H.cost) && (D = H), Y <= e.alterStep)
           break;
-        j = Math.ceil(j / 2), C += 1;
+        Y = Math.ceil(Y / 2), F += 1;
       }
-      u.push(q), T && u.push(T);
+      l.push(T), D && l.push(D);
     }
-    const k = w().valueOf() - n;
-    return I == null || I.info("[%s] analyse elapsed: %d ms", a == null ? void 0 : a.requestId, k), u.sort((c, M) => c.cost - M.cost);
+    const M = p().valueOf() - n;
+    return k == null || k.info("[%s] analyse elapsed: %d ms", a == null ? void 0 : a.requestId, M), l.sort((c, w) => c.cost - w.cost);
   }
   /**
    * 按步长多次减半，分别用7,4,2,1天步长及cpa,cpb交替计算各种组合下的成本
@@ -1086,11 +1086,11 @@ class E {
    * @param options
    */
   static async combinedAnalyse(e, t, o, i, a, n, s = {}) {
-    s.counter = 1, I == null || I.info("[%s][L%d] analyse with alternate cp in every %d days", s.requestId, s.level, n);
-    const d = await E.alternateAnalyse(e, t, o, i, 0, a, n, s), r = d.reduce((l, f) => l + f.cost.total, 0);
-    I == null || I.info("[%s][L%d] cost with cpa/cpb turn: %d", s.requestId, s.level, r);
-    const h = await E.alternateAnalyse(e, t, o, i, 1, a, n, s), y = h.reduce((l, f) => l + f.cost.total, 0);
-    return I == null || I.info("[%s][L%d] cost with cpb/cpa turn: %d", s.requestId, s.level, y), r < y ? { combined: !0, cost: Math.round(r * 1e3) / 1e3, speeds: d, step: n } : { combined: !0, cost: Math.round(y * 1e3) / 1e3, speeds: h, step: n };
+    s.counter = 1, k == null || k.info("[%s][L%d] analyse with alternate cp in every %d days", s.requestId, s.level, n);
+    const d = await C.alternateAnalyse(e, t, o, i, 0, a, n, s), r = d.reduce((h, f) => h + f.cost.total, 0);
+    k == null || k.info("[%s][L%d] cost with cpa/cpb turn: %d", s.requestId, s.level, r);
+    const u = await C.alternateAnalyse(e, t, o, i, 1, a, n, s), y = u.reduce((h, f) => h + f.cost.total, 0);
+    return k == null || k.info("[%s][L%d] cost with cpb/cpa turn: %d", s.requestId, s.level, y), r < y ? { combined: !0, cost: Math.round(r * 1e3) / 1e3, speeds: d, step: n } : { combined: !0, cost: Math.round(y * 1e3) / 1e3, speeds: u, step: n };
   }
   /**
    * 基于cp索引，交替计算指定步长下的成本
@@ -1104,36 +1104,36 @@ class E {
    * @param options
    */
   static async alternateAnalyse(e, t, o, i, a, n, s, d = {}) {
-    var l, f;
-    let r = w.utc(e.etd);
-    const h = { lat: e.lat, lng: e.lng }, y = [];
+    var h, f;
+    let r = p.utc(e.etd);
+    const u = { lat: e.lat, lng: e.lng }, y = [];
     for (; r.isBefore(o); ) {
-      const u = r.clone().utc().add(s, "day"), b = JSON.parse(JSON.stringify(n.route)), k = JSON.parse(JSON.stringify(n.waypoints)), v = i[a], p = await E.analyseInstantWithThreshed(
-        h,
-        r.format(),
+      const l = r.clone().utc().add(s, "day"), m = JSON.parse(JSON.stringify(n.route)), M = JSON.parse(JSON.stringify(n.waypoints)), g = i[a], I = await C.analyseInstantWithThreshed(
         u,
+        r.format(),
+        l,
         t,
-        v,
-        b,
-        k,
+        g,
+        m,
+        M,
         e.meteoVendor,
         e.speedStep,
         e.useMeteo,
         e.useRouteParam,
         d
       );
-      p && (await E.calculateCost(p, v, e, d), I == null || I.info(
+      I && (await C.calculateCost(I, g, e, d), k == null || k.info(
         "[%s][L%d-%d] analyse from %s to %s cost: %j",
         d.requestId,
         d.level,
         d.counter,
         r.utc().format(),
-        u.utc().format(),
-        { cost: p.cost.total, distance: p.distance, hours: p.totalHrs, cp: `${v.speed}/${v.fo}/${v.dgo}` }
+        l.utc().format(),
+        { cost: I.cost.total, distance: I.distance, hours: I.totalHrs, cp: `${g.speed}/${g.fo}/${g.dgo}` }
       )), d.counter = d.counter + 1;
-      const c = (f = (l = p == null ? void 0 : p.sample) == null ? void 0 : l.hours) == null ? void 0 : f.at(-1);
+      const c = (f = (h = I == null ? void 0 : I.sample) == null ? void 0 : h.hours) == null ? void 0 : f.at(-1);
       if (c)
-        h.lat = c.lat, h.lng = c.lng, r = w(c.eta), y.push(p), a = a ? 0 : 1;
+        u.lat = c.lat, u.lng = c.lng, r = p(c.eta), y.push(I), a = a ? 0 : 1;
       else
         break;
     }
@@ -1159,35 +1159,40 @@ class E {
     return e;
   }
   static async mergeSpeeds(e, t = {}) {
-    var f;
+    var l;
     const o = {
       hours: [],
       wps: [],
       days: []
-    }, i = e.reduce((u, b) => u + b.distance, 0), a = e.reduce((u, b) => u + b.totalHrs, 0), n = e.reduce((u, b) => u + b.wxFactor * b.totalHrs / a, 0), s = e.reduce((u, b) => u + b.cFactor * b.totalHrs / a, 0), d = e.reduce((u, b) => u + b.totalFoCons, 0), r = e.reduce((u, b) => u + b.totalDgoCons, 0), h = e.reduce((u, b) => u + b.cost.total, 0), y = e.reduce((u, b) => u + b.cost.hire, 0), l = e.reduce((u, b) => u + b.cost.bunker, 0);
-    for (const u of e) {
-      const b = u.sample.hours, k = b.at(0);
-      k.cp = u.cost.cp;
-      const v = u.sample.wps, p = u.sample.days;
-      b.forEach((M) => {
-        var m;
-        ((m = o.hours) == null ? void 0 : m.findIndex((S) => S.eta === M.eta)) === -1 && o.hours.push(M);
-      }), v.forEach((M) => {
-        var m;
-        ((m = o.wps) == null ? void 0 : m.findIndex((S) => S.eta === M.eta)) === -1 && o.wps.push(M);
-      }), p.forEach((M) => {
-        var m;
-        ((m = o == null ? void 0 : o.days) == null ? void 0 : m.findIndex((S) => S.eta === M.eta)) === -1 && o.days.push(M);
+    }, i = e.reduce((m, M) => m + M.distance, 0), a = e.reduce((m, M) => m + M.totalHrs, 0), n = e.reduce((m, M) => m + M.wxFactor * M.totalHrs / a, 0), s = e.reduce((m, M) => m + M.cFactor * M.totalHrs / a, 0), d = e.reduce((m, M) => m + M.totalFoCons, 0), r = e.reduce((m, M) => m + M.totalDgoCons, 0), u = e.reduce((m, M) => m + M.cost.total, 0), y = e.reduce((m, M) => m + M.cost.hire, 0), h = e.reduce((m, M) => m + M.cost.bunker, 0), f = [];
+    for (const m of e) {
+      const M = m.sample.hours, g = M.at(0);
+      g.cp = m.cost.cp;
+      const I = [m.etd, m.eta], c = f.findIndex((S) => S.id === g.cp.id);
+      c === -1 ? (g.cp.segment = [I], f.push(g.cp)) : f[c].segment.push(I);
+      const w = m.sample.wps, N = m.sample.days;
+      M.forEach((S) => {
+        var F;
+        ((F = o.hours) == null ? void 0 : F.findIndex((T) => T.eta === S.eta)) === -1 && o.hours.push(S);
+      }), w.forEach((S) => {
+        var F;
+        ((F = o.wps) == null ? void 0 : F.findIndex((T) => T.eta === S.eta)) === -1 && o.wps.push(S);
+      }), N.forEach((S) => {
+        var F;
+        ((F = o == null ? void 0 : o.days) == null ? void 0 : F.findIndex((T) => T.eta === S.eta)) === -1 && o.days.push(S);
       });
-      const c = (f = o.wps) == null ? void 0 : f.findIndex((M) => M.eta === k.eta);
-      c === -1 ? o.wps.push(k) : o.wps[c] = k;
+      const v = (l = o.wps) == null ? void 0 : l.findIndex((S) => S.eta === g.eta);
+      v === -1 ? o.wps.push(g) : o.wps[v] = g;
     }
-    return {
+    return o.wps.sort((m, M) => {
+      p(m.etd).unix() - p(M.etd).unix();
+    }), {
       sample: o,
       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 * 1e4) / 1e4,
       totalHrs: Math.round(a * 1e3) / 1e3,
@@ -1197,10 +1202,11 @@ class E {
       totalFoCons: Math.round(d * 1e3) / 1e3,
       totalDgoCons: Math.round(r * 1e3) / 1e3,
       cost: {
-        total: Math.round(h * 1e3) / 1e3,
+        total: Math.round(u * 1e3) / 1e3,
         hire: Math.round(y * 1e3) / 1e3,
-        bunker: Math.round(l * 1e3) / 1e3
-      }
+        bunker: Math.round(h * 1e3) / 1e3
+      },
+      cps: f
     };
   }
 }
@@ -1213,7 +1219,7 @@ export {
   It as MyShipImpl,
   vt as MyVesselImpl,
   pt as ShipxyImpl,
-  E as SpeedHelper,
+  C as SpeedHelper,
   ht as SpeedLabel,
   dt as VesselTag,
   kt as alertHelper