@idm-plugin/vessel 3.4.9 → 3.5.0

package/dist/index.js

@@ -1,10 +1,10 @@
-var lt = Object.defineProperty;
-var mt = (x, e, t) => e in x ? lt(x, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : x[e] = t;
+var ht = Object.defineProperty;
+var mt = (x, e, t) => e in x ? ht(x, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : x[e] = t;
 var U = (x, e, t) => (mt(x, typeof e != "symbol" ? e + "" : e, t), t);
 import B from "got";
 import dt from "@log4js-node/log4js-api";
-import v from "moment";
-import { LaneHelper as W, LngLatHelper as z } from "@idm-plugin/geo2";
+import w from "moment";
+import { LaneHelper as O, LngLatHelper as z } from "@idm-plugin/geo2";
 import { MeteoHelper2 as ft } from "@idm-plugin/meteo2";
 import { Meteo2Assist as ct } from "@idm-plugin/meteo";
 let M;
@@ -54,7 +54,7 @@ class at {
     return { labelCn: t, labelEn: a };
   }
 }
-class Et extends at {
+class jt extends at {
   constructor(t, a) {
     super();
     U(this, "clientId");
@@ -76,12 +76,12 @@ class Et extends at {
       expiresIn: n.expires_in,
       scope: n.scope,
       jti: n.jti,
-      issuedAt: v().utc().format()
+      issuedAt: w().utc().format()
     });
   }
   async checkToken(t = {}) {
     var a;
-    return (!this.token || v().diff(v(this.token.issuedAt), "seconds") > (((a = this.token) == null ? void 0 : a.expiresIn) || 0) - 300) && await this.authToken(t), this.token;
+    return (!this.token || w().diff(w(this.token.issuedAt), "seconds") > (((a = this.token) == null ? void 0 : a.expiresIn) || 0) - 300) && await this.authToken(t), this.token;
   }
   /**
    * 模糊查询
@@ -102,16 +102,16 @@ class Et extends at {
     };
     M == null || M.info("[%s] fetch suggest vessels from: %s - %j", a.requestId, o, n);
     const i = await B.post(o, n).json();
-    return i.status !== 200 ? (M == null || M.warn("[%s] fetch suggest vessels failed: %j", a.requestId, { message: i.message, status: i.status, code: i.code }), []) : (i.data || []).map((l) => ({
-      mmsi: l.mmsi,
-      name: l.nameEn,
-      nameCn: l.nameCn,
-      imo: Number.isNaN(l.imo) ? null : Number(l.imo),
-      callSign: l.callsign,
-      type: l.vesselTypeNameEn,
-      flagName: l.flagCtry,
+    return i.status !== 200 ? (M == null || M.warn("[%s] fetch suggest vessels failed: %j", a.requestId, { message: i.message, status: i.status, code: i.code }), []) : (i.data || []).map((u) => ({
+      mmsi: u.mmsi,
+      name: u.nameEn,
+      nameCn: u.nameCn,
+      imo: Number.isNaN(u.imo) ? null : Number(u.imo),
+      callSign: u.callsign,
+      type: u.vesselTypeNameEn,
+      flagName: u.flagCtry,
       vendor: "myvessel",
-      raw: l
+      raw: u
     }));
   }
   /**
@@ -120,11 +120,11 @@ class Et extends at {
    * @param options
    */
   async search(t, a = {}) {
-    var h, l;
+    var l, u;
     await this.checkToken(a);
     const o = /^\d{7}$/.test(t.toString()), n = o ? "https://market.myvessel.cn/sdc/v1/mkt/vessels/detail/imo" : "https://market.myvessel.cn/sdc/v1/mkt/vessels/detail/mmsi", i = o ? { imo: t } : { mmsi: t }, s = {
       headers: {
-        Authorization: `${(h = this.token) == null ? void 0 : h.tokenType} ${(l = this.token) == null ? void 0 : l.accessToken}`
+        Authorization: `${(l = this.token) == null ? void 0 : l.tokenType} ${(u = this.token) == null ? void 0 : u.accessToken}`
       },
       searchParams: i
     };
@@ -177,11 +177,11 @@ class Et extends at {
     return i.status !== 200 ? (M == null || M.warn("[%s] fetch vessel archive failed: %j", a.requestId, { message: i.message, status: i.status, code: i.code }), {}) : i.data;
   }
   async realTimePosition(t, a = {}) {
-    var r, h;
+    var r, l;
     await this.checkToken(a);
     const o = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/location/unit", n = {
       headers: {
-        Authorization: `${(r = this.token) == null ? void 0 : r.tokenType} ${(h = this.token) == null ? void 0 : h.accessToken}`
+        Authorization: `${(r = this.token) == null ? void 0 : r.tokenType} ${(l = this.token) == null ? void 0 : l.accessToken}`
       },
       searchParams: { mmsi: t }
     };
@@ -190,10 +190,10 @@ class Et extends at {
     if (i.code)
       return M == null || M.warn("[%s] fetch realtime position failed: %j", a.requestId, { message: i.message, status: i.status, code: i.code }), i;
     const s = i.data;
-    for (const l in s)
-      !isNaN(s[l]) && Number(s[l]) !== 1 / 0 && (s[l] = Number(s[l]));
+    for (const u in s)
+      !isNaN(s[u]) && Number(s[u]) !== 1 / 0 && (s[u] = Number(s[u]));
     if (s) {
-      const l = v(`${s.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+      const u = w(`${s.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
       return {
         mmsi: s.mmsi,
         name: s.vesselName || s.aisVesselName,
@@ -208,9 +208,9 @@ class Et extends at {
         cog: s.cog,
         hdg: s.hdg,
         rot: s.rot,
-        eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(s.eta) ? v.utc(s.eta).format() : void 0,
+        eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(s.eta) ? w.utc(s.eta).format() : void 0,
         destination: s.dest,
-        positionTime: l.unix(),
+        positionTime: u.unix(),
         status: s.status,
         labelCn: s.statusNameCn,
         labelEn: s.statusNameEn,
@@ -223,7 +223,7 @@ class Et extends at {
         net: s.net,
         method: "position",
         vendor: "myVessel",
-        utc: l.utc().format()
+        utc: u.utc().format()
       };
     } else
       return {};
@@ -237,34 +237,38 @@ class Et extends at {
    * @param options { requiretId: '请求ID', useAIModel: '启用AI算法', withECA: '是否计算低硫区航行距离', withSpecial: '是否计算穿越的特战区列表和海盗区列表', draught: '最大吃水' }
    */
   async calculateRoute(t, a, o, n, i, s = {}) {
-    var y, w, g;
-    const r = v();
+    var k, b, S;
+    const r = w();
     await this.checkToken(s);
-    const h = "https://svc.data.myvessel.cn/sdc/v1/routes/routing/nodes", l = {
+    const l = "https://svc.data.myvessel.cn/sdc/v1/routes/routing/nodes", u = {
+      endPoint: {
+        lon: a.lng,
+        lat: a.lat
+      },
+      maxDraught: s.draught || 10,
+      useAIModel: s.useAIModel || !1,
+      withECA: s.withECA || !1,
+      withSpecialRegion: s.withSpecial || !1
+    };
+    t.code && (u.startPortCode = t.code), t.lng !== void 0 && t.lat !== void 0 && (u.startPoint = {
+      lon: t.lng,
+      lat: t.lat
+    }), a.code && (u.endPortCode = a.code), a.lng !== void 0 && a.lat !== void 0 && (u.endPoint = {
+      lon: a.lng,
+      lat: a.lat
+    }), o != null && o.length && (u.crossMonthList = o), n != null && n.length && (u.excludeNodes = n), i != null && i.length && (u.excludeSeaAreas = i);
+    const d = {
       headers: {
-        Authorization: `${(y = this.token) == null ? void 0 : y.tokenType} ${(w = this.token) == null ? void 0 : w.accessToken}`
+        Authorization: `${(k = this.token) == null ? void 0 : k.tokenType} ${(b = this.token) == null ? void 0 : b.accessToken}`
       },
-      json: {
-        startPoint: {
-          lon: t.lng,
-          lat: t.lat
-        },
-        endPoint: {
-          lon: a.lng,
-          lat: a.lat
-        },
-        maxDraught: s.draught || 10,
-        useAIModel: s.useAIModel || !1,
-        withECA: s.withECA || !1,
-        withSpecialRegion: s.withSpecial || !1
-      }
+      json: u
     };
-    o != null && o.length && (l.json.crossMonthList = o), n != null && n.length && (l.json.excludeNodes = n), i != null && i.length && (l.json.excludeSeaAreas = i), M == null || M.info("[%s] fetch route from: %s - %j", s.requestId, h, l);
-    const d = await B.post(h, l).json();
-    if (d.status !== 200)
-      return M == null || M.warn("[%s] fetch route failed: %j", s.requestId, { message: d.message, status: d.status, code: d.code }), {};
+    M == null || M.info("[%s] fetch route from: %s - %j", s.requestId, l, d);
+    const y = await B.post(l, d).json();
+    if (y.status !== 200)
+      return M == null || M.warn("[%s] fetch route failed: %j", s.requestId, { message: y.message, status: y.status, code: y.code }), {};
     {
-      const k = {
+      const C = {
         status: "Success",
         nodes: [],
         seas: [],
@@ -273,52 +277,52 @@ class Et extends at {
         route: [],
         distance: 0,
         memo: ""
-      }, { nodes: j, seas: b, tracks: p, specialRegions: f } = d.data;
-      k.nodes = j == null ? void 0 : j.map((c) => ({
-        code: c.nodeCode,
-        nameEn: c.nameEn,
-        nameCn: c.nameCn,
+      }, { nodes: p, seas: v, tracks: m, specialRegions: c } = y.data;
+      C.nodes = p == null ? void 0 : p.map((g) => ({
+        code: g.nodeCode,
+        nameEn: g.nameEn,
+        nameCn: g.nameCn,
         // 中心
         center: {
-          lat: Math.round(c.lat * 1e6) / 1e6,
-          lng: Math.round(c.lon * 1e6) / 1e6
+          lat: Math.round(g.lat * 1e6) / 1e6,
+          lng: Math.round(g.lon * 1e6) / 1e6
         },
         // 起点
         start: {
-          lat: Math.round(c.startLat * 1e6) / 1e6,
-          lng: Math.round(c.startLon * 1e6) / 1e6
+          lat: Math.round(g.startLat * 1e6) / 1e6,
+          lng: Math.round(g.startLon * 1e6) / 1e6
         },
         // 终点
         end: {
-          lat: Math.round(c.endLat * 1e6) / 1e6,
-          lng: Math.round(c.endLat * 1e6) / 1e6
+          lat: Math.round(g.endLat * 1e6) / 1e6,
+          lng: Math.round(g.endLat * 1e6) / 1e6
         },
         // 是否为不可避开关键节点
-        isKey: c.isKeyNode,
+        isKey: g.isKeyNode,
         // 重要枢纽节点
-        isHub: c.isHubNode
-      })), k.seas = b == null ? void 0 : b.map((c) => ({
-        code: c.mrgidSea,
-        nameEn: c.nameEn,
-        nameCn: c.nameCn,
+        isHub: g.isHubNode
+      })), C.seas = v == null ? void 0 : v.map((g) => ({
+        code: g.mrgidSea,
+        nameEn: g.nameEn,
+        nameCn: g.nameCn,
         center: {
-          lat: Math.round(c.centerLat * 1e6) / 1e6,
-          lng: Math.round(c.centerLon * 1e6) / 1e6
+          lat: Math.round(g.centerLat * 1e6) / 1e6,
+          lng: Math.round(g.centerLon * 1e6) / 1e6
         },
         min: {
-          lat: Math.round(c.minLat * 1e6) / 1e6,
-          lng: Math.round(c.minLon * 1e6) / 1e6
+          lat: Math.round(g.minLat * 1e6) / 1e6,
+          lng: Math.round(g.minLon * 1e6) / 1e6
         },
         max: {
-          lat: Math.round(c.maxLat * 1e6) / 1e6,
-          lng: Math.round(c.maxLon * 1e6) / 1e6
+          lat: Math.round(g.maxLat * 1e6) / 1e6,
+          lng: Math.round(g.maxLon * 1e6) / 1e6
         },
-        level: c.mapLevel
-      })), f == null || f.map((c) => {
-        c.regionLength && k.regions.push({
-          type: c.regionType,
-          distance: c.regionLength,
-          rows: c.regions.map((I) => ({
+        level: g.mapLevel
+      })), c == null || c.map((g) => {
+        g.regionLength && C.regions.push({
+          type: g.regionType,
+          distance: g.regionLength,
+          rows: g.regions.map((I) => ({
             code: I.regionCode,
             nameCn: I.nameCn,
             nameEn: I.nameEn,
@@ -326,26 +330,26 @@ class Et extends at {
             distance: I.length
           }))
         });
-      }), k.waypoints = p == null ? void 0 : p.map((c) => ({
-        lat: Math.round(c.lat * 1e5) / 1e5,
-        lng: Math.round(c.lon * 1e5) / 1e5
-      })), (g = k.waypoints) != null && g.length && (k.waypoints = W.simplifyCoordinates(k.waypoints), k.route = W.divideAccordingToLng(k.waypoints), k.distance = W.calculateRouteDistance(k.route));
-      const m = v().diff(r, "second");
-      return k.memo = `time cost: ${m}s`, M.info("[%s] calculate route cost: %d seconds", s.requestId, m), k;
+      }), C.waypoints = m == null ? void 0 : m.map((g) => ({
+        lat: Math.round(g.lat * 1e5) / 1e5,
+        lng: Math.round(g.lon * 1e5) / 1e5
+      })), (S = C.waypoints) != null && S.length && (C.waypoints = O.simplifyCoordinates(C.waypoints), C.route = O.divideAccordingToLng(C.waypoints), C.distance = O.calculateRouteDistance(C.route));
+      const h = w().diff(r, "second");
+      return C.memo = `time cost: ${h}s`, M.info("[%s] calculate route cost: %d seconds", s.requestId, h), C;
     }
   }
   async trajectory(t, a, o, n, i = !0, s = {}) {
     await this.checkToken(s);
-    const r = await this.realTimePosition(t, s), h = v(a), l = v(o), d = [];
-    for (; l.diff(h, "day", !0) > 30; )
-      await this.trajectoryIn30Day(t, h, h.clone().add(30, "day"), r, n, d, s), h.add(30, "day");
-    return await this.trajectoryIn30Day(t, h, l, r, n, d, s), d;
+    const r = await this.realTimePosition(t, s), l = w(a), u = w(o), d = [];
+    for (; u.diff(l, "day", !0) > 30; )
+      await this.trajectoryIn30Day(t, l, l.clone().add(30, "day"), r, n, d, s), l.add(30, "day");
+    return await this.trajectoryIn30Day(t, l, u, r, n, d, s), d;
   }
   async trajectoryIn30Day(t, a, o, n, i, s, r = {}) {
-    var g, k, j, b, p;
-    const h = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/track", l = {
+    var b, S, C, p, v;
+    const l = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/track", u = {
       headers: {
-        Authorization: `${(g = this.token) == null ? void 0 : g.tokenType} ${(k = this.token) == null ? void 0 : k.accessToken}`
+        Authorization: `${(b = this.token) == null ? void 0 : b.tokenType} ${(S = this.token) == null ? void 0 : S.accessToken}`
       },
       json: {
         mmsi: t,
@@ -353,35 +357,35 @@ class Et extends at {
         endTime: o.utcOffset(8).format("YYYY-MM-DD HH:mm:ss")
       }
     };
-    M == null || M.info("[%s] fetch trajectory from: %s - %j", r.requestId, h, l);
-    const d = await B.post(h, l).json();
+    M == null || M.info("[%s] fetch trajectory from: %s - %j", r.requestId, l, u);
+    const d = await B.post(l, u).json();
     if (d.code)
-      return M == null || M.warn("[%s] fetch trajectory failed: %j", r.requestId, h, { message: d.message, status: d.status, code: d.code }), d;
+      return M == null || M.warn("[%s] fetch trajectory failed: %j", r.requestId, l, { message: d.message, status: d.status, code: d.code }), d;
     let y = -1;
-    const w = v(`${(b = (j = d.data) == null ? void 0 : j[0]) == null ? void 0 : b.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-    return (p = d.data) == null || p.forEach((f) => {
-      for (const P in f)
-        !isNaN(f[P]) && Number(f[P]) !== 1 / 0 && (f[P] = Number(f[P]));
-      const u = v(`${f.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00"), m = f.status, { labelCn: c, labelEn: I } = this.parseStatus(m), C = {
-        mmsi: f.mmsi,
+    const k = w(`${(p = (C = d.data) == null ? void 0 : C[0]) == null ? void 0 : p.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    return (v = d.data) == null || v.forEach((m) => {
+      for (const P in m)
+        !isNaN(m[P]) && Number(m[P]) !== 1 / 0 && (m[P] = Number(m[P]));
+      const c = w(`${m.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00"), f = m.status, { labelCn: h, labelEn: g } = this.parseStatus(f), I = {
+        mmsi: m.mmsi,
         imo: n == null ? void 0 : n.imo,
-        lat: f.lat,
-        lng: f.lon,
-        sog: f.sog,
-        cog: f.cog,
-        hdg: f.hdg,
-        draught: f.draught,
-        status: m,
-        eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(f.eta) ? v(`${f.eta} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00").utc().format() : void 0,
-        destination: f.dest,
-        positionTime: u.unix(),
-        labelCn: c,
-        labelEn: I,
+        lat: m.lat,
+        lng: m.lon,
+        sog: m.sog,
+        cog: m.cog,
+        hdg: m.hdg,
+        draught: m.draught,
+        status: f,
+        eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(m.eta) ? w(`${m.eta} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00").utc().format() : void 0,
+        destination: m.dest,
+        positionTime: c.unix(),
+        labelCn: h,
+        labelEn: g,
         method: "trajectory",
         vendor: "myVessel",
-        utc: u.utc().format()
-      }, F = Math.floor(u.diff(w, "minute", !0) / (i || 1));
-      F !== y && (y = F, s.push(C));
+        utc: c.utc().format()
+      }, F = Math.floor(c.diff(k, "minute", !0) / (i || 1));
+      F !== y && (y = F, s.push(I));
     }), s;
   }
 }
@@ -402,10 +406,10 @@ class Ft extends at {
     const s = i == null ? void 0 : i.list;
     if (!s)
       return M == null || M.warn("[%s] fetch realtime position failed: %j", a.requestId, o, i), i;
-    for (const w in s)
-      !isNaN(s[w]) && Number(s[w]) !== 1 / 0 && (s[w] = Number(s[w]));
+    for (const k in s)
+      !isNaN(s[k]) && Number(s[k]) !== 1 / 0 && (s[k] = Number(s[k]));
     s.status = s.sp > 3 ? 0 : 1;
-    const r = s.status, { labelCn: h, labelEn: l } = this.parseStatus(r), d = v(`${s.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    const r = s.status, { labelCn: l, labelEn: u } = this.parseStatus(r), d = w(`${s.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
     return {
       mmsi: s.m,
       name: s.n,
@@ -420,7 +424,7 @@ class Ft extends at {
       cog: s.co,
       hdg: s.h,
       rot: isNaN(s.rot) ? 0 : s.rot,
-      eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(s.eta) ? v.utc(s.eta).format() : void 0,
+      eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(s.eta) ? w.utc(s.eta).format() : void 0,
       destination: s.destination,
       vesselType: s.type,
       dwt: s.dwt,
@@ -429,8 +433,8 @@ class Ft extends at {
       positionTime: d.unix(),
       utc: d.utc().format(),
       status: r,
-      labelCn: h,
-      labelEn: l,
+      labelCn: l,
+      labelEn: u,
       method: "position",
       vendor: "hifleet"
     };
@@ -484,57 +488,57 @@ class Ft extends at {
         imo: !r.imo || isNaN(r.imo) ? null : Number(r.imo),
         score: r._score
       });
-    return s.sort((r, h) => h.score - r.score), s;
+    return s.sort((r, l) => l.score - r.score), s;
   }
   async trajectory(t, a, o, n, i = !0, s = {}) {
-    var f, u, m;
+    var m, c, f;
     const r = await this.realTimePosition(t, s);
-    let h = v(a);
-    const l = v(o), d = v();
+    let l = w(a);
+    const u = w(o), d = w();
     if (i) {
-      let c = l.diff(h, "d", !0);
-      c < 0 ? h = l.clone().subtract(40, "d") : c < 30 ? h.subtract(10, "d") : c < 60 ? h.subtract(5, "d") : h = l.clone().subtract(80, "d"), c = d.diff(l, "d", !0), l.add(c > 10 ? 240 : c * 24, "h");
+      let h = u.diff(l, "d", !0);
+      h < 0 ? l = u.clone().subtract(40, "d") : h < 30 ? l.subtract(10, "d") : h < 60 ? l.subtract(5, "d") : l = u.clone().subtract(80, "d"), h = d.diff(u, "d", !0), u.add(h > 10 ? 240 : h * 24, "h");
     }
     const y = {
       searchParams: {
-        endtime: l.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
-        starttime: h.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
+        endtime: u.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
+        starttime: l.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
         mmsi: t,
         usertoken: this.token
       }
-    }, w = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", g = await B.get(w, y).json();
-    M == null || M.info("[%s] fetch trajectory from: %s - %j", s.requestId, w, y);
-    let k;
-    g && (k = ((u = (f = g.ships) == null ? void 0 : f.offors) == null ? void 0 : u.ship) || [], k.length || M == null || M.warn("[%s] fetch trajectory failed: %j", s.requestId, g));
-    const j = [];
-    let b = -1;
-    const p = v(`${(m = k == null ? void 0 : k[0]) == null ? void 0 : m.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-    for (const c of k) {
-      for (const H in c)
-        !isNaN(c[H]) && Number(c[H]) !== 1 / 0 && (c[H] = Number(c[H]));
-      const I = v(`${c.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-      c.status = c.sp > 4 ? 0 : 1;
-      const { labelEn: C, labelCn: F } = this.parseStatus(c.status), P = {
-        mmsi: c.m,
-        name: c.n,
+    }, k = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", b = await B.get(k, y).json();
+    M == null || M.info("[%s] fetch trajectory from: %s - %j", s.requestId, k, y);
+    let S;
+    b && (S = ((c = (m = b.ships) == null ? void 0 : m.offors) == null ? void 0 : c.ship) || [], S.length || M == null || M.warn("[%s] fetch trajectory failed: %j", s.requestId, b));
+    const C = [];
+    let p = -1;
+    const v = w(`${(f = S == null ? void 0 : S[0]) == null ? void 0 : f.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    for (const h of S) {
+      for (const H in h)
+        !isNaN(h[H]) && Number(h[H]) !== 1 / 0 && (h[H] = Number(h[H]));
+      const g = w(`${h.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+      h.status = h.sp > 4 ? 0 : 1;
+      const { labelEn: I, labelCn: F } = this.parseStatus(h.status), P = {
+        mmsi: h.m,
+        name: h.n,
         imo: r == null ? void 0 : r.imo,
-        lat: c.la,
-        lng: c.lo,
-        draught: c.draught,
-        sog: c.sp,
-        cog: c.co,
-        hdg: c.hdg,
-        positionTime: I.unix(),
-        utc: I.utc().format(),
-        status: c.status,
+        lat: h.la,
+        lng: h.lo,
+        draught: h.draught,
+        sog: h.sp,
+        cog: h.co,
+        hdg: h.hdg,
+        positionTime: g.unix(),
+        utc: g.utc().format(),
+        status: h.status,
         labelCn: F,
-        labelEn: C,
+        labelEn: I,
         method: "trajectory",
         vendor: "hifleet"
-      }, D = Math.floor(I.diff(p, "minute", !0) / (n || 1));
-      D !== b && (b = D, j.push(P));
+      }, D = Math.floor(g.diff(v, "minute", !0) / (n || 1));
+      D !== p && (p = D, C.push(P));
     }
-    return j;
+    return C;
   }
 }
 class Nt extends at {
@@ -556,7 +560,7 @@ class Nt extends at {
     const s = i.data[0];
     for (const y in s)
       !isNaN(s[y]) && Number(s[y]) !== 1 / 0 && (s[y] = Number(s[y]));
-    const { labelCn: r, labelEn: h } = await this.parseStatus(s.navistat), l = v.unix(s.lasttime);
+    const { labelCn: r, labelEn: l } = await this.parseStatus(s.navistat), u = w.unix(s.lasttime);
     return {
       mmsi: s.ShipID,
       name: s.name,
@@ -572,46 +576,46 @@ class Nt extends at {
       hdg: Math.round(s.hdg / 100 * 100) / 100,
       rot: Math.round(s.rot / 100 * 100) / 100,
       positionTime: s.lasttime,
-      utc: l.utc().format(),
+      utc: u.utc().format(),
       status: s.navistat,
-      labelEn: h,
+      labelEn: l,
       labelCn: r,
       method: "position",
       vendor: "shipxy"
     };
   }
   async trajectory(t, a, o, n, i = !0, s = {}) {
-    var p;
-    const r = await this.realTimePosition(t, s), h = v(a), l = v(o), d = "https://api.shipxy.com/apicall/GetShipTrack", y = {
+    var v;
+    const r = await this.realTimePosition(t, s), l = w(a), u = w(o), d = "https://api.shipxy.com/apicall/GetShipTrack", y = {
       searchParams: {
         id: t,
         k: this.token,
         enc: 1,
         cut: 0,
-        btm: h.unix(),
-        etm: l.unix()
+        btm: l.unix(),
+        etm: u.unix()
       }
-    }, w = await B.get(d, y).json();
-    if (M == null || M.info("[%s] fetch trajectory from: %s - %j", s.requestId, d, y), (w == null ? void 0 : w.status) !== 0)
-      return w;
-    const g = w == null ? void 0 : w.points, k = [], j = v.unix((p = g[0]) == null ? void 0 : p.utc);
-    let b = -1;
-    for (const f of g) {
-      const u = v.unix(f.utc), m = {
+    }, k = await B.get(d, y).json();
+    if (M == null || M.info("[%s] fetch trajectory from: %s - %j", s.requestId, d, y), (k == null ? void 0 : k.status) !== 0)
+      return k;
+    const b = k == null ? void 0 : k.points, S = [], C = w.unix((v = b[0]) == null ? void 0 : v.utc);
+    let p = -1;
+    for (const m of b) {
+      const c = w.unix(m.utc), f = {
         imo: r == null ? void 0 : r.imo,
         mmsi: t,
-        sog: Math.round(f.sog * 3600 / 1e3 / 1852 * 100) / 100,
-        cog: Math.round(f.cog / 100 * 100) / 100,
-        lat: Math.round(f.lat / 1e6 * 1e5) / 1e5,
-        lng: Math.round(f.lon / 1e6 * 1e5) / 1e5,
-        positionTime: u.unix(),
-        utc: u.utc().format(),
+        sog: Math.round(m.sog * 3600 / 1e3 / 1852 * 100) / 100,
+        cog: Math.round(m.cog / 100 * 100) / 100,
+        lat: Math.round(m.lat / 1e6 * 1e5) / 1e5,
+        lng: Math.round(m.lon / 1e6 * 1e5) / 1e5,
+        positionTime: c.unix(),
+        utc: c.utc().format(),
         method: "trajectory",
         vendor: "shipxy"
-      }, c = Math.floor(u.diff(j, "minute", !0) / (n || 1));
-      c !== b && (b = c, k.push(m));
+      }, h = Math.floor(c.diff(C, "minute", !0) / (n || 1));
+      h !== p && (p = h, S.push(f));
     }
-    return k;
+    return S;
   }
 }
 class xt extends at {
@@ -664,37 +668,37 @@ class xt extends at {
       }
     }, s = "https://api3.myships.com/sp/ships/position/latest", r = await B.post(s, i).json();
     M == null || M.info("[%s] fetch realtime position from: %s - %j", a.requestId, s, i);
-    const h = r.data[0];
-    for (const g in h)
-      !isNaN(h[g]) && Number(h[g]) !== 1 / 0 && (h[g] = Number(h[g]));
-    const { labelCn: l, labelEn: d } = await this.parseStatus(h.aisNavStatus), y = v.unix(h.posTime);
+    const l = r.data[0];
+    for (const b in l)
+      !isNaN(l[b]) && Number(l[b]) !== 1 / 0 && (l[b] = Number(l[b]));
+    const { labelCn: u, labelEn: d } = await this.parseStatus(l.aisNavStatus), y = w.unix(l.posTime);
     return {
       ...n,
       mmsi: t,
-      lat: Math.round(h.lat / 1e4 / 60 * 1e5) / 1e5,
-      lng: Math.round(h.lon / 1e4 / 60 * 1e5) / 1e5,
-      sog: Math.round(h.sog / 10 * 100) / 100,
-      cog: Math.round(h.cog / 10 * 100) / 100,
-      hdg: Math.round(h.heading * 100) / 100,
-      rot: Math.round(h.rot * 100) / 100,
-      positionTime: h.posTime,
+      lat: Math.round(l.lat / 1e4 / 60 * 1e5) / 1e5,
+      lng: Math.round(l.lon / 1e4 / 60 * 1e5) / 1e5,
+      sog: Math.round(l.sog / 10 * 100) / 100,
+      cog: Math.round(l.cog / 10 * 100) / 100,
+      hdg: Math.round(l.heading * 100) / 100,
+      rot: Math.round(l.rot * 100) / 100,
+      positionTime: l.posTime,
       utc: y.utc().format(),
-      status: h.aisNavStatus,
+      status: l.aisNavStatus,
       labelEn: d,
-      labelCn: l,
+      labelCn: u,
       method: "position",
       vendor: "myship"
     };
   }
   async trajectory(t, a, o, n, i = !0, s = {}) {
-    const r = v(a), h = v(o), l = await this.getShipId(t), d = await this.getShipInfo(l), y = [];
-    for (; h.diff(r, "day", !0) > 30; )
-      await this.trajectoryIn30Day(l, r.unix(), r.add(30, "day").unix(), d, t, n, y);
-    return await this.trajectoryIn30Day(l, r.unix(), h.unix(), d, t, n, y), y;
+    const r = w(a), l = w(o), u = await this.getShipId(t), d = await this.getShipInfo(u), y = [];
+    for (; l.diff(r, "day", !0) > 30; )
+      await this.trajectoryIn30Day(u, r.unix(), r.add(30, "day").unix(), d, t, n, y);
+    return await this.trajectoryIn30Day(u, r.unix(), l.unix(), d, t, n, y), y;
   }
-  async trajectoryIn30Day(t, a, o, n, i, s, r, h = {}) {
-    var j;
-    const l = {
+  async trajectoryIn30Day(t, a, o, n, i, s, r, l = {}) {
+    var C;
+    const u = {
       headers: {
         appKey: this.token
       },
@@ -703,30 +707,30 @@ class xt extends at {
         startTime: a,
         endTime: o
       }
-    }, d = "https://api3.myships.com/sp/ships/position/history", y = await B.post(d, l).json();
-    if (M == null || M.info("[%s] fetch trajectory from: %s - %j", h.requestId, d, l), y.code !== "0")
-      return M == null || M.warn("[%s] invoke myship trajectory failed: %j", h.requestId, y), y;
-    const w = y.data;
-    for (const b in w)
-      !isNaN(w[b]) && Number(w[b]) !== 1 / 0 && (w[b] = Number(w[b]));
-    const g = v.unix((j = w[0]) == null ? void 0 : j.posTime);
-    let k = -1;
-    for (const b of w) {
-      const p = v.unix(b.posTime), f = {
+    }, d = "https://api3.myships.com/sp/ships/position/history", y = await B.post(d, u).json();
+    if (M == null || M.info("[%s] fetch trajectory from: %s - %j", l.requestId, d, u), y.code !== "0")
+      return M == null || M.warn("[%s] invoke myship trajectory failed: %j", l.requestId, y), y;
+    const k = y.data;
+    for (const p in k)
+      !isNaN(k[p]) && Number(k[p]) !== 1 / 0 && (k[p] = Number(k[p]));
+    const b = w.unix((C = k[0]) == null ? void 0 : C.posTime);
+    let S = -1;
+    for (const p of k) {
+      const v = w.unix(p.posTime), m = {
         imo: n == null ? void 0 : n.imo,
         mmsi: i,
-        lat: Math.round(b.lat / 1e4 / 60 * 1e5) / 1e5,
-        lng: Math.round(b.lon / 1e4 / 60 * 1e5) / 1e5,
-        sog: Math.round(b.sog / 10 * 100) / 100,
-        cog: Math.round(b.cog / 10 * 100) / 100,
-        hdg: Math.round(b.heading * 100) / 100,
-        rot: Math.round(b.rot * 100) / 100,
-        positionTime: p.unix(),
-        utc: p.utc().format(),
+        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"
-      }, u = Math.floor(p.diff(g, "minute", !0) / (s || 1));
-      u !== k && (k = u, r.push(f));
+      }, c = Math.floor(v.diff(b, "minute", !0) / (s || 1));
+      c !== S && (S = c, r.push(m));
     }
     return r;
   }
@@ -748,20 +752,20 @@ class Mt {
    * @param options
    */
   parsePrinciple(e, t = {}) {
-    var s, r, h;
+    var s, r, l;
     J == null || J.debug("[%s] parse rule: %s", t.requestId, e);
     const a = new RegExp("(?<=\\[)(.+)(?=])", "g"), o = e.match(a) ? (s = e.match(a)) == null ? void 0 : s[0] : void 0, n = o == null ? void 0 : o.split(";");
     if (!n)
       return;
     const i = {};
-    for (let l = 0; l < (n == null ? void 0 : n.length); l++) {
-      const d = (h = (r = n[l].match(a)) == null ? void 0 : r[0]) == null ? void 0 : h.split("],");
-      if (l === 0 && !d)
+    for (let u = 0; u < (n == null ? void 0 : n.length); u++) {
+      const d = (l = (r = n[u].match(a)) == null ? void 0 : r[0]) == null ? void 0 : l.split("],");
+      if (u === 0 && !d)
         i.scope = n[0];
       else if (d)
-        for (let y = 0, w = d.length; y < w; y++) {
-          const g = this.parseRule(d[y]);
-          g && (i[g.level] ? g.key ? i[g.level][g == null ? void 0 : g.key] = g : i[g.level] = g : g.key ? i[g.level] = { [g == null ? void 0 : g.key]: g } : i[g.level] = g);
+        for (let y = 0, k = d.length; y < k; y++) {
+          const b = this.parseRule(d[y]);
+          b && (i[b.level] ? b.key ? i[b.level][b == null ? void 0 : b.key] = b : i[b.level] = b : b.key ? i[b.level] = { [b == null ? void 0 : b.key]: b } : i[b.level] = b);
         }
     }
     return i;
@@ -794,20 +798,20 @@ class Mt {
    * @param options
    */
   checkWeather(e, t, a = {}) {
-    var g, k, j, b, p, f, u, m, c, I, C, F, P, D, H;
+    var b, S, C, p, v, m, c, f, h, g, I, F, P, D, H;
     let o = 0, n = 0, i = 0, s = 0;
-    const r = Math.round(((k = (g = t == null ? void 0 : t.SEVERE) == null ? void 0 : g.sigWave) == null ? void 0 : k.number) * 1.6 * 100) / 100, h = (b = (j = t == null ? void 0 : t.SEVERE) == null ? void 0 : j.sigWave) == null ? void 0 : b.number, l = (f = (p = t == null ? void 0 : t.HEAVY) == null ? void 0 : p.sigWave) == null ? void 0 : f.number, d = Math.round((((m = (u = t == null ? void 0 : t.SEVERE) == null ? void 0 : u.wind) == null ? void 0 : m.number) + 2) * 100) / 100, y = (I = (c = t == null ? void 0 : t.SEVERE) == null ? void 0 : c.wind) == null ? void 0 : I.number, w = (F = (C = t == null ? void 0 : t.HEAVY) == null ? void 0 : C.wind) == null ? void 0 : F.number;
-    for (let E = 0; E < (e == null ? void 0 : e.length); E++) {
-      const N = e[E], O = (D = (P = N == null ? void 0 : N.meteo) == null ? void 0 : P.wave) == null ? void 0 : D.sig, R = (H = N == null ? void 0 : N.meteo) == null ? void 0 : H.wind, K = E ? v(N.eta).diff(v(e[E - 1].eta), "hour", !0) : 0;
-      s = K > s ? K : s, J == null || J.debug("[%s] check sig.wave: %j", a.requestId, { ...O, dgThd4Wv: r, svThd4Wv: h, hvThd4Wv: l }), (O == null ? void 0 : O.height) >= r ? N.isDangerous = !0 : (O == null ? void 0 : O.height) >= h ? N.isSevere = !0 : (O == null ? void 0 : O.height) >= l && (N.isHeavy = !0), J == null || J.debug("[%s] check wind: %j", a.requestId, { ...R, dgThd4Wd: d, svThd4Wd: y, hvThd4Wd: w }), (R == null ? void 0 : R.scale) >= d ? (N.isDangerous = !0, delete N.isSevere, delete N.isHeavy) : (R == null ? void 0 : R.scale) > y ? (N.isDangerous || (N.isSevere = !0), delete N.isHeavy) : (R == null ? void 0 : R.scale) === w && !N.isDangerous && !N.isSevere && (N.isHeavy = !0), o += N.isDangerous ? K : 0, n += N.isSevere ? K : 0, i += N.isHeavy ? K : 0;
+    const r = Math.round(((S = (b = t == null ? void 0 : t.SEVERE) == null ? void 0 : b.sigWave) == null ? void 0 : S.number) * 1.6 * 100) / 100, l = (p = (C = t == null ? void 0 : t.SEVERE) == null ? void 0 : C.sigWave) == null ? void 0 : p.number, u = (m = (v = t == null ? void 0 : t.HEAVY) == null ? void 0 : v.sigWave) == null ? void 0 : m.number, d = Math.round((((f = (c = t == null ? void 0 : t.SEVERE) == null ? void 0 : c.wind) == null ? void 0 : f.number) + 2) * 100) / 100, y = (g = (h = t == null ? void 0 : t.SEVERE) == null ? void 0 : h.wind) == null ? void 0 : g.number, k = (F = (I = t == null ? void 0 : t.HEAVY) == null ? void 0 : I.wind) == null ? void 0 : F.number;
+    for (let j = 0; j < (e == null ? void 0 : e.length); j++) {
+      const N = e[j], R = (D = (P = N == null ? void 0 : N.meteo) == null ? void 0 : P.wave) == null ? void 0 : D.sig, W = (H = N == null ? void 0 : N.meteo) == null ? void 0 : H.wind, K = j ? w(N.eta).diff(w(e[j - 1].eta), "hour", !0) : 0;
+      s = K > s ? K : s, J == null || J.debug("[%s] check sig.wave: %j", a.requestId, { ...R, dgThd4Wv: r, svThd4Wv: l, hvThd4Wv: u }), (R == null ? void 0 : R.height) >= r ? N.isDangerous = !0 : (R == null ? void 0 : R.height) >= l ? N.isSevere = !0 : (R == null ? void 0 : R.height) >= u && (N.isHeavy = !0), J == null || J.debug("[%s] check wind: %j", a.requestId, { ...W, dgThd4Wd: d, svThd4Wd: y, hvThd4Wd: k }), (W == null ? void 0 : W.scale) >= d ? (N.isDangerous = !0, delete N.isSevere, delete N.isHeavy) : (W == null ? void 0 : W.scale) > y ? (N.isDangerous || (N.isSevere = !0), delete N.isHeavy) : (W == null ? void 0 : W.scale) === k && !N.isDangerous && !N.isSevere && (N.isHeavy = !0), o += N.isDangerous ? K : 0, n += N.isSevere ? K : 0, i += N.isHeavy ? K : 0;
     }
-    return o = Math.round(o * 100) / 100, n = Math.round(n * 100) / 100, i = Math.round(i * 100) / 100, s = Math.round(s), { sample: e, dangerous: o, severe: n, heavy: i, step: s < 3 ? 3 : s, wind: { dgThd4Wd: d, svThd4Wd: y, hvThd4Wd: w }, sig: { dgThd4Wv: r, svThd4Wv: h, hvThd4Wv: l } };
+    return o = Math.round(o * 100) / 100, n = Math.round(n * 100) / 100, i = Math.round(i * 100) / 100, s = Math.round(s), { sample: e, dangerous: o, severe: n, heavy: i, step: s < 3 ? 3 : s, wind: { dgThd4Wd: d, svThd4Wd: y, hvThd4Wd: k }, sig: { dgThd4Wv: r, svThd4Wv: l, hvThd4Wv: u } };
   }
 }
 const Dt = new Mt();
-let S;
+let T;
 try {
-  S = dt.getLogger("vessel");
+  T = dt.getLogger("vessel");
 } catch {
 } finally {
 }
@@ -927,9 +931,9 @@ class Y {
    */
   static assembleProperties(e, t, a, o) {
     var y;
-    const n = e.lbp ?? e.length ?? e.lengthOverall ?? 198.9642, i = e.draught ?? 8, s = e.breadthMoulded ?? e.breadth ?? e.breadthExtreme ?? 32.4572, r = e.deadweight ?? 67035.7773, h = ((y = e == null ? void 0 : e.type) == null ? void 0 : y.toLowerCase()) || "common";
+    const n = e.lbp ?? e.length ?? e.lengthOverall ?? 198.9642, i = e.draught ?? 8, s = e.breadthMoulded ?? e.breadth ?? e.breadthExtreme ?? 32.4572, r = e.deadweight ?? 67035.7773, l = ((y = e == null ? void 0 : e.type) == null ? void 0 : y.toLowerCase()) || "common";
     return {
-      tag: h.indexOf("container") > -1 ? "container" : h.indexOf("tugs") > -1 ? "tugs" : "common",
+      tag: l.indexOf("container") > -1 ? "container" : l.indexOf("tugs") > -1 ? "tugs" : "common",
       lbp: n,
       loadCondition: t,
       draught: i,
@@ -954,40 +958,40 @@ class Y {
    * @param options
    */
   static async speedLoseAt(e, t, a, o = "", n = 2, i = !0, s = !1, r = {}) {
-    let h;
+    let l;
     if (t.velocity && s && (e.speed = z.roundPrecision(t.velocity * 1852 / 3600, 6)), i) {
-      let l;
+      let u;
       try {
         o = (o == null ? void 0 : o.toUpperCase()) === "CMEMS" ? "ECMWF" : o, o = (o == null ? void 0 : o.toUpperCase()) === "METEO2" ? "best_match" : o;
-        const { weatherModels: g, marineModels: k } = await ct.autoPickMeteoModel(o), j = await gt.spotForecast(t.lat, t.lng, a.utc().format(), !1, !1, !0, {
+        const { weatherModels: b, marineModels: S } = await ct.autoPickMeteoModel(o), C = await gt.spotForecast(t.lat, t.lng, a.utc().format(), !1, !1, !0, {
           ...r,
           pastDays: 1,
           forecastDays: 1,
-          weatherModels: g,
-          marineModels: k
-        }), [b] = ct.pickHourly(j, a);
-        l = ct.toLegacy(b);
-      } catch (g) {
-        S.warn("[%s] meteo2 spot(%j) forecast failed: %s", r.requestId, { ...t, eta: a.utc().format(), source: o }, g);
+          weatherModels: b,
+          marineModels: S
+        }), [p] = ct.pickHourly(C, a);
+        u = ct.toLegacy(p);
+      } catch (b) {
+        T.warn("[%s] meteo2 spot(%j) forecast failed: %s", r.requestId, { ...t, eta: a.utc().format(), source: o }, b);
       }
-      const d = Y.currentFactor(e.bearing, l == null ? void 0 : l.current, n), y = Y.weatherFactor(e, l, d), w = Math.round((e.speed * 1.943844 + y + d) * 100) / 100;
-      h = {
-        meteo: { ...l },
+      const d = Y.currentFactor(e.bearing, u == null ? void 0 : u.current, n), y = Y.weatherFactor(e, u, d), k = Math.round((e.speed * 1.943844 + y + d) * 100) / 100;
+      l = {
+        meteo: { ...u },
         wxFactor: y,
         cFactor: d,
-        speed: t.velocity && s ? t.velocity : w < 0 ? 1 : w,
+        speed: t.velocity && s ? t.velocity : k < 0 ? 1 : k,
         eta: a.utc().format(),
         etd: a.utc().format()
       };
     } else
-      h = {
+      l = {
         wxFactor: 0,
         cFactor: 0,
         speed: t.velocity && s ? t.velocity : Math.round(e.speed * 1.943844 * 100) / 100,
         eta: a.utc().format(),
         etd: a.utc().format()
       };
-    return delete t.meteo, delete t.wxFactor, delete t.cFactor, delete t.speed, delete t.etd, { ...h, ...t };
+    return delete t.meteo, delete t.wxFactor, delete t.cFactor, delete t.speed, delete t.etd, { ...l, ...t };
   }
   /**
    * 基于步长计算失速样本
@@ -1003,53 +1007,53 @@ class Y {
    * @param options
    * @private
    */
-  static async speedLoseInHoursStep(e, t, a, o, n, i, s = "", r = !0, h = !1, l = {}) {
+  static async speedLoseInHoursStep(e, t, a, o, n, i, s = "", r = !0, l = !1, u = {}) {
     t.utc();
-    const d = t.clone().add(14, "days"), y = [], w = [], g = [];
-    let k = 0, j = 0, b, p;
-    for (let f = 0; f < i.length - 1; f++) {
-      let u = i[f];
-      u.distanceFromStart = Math.round((n + j) * 1e3) / 1e3;
-      const m = i[f + 1];
-      if (e.bearing = W.calculateBearing(u, m, !m.gcToPrevious), u.bearing = e.bearing, u.suspend && h) {
-        u.eta = u.eta || t.utc().format(), u.elapsed = u.elapsed ?? 0;
-        const C = u.suspend - u.elapsed;
-        if (o - k > C)
-          o = o - k - C, t.add(C, "hour"), u.elapsed = u.suspend;
+    const d = t.clone().add(14, "days"), y = [], k = [], b = [];
+    let S = 0, C = 0, p, v;
+    for (let m = 0; m < i.length - 1; m++) {
+      let c = i[m];
+      c.distanceFromStart = Math.round((n + C) * 1e3) / 1e3;
+      const f = i[m + 1];
+      if (e.bearing = O.calculateBearing(c, f, !f.gcToPrevious), c.bearing = e.bearing, c.suspend && l) {
+        c.eta = c.eta || t.utc().format(), c.elapsed = c.elapsed ?? 0;
+        const I = c.suspend - c.elapsed;
+        if (o - S > I)
+          o = o - S - I, t.add(I, "hour"), c.elapsed = c.suspend;
         else {
-          const F = o - k;
-          u.elapsed += F, t.add(F, "hour"), o = 0;
+          const F = o - S;
+          c.elapsed += F, t.add(F, "hour"), o = 0;
         }
-        if (S == null || S.info(`[%s] suspend ${u.elapsed} hours at %j, and remain ${o} hours need to go...`, l.requestId, u), o === 0)
-          return u.distanceFromPrevious = j, { etd: t, from: p || u, to: u, next: i.filter((F) => F), wps: y, days: w, all: g };
+        if (T == null || T.info(`[%s] suspend ${c.elapsed} hours at %j, and remain ${o} hours need to go...`, u.requestId, c), o === 0)
+          return c.distanceFromPrevious = C, { etd: t, from: v || c, to: c, next: i.filter((F) => F), wps: y, days: k, all: b };
       } else
-        u.suspend = 0;
-      r = t.isAfter(d) ? !1 : r, u = await Y.speedLoseAt(e, u, t, s, 0, r, h, l), g.push(u), p = p || u, u.important && y.push(u), t.isSameOrAfter(a) && (w.push(u), a.add(24, "hour"));
-      const c = W.calculateDistance(u, m, !m.gcToPrevious);
-      let I = Math.round(c / p.speed * 1e5) / 1e5;
-      if (k + I < o) {
-        if (k += I, t.add(I, "hour"), delete i[f], S == null || S.debug(
-          `[%s] go to %j from %j with ${c}nm, and cost ${I} hours`,
-          l.requestId,
-          { lat: m.lat, lng: m.lng },
-          { lat: p.lat, lng: p.lng, etd: p.etd }
-        ), j += c, i.filter((C) => C).length <= 1) {
-          b = m, b.eta = t.utc().format(), b.distanceFromPrevious = c, b.distanceFromStart = Math.round((n + j) * 1e4) / 1e4, y.push(b), g.push(b), delete i[f + 1];
+        c.suspend = 0;
+      r = t.isAfter(d) ? !1 : r, c = await Y.speedLoseAt(e, c, t, s, 0, r, l, u), b.push(c), v = v || c, c.important && y.push(c), t.isSameOrAfter(a) && (k.push(c), a.add(24, "hour"));
+      const h = O.calculateDistance(c, f, !f.gcToPrevious);
+      let g = Math.round(h / v.speed * 1e5) / 1e5;
+      if (S + g < o) {
+        if (S += g, t.add(g, "hour"), delete i[m], T == null || T.debug(
+          `[%s] go to %j from %j with ${h}nm, and cost ${g} hours`,
+          u.requestId,
+          { lat: f.lat, lng: f.lng },
+          { lat: v.lat, lng: v.lng, etd: v.etd }
+        ), C += h, i.filter((I) => I).length <= 1) {
+          p = f, p.eta = t.utc().format(), p.distanceFromPrevious = h, p.distanceFromStart = Math.round((n + C) * 1e4) / 1e4, y.push(p), b.push(p), delete i[m + 1];
           break;
         }
       } else {
-        I = o - k, t.add(I, "hour");
-        const C = z.roundPrecision(p.speed * I, 5);
-        b = W.calculateCoordinate(u, e.bearing, C, "nauticalmiles", !m.gcToPrevious), b.eta = t.utc().format(), i[f] = b, S == null || S.debug(
-          `[%s] go to %j from %j with ${C}nm, and cost ${I} hours`,
-          l.requestId,
-          { lat: b.lat, lng: b.lng },
-          { lat: u.lat, lng: u.lng, etd: u.etd }
-        ), j += C, b.distanceFromPrevious = Math.round(j * 1e4) / 1e4, b.distanceFromStart = Math.round((n + j) * 1e4) / 1e4;
+        g = o - S, t.add(g, "hour");
+        const I = z.roundPrecision(v.speed * g, 5);
+        p = O.calculateCoordinate(c, e.bearing, I, "nauticalmiles", !f.gcToPrevious), p.eta = t.utc().format(), i[m] = p, T == null || T.debug(
+          `[%s] go to %j from %j with ${I}nm, and cost ${g} hours`,
+          u.requestId,
+          { lat: p.lat, lng: p.lng },
+          { lat: c.lat, lng: c.lng, etd: c.etd }
+        ), C += I, p.distanceFromPrevious = Math.round(C * 1e4) / 1e4, p.distanceFromStart = Math.round((n + C) * 1e4) / 1e4;
         break;
       }
     }
-    return { etd: t, from: p, to: b, next: i.filter((f) => f), wps: y, days: w, all: g };
+    return { etd: t, from: v, to: p, next: i.filter((m) => m), wps: y, days: k, all: b };
   }
   /**
    * 洋流影响因子
@@ -1058,7 +1062,7 @@ class Y {
    * @param role  1: 船东, 2: 租家, 0: 未知
    */
   static currentFactor(e, t, a = 0) {
-    const o = (e - (t == null ? void 0 : t.degree) || 0) / 180 * Math.PI;
+    const o = O.includedAngle(e, (t == null ? void 0 : t.degree) || 0) / 180 * Math.PI;
     if (Math.abs(o) === Math.PI / 2)
       return 0;
     let n = ((t == null ? void 0 : t.kts) || 0) * Math.cos(o);
@@ -1071,16 +1075,15 @@ class Y {
    * @param cFactor 洋流因子
    */
   static weatherFactor(e, t, a = 0) {
-    var w, g, k, j, b, p, f;
-    S == null || S.debug("calculate weather factor via: %j", { ...e, ...t });
+    var k, b, S, C, p, v, m;
+    T == null || T.debug("calculate weather factor via: %j", { ...e, ...t });
     const o = Y.blockCoefficient(e.displacement, e.lbp, e.breadthMoulded, e.draught), n = z.roundPrecision(a * 1852 / 3600, 6), i = Y.froudeNumber(e.speed - n, e.lbp), s = Y.amendFactor(o, i, e.loadCondition);
-    let r = Math.abs(e.bearing % 360 - (((w = t == null ? void 0 : t.wind) == null ? void 0 : w.degree) % 360 || 0));
-    r = r > 180 ? 360 - r : r;
-    const h = Y.directionFactor(r, (g = t == null ? void 0 : t.wind) == null ? void 0 : g.scale), l = Y.vesselTagFactor(e.displacement, e.loadCondition, e.tag, (k = t == null ? void 0 : t.wind) == null ? void 0 : k.kts);
-    let d = h * s * l / 100 * (e.speed - n);
-    d = Math.round(d * 1.943844 * 1e4) / 1e4 * -1, e.tag === "tugs" && Math.abs(d) > 1 && (d = d / (Math.abs(Math.round(d)) + 1)), S == null || S.debug("wind wx factor = %d", d), r = Math.abs(e.bearing % 360 - (((b = (j = t == null ? void 0 : t.wave) == null ? void 0 : j.sig) == null ? void 0 : b.degree) % 360 || 0)), r = r > 180 ? 360 - r : r;
-    const y = Y.waveHeightFactor(((f = (p = t == null ? void 0 : t.wave) == null ? void 0 : p.sig) == null ? void 0 : f.height) ?? 1, r);
-    return S == null || S.debug("wave wx factor = %d", y), d = Math.abs(d) > Math.abs(y) ? d : d * 0.3 + y * 0.7, S == null || S.debug("weather factor = %d", d), d = Math.abs(d) > 3 ? 3 * (Math.abs(d) / d) + Math.abs(d) / d * (Math.abs(d) - 2) * 0.1 : d, Math.round((d || 0) * 100) / 100;
+    let r = O.includedAngle(e.bearing, (k = t == null ? void 0 : t.wind) == null ? void 0 : k.degree);
+    const l = Y.directionFactor(r, (b = t == null ? void 0 : t.wind) == null ? void 0 : b.scale), u = Y.vesselTagFactor(e.displacement, e.loadCondition, e.tag, (S = t == null ? void 0 : t.wind) == null ? void 0 : S.kts);
+    let d = l * s * u / 100 * (e.speed - n);
+    d = Math.round(d * 1.943844 * 1e4) / 1e4 * -1, e.tag === "tugs" && Math.abs(d) > 1 && (d = d / (Math.abs(Math.round(d)) + 1)), T == null || T.debug("wind wx factor = %d", d), r = O.includedAngle(e.bearing, (p = (C = t == null ? void 0 : t.wave) == null ? void 0 : C.sig) == null ? void 0 : p.degree);
+    const y = Y.waveHeightFactor(((m = (v = t == null ? void 0 : t.wave) == null ? void 0 : v.sig) == null ? void 0 : m.height) ?? 1, r);
+    return T == null || T.debug("wave wx factor = %d", y), d = Math.abs(d) > Math.abs(y) ? d : d * 0.3 + y * 0.7, T == null || T.debug("weather factor = %d", d), d = Math.abs(d) > 3 ? 3 * (Math.abs(d) / d) + Math.abs(d) / d * (Math.abs(d) - 2) * 0.1 : d, Math.round((d || 0) * 100) / 100;
   }
   /**
    * 以12小时级别去掉重复的days
@@ -1088,7 +1091,7 @@ class Y {
    * @param interval 12 hours
    */
   static async reduceDays(e, t = 12 * 60 * 60) {
-    return e = e == null ? void 0 : e.reduce((a, o) => (o.positionTime || (o.positionTime = v.utc(o.etd || o.eta).unix()), a.some((n) => Math.floor(n.positionTime / t) === Math.floor(o.positionTime / t)) || a.push(o), a), []), e;
+    return e = e == null ? void 0 : e.reduce((a, o) => (o.positionTime || (o.positionTime = w.utc(o.etd || o.eta).unix()), a.some((n) => Math.floor(n.positionTime / t) === Math.floor(o.positionTime / t)) || a.push(o), a), []), e;
   }
   /**
    * 以分钟级别去掉重复的wps
@@ -1096,7 +1099,7 @@ class Y {
    * @param interval 1 minute
    */
   static async reduceWPS(e, t = 60) {
-    return e = e == null ? void 0 : e.reduce((a, o) => (a.some((n) => Math.floor(v(n.etd).unix() / t) === Math.floor(v(o.etd).unix() / t)) || a.push(o), a), []), e;
+    return e = e == null ? void 0 : e.reduce((a, o) => (a.some((n) => Math.floor(w(n.etd).unix() / t) === Math.floor(w(o.etd).unix() / t)) || a.push(o), a), []), e;
   }
   /**
    * 全程失速分析(走完航程)
@@ -1111,14 +1114,14 @@ class Y {
    * @param useRouteParam
    * @param options
    */
-  static async analyseInstant(e, t, a, o, n, i = "", s = 0, r = !0, h = !1, l = {}) {
+  static async analyseInstant(e, t, a, o, n, i = "", s = 0, r = !0, l = !1, u = {}) {
     var _, G, X, Q, Z, $;
-    const d = v().valueOf();
+    const d = w().valueOf();
     e.lng = z.convertToStdLng(e.lng);
-    const { route: y, waypoints: w } = n.points, g = W.calculateSubRoute(e, y);
-    if (((_ = g[0]) == null ? void 0 : _.length) <= 1)
+    const { route: y, waypoints: k } = n.points, b = O.calculateSubRoute(e, y);
+    if (((_ = b[0]) == null ? void 0 : _.length) <= 1)
       return;
-    const { v0: k, label: j } = e.sog ? {
+    const { v0: S, label: C } = e.sog ? {
       v0: e.sog,
       label: e.label || "Other"
       /* Instruct */
@@ -1126,69 +1129,69 @@ class Y {
       v0: o.speed,
       label: "CP"
       /* Cp */
-    }, b = Y.assembleProperties(a, o.loadCondition, k, 0), p = w.length ? W.calculateSubWaypoints(e, w) : [];
-    p.forEach((A) => A.important = !0);
-    const f = {
+    }, p = Y.assembleProperties(a, o.loadCondition, S, 0), v = k.length ? O.calculateSubWaypoints(e, k) : [];
+    v.forEach((A) => A.important = !0);
+    const m = {
       from: { ...e },
-      route: g,
-      waypoints: p,
-      v0: k,
-      label: j
-    }, u = {
+      route: b,
+      waypoints: v,
+      v0: S,
+      label: C
+    }, c = {
       hours: [],
       days: [],
       wps: [],
       all: []
     };
-    s || (W.calculateRouteDistance(g) / o.speed <= 72 ? s = 3 : s = 6);
-    let m = W.simplifyRouteToCoordinates(g, p, 0), c = 0, I = 0, C = 0, F = 0;
-    t = v(t).utc();
+    s || (O.calculateRouteDistance(b) / o.speed <= 72 ? s = 3 : s = 6);
+    let f = O.simplifyRouteToCoordinates(b, v, 0), h = 0, g = 0, I = 0, F = 0;
+    t = w(t).utc();
     const P = t.clone();
-    for (; m.length > 0; ) {
-      const A = s - t.hour() % s, V = Math.ceil(t.clone().add(A, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4, T = await Y.speedLoseInHoursStep(
-        b,
+    for (; f.length > 0; ) {
+      const A = s - t.hour() % s, V = Math.ceil(t.clone().add(A, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4, E = await Y.speedLoseInHoursStep(
+        p,
         t,
         P,
         V,
-        c,
-        m,
+        h,
+        f,
         i,
         r,
-        h,
-        l
+        l,
+        u
       );
-      if (u.all.push(...T.all), (G = T.from) != null && G.speed && (u.hours.push(T.from), u.wps.push(...T.wps), u.days.push(...T.days)), m = T == null ? void 0 : T.next, !m.length) {
-        const L = await Y.speedLoseAt(b, T.to, v(T.to.eta), i, 0, r, h, l);
-        L.bearing = b.bearing, u.hours.push(L), u.all.push(L);
+      if (c.all.push(...E.all), (G = E.from) != null && G.speed && (c.hours.push(E.from), c.wps.push(...E.wps), c.days.push(...E.days)), f = E == null ? void 0 : E.next, !f.length) {
+        const L = await Y.speedLoseAt(p, E.to, w(E.to.eta), i, 0, r, l, u);
+        L.bearing = p.bearing, c.hours.push(L), c.all.push(L);
       }
-      c += Math.round((((X = T == null ? void 0 : T.to) == null ? void 0 : X.distanceFromPrevious) ?? 0) * 1e4) / 1e4;
+      h += Math.round((((X = E == null ? void 0 : E.to) == null ? void 0 : X.distanceFromPrevious) ?? 0) * 1e4) / 1e4;
     }
-    const D = u.hours;
+    const D = c.hours;
     for (let A = 0; A < D.length - 1; A++) {
-      const V = v(D[A + 1].eta).diff(D[A].etd, "hour", !0) || 1;
-      I += (D[A].wxFactor || 0) * V, C += (D[A].cFactor || 0) * V, F += V;
+      const V = w(D[A + 1].eta).diff(D[A].etd, "hour", !0) || 1;
+      g += (D[A].wxFactor || 0) * V, I += (D[A].cFactor || 0) * V, F += V;
     }
     const H = D.reduce((A, V) => A + (V.suspend || 0), 0);
-    (Q = u.wps) == null || Q.forEach((A, V) => {
-      A.positionTime = v.utc(A.etd || A.eta).unix();
-      const T = u.wps[V - 1];
-      if (T) {
-        const L = A.distanceFromStart - T.distanceFromStart, q = v(A.eta || A.etd).diff(v(T.etd || T.eta), "h", !0);
-        A.avgSpd = Math.round(L / q * 100) / 100, T.bearing = W.calculateBearing(T, A);
+    (Q = c.wps) == null || Q.forEach((A, V) => {
+      A.positionTime = w.utc(A.etd || A.eta).unix();
+      const E = c.wps[V - 1];
+      if (E) {
+        const L = A.distanceFromStart - E.distanceFromStart, q = w(A.eta || A.etd).diff(w(E.etd || E.eta), "h", !0);
+        A.avgSpd = Math.round(L / q * 100) / 100, E.bearing = O.calculateBearing(E, A);
       }
-    }), u.wps = await Y.reduceWPS(u.wps), u.days = await Y.reduceDays(u.days), u.all = (Z = u.all) == null ? void 0 : Z.reduce((A, V) => (V.positionTime = v.utc(V.etd || V.eta).unix(), A.some((T) => Math.round(T.positionTime / 60) === Math.round(V.positionTime / 60)) || A.push(V), A), []), f.sample = u;
-    const E = u.hours.at(0), N = u.hours.at(-1);
-    f.distance = Math.round(N.distanceFromStart * 1e3) / 1e3, f.etd = v(E.eta).utc().format(), f.eta = v(N.eta).utc().format(), f.wxFactor = Math.round(I / F * 1e3) / 1e3, f.cFactor = Math.round(C / F * 1e3) / 1e3, f.avgSpeed = Math.round(N.distanceFromStart / F * 1e3) / 1e3, f.totalHrs = Math.round(F * 1e3) / 1e3, f.suspend = Math.round(H * 1e3) / 1e3;
-    const O = z.roundPrecision(o.dgo / 24 * H, 3), { distanceInECA: R, hoursInECA: K, totalDgoConsInECA: nt, eca: tt } = await this.calculateECA(f, o, l), et = z.roundPrecision(o.fo / 24 * (F - K), 3), ot = z.roundPrecision(o.dgo / 24 * F + O, 3);
-    f.extend = {
+    }), c.wps = await Y.reduceWPS(c.wps), c.days = await Y.reduceDays(c.days), c.all = (Z = c.all) == null ? void 0 : Z.reduce((A, V) => (V.positionTime = w.utc(V.etd || V.eta).unix(), A.some((E) => Math.round(E.positionTime / 60) === Math.round(V.positionTime / 60)) || A.push(V), A), []), m.sample = c;
+    const j = c.hours.at(0), N = c.hours.at(-1);
+    m.distance = Math.round(N.distanceFromStart * 1e3) / 1e3, m.etd = w(j.eta).utc().format(), m.eta = w(N.eta).utc().format(), m.wxFactor = Math.round(g / F * 1e3) / 1e3, m.cFactor = Math.round(I / F * 1e3) / 1e3, m.avgSpeed = Math.round(N.distanceFromStart / F * 1e3) / 1e3, m.totalHrs = Math.round(F * 1e3) / 1e3, m.suspend = Math.round(H * 1e3) / 1e3;
+    const R = z.roundPrecision(o.dgo / 24 * H, 3), { distanceInECA: W, hoursInECA: K, totalDgoConsInECA: nt, eca: tt } = await this.calculateECA(m, o, u), et = z.roundPrecision(o.fo / 24 * (F - K), 3), ot = z.roundPrecision(o.dgo / 24 * F + R, 3);
+    m.extend = {
       eca: tt,
-      distanceInECA: R,
+      distanceInECA: W,
       hoursInECA: K,
       totalDgoConsInECA: nt,
-      totalDgoConsInSuspend: O
-    }, f.totalFoCons = et < 0 ? 0 : et, f.totalDgoCons = ot;
-    const st = v().valueOf() - d, rt = (($ = u == null ? void 0 : u.hours) == null ? void 0 : $.length) || 1;
-    return S == null || S.info("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", l == null ? void 0 : l.requestId, st, rt, Math.round(st / rt * 1e3) / 1e3), f;
+      totalDgoConsInSuspend: R
+    }, m.totalFoCons = et < 0 ? 0 : et, m.totalDgoCons = ot;
+    const st = w().valueOf() - d, rt = (($ = c == null ? void 0 : c.hours) == null ? void 0 : $.length) || 1;
+    return T == null || T.info("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", u == null ? void 0 : u.requestId, st, rt, Math.round(st / rt * 1e3) / 1e3), m;
   }
   /**
    * 分段失速分析（最多走hours 小时）
@@ -1205,11 +1208,11 @@ class Y {
    * @param useRouteParam
    * @param options
    */
-  static async analyseInstantWithThreshed(e, t, a, o, n, i, s, r = "", h = 3, l = !0, d = !1, y = {}) {
+  static async analyseInstantWithThreshed(e, t, a, o, n, i, s, r = "", l = 3, u = !0, d = !1, y = {}) {
     var X, Q, Z, $, A, V;
-    const w = v().valueOf();
+    const k = w().valueOf();
     e.lng = z.convertToStdLng(e.lng);
-    const { v0: g, label: k } = e.sog ? {
+    const { v0: b, label: S } = e.sog ? {
       v0: e.sog,
       label: e.label || "Other"
       /* Instruct */
@@ -1217,67 +1220,67 @@ class Y {
       v0: n.speed,
       label: "CP"
       /* Cp */
-    }, j = Y.assembleProperties(o, n.loadCondition, g, 0), b = W.calculateSubRoute(e, i);
-    if (((X = b[0]) == null ? void 0 : X.length) <= 1)
+    }, C = Y.assembleProperties(o, n.loadCondition, b, 0), p = O.calculateSubRoute(e, i);
+    if (((X = p[0]) == null ? void 0 : X.length) <= 1)
       return;
-    const p = s.length ? W.calculateSubWaypoints(e, s) : [];
-    p.forEach((T) => T.important = !0);
-    let f = W.simplifyRouteToCoordinates(b, p, 0), u = 0, m = 0, c = 0, I = 0;
-    const C = {
+    const v = s.length ? O.calculateSubWaypoints(e, s) : [];
+    v.forEach((E) => E.important = !0);
+    let m = O.simplifyRouteToCoordinates(p, v, 0), c = 0, f = 0, h = 0, g = 0;
+    const I = {
       hours: [],
       wps: [],
       days: [],
       all: []
     };
-    t = v(t).utc();
+    t = w(t).utc();
     const F = t.clone();
-    for (; f.length > 0; ) {
-      const T = h - t.hour() % h;
-      let L = Math.ceil(t.clone().add(T, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4;
+    for (; m.length > 0; ) {
+      const E = l - t.hour() % l;
+      let L = Math.ceil(t.clone().add(E, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4;
       L = t.clone().add(L, "h").isSameOrAfter(a) ? a.diff(t, "h", !0) * 1e4 / 1e4 : L;
-      const q = await Y.speedLoseInHoursStep(j, t, F, L, u, f, r, l, d, y);
-      if (C.all.push(...q.all), (Q = q.from) != null && Q.speed && (C.hours.push(q.from), q != null && q.wps && C.wps.push(...q.wps), C.days.push(...q.days)), f = q == null ? void 0 : q.next, f.length || C.hours.push(q == null ? void 0 : q.to), u += Math.round((((Z = q == null ? void 0 : q.to) == null ? void 0 : Z.distanceFromPrevious) ?? 0) * 1e4) / 1e4, !L)
+      const q = await Y.speedLoseInHoursStep(C, t, F, L, c, m, r, u, d, y);
+      if (I.all.push(...q.all), (Q = q.from) != null && Q.speed && (I.hours.push(q.from), q != null && q.wps && I.wps.push(...q.wps), I.days.push(...q.days)), m = q == null ? void 0 : q.next, m.length || I.hours.push(q == null ? void 0 : q.to), c += Math.round((((Z = q == null ? void 0 : q.to) == null ? void 0 : Z.distanceFromPrevious) ?? 0) * 1e4) / 1e4, !L)
         break;
     }
-    C.wps = await Y.reduceWPS(C.wps), C.days = await Y.reduceDays(C.days), C.all = ($ = C.all) == null ? void 0 : $.reduce((T, L) => (L.positionTime = v.utc(L.etd || L.eta).unix(), T.some((q) => Math.round(v(q.etd).unix() / 60) === Math.round(v(L.etd).unix() / 60)) || T.push(L), T), []), (A = C.wps) == null || A.forEach((T, L) => {
-      const q = C.wps[L - 1];
+    I.wps = await Y.reduceWPS(I.wps), I.days = await Y.reduceDays(I.days), I.all = ($ = I.all) == null ? void 0 : $.reduce((E, L) => (L.positionTime = w.utc(L.etd || L.eta).unix(), E.some((q) => Math.round(w(q.etd).unix() / 60) === Math.round(w(L.etd).unix() / 60)) || E.push(L), E), []), (A = I.wps) == null || A.forEach((E, L) => {
+      const q = I.wps[L - 1];
       if (q) {
-        const ut = T.distanceFromStart - q.distanceFromStart, ht = v(T.eta || T.etd).diff(v(q.etd || q.eta), "h", !0);
-        q.bearing = W.calculateBearing(q, T), T.avgSpd = Math.round(ut / ht * 100) / 100;
+        const ut = E.distanceFromStart - q.distanceFromStart, lt = w(E.eta || E.etd).diff(w(q.etd || q.eta), "h", !0);
+        q.bearing = O.calculateBearing(q, E), E.avgSpd = Math.round(ut / lt * 100) / 100;
       }
     });
-    const P = C.hours;
-    for (let T = 0; T < P.length - 1; T++) {
-      const L = v(P[T + 1].eta).diff(P[T].etd, "hour", !0);
-      m += P[T].wxFactor * L, c += P[T].cFactor * L, I += L;
+    const P = I.hours;
+    for (let E = 0; E < P.length - 1; E++) {
+      const L = w(P[E + 1].eta).diff(P[E].etd, "hour", !0);
+      f += P[E].wxFactor * L, h += P[E].cFactor * L, g += L;
     }
-    const D = P.reduce((T, L) => T + (L.suspend || 0), 0), H = C.hours.at(0), E = C.hours.at(-1), N = await W.calculateRangeRoute(H, E, b), O = await W.calculateRangeWaypoints(H, E, b, p), R = {
-      sample: C,
-      distance: Math.round(((E == null ? void 0 : E.distanceFromStart) || 0) * 1e4) / 1e4,
+    const D = P.reduce((E, L) => E + (L.suspend || 0), 0), H = I.hours.at(0), j = I.hours.at(-1), N = await O.calculateRangeRoute(H, j, p), R = await O.calculateRangeWaypoints(H, j, p, v), W = {
+      sample: I,
+      distance: Math.round(((j == null ? void 0 : j.distanceFromStart) || 0) * 1e4) / 1e4,
       // 注意，可能会在first节点Drift,所有采用eta做为初始出发时间
-      etd: v(H.eta).utc().format(),
-      eta: v(E == null ? void 0 : E.eta).utc().format(),
-      wxFactor: Math.round(m / I * 1e3) / 1e3,
-      cFactor: Math.round(c / I * 1e3) / 1e3,
-      avgSpeed: Math.round(((E == null ? void 0 : E.distanceFromStart) || 0) / I * 1e3) / 1e3,
-      totalHrs: Math.round(I * 1e3) / 1e3,
+      etd: w(H.eta).utc().format(),
+      eta: w(j == null ? void 0 : j.eta).utc().format(),
+      wxFactor: Math.round(f / g * 1e3) / 1e3,
+      cFactor: Math.round(h / g * 1e3) / 1e3,
+      avgSpeed: Math.round(((j == null ? void 0 : j.distanceFromStart) || 0) / g * 1e3) / 1e3,
+      totalHrs: Math.round(g * 1e3) / 1e3,
       suspend: Math.round(D * 1e3) / 1e3,
       from: H,
-      to: E,
+      to: j,
       route: N,
-      waypoints: O,
-      v0: g,
-      label: k
-    }, K = z.roundPrecision(n.dgo / 24 * D, 3), { distanceInECA: nt, hoursInECA: tt, totalDgoConsInECA: et, eca: ot } = await this.calculateECA(R, n, y), it = z.roundPrecision(n.fo / 24 * (I - tt), 3), st = z.roundPrecision(n.dgo / 24 * I + K, 3);
-    R.extend = {
+      waypoints: R,
+      v0: b,
+      label: S
+    }, K = z.roundPrecision(n.dgo / 24 * D, 3), { distanceInECA: nt, hoursInECA: tt, totalDgoConsInECA: et, eca: ot } = await this.calculateECA(W, n, y), it = z.roundPrecision(n.fo / 24 * (g - tt), 3), st = z.roundPrecision(n.dgo / 24 * g + K, 3);
+    W.extend = {
       eca: ot,
       distanceInECA: nt,
       hoursInECA: tt,
       totalDgoConsInECA: et,
       totalDgoConsInSuspend: K
-    }, R.totalDgoCons = st, R.totalFoCons = it < 0 ? 0 : it;
-    const _ = v().valueOf() - w, G = ((V = C == null ? void 0 : C.hours) == null ? void 0 : V.length) || 1;
-    return S == null || S.debug("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", y == null ? void 0 : y.requestId, _, G, Math.round(_ / G * 1e3) / 1e3), R;
+    }, W.totalDgoCons = st, W.totalFoCons = it < 0 ? 0 : it;
+    const _ = w().valueOf() - k, G = ((V = I == null ? void 0 : I.hours) == null ? void 0 : V.length) || 1;
+    return T == null || T.debug("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", y == null ? void 0 : y.requestId, _, G, Math.round(_ / G * 1e3) / 1e3), W;
   }
   /**
    * 在指定航线条件下，基于多CP，动态计算最优成本(租金+油费)方案
@@ -1295,58 +1298,58 @@ class Y {
    * @param options
    */
   static async analyseCost(e, t, a, o, n = {}) {
-    var b, p;
-    const i = v().valueOf(), s = [];
+    var p, v;
+    const i = w().valueOf(), s = [];
     e.speedStep = e.speedStep || 3, e.alterStep = e.alterStep ?? 1;
-    const r = W.calculateRouteDistance(o.route);
-    let h = 0;
-    a.forEach((f) => {
-      const u = Math.ceil(r / f.speed / 24);
-      h = h < u ? u : h;
-    }), h = h * 1.3;
-    const l = v.utc(e.etd).add(h ?? 14, "day");
+    const r = O.calculateRouteDistance(o.route);
+    let l = 0;
+    a.forEach((m) => {
+      const c = Math.ceil(r / m.speed / 24);
+      l = l < c ? c : l;
+    }), l = l * 1.3;
+    const u = w.utc(e.etd).add(l ?? 14, "day");
     let d = 1;
-    for (const f of a) {
-      const u = JSON.parse(JSON.stringify(o.route)), m = JSON.parse(JSON.stringify(o.waypoints)), c = await Y.analyseInstantWithThreshed(
+    for (const m of a) {
+      const c = JSON.parse(JSON.stringify(o.route)), f = JSON.parse(JSON.stringify(o.waypoints)), h = await Y.analyseInstantWithThreshed(
         { lat: e.lat, lng: e.lng },
         e.etd,
-        l,
-        t,
-        f,
         u,
+        t,
         m,
+        c,
+        f,
         e.meteoVendor,
         e.speedStep,
         e.useMeteo,
         e.useRouteParam,
         n
       );
-      c && (await Y.calculateCost(c, f, e, n), s.push(c), S == null || S.info("[%s][L%d-%d] analyse from %s to %s cost: %j", n.requestId, 1, d, e.etd, l.format(), {
-        cost: c.cost.total,
-        hire: c.cost.hire,
-        bunker: c.cost.bunker,
-        distance: c.distance,
-        hours: c.totalHrs,
-        cp: `${f.speed}/${f.fo}/${f.dgo}`
+      h && (await Y.calculateCost(h, m, e, n), s.push(h), T == null || T.info("[%s][L%d-%d] analyse from %s to %s cost: %j", n.requestId, 1, d, e.etd, u.format(), {
+        cost: h.cost.total,
+        hire: h.cost.hire,
+        bunker: h.cost.bunker,
+        distance: h.distance,
+        hours: h.totalHrs,
+        cp: `${m.speed}/${m.fo}/${m.dgo}`
       })), d++;
     }
-    s.sort((f, u) => f.cost.total - u.cost.total);
-    const y = s.at(0), w = s.at(1), g = [];
-    if (g.push({ combined: !1, speeds: [y], cost: (b = y.cost) == null ? void 0 : b.total }), w) {
-      const f = y.cost.cp, u = w.cost.cp, m = v(y.eta), c = v(y.etd), I = m.diff(c, "days", !0);
-      let C = Math.ceil(I / 2);
-      C = C > 7 ? 7 : C < e.alterStep ? e.alterStep : C;
-      let F = 2, P = { combined: !1, speeds: [w], cost: (p = w.cost) == null ? void 0 : p.total }, D;
-      for (; C >= e.alterStep; ) {
-        const H = await Y.combinedAnalyse(e, t, l, [f, u], o, C, { ...n, level: F });
-        if (P.cost > H.cost ? D ? (D == null ? void 0 : D.cost) > H.cost && (D = H) : (D = P, P = H) : (!D || (D == null ? void 0 : D.cost) > H.cost) && (D = H), C <= e.alterStep)
+    s.sort((m, c) => m.cost.total - c.cost.total);
+    const y = s.at(0), k = s.at(1), b = [];
+    if (b.push({ combined: !1, speeds: [y], cost: (p = y.cost) == null ? void 0 : p.total }), k) {
+      const m = y.cost.cp, c = k.cost.cp, f = w(y.eta), h = w(y.etd), g = f.diff(h, "days", !0);
+      let I = Math.ceil(g / 2);
+      I = I > 7 ? 7 : I < e.alterStep ? e.alterStep : I;
+      let F = 2, P = { combined: !1, speeds: [k], cost: (v = k.cost) == null ? void 0 : v.total }, D;
+      for (; I >= e.alterStep; ) {
+        const H = await Y.combinedAnalyse(e, t, u, [m, c], o, I, { ...n, level: F });
+        if (P.cost > H.cost ? D ? (D == null ? void 0 : D.cost) > H.cost && (D = H) : (D = P, P = H) : (!D || (D == null ? void 0 : D.cost) > H.cost) && (D = H), I <= e.alterStep)
           break;
-        C = Math.ceil(C / 2), F += 1;
+        I = Math.ceil(I / 2), F += 1;
       }
-      g.push(P), D && g.push(D);
+      b.push(P), D && b.push(D);
     }
-    const j = v().valueOf() - i;
-    return S == null || S.info("[%s] analyse elapsed: %d ms", n == null ? void 0 : n.requestId, j), g.sort((f, u) => f.cost - u.cost);
+    const C = w().valueOf() - i;
+    return T == null || T.info("[%s] analyse elapsed: %d ms", n == null ? void 0 : n.requestId, C), b.sort((m, c) => m.cost - c.cost);
   }
   /**
    * 按步长多次减半，分别用7,4,2,1天步长及cpa,cpb交替计算各种组合下的成本
@@ -1359,23 +1362,23 @@ class Y {
    * @param options
    */
   static async combinedAnalyse(e, t, a, o, n, i, s = {}) {
-    s.counter = 1, S == null || S.info("[%s][L%d] analyse with alternate cp in every %d days", s.requestId, s.level, i);
-    const r = await Y.alternateAnalyse(e, t, a, o, 0, n, i, s), h = r.reduce((u, m) => u + m.cost.total, 0), l = r.reduce((u, m) => u + m.cost.hire, 0), d = r.reduce((u, m) => u + m.cost.bunker, 0), y = r.reduce((u, m) => u + m.distance, 0), w = r.reduce((u, m) => u + m.totalHrs, 0);
-    S == null || S.info("[%s][L%d] cost with cpa/cpb turn: %j", s.requestId, s.level, {
-      cost: h,
-      hire: l,
+    s.counter = 1, T == null || T.info("[%s][L%d] analyse with alternate cp in every %d days", s.requestId, s.level, i);
+    const r = await Y.alternateAnalyse(e, t, a, o, 0, n, i, s), l = r.reduce((c, f) => c + f.cost.total, 0), u = r.reduce((c, f) => c + f.cost.hire, 0), d = r.reduce((c, f) => c + f.cost.bunker, 0), y = r.reduce((c, f) => c + f.distance, 0), k = r.reduce((c, f) => c + f.totalHrs, 0);
+    T == null || T.info("[%s][L%d] cost with cpa/cpb turn: %j", s.requestId, s.level, {
+      cost: l,
+      hire: u,
       bunker: d,
       distance: y,
-      hours: w
+      hours: k
     });
-    const g = await Y.alternateAnalyse(e, t, a, o, 1, n, i, s), k = g.reduce((u, m) => u + m.cost.total, 0), j = g.reduce((u, m) => u + m.cost.hire, 0), b = g.reduce((u, m) => u + m.cost.bunker, 0), p = g.reduce((u, m) => u + m.distance, 0), f = g.reduce((u, m) => u + m.totalHrs, 0);
-    return S == null || S.info("[%s][L%d] cost with cpb/cpa turn: %j", s.requestId, s.level, {
-      cost: k,
-      hire: j,
-      bunker: b,
-      distance: p,
-      hours: f
-    }), h < k ? { combined: !0, cost: Math.round(h * 1e3) / 1e3, speeds: r, step: i } : { combined: !0, cost: Math.round(k * 1e3) / 1e3, speeds: g, step: i };
+    const b = await Y.alternateAnalyse(e, t, a, o, 1, n, i, s), S = b.reduce((c, f) => c + f.cost.total, 0), C = b.reduce((c, f) => c + f.cost.hire, 0), p = b.reduce((c, f) => c + f.cost.bunker, 0), v = b.reduce((c, f) => c + f.distance, 0), m = b.reduce((c, f) => c + f.totalHrs, 0);
+    return T == null || T.info("[%s][L%d] cost with cpb/cpa turn: %j", s.requestId, s.level, {
+      cost: S,
+      hire: C,
+      bunker: p,
+      distance: v,
+      hours: m
+    }), l < S ? { combined: !0, cost: Math.round(l * 1e3) / 1e3, speeds: r, step: i } : { combined: !0, cost: Math.round(S * 1e3) / 1e3, speeds: b, step: i };
   }
   /**
    * 基于cp索引，交替计算指定步长下的成本
@@ -1389,43 +1392,43 @@ class Y {
    * @param options
    */
   static async alternateAnalyse(e, t, a, o, n, i, s, r = {}) {
-    var y, w;
-    let h = v.utc(e.etd);
-    const l = { lat: e.lat, lng: e.lng }, d = [];
-    for (; h.isBefore(a); ) {
-      const g = h.clone().utc().add(s, "day"), k = JSON.parse(JSON.stringify(i.route)), j = JSON.parse(JSON.stringify(i.waypoints)), b = o[n], p = await Y.analyseInstantWithThreshed(
-        l,
-        h.utc().format(),
-        g,
-        t,
+    var y, k;
+    let l = w.utc(e.etd);
+    const u = { lat: e.lat, lng: e.lng }, d = [];
+    for (; l.isBefore(a); ) {
+      const b = l.clone().utc().add(s, "day"), S = JSON.parse(JSON.stringify(i.route)), C = JSON.parse(JSON.stringify(i.waypoints)), p = o[n], v = await Y.analyseInstantWithThreshed(
+        u,
+        l.utc().format(),
         b,
-        k,
-        j,
+        t,
+        p,
+        S,
+        C,
         e.meteoVendor,
         e.speedStep,
         e.useMeteo,
         e.useRouteParam,
         r
       );
-      p && (await Y.calculateCost(p, b, e, r), S == null || S.info(
+      v && (await Y.calculateCost(v, p, e, r), T == null || T.info(
         "[%s][L%d-%d] analyse from %s to %s cost: %j",
         r.requestId,
         r.level,
         r.counter,
-        h.utc().format(),
-        g.utc().format(),
+        l.utc().format(),
+        b.utc().format(),
         {
-          cost: p.cost.total,
-          hire: p.cost.hire,
-          bunker: p.cost.bunker,
-          distance: p.distance,
-          hours: p.totalHrs,
-          cp: `${b.speed}/${b.fo}/${b.dgo}`
+          cost: v.cost.total,
+          hire: v.cost.hire,
+          bunker: v.cost.bunker,
+          distance: v.distance,
+          hours: v.totalHrs,
+          cp: `${p.speed}/${p.fo}/${p.dgo}`
         }
       )), r.counter = r.counter + 1;
-      const f = (w = (y = p == null ? void 0 : p.sample) == null ? void 0 : y.hours) == null ? void 0 : w.at(-1);
-      if (f)
-        l.lat = f.lat, l.lng = f.lng, h = v(f.eta), d.push(p), n = n ? 0 : 1;
+      const m = (k = (y = v == null ? void 0 : v.sample) == null ? void 0 : y.hours) == null ? void 0 : k.at(-1);
+      if (m)
+        u.lat = m.lat, u.lng = m.lng, l = w(m.eta), d.push(v), n = n ? 0 : 1;
       else
         break;
     }
@@ -1441,12 +1444,12 @@ class Y {
   static async calculateCost(e, t, a, o = {}) {
     var n;
     if (e) {
-      const i = (a.addComm || 0) >= 1 ? (a.addComm || 0) / 100 : a.addComm || 0, s = Math.round((a.dailyHire || 0) * (e.suspend || 0) / 24 * 1e3) / 1e3, r = Math.round(e.totalHrs / 24 * (a.dailyHire || 0) * (1 - i) * 1e3) / 1e3 + s, h = Math.round(e.totalFoCons * (a.priceFO || 0) * 1e3) / 1e3, l = Math.round((e.totalDgoCons + (((n = e.extend) == null ? void 0 : n.totalDgoConsInECA) || 0)) * (a.priceDGO || 0) * 1e3) / 1e3;
+      const i = (a.addComm || 0) >= 1 ? (a.addComm || 0) / 100 : a.addComm || 0, s = Math.round((a.dailyHire || 0) * (e.suspend || 0) / 24 * 1e3) / 1e3, r = Math.round(e.totalHrs / 24 * (a.dailyHire || 0) * (1 - i) * 1e3) / 1e3 + s, l = Math.round(e.totalFoCons * (a.priceFO || 0) * 1e3) / 1e3, u = Math.round((e.totalDgoCons + (((n = e.extend) == null ? void 0 : n.totalDgoConsInECA) || 0)) * (a.priceDGO || 0) * 1e3) / 1e3;
       e.cost = {
-        total: Math.round((r + h + l) * 1e3) / 1e3,
+        total: Math.round((r + l + u) * 1e3) / 1e3,
         hire: Math.round(r * 1e3) / 1e3,
         suspendHire: s,
-        bunker: Math.round((h + l) * 1e3) / 1e3,
+        bunker: Math.round((l + u) * 1e3) / 1e3,
         cp: t
       };
     }
@@ -1457,16 +1460,16 @@ class Y {
    *
    */
   static async calculateECA(e, t, a = {}) {
-    var r, h, l, d;
-    const o = await W.intersectInECA((e == null ? void 0 : e.route) || []);
+    var r, l, u, d;
+    const o = await O.intersectInECA((e == null ? void 0 : e.route) || []);
     let n = 0, i = 0, s = 0;
-    (h = (r = e == null ? void 0 : e.sample) == null ? void 0 : r.wps) == null || h.forEach((y) => {
-      y.positionTime = v.utc(y.etd || y.eta).unix();
+    (l = (r = e == null ? void 0 : e.sample) == null ? void 0 : r.wps) == null || l.forEach((y) => {
+      y.positionTime = w.utc(y.etd || y.eta).unix();
     });
     for (const y of o) {
       n += y.distance;
-      const w = await W.deadReckoningTime((l = y.waypoints) == null ? void 0 : l.at(0), e.sample.all || e.sample.wps), g = await W.deadReckoningTime((d = y.waypoints) == null ? void 0 : d.at(-1), e.sample.all || e.sample.wps);
-      y.in = w, y.out = g, y.totalHrs = z.roundPrecision((g.positionTime - w.positionTime) / 3600, 3), y.totalDgoCons = z.roundPrecision(t.fo / 24 * y.totalHrs, 3), i += y.totalHrs, s += y.totalDgoCons;
+      const k = await O.deadReckoningTime((u = y.waypoints) == null ? void 0 : u.at(0), e.sample.all || e.sample.wps), b = await O.deadReckoningTime((d = y.waypoints) == null ? void 0 : d.at(-1), e.sample.all || e.sample.wps);
+      y.in = k, y.out = b, y.totalHrs = z.roundPrecision((b.positionTime - k.positionTime) / 3600, 3), y.totalDgoCons = z.roundPrecision(t.fo / 24 * y.totalHrs, 3), i += y.totalHrs, s += y.totalDgoCons;
     }
     return n = z.roundPrecision(n, 3), i = z.roundPrecision(i, 3), s = z.roundPrecision(s, 3), {
       distanceInECA: n,
@@ -1481,53 +1484,53 @@ class Y {
    * @param options
    */
   static async mergeSpeeds(e, t = {}) {
-    var f, u;
+    var m, c;
     const a = {
       hours: [],
       wps: [],
       days: []
-    }, o = e.reduce((m, c) => m + c.distance, 0), n = e.reduce((m, c) => {
-      var I;
-      return m + (((I = c.extend) == null ? void 0 : I.distanceInECA) || 0);
-    }, 0), i = e.reduce((m, c) => m + c.totalHrs, 0), s = e.reduce((m, c) => {
-      var I;
-      return m + (((I = c.extend) == null ? void 0 : I.hoursInECA) || 0);
-    }, 0), r = e.reduce((m, c) => {
-      var I;
-      return m + (((I = c.extend) == null ? void 0 : I.totalDgoConsInECA) || 0);
-    }, 0), h = e.reduce((m, c) => m + c.wxFactor * c.totalHrs / i, 0), l = e.reduce((m, c) => m + c.cFactor * c.totalHrs / i, 0), d = e.reduce((m, c) => m + c.totalFoCons, 0), y = e.reduce((m, c) => m + c.totalDgoCons, 0), w = e.reduce((m, c) => m + c.cost.total, 0), g = e.reduce((m, c) => m + c.cost.hire, 0), k = e.reduce((m, c) => m + c.cost.bunker, 0), j = [], b = [];
-    let p;
-    for (const m of e) {
-      b.push(...((f = m.extend) == null ? void 0 : f.eca) || []);
-      const c = m.sample.hours, I = m.sample.wps, C = m.sample.days, F = c.at(0);
-      p && (F.distanceFromPrevious = p.distanceFromPrevious, F.distanceFromStart = p.distanceFromStart, c.forEach((E, N) => {
-        N && (E.distanceFromStart = E.distanceFromStart + p.distanceFromStart);
-      }), I.at(0).distanceFromPrevious = p.distanceFromPrevious, I.at(0).distanceFromStart = p.distanceFromStart, I.forEach((E, N) => {
-        N && (E.distanceFromStart = E.distanceFromStart + p.distanceFromStart);
-      }), C.at(0).distanceFromPrevious = p.distanceFromPrevious, C.at(0).distanceFromStart = p.distanceFromStart, C.forEach((E, N) => {
-        N && (E.distanceFromStart = E.distanceFromStart + p.distanceFromStart);
-      })), F.cp = m.cost.cp;
-      const P = [m.etd, m.eta], D = j.findIndex((E) => E.id === F.cp.id);
-      D === -1 ? (F.cp.segment = [P], j.push(F.cp)) : j[D].segment.push(P), c.forEach((E) => {
-        var O;
-        ((O = a.hours) == null ? void 0 : O.findIndex((R) => R.eta === E.eta)) === -1 && a.hours.push(E);
-      }), I.forEach((E) => {
-        var O;
-        ((O = a.wps) == null ? void 0 : O.findIndex((R) => R.eta === E.eta)) === -1 && a.wps.push(E);
-      }), C.forEach((E) => {
-        var O;
-        ((O = a == null ? void 0 : a.days) == null ? void 0 : O.findIndex((R) => R.eta === E.eta)) === -1 && a.days.push(E);
+    }, o = e.reduce((f, h) => f + h.distance, 0), n = e.reduce((f, h) => {
+      var g;
+      return f + (((g = h.extend) == null ? void 0 : g.distanceInECA) || 0);
+    }, 0), i = e.reduce((f, h) => f + h.totalHrs, 0), s = e.reduce((f, h) => {
+      var g;
+      return f + (((g = h.extend) == null ? void 0 : g.hoursInECA) || 0);
+    }, 0), r = e.reduce((f, h) => {
+      var g;
+      return f + (((g = h.extend) == null ? void 0 : g.totalDgoConsInECA) || 0);
+    }, 0), l = e.reduce((f, h) => f + h.wxFactor * h.totalHrs / i, 0), u = e.reduce((f, h) => f + h.cFactor * h.totalHrs / i, 0), d = e.reduce((f, h) => f + h.totalFoCons, 0), y = e.reduce((f, h) => f + h.totalDgoCons, 0), k = e.reduce((f, h) => f + h.cost.total, 0), b = e.reduce((f, h) => f + h.cost.hire, 0), S = e.reduce((f, h) => f + h.cost.bunker, 0), C = [], p = [];
+    let v;
+    for (const f of e) {
+      p.push(...((m = f.extend) == null ? void 0 : m.eca) || []);
+      const h = f.sample.hours, g = f.sample.wps, I = f.sample.days, F = h.at(0);
+      v && (F.distanceFromPrevious = v.distanceFromPrevious, F.distanceFromStart = v.distanceFromStart, h.forEach((j, N) => {
+        N && (j.distanceFromStart = j.distanceFromStart + v.distanceFromStart);
+      }), g.at(0).distanceFromPrevious = v.distanceFromPrevious, g.at(0).distanceFromStart = v.distanceFromStart, g.forEach((j, N) => {
+        N && (j.distanceFromStart = j.distanceFromStart + v.distanceFromStart);
+      }), I.at(0).distanceFromPrevious = v.distanceFromPrevious, I.at(0).distanceFromStart = v.distanceFromStart, I.forEach((j, N) => {
+        N && (j.distanceFromStart = j.distanceFromStart + v.distanceFromStart);
+      })), F.cp = f.cost.cp;
+      const P = [f.etd, f.eta], D = C.findIndex((j) => j.id === F.cp.id);
+      D === -1 ? (F.cp.segment = [P], C.push(F.cp)) : C[D].segment.push(P), h.forEach((j) => {
+        var R;
+        ((R = a.hours) == null ? void 0 : R.findIndex((W) => W.eta === j.eta)) === -1 && a.hours.push(j);
+      }), g.forEach((j) => {
+        var R;
+        ((R = a.wps) == null ? void 0 : R.findIndex((W) => W.eta === j.eta)) === -1 && a.wps.push(j);
+      }), I.forEach((j) => {
+        var R;
+        ((R = a == null ? void 0 : a.days) == null ? void 0 : R.findIndex((W) => W.eta === j.eta)) === -1 && a.days.push(j);
       });
-      const H = (u = a.wps) == null ? void 0 : u.findIndex((E) => E.eta === F.eta);
-      H === -1 ? a.wps.push(F) : a.wps[H] = F, p = c.at(-1);
+      const H = (c = a.wps) == null ? void 0 : c.findIndex((j) => j.eta === F.eta);
+      H === -1 ? a.wps.push(F) : a.wps[H] = F, v = h.at(-1);
     }
-    return a.wps.sort((m, c) => v(m.etd).unix() - v(c.etd).unix()), a.wps.forEach((m, c) => {
-      const I = a.wps[c - 1];
-      if (I) {
-        const C = m.distanceFromStart - (I.distanceFromStart || 0), F = v(m.eta || m.etd).diff(v(I.etd || I.eta), "hour", !0), P = Math.round(C / F * 100) / 100;
-        m.avgSpd = P;
-        const D = W.calculateBearing(I, m);
-        I.bearing = D;
+    return a.wps.sort((f, h) => w(f.etd).unix() - w(h.etd).unix()), a.wps.forEach((f, h) => {
+      const g = a.wps[h - 1];
+      if (g) {
+        const I = f.distanceFromStart - (g.distanceFromStart || 0), F = w(f.eta || f.etd).diff(w(g.etd || g.eta), "hour", !0), P = Math.round(I / F * 100) / 100;
+        f.avgSpd = P;
+        const D = O.calculateBearing(g, f);
+        g.bearing = D;
       }
     }), {
       sample: a,
@@ -1540,18 +1543,18 @@ class Y {
       distance: Math.round(o * 1e3) / 1e3,
       totalHrs: Math.round(i * 1e3) / 1e3,
       avgSpeed: Math.round(o / i * 1e3) / 1e3,
-      wxFactor: Math.round(h * 1e3) / 1e3,
-      cFactor: Math.round(l * 1e3) / 1e3,
+      wxFactor: Math.round(l * 1e3) / 1e3,
+      cFactor: Math.round(u * 1e3) / 1e3,
       totalFoCons: Math.round(d * 1e3) / 1e3,
       totalDgoCons: Math.round(y * 1e3) / 1e3,
       cost: {
-        total: Math.round(w * 1e3) / 1e3,
-        hire: Math.round(g * 1e3) / 1e3,
-        bunker: Math.round(k * 1e3) / 1e3
+        total: Math.round(k * 1e3) / 1e3,
+        hire: Math.round(b * 1e3) / 1e3,
+        bunker: Math.round(S * 1e3) / 1e3
       },
       extend: {
-        cps: j,
-        eca: b,
+        cps: C,
+        eca: p,
         distanceInECA: Math.round(n * 1e3) / 1e3,
         hoursInECA: Math.round(s * 1e3) / 1e3,
         totalDgoConsInECA: Math.round(r * 1e3) / 1e3,
@@ -1567,7 +1570,7 @@ export {
   Ft as HifleetImpl,
   pt as LoadCondition,
   xt as MyShipImpl,
-  Et as MyVesselImpl,
+  jt as MyVesselImpl,
   Nt as ShipxyImpl,
   Y as SpeedHelper,
   vt as SpeedLabel,