@idm-plugin/vessel 3.4.1 → 3.4.2

package/dist/index.js

@@ -1,19 +1,19 @@
 var ht = Object.defineProperty;
 var lt = (E, s, t) => s in E ? ht(E, s, { enumerable: !0, configurable: !0, writable: !0, value: t }) : E[s] = t;
 var U = (E, s, t) => (lt(E, typeof s != "symbol" ? s + "" : s, t), t);
-import V from "got";
+import B from "got";
 import ct from "@log4js-node/log4js-api";
-import p from "moment";
-import { LngLatHelper as z, LaneHelper as W } from "@idm-plugin/geo2";
+import v from "moment";
+import { LngLatHelper as z, LaneHelper as V } from "@idm-plugin/geo2";
 import { MeteoHelper2 as mt } from "@idm-plugin/meteo2";
-import { Meteo2Assist as it } from "@idm-plugin/meteo";
-let f;
+import { Meteo2Assist as rt } from "@idm-plugin/meteo";
+let y;
 try {
-  f = ct.getLogger("vessel");
+  y = ct.getLogger("vessel");
 } catch {
 } finally {
 }
-class st {
+class at {
   /**
    * 解析AIS状态码
    * @param status
@@ -54,7 +54,7 @@ class st {
     return { labelCn: t, labelEn: a };
   }
 }
-class Ft extends st {
+class Tt extends at {
   constructor(t, a) {
     super();
     U(this, "clientId");
@@ -69,19 +69,19 @@ class Ft extends st {
         client_secret: this.clientSecret,
         grant_type: "client_credentials"
       }
-    }, n = await V.post(a, i).json();
-    f == null || f.info("[%s] fetch access token from: %s - %j", t.requestId, a, n), n.error || (this.token = {
+    }, n = await B.post(a, i).json();
+    y == null || y.info("[%s] fetch access token from: %s - %j", t.requestId, a, n), n.error || (this.token = {
       accessToken: n.access_token,
       tokenType: n.token_type,
       expiresIn: n.expires_in,
       scope: n.scope,
       jti: n.jti,
-      issuedAt: p().utc().format()
+      issuedAt: v().utc().format()
     });
   }
   async checkToken(t = {}) {
     var a;
-    return (!this.token || p().diff(p(this.token.issuedAt), "seconds") > (((a = this.token) == null ? void 0 : a.expiresIn) || 0) - 300) && await this.authToken(t), this.token;
+    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;
   }
   /**
    * 模糊查询
@@ -89,20 +89,20 @@ class Ft extends st {
    * @param options
    */
   async suggest(t, a = {}) {
-    var e, c;
+    var e, r;
     await this.checkToken(a);
     const i = "https://market.myvessel.cn/sdc/v1/mkt/vessels/fuzzy", n = {
       headers: {
-        Authorization: `${(e = this.token) == null ? void 0 : e.tokenType} ${(c = this.token) == null ? void 0 : c.accessToken}`
+        Authorization: `${(e = this.token) == null ? void 0 : e.tokenType} ${(r = this.token) == null ? void 0 : r.accessToken}`
       },
       json: {
         kw: t,
         recordNum: a.ps || 10
       }
     };
-    f == null || f.info("[%s] fetch suggest vessels from: %s - %j", a.requestId, i, n);
-    const o = await V.post(i, n).json();
-    return o.status !== 200 ? (f == null || f.warn("[%s] fetch suggest vessels failed: %j", a.requestId, { message: o.message, status: o.status, code: o.code }), []) : (o.data || []).map((h) => ({
+    y == null || y.info("[%s] fetch suggest vessels from: %s - %j", a.requestId, i, n);
+    const o = await B.post(i, n).json();
+    return o.status !== 200 ? (y == null || y.warn("[%s] fetch suggest vessels failed: %j", a.requestId, { message: o.message, status: o.status, code: o.code }), []) : (o.data || []).map((h) => ({
       mmsi: h.mmsi,
       name: h.nameEn,
       nameCn: h.nameCn,
@@ -120,80 +120,80 @@ class Ft extends st {
    * @param options
    */
   async search(t, a = {}) {
-    var u, h;
+    var d, h;
     await this.checkToken(a);
     const i = /^\d{7}$/.test(t.toString()), n = i ? "https://market.myvessel.cn/sdc/v1/mkt/vessels/detail/imo" : "https://market.myvessel.cn/sdc/v1/mkt/vessels/detail/mmsi", o = i ? { imo: t } : { mmsi: t }, e = {
       headers: {
-        Authorization: `${(u = this.token) == null ? void 0 : u.tokenType} ${(h = this.token) == null ? void 0 : h.accessToken}`
+        Authorization: `${(d = this.token) == null ? void 0 : d.tokenType} ${(h = this.token) == null ? void 0 : h.accessToken}`
       },
       searchParams: o
     };
-    f == null || f.info("[%s] fetch vessel from: %s - %j", a.requestId, n, e);
-    const c = await V.get(n, e).json();
-    if (c.status !== 200)
-      return f == null || f.warn("[%s] fetch suggest vessels failed: %j", a.requestId, { message: c.message, status: c.status, code: c.code }), {};
+    y == null || y.info("[%s] fetch vessel from: %s - %j", a.requestId, n, e);
+    const r = await B.get(n, e).json();
+    if (r.status !== 200)
+      return y == null || y.warn("[%s] fetch suggest vessels failed: %j", a.requestId, { message: r.message, status: r.status, code: r.code }), {};
     {
-      const d = c.data;
-      if (d)
+      const c = r.data;
+      if (c)
         return {
-          mmsi: d.mmsi,
-          imo: Number.isNaN(d.imo) ? null : Number(d.imo),
-          callSign: d.callsign,
-          name: d.nameEn,
-          nameCn: d.nameCn,
-          type: d.vesselTypeNameEn,
-          flagName: d.flagCtry,
-          clasz: d.classSociety,
-          dateOfBuild: d.buildYearMonth,
-          deadweight: d.dwt,
-          grossTonnage: d.grt,
-          netTonnage: d.net,
-          teu: d.teu,
-          length: d.length,
-          breadth: d.width,
-          height: d.height,
-          draught: d.draught,
-          speed: d.speed,
-          passengerCapacity: d.passengercapacity,
+          mmsi: c.mmsi,
+          imo: Number.isNaN(c.imo) ? null : Number(c.imo),
+          callSign: c.callsign,
+          name: c.nameEn,
+          nameCn: c.nameCn,
+          type: c.vesselTypeNameEn,
+          flagName: c.flagCtry,
+          clasz: c.classSociety,
+          dateOfBuild: c.buildYearMonth,
+          deadweight: c.dwt,
+          grossTonnage: c.grt,
+          netTonnage: c.net,
+          teu: c.teu,
+          length: c.length,
+          breadth: c.width,
+          height: c.height,
+          draught: c.draught,
+          speed: c.speed,
+          passengerCapacity: c.passengercapacity,
           vendor: "myvessel",
-          raw: d
+          raw: c
         };
     }
     return {};
   }
   async archives(t, a = {}) {
-    var e, c;
+    var e, r;
     await this.checkToken(a);
     const i = "https://svc.data.myvessel.cn/sdc/v1/ship/info/batch", n = {
       headers: {
-        Authorization: `${(e = this.token) == null ? void 0 : e.tokenType} ${(c = this.token) == null ? void 0 : c.accessToken}`
+        Authorization: `${(e = this.token) == null ? void 0 : e.tokenType} ${(r = this.token) == null ? void 0 : r.accessToken}`
       },
       json: {
         mmsiList: typeof t == "number" ? [t] : t
       }
     };
-    f == null || f.info("[%s] fetch vessel archive from: %s - %j", a.requestId, i, n);
-    const o = await V.post(i, n).json();
-    return o.status !== 200 ? (f == null || f.warn("[%s] fetch vessel archive failed: %j", a.requestId, { message: o.message, status: o.status, code: o.code }), {}) : o.data;
+    y == null || y.info("[%s] fetch vessel archive from: %s - %j", a.requestId, i, n);
+    const o = await B.post(i, n).json();
+    return o.status !== 200 ? (y == null || y.warn("[%s] fetch vessel archive failed: %j", a.requestId, { message: o.message, status: o.status, code: o.code }), {}) : o.data;
   }
   async realTimePosition(t, a = {}) {
-    var c, u;
+    var r, d;
     await this.checkToken(a);
     const i = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/location/unit", n = {
       headers: {
-        Authorization: `${(c = this.token) == null ? void 0 : c.tokenType} ${(u = this.token) == null ? void 0 : u.accessToken}`
+        Authorization: `${(r = this.token) == null ? void 0 : r.tokenType} ${(d = this.token) == null ? void 0 : d.accessToken}`
       },
       searchParams: { mmsi: t }
     };
-    f == null || f.info("[%s] fetch realtime position from: %s - %j", a.requestId, i, n);
-    const o = await V.get(i, n).json();
+    y == null || y.info("[%s] fetch realtime position from: %s - %j", a.requestId, i, n);
+    const o = await B.get(i, n).json();
     if (o.code)
-      return f == null || f.warn("[%s] fetch realtime position failed: %j", a.requestId, { message: o.message, status: o.status, code: o.code }), o;
+      return y == null || y.warn("[%s] fetch realtime position failed: %j", a.requestId, { message: o.message, status: o.status, code: o.code }), o;
     const e = o.data;
     for (const h in e)
       !isNaN(e[h]) && Number(e[h]) !== 1 / 0 && (e[h] = Number(e[h]));
     if (e) {
-      const h = p(`${e.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+      const h = v(`${e.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
       return {
         mmsi: e.mmsi,
         name: e.vesselName || e.aisVesselName,
@@ -208,7 +208,7 @@ class Ft extends st {
         cog: e.cog,
         hdg: e.hdg,
         rot: e.rot,
-        eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(e.eta) ? p.utc(e.eta).format() : void 0,
+        eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(e.eta) ? v.utc(e.eta).format() : void 0,
         destination: e.dest,
         positionTime: h.unix(),
         status: e.status,
@@ -229,11 +229,11 @@ class Ft extends st {
       return {};
   }
   async calculateRoute(t, a, i = {}) {
-    var c, u;
+    var r, d;
     await this.checkToken(i);
     const n = "https://svc.data.myvessel.cn/sdc/v1/routes/routing/nodes", o = {
       headers: {
-        Authorization: `${(c = this.token) == null ? void 0 : c.tokenType} ${(u = this.token) == null ? void 0 : u.accessToken}`
+        Authorization: `${(r = this.token) == null ? void 0 : r.tokenType} ${(d = this.token) == null ? void 0 : d.accessToken}`
       },
       json: {
         startPoint: {
@@ -249,22 +249,22 @@ class Ft extends st {
         withECA: i.withECA || !1
       }
     };
-    f == null || f.info("[%s] fetch route from: %s - %j", i.requestId, n, o);
-    const e = await V.post(n, o).json();
-    return e.status !== 200 ? (f == null || f.warn("[%s] fetch route failed: %j", i.requestId, { message: e.message, status: e.status, code: e.code }), {}) : e.data;
+    y == null || y.info("[%s] fetch route from: %s - %j", i.requestId, n, o);
+    const e = await B.post(n, o).json();
+    return e.status !== 200 ? (y == null || y.warn("[%s] fetch route failed: %j", i.requestId, { message: e.message, status: e.status, code: e.code }), {}) : e.data;
   }
   async trajectory(t, a, i, n, o = !0, e = {}) {
     await this.checkToken(e);
-    const c = await this.realTimePosition(t, e), u = p(a), h = p(i), d = [];
-    for (; h.diff(u, "day", !0) > 30; )
-      await this.trajectoryIn30Day(t, u, u.clone().add(30, "day"), c, n, d, e), u.add(30, "day");
-    return await this.trajectoryIn30Day(t, u, h, c, n, d, e), d;
+    const r = await this.realTimePosition(t, e), d = v(a), h = v(i), c = [];
+    for (; h.diff(d, "day", !0) > 30; )
+      await this.trajectoryIn30Day(t, d, d.clone().add(30, "day"), r, n, c, e), d.add(30, "day");
+    return await this.trajectoryIn30Day(t, d, h, r, n, c, e), c;
   }
-  async trajectoryIn30Day(t, a, i, n, o, e, c = {}) {
-    var M, j, I, w, g;
-    const u = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/track", h = {
+  async trajectoryIn30Day(t, a, i, n, o, e, r = {}) {
+    var b, j, T, g, p;
+    const d = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/track", h = {
       headers: {
-        Authorization: `${(M = this.token) == null ? void 0 : M.tokenType} ${(j = this.token) == null ? void 0 : j.accessToken}`
+        Authorization: `${(b = this.token) == null ? void 0 : b.tokenType} ${(j = this.token) == null ? void 0 : j.accessToken}`
       },
       json: {
         mmsi: t,
@@ -272,39 +272,39 @@ class Ft extends st {
         endTime: i.utcOffset(8).format("YYYY-MM-DD HH:mm:ss")
       }
     };
-    f == null || f.info("[%s] fetch trajectory from: %s - %j", c.requestId, u, h);
-    const d = await V.post(u, h).json();
-    if (d.code)
-      return f == null || f.warn("[%s] fetch trajectory failed: %j", c.requestId, u, { message: d.message, status: d.status, code: d.code }), d;
-    let y = -1;
-    const v = p(`${(w = (I = d.data) == null ? void 0 : I[0]) == null ? void 0 : w.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-    return (g = d.data) == null || g.forEach((r) => {
-      for (const P in r)
-        !isNaN(r[P]) && Number(r[P]) !== 1 / 0 && (r[P] = Number(r[P]));
-      const b = p(`${r.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00"), m = r.status, { labelCn: l, labelEn: k } = this.parseStatus(m), S = {
-        mmsi: r.mmsi,
+    y == null || y.info("[%s] fetch trajectory from: %s - %j", r.requestId, d, h);
+    const c = await B.post(d, h).json();
+    if (c.code)
+      return y == null || y.warn("[%s] fetch trajectory failed: %j", r.requestId, d, { message: c.message, status: c.status, code: c.code }), c;
+    let M = -1;
+    const w = v(`${(g = (T = c.data) == null ? void 0 : T[0]) == null ? void 0 : g.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    return (p = c.data) == null || p.forEach((f) => {
+      for (const H in f)
+        !isNaN(f[H]) && Number(f[H]) !== 1 / 0 && (f[H] = Number(f[H]));
+      const u = v(`${f.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00"), l = f.status, { labelCn: m, labelEn: I } = this.parseStatus(l), k = {
+        mmsi: f.mmsi,
         imo: n == null ? void 0 : n.imo,
-        lat: r.lat,
-        lng: r.lon,
-        sog: r.sog,
-        cog: r.cog,
-        hdg: r.hdg,
-        draught: r.draught,
-        status: m,
-        eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(r.eta) ? p(`${r.eta} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00").utc().format() : void 0,
-        destination: r.dest,
-        positionTime: b.unix(),
-        labelCn: l,
-        labelEn: k,
+        lat: f.lat,
+        lng: f.lon,
+        sog: f.sog,
+        cog: f.cog,
+        hdg: f.hdg,
+        draught: f.draught,
+        status: l,
+        eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(f.eta) ? v(`${f.eta} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00").utc().format() : void 0,
+        destination: f.dest,
+        positionTime: u.unix(),
+        labelCn: m,
+        labelEn: I,
         method: "trajectory",
         vendor: "myVessel",
-        utc: b.utc().format()
-      }, D = Math.floor(b.diff(v, "minute", !0) / (o || 1));
-      D !== y && (y = D, e.push(S));
+        utc: u.utc().format()
+      }, F = Math.floor(u.diff(w, "minute", !0) / (o || 1));
+      F !== M && (M = F, e.push(k));
     }), e;
   }
 }
-class Et extends st {
+class Ft extends at {
   constructor(t) {
     super();
     U(this, "token");
@@ -316,15 +316,15 @@ class Et extends st {
         mmsi: t,
         usertoken: this.token
       }
-    }, o = await V.post(i, n).json();
-    f == null || f.info("[%s] fetch realtime position from: %s - %j", a.requestId, i, n);
+    }, o = await B.post(i, n).json();
+    y == null || y.info("[%s] fetch realtime position from: %s - %j", a.requestId, i, n);
     const e = o == null ? void 0 : o.list;
     if (!e)
-      return f == null || f.warn("[%s] fetch realtime position failed: %j", a.requestId, i, o), o;
-    for (const v in e)
-      !isNaN(e[v]) && Number(e[v]) !== 1 / 0 && (e[v] = Number(e[v]));
+      return y == null || y.warn("[%s] fetch realtime position failed: %j", a.requestId, i, o), o;
+    for (const w in e)
+      !isNaN(e[w]) && Number(e[w]) !== 1 / 0 && (e[w] = Number(e[w]));
     e.status = e.sp > 3 ? 0 : 1;
-    const c = e.status, { labelCn: u, labelEn: h } = this.parseStatus(c), d = p(`${e.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    const r = e.status, { labelCn: d, labelEn: h } = this.parseStatus(r), c = v(`${e.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
     return {
       mmsi: e.m,
       name: e.n,
@@ -339,16 +339,16 @@ class Et extends st {
       cog: e.co,
       hdg: e.h,
       rot: isNaN(e.rot) ? 0 : e.rot,
-      eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(e.eta) ? p.utc(e.eta).format() : void 0,
+      eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(e.eta) ? v.utc(e.eta).format() : void 0,
       destination: e.destination,
       vesselType: e.type,
       dwt: e.dwt,
       build: e.buildyear,
       flag: e.fn,
-      positionTime: d.unix(),
-      utc: d.utc().format(),
-      status: c,
-      labelCn: u,
+      positionTime: c.unix(),
+      utc: c.utc().format(),
+      status: r,
+      labelCn: d,
       labelEn: h,
       method: "position",
       vendor: "hifleet"
@@ -366,10 +366,10 @@ class Et extends st {
         Host: "www.hifleet.com"
       }
     };
-    let o = await V.post(i, n).json();
-    f == null || f.info("[%s] fetch vessel props from: %s - %j", a.requestId, i, n), o instanceof Array && (o = o[0]);
-    for (const c in o)
-      !isNaN(o[c]) && Number(o[c]) !== 1 / 0 && (o[c] = Number(o[c]));
+    let o = await B.post(i, n).json();
+    y == null || y.info("[%s] fetch vessel props from: %s - %j", a.requestId, i, n), o instanceof Array && (o = o[0]);
+    for (const r in o)
+      !isNaN(o[r]) && Number(o[r]) !== 1 / 0 && (o[r] = Number(o[r]));
     const e = {
       mmsi: o.m,
       name: o.n,
@@ -380,7 +380,7 @@ class Et extends st {
       draught: o.dr,
       type: o.t
     };
-    return i = "https://www.hifleet.com/hifleetapi/sameShipSearch.do", o = await V.post(i, n).json(), f == null || f.info("[%s] search vessel dead weight from: %s - %j", a.requestId, i, n), o instanceof Array && (o = o[0]), o && (e.deadweight = Number(o.dwt)), e;
+    return i = "https://www.hifleet.com/hifleetapi/sameShipSearch.do", o = await B.post(i, n).json(), y == null || y.info("[%s] search vessel dead weight from: %s - %j", a.requestId, i, n), o instanceof Array && (o = o[0]), o && (e.deadweight = Number(o.dwt)), e;
   }
   async suggest(t, a = {}) {
     const i = "https://www.hifleet.com/hifleetapi/getShipSuggest.do", n = {
@@ -392,71 +392,71 @@ class Et extends st {
         Origin: "https://www.hifleet.com",
         Host: "www.hifleet.com"
       }
-    }, o = await V.post(i, n).json();
-    f == null || f.info("[%s] suggest vessel props from: %s - %j", a.requestId, i, n);
+    }, o = await B.post(i, n).json();
+    y == null || y.info("[%s] suggest vessel props from: %s - %j", a.requestId, i, n);
     const e = [];
-    for (const c of o)
+    for (const r of o)
       e.push({
-        mmsi: !c.mmsi || isNaN(c.mmsi) ? null : Number(c.mmsi),
-        name: c.name,
-        callSign: c.callsign,
-        imo: !c.imo || isNaN(c.imo) ? null : Number(c.imo),
-        score: c._score
+        mmsi: !r.mmsi || isNaN(r.mmsi) ? null : Number(r.mmsi),
+        name: r.name,
+        callSign: r.callsign,
+        imo: !r.imo || isNaN(r.imo) ? null : Number(r.imo),
+        score: r._score
       });
-    return e.sort((c, u) => u.score - c.score), e;
+    return e.sort((r, d) => d.score - r.score), e;
   }
   async trajectory(t, a, i, n, o = !0, e = {}) {
-    var r, b, m;
-    const c = await this.realTimePosition(t, e);
-    let u = p(a);
-    const h = p(i), d = p();
+    var f, u, l;
+    const r = await this.realTimePosition(t, e);
+    let d = v(a);
+    const h = v(i), c = v();
     if (o) {
-      let l = h.diff(u, "d", !0);
-      l < 0 ? u = h.clone().subtract(40, "d") : l < 30 ? u.subtract(10, "d") : l < 60 ? u.subtract(5, "d") : u = h.clone().subtract(80, "d"), l = d.diff(h, "d", !0), h.add(l > 10 ? 240 : l * 24, "h");
+      let m = h.diff(d, "d", !0);
+      m < 0 ? d = h.clone().subtract(40, "d") : m < 30 ? d.subtract(10, "d") : m < 60 ? d.subtract(5, "d") : d = h.clone().subtract(80, "d"), m = c.diff(h, "d", !0), h.add(m > 10 ? 240 : m * 24, "h");
     }
-    const y = {
+    const M = {
       searchParams: {
         endtime: h.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
-        starttime: u.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
+        starttime: d.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
         mmsi: t,
         usertoken: this.token
       }
-    }, v = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", M = await V.get(v, y).json();
-    f == null || f.info("[%s] fetch trajectory from: %s - %j", e.requestId, v, y);
+    }, w = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", b = await B.get(w, M).json();
+    y == null || y.info("[%s] fetch trajectory from: %s - %j", e.requestId, w, M);
     let j;
-    M && (j = ((b = (r = M.ships) == null ? void 0 : r.offors) == null ? void 0 : b.ship) || [], j.length || f == null || f.warn("[%s] fetch trajectory failed: %j", e.requestId, M));
-    const I = [];
-    let w = -1;
-    const g = p(`${(m = j == null ? void 0 : j[0]) == null ? void 0 : m.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-    for (const l of j) {
-      for (const A in l)
-        !isNaN(l[A]) && Number(l[A]) !== 1 / 0 && (l[A] = Number(l[A]));
-      const k = p(`${l.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-      l.status = l.sp > 4 ? 0 : 1;
-      const { labelEn: S, labelCn: D } = this.parseStatus(l.status), P = {
-        mmsi: l.m,
-        name: l.n,
-        imo: c == null ? void 0 : c.imo,
-        lat: l.la,
-        lng: l.lo,
-        draught: l.draught,
-        sog: l.sp,
-        cog: l.co,
-        hdg: l.hdg,
-        positionTime: k.unix(),
-        utc: k.utc().format(),
-        status: l.status,
-        labelCn: D,
-        labelEn: S,
+    b && (j = ((u = (f = b.ships) == null ? void 0 : f.offors) == null ? void 0 : u.ship) || [], j.length || y == null || y.warn("[%s] fetch trajectory failed: %j", e.requestId, b));
+    const T = [];
+    let g = -1;
+    const p = v(`${(l = j == null ? void 0 : j[0]) == null ? void 0 : l.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    for (const m of j) {
+      for (const A in m)
+        !isNaN(m[A]) && Number(m[A]) !== 1 / 0 && (m[A] = Number(m[A]));
+      const I = v(`${m.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+      m.status = m.sp > 4 ? 0 : 1;
+      const { labelEn: k, labelCn: F } = this.parseStatus(m.status), H = {
+        mmsi: m.m,
+        name: m.n,
+        imo: r == null ? void 0 : r.imo,
+        lat: m.la,
+        lng: m.lo,
+        draught: m.draught,
+        sog: m.sp,
+        cog: m.co,
+        hdg: m.hdg,
+        positionTime: I.unix(),
+        utc: I.utc().format(),
+        status: m.status,
+        labelCn: F,
+        labelEn: k,
         method: "trajectory",
         vendor: "hifleet"
-      }, N = Math.floor(k.diff(g, "minute", !0) / (n || 1));
-      N !== w && (w = N, I.push(P));
+      }, x = Math.floor(I.diff(p, "minute", !0) / (n || 1));
+      x !== g && (g = x, T.push(H));
     }
-    return I;
+    return T;
   }
 }
-class Nt extends st {
+class Et extends at {
   constructor(t) {
     super();
     U(this, "token");
@@ -469,13 +469,13 @@ class Nt extends st {
         k: this.token,
         enc: 1
       }
-    }, n = "https://api.shipxy.com/apicall/GetSingleShip", o = await V.get(n, i).json();
-    if (f == null || f.info("[%s] fetch realtime position from: %s - %j", a.requestId, n, i), (o == null ? void 0 : o.status) !== 0)
+    }, n = "https://api.shipxy.com/apicall/GetSingleShip", o = await B.get(n, i).json();
+    if (y == null || y.info("[%s] fetch realtime position from: %s - %j", a.requestId, n, i), (o == null ? void 0 : o.status) !== 0)
       return o;
     const e = o.data[0];
-    for (const y in e)
-      !isNaN(e[y]) && Number(e[y]) !== 1 / 0 && (e[y] = Number(e[y]));
-    const { labelCn: c, labelEn: u } = await this.parseStatus(e.navistat), h = p.unix(e.lasttime);
+    for (const M in e)
+      !isNaN(e[M]) && Number(e[M]) !== 1 / 0 && (e[M] = Number(e[M]));
+    const { labelCn: r, labelEn: d } = await this.parseStatus(e.navistat), h = v.unix(e.lasttime);
     return {
       mmsi: e.ShipID,
       name: e.name,
@@ -493,47 +493,47 @@ class Nt extends st {
       positionTime: e.lasttime,
       utc: h.utc().format(),
       status: e.navistat,
-      labelEn: u,
-      labelCn: c,
+      labelEn: d,
+      labelCn: r,
       method: "position",
       vendor: "shipxy"
     };
   }
   async trajectory(t, a, i, n, o = !0, e = {}) {
-    var g;
-    const c = await this.realTimePosition(t, e), u = p(a), h = p(i), d = "https://api.shipxy.com/apicall/GetShipTrack", y = {
+    var p;
+    const r = await this.realTimePosition(t, e), d = v(a), h = v(i), c = "https://api.shipxy.com/apicall/GetShipTrack", M = {
       searchParams: {
         id: t,
         k: this.token,
         enc: 1,
         cut: 0,
-        btm: u.unix(),
+        btm: d.unix(),
         etm: h.unix()
       }
-    }, v = await V.get(d, y).json();
-    if (f == null || f.info("[%s] fetch trajectory from: %s - %j", e.requestId, d, y), (v == null ? void 0 : v.status) !== 0)
-      return v;
-    const M = v == null ? void 0 : v.points, j = [], I = p.unix((g = M[0]) == null ? void 0 : g.utc);
-    let w = -1;
-    for (const r of M) {
-      const b = p.unix(r.utc), m = {
-        imo: c == null ? void 0 : c.imo,
+    }, w = await B.get(c, M).json();
+    if (y == null || y.info("[%s] fetch trajectory from: %s - %j", e.requestId, c, M), (w == null ? void 0 : w.status) !== 0)
+      return w;
+    const b = w == null ? void 0 : w.points, j = [], T = v.unix((p = b[0]) == null ? void 0 : p.utc);
+    let g = -1;
+    for (const f of b) {
+      const u = v.unix(f.utc), l = {
+        imo: r == null ? void 0 : r.imo,
         mmsi: t,
-        sog: Math.round(r.sog * 3600 / 1e3 / 1852 * 100) / 100,
-        cog: Math.round(r.cog / 100 * 100) / 100,
-        lat: Math.round(r.lat / 1e6 * 1e5) / 1e5,
-        lng: Math.round(r.lon / 1e6 * 1e5) / 1e5,
-        positionTime: b.unix(),
-        utc: b.utc().format(),
+        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(),
         method: "trajectory",
         vendor: "shipxy"
-      }, l = Math.floor(b.diff(I, "minute", !0) / (n || 1));
-      l !== w && (w = l, j.push(m));
+      }, m = Math.floor(u.diff(T, "minute", !0) / (n || 1));
+      m !== g && (g = m, j.push(l));
     }
     return j;
   }
 }
-class Tt extends st {
+class xt extends at {
   constructor(t) {
     super();
     U(this, "token");
@@ -547,8 +547,8 @@ class Tt extends st {
       json: {
         mmsiList: t
       }
-    }, n = "https://api3.myships.com/sp/ships/getShipIdByMMSI", o = await V.post(n, i).json();
-    return f == null || f.info("[%s] fetch ship id from: %s - %j", a.requestId, n, i), o.code !== "0" ? o : o.data[0].shipId;
+    }, n = "https://api3.myships.com/sp/ships/getShipIdByMMSI", o = await B.post(n, i).json();
+    return y == null || y.info("[%s] fetch ship id from: %s - %j", a.requestId, n, i), o.code !== "0" ? o : o.data[0].shipId;
   }
   async getShipInfo(t, a = {}) {
     const i = {
@@ -558,15 +558,15 @@ class Tt extends st {
       json: {
         shipId: t
       }
-    }, n = "https://api3.myships.com/sp/ships/aissta", o = await V.post(n, i).json();
-    if (f == null || f.info("[%s] fetch ship info from: %s - %j", a.requestId, n, i), o.code !== "0")
+    }, n = "https://api3.myships.com/sp/ships/aissta", o = await B.post(n, i).json();
+    if (y == null || y.info("[%s] fetch ship info from: %s - %j", a.requestId, n, i), o.code !== "0")
       return o;
     const e = o.data;
-    let c = e.imo;
-    return t === "407170" && (c = "9198379", f == null || f.warn("[%s] ship(%s) imo error: %s, should be %s", a.requestId, t, e.imo, c)), {
+    let r = e.imo;
+    return t === "407170" && (r = "9198379", y == null || y.warn("[%s] ship(%s) imo error: %s, should be %s", a.requestId, t, e.imo, r)), {
       mmsi: e.mmsi,
       name: e.shipnameEn,
-      imo: c,
+      imo: r,
       callSign: e.callSign,
       length: e.length,
       width: e.breadth,
@@ -581,38 +581,38 @@ class Tt extends st {
       json: {
         shipId: i
       }
-    }, e = "https://api3.myships.com/sp/ships/position/latest", c = await V.post(e, o).json();
-    f == null || f.info("[%s] fetch realtime position from: %s - %j", a.requestId, e, o);
-    const u = c.data[0];
-    for (const M in u)
-      !isNaN(u[M]) && Number(u[M]) !== 1 / 0 && (u[M] = Number(u[M]));
-    const { labelCn: h, labelEn: d } = await this.parseStatus(u.aisNavStatus), y = p.unix(u.posTime);
+    }, e = "https://api3.myships.com/sp/ships/position/latest", r = await B.post(e, o).json();
+    y == null || y.info("[%s] fetch realtime position from: %s - %j", a.requestId, e, o);
+    const d = r.data[0];
+    for (const b in d)
+      !isNaN(d[b]) && Number(d[b]) !== 1 / 0 && (d[b] = Number(d[b]));
+    const { labelCn: h, labelEn: c } = await this.parseStatus(d.aisNavStatus), M = v.unix(d.posTime);
     return {
       ...n,
       mmsi: t,
-      lat: Math.round(u.lat / 1e4 / 60 * 1e5) / 1e5,
-      lng: Math.round(u.lon / 1e4 / 60 * 1e5) / 1e5,
-      sog: Math.round(u.sog / 10 * 100) / 100,
-      cog: Math.round(u.cog / 10 * 100) / 100,
-      hdg: Math.round(u.heading * 100) / 100,
-      rot: Math.round(u.rot * 100) / 100,
-      positionTime: u.posTime,
-      utc: y.utc().format(),
-      status: u.aisNavStatus,
-      labelEn: d,
+      lat: Math.round(d.lat / 1e4 / 60 * 1e5) / 1e5,
+      lng: Math.round(d.lon / 1e4 / 60 * 1e5) / 1e5,
+      sog: Math.round(d.sog / 10 * 100) / 100,
+      cog: Math.round(d.cog / 10 * 100) / 100,
+      hdg: Math.round(d.heading * 100) / 100,
+      rot: Math.round(d.rot * 100) / 100,
+      positionTime: d.posTime,
+      utc: M.utc().format(),
+      status: d.aisNavStatus,
+      labelEn: c,
       labelCn: h,
       method: "position",
       vendor: "myship"
     };
   }
   async trajectory(t, a, i, n, o = !0, e = {}) {
-    const c = p(a), u = p(i), h = await this.getShipId(t), d = await this.getShipInfo(h), y = [];
-    for (; u.diff(c, "day", !0) > 30; )
-      await this.trajectoryIn30Day(h, c.unix(), c.add(30, "day").unix(), d, t, n, y);
-    return await this.trajectoryIn30Day(h, c.unix(), u.unix(), d, t, n, y), y;
+    const r = v(a), d = v(i), h = await this.getShipId(t), c = await this.getShipInfo(h), M = [];
+    for (; d.diff(r, "day", !0) > 30; )
+      await this.trajectoryIn30Day(h, r.unix(), r.add(30, "day").unix(), c, t, n, M);
+    return await this.trajectoryIn30Day(h, r.unix(), d.unix(), c, t, n, M), M;
   }
-  async trajectoryIn30Day(t, a, i, n, o, e, c, u = {}) {
-    var I;
+  async trajectoryIn30Day(t, a, i, n, o, e, r, d = {}) {
+    var T;
     const h = {
       headers: {
         appKey: this.token
@@ -622,32 +622,32 @@ class Tt extends st {
         startTime: a,
         endTime: i
       }
-    }, d = "https://api3.myships.com/sp/ships/position/history", y = await V.post(d, h).json();
-    if (f == null || f.info("[%s] fetch trajectory from: %s - %j", u.requestId, d, h), y.code !== "0")
-      return f == null || f.warn("[%s] invoke myship trajectory failed: %j", u.requestId, y), y;
-    const v = y.data;
-    for (const w in v)
-      !isNaN(v[w]) && Number(v[w]) !== 1 / 0 && (v[w] = Number(v[w]));
-    const M = p.unix((I = v[0]) == null ? void 0 : I.posTime);
+    }, c = "https://api3.myships.com/sp/ships/position/history", M = await B.post(c, h).json();
+    if (y == null || y.info("[%s] fetch trajectory from: %s - %j", d.requestId, c, h), M.code !== "0")
+      return y == null || y.warn("[%s] invoke myship trajectory failed: %j", d.requestId, M), M;
+    const w = M.data;
+    for (const g in w)
+      !isNaN(w[g]) && Number(w[g]) !== 1 / 0 && (w[g] = Number(w[g]));
+    const b = v.unix((T = w[0]) == null ? void 0 : T.posTime);
     let j = -1;
-    for (const w of v) {
-      const g = p.unix(w.posTime), r = {
+    for (const g of w) {
+      const p = v.unix(g.posTime), f = {
         imo: n == null ? void 0 : n.imo,
         mmsi: o,
-        lat: Math.round(w.lat / 1e4 / 60 * 1e5) / 1e5,
-        lng: Math.round(w.lon / 1e4 / 60 * 1e5) / 1e5,
-        sog: Math.round(w.sog / 10 * 100) / 100,
-        cog: Math.round(w.cog / 10 * 100) / 100,
-        hdg: Math.round(w.heading * 100) / 100,
-        rot: Math.round(w.rot * 100) / 100,
-        positionTime: g.unix(),
-        utc: g.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: p.unix(),
+        utc: p.utc().format(),
         method: "trajectory",
         vendor: "myship"
-      }, b = Math.floor(g.diff(M, "minute", !0) / (e || 1));
-      b !== j && (j = b, c.push(r));
+      }, u = Math.floor(p.diff(b, "minute", !0) / (e || 1));
+      u !== j && (j = u, r.push(f));
     }
-    return c;
+    return r;
   }
 }
 let _;
@@ -667,20 +667,20 @@ class yt {
    * @param options
    */
   parsePrinciple(s, t = {}) {
-    var e, c, u;
+    var e, r, d;
     _ == null || _.debug("[%s] parse rule: %s", t.requestId, s);
     const a = new RegExp("(?<=\\[)(.+)(?=])", "g"), i = s.match(a) ? (e = s.match(a)) == null ? void 0 : e[0] : void 0, n = i == null ? void 0 : i.split(";");
     if (!n)
       return;
     const o = {};
     for (let h = 0; h < (n == null ? void 0 : n.length); h++) {
-      const d = (u = (c = n[h].match(a)) == null ? void 0 : c[0]) == null ? void 0 : u.split("],");
-      if (h === 0 && !d)
+      const c = (d = (r = n[h].match(a)) == null ? void 0 : r[0]) == null ? void 0 : d.split("],");
+      if (h === 0 && !c)
         o.scope = n[0];
-      else if (d)
-        for (let y = 0, v = d.length; y < v; y++) {
-          const M = this.parseRule(d[y]);
-          M && (o[M.level] ? M.key ? o[M.level][M == null ? void 0 : M.key] = M : o[M.level] = M : M.key ? o[M.level] = { [M == null ? void 0 : M.key]: M } : o[M.level] = M);
+      else if (c)
+        for (let M = 0, w = c.length; M < w; M++) {
+          const b = this.parseRule(c[M]);
+          b && (o[b.level] ? b.key ? o[b.level][b == null ? void 0 : b.key] = b : o[b.level] = b : b.key ? o[b.level] = { [b == null ? void 0 : b.key]: b } : o[b.level] = b);
         }
     }
     return o;
@@ -713,17 +713,17 @@ class yt {
    * @param options
    */
   checkWeather(s, t, a = {}) {
-    var M, j, I, w, g, r, b, m, l, k, S, D, P, N, A;
+    var b, j, T, g, p, f, u, l, m, I, k, F, H, x, A;
     let i = 0, n = 0, o = 0, e = 0;
-    const c = Math.round(((j = (M = t == null ? void 0 : t.SEVERE) == null ? void 0 : M.sigWave) == null ? void 0 : j.number) * 1.6 * 100) / 100, u = (w = (I = t == null ? void 0 : t.SEVERE) == null ? void 0 : I.sigWave) == null ? void 0 : w.number, h = (r = (g = t == null ? void 0 : t.HEAVY) == null ? void 0 : g.sigWave) == null ? void 0 : r.number, d = Math.round((((m = (b = t == null ? void 0 : t.SEVERE) == null ? void 0 : b.wind) == null ? void 0 : m.number) + 2) * 100) / 100, y = (k = (l = t == null ? void 0 : t.SEVERE) == null ? void 0 : l.wind) == null ? void 0 : k.number, v = (D = (S = t == null ? void 0 : t.HEAVY) == null ? void 0 : S.wind) == null ? void 0 : D.number;
-    for (let x = 0; x < (s == null ? void 0 : s.length); x++) {
-      const T = s[x], q = (N = (P = T == null ? void 0 : T.meteo) == null ? void 0 : P.wave) == null ? void 0 : N.sig, R = (A = T == null ? void 0 : T.meteo) == null ? void 0 : A.wind, J = x ? p(T.eta).diff(p(s[x - 1].eta), "hour", !0) : 0;
-      e = J > e ? J : e, _ == null || _.debug("[%s] check sig.wave: %j", a.requestId, { ...q, dgThd4Wv: c, svThd4Wv: u, hvThd4Wv: h }), (q == null ? void 0 : q.height) >= c ? T.isDangerous = !0 : (q == null ? void 0 : q.height) >= u ? T.isSevere = !0 : (q == null ? void 0 : q.height) >= h && (T.isHeavy = !0), _ == null || _.debug("[%s] check wind: %j", a.requestId, { ...R, dgThd4Wd: d, svThd4Wd: y, hvThd4Wd: v }), (R == null ? void 0 : R.scale) >= d ? (T.isDangerous = !0, delete T.isSevere, delete T.isHeavy) : (R == null ? void 0 : R.scale) > y ? (T.isDangerous || (T.isSevere = !0), delete T.isHeavy) : (R == null ? void 0 : R.scale) === v && !T.isDangerous && !T.isSevere && (T.isHeavy = !0), i += T.isDangerous ? J : 0, n += T.isSevere ? J : 0, o += T.isHeavy ? J : 0;
+    const r = Math.round(((j = (b = t == null ? void 0 : t.SEVERE) == null ? void 0 : b.sigWave) == null ? void 0 : j.number) * 1.6 * 100) / 100, d = (g = (T = t == null ? void 0 : t.SEVERE) == null ? void 0 : T.sigWave) == null ? void 0 : g.number, h = (f = (p = t == null ? void 0 : t.HEAVY) == null ? void 0 : p.sigWave) == null ? void 0 : f.number, c = Math.round((((l = (u = t == null ? void 0 : t.SEVERE) == null ? void 0 : u.wind) == null ? void 0 : l.number) + 2) * 100) / 100, M = (I = (m = t == null ? void 0 : t.SEVERE) == null ? void 0 : m.wind) == null ? void 0 : I.number, w = (F = (k = t == null ? void 0 : t.HEAVY) == null ? void 0 : k.wind) == null ? void 0 : F.number;
+    for (let D = 0; D < (s == null ? void 0 : s.length); D++) {
+      const N = s[D], Y = (x = (H = N == null ? void 0 : N.meteo) == null ? void 0 : H.wave) == null ? void 0 : x.sig, L = (A = N == null ? void 0 : N.meteo) == null ? void 0 : A.wind, J = D ? v(N.eta).diff(v(s[D - 1].eta), "hour", !0) : 0;
+      e = J > e ? J : e, _ == null || _.debug("[%s] check sig.wave: %j", a.requestId, { ...Y, dgThd4Wv: r, svThd4Wv: d, hvThd4Wv: h }), (Y == null ? void 0 : Y.height) >= r ? N.isDangerous = !0 : (Y == null ? void 0 : Y.height) >= d ? N.isSevere = !0 : (Y == null ? void 0 : Y.height) >= h && (N.isHeavy = !0), _ == null || _.debug("[%s] check wind: %j", a.requestId, { ...L, dgThd4Wd: c, svThd4Wd: M, hvThd4Wd: w }), (L == null ? void 0 : L.scale) >= c ? (N.isDangerous = !0, delete N.isSevere, delete N.isHeavy) : (L == null ? void 0 : L.scale) > M ? (N.isDangerous || (N.isSevere = !0), delete N.isHeavy) : (L == null ? void 0 : L.scale) === w && !N.isDangerous && !N.isSevere && (N.isHeavy = !0), i += N.isDangerous ? J : 0, n += N.isSevere ? J : 0, o += N.isHeavy ? J : 0;
     }
-    return i = Math.round(i * 100) / 100, n = Math.round(n * 100) / 100, o = Math.round(o * 100) / 100, e = Math.round(e), { sample: s, dangerous: i, severe: n, heavy: o, step: e < 3 ? 3 : e, wind: { dgThd4Wd: d, svThd4Wd: y, hvThd4Wd: v }, sig: { dgThd4Wv: c, svThd4Wv: u, hvThd4Wv: h } };
+    return i = Math.round(i * 100) / 100, n = Math.round(n * 100) / 100, o = Math.round(o * 100) / 100, e = Math.round(e), { sample: s, dangerous: i, severe: n, heavy: o, step: e < 3 ? 3 : e, wind: { dgThd4Wd: c, svThd4Wd: M, hvThd4Wd: w }, sig: { dgThd4Wv: r, svThd4Wv: d, hvThd4Wv: h } };
   }
 }
-const xt = new yt();
+const Nt = new yt();
 let C;
 try {
   C = ct.getLogger("vessel");
@@ -732,7 +732,7 @@ try {
 }
 const Mt = new mt("", !0);
 var bt = /* @__PURE__ */ ((E) => (E.common = "common", E.container = "container", E.tugs = "tugs", E))(bt || {}), gt = /* @__PURE__ */ ((E) => (E.Ballast = "Ballast", E.Laden = "Laden", E))(gt || {}), vt = /* @__PURE__ */ ((E) => (E.Cp = "CP", E.Perf = "Basis", E.Instruct = "Other", E))(vt || {});
-class O {
+class R {
   /**
    * @see https://baike.baidu.com/item/%E6%96%B9%E5%BD%A2%E7%B3%BB%E6%95%B0/4965568?fr=aladdin
    * 方形系数（block coefficient）
@@ -748,7 +748,7 @@ class O {
   static blockCoefficient(s, t, a, i) {
     let n = Math.round(s / (t * a * i) * 100) / 100;
     n = n < 0.55 ? 0.55 : n > 0.85 ? 0.85 : n;
-    const o = [0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85], e = o.map((c) => Math.abs(c - n));
+    const o = [0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85], e = o.map((r) => Math.abs(r - n));
     return o[e.indexOf(Math.min(...e))];
   }
   /**
@@ -845,17 +845,17 @@ class O {
    * @private
    */
   static assembleProperties(s, t, a, i) {
-    var y;
-    const n = s.lbp ?? s.length ?? s.lengthOverall ?? 198.9642, o = s.draught ?? 8, e = s.breadthMoulded ?? s.breadth ?? s.breadthExtreme ?? 32.4572, c = s.deadweight ?? 67035.7773, u = ((y = s == null ? void 0 : s.type) == null ? void 0 : y.toLowerCase()) || "common";
+    var M;
+    const n = s.lbp ?? s.length ?? s.lengthOverall ?? 198.9642, o = s.draught ?? 8, e = s.breadthMoulded ?? s.breadth ?? s.breadthExtreme ?? 32.4572, r = s.deadweight ?? 67035.7773, d = ((M = s == null ? void 0 : s.type) == null ? void 0 : M.toLowerCase()) || "common";
     return {
-      tag: u.indexOf("container") > -1 ? "container" : u.indexOf("tugs") > -1 ? "tugs" : "common",
+      tag: d.indexOf("container") > -1 ? "container" : d.indexOf("tugs") > -1 ? "tugs" : "common",
       lbp: n,
       loadCondition: t,
       draught: o,
       breadthMoulded: e,
       // 排水量（吨）= 载重量（吨）/ 1.025 + 吃水（米）× 船舶型宽（米）× 船舶型长（米）× 0.7
       // 其中，1.025是指海水的密度，吨是指公吨，吃水是指船舶的最大吃水深度。船舶型宽是指船舶的最大型宽，船舶型长是指船舶的设计型长。上述公式是针对常规船舶适用的，不同类型的船舶可能会有一些差异。
-      displacement: Math.round((c / 1.025 + o * e * n * 0.7) * 1e4) / 1e4,
+      displacement: Math.round((r / 1.025 + o * e * n * 0.7) * 1e4) / 1e4,
       // 换算为m/s
       speed: Math.round((a ?? 14.1382) * 1852 / 3600 * 1e4) / 1e4,
       bearing: i || 90
@@ -872,41 +872,41 @@ class O {
    * @param useRouteParam true 启用设置速度
    * @param options
    */
-  static async speedLoseAt(s, t, a, i = "", n = 2, o = !0, e = !1, c = {}) {
-    let u;
+  static async speedLoseAt(s, t, a, i = "", n = 2, o = !0, e = !1, r = {}) {
+    let d;
     if (t.velocity && e && (s.speed = z.roundPrecision(t.velocity * 1852 / 3600, 6)), o) {
       let h;
       try {
         i = (i == null ? void 0 : i.toUpperCase()) === "CMEMS" ? "ECMWF" : i, i = (i == null ? void 0 : i.toUpperCase()) === "METEO2" ? "best_match" : i;
-        const { weatherModels: M, marineModels: j } = await it.autoPickMeteoModel(i), I = await Mt.spotForecast(t.lat, t.lng, a.utc().format(), !1, !1, !0, {
-          ...c,
+        const { weatherModels: b, marineModels: j } = await rt.autoPickMeteoModel(i), T = await Mt.spotForecast(t.lat, t.lng, a.utc().format(), !1, !1, !0, {
+          ...r,
           pastDays: 1,
           forecastDays: 1,
-          weatherModels: M,
+          weatherModels: b,
           marineModels: j
-        }), [w] = it.pickHourly(I, a);
-        h = it.toLegacy(w);
-      } catch (M) {
-        C.warn("[%s] meteo2 spot(%j) forecast failed: %s", c.requestId, { ...t, eta: a.utc().format(), source: i }, M);
+        }), [g] = rt.pickHourly(T, a);
+        h = rt.toLegacy(g);
+      } catch (b) {
+        C.warn("[%s] meteo2 spot(%j) forecast failed: %s", r.requestId, { ...t, eta: a.utc().format(), source: i }, b);
       }
-      const d = O.currentFactor(s.bearing, h == null ? void 0 : h.current, n), y = O.weatherFactor(s, h, d), v = Math.round((s.speed * 1.943844 + y + d) * 100) / 100;
-      u = {
+      const c = R.currentFactor(s.bearing, h == null ? void 0 : h.current, n), M = R.weatherFactor(s, h, c), w = Math.round((s.speed * 1.943844 + M + c) * 100) / 100;
+      d = {
         meteo: { ...h },
-        wxFactor: y,
-        cFactor: d,
-        speed: t.velocity && e ? t.velocity : v < 0 ? 1 : v,
+        wxFactor: M,
+        cFactor: c,
+        speed: t.velocity && e ? t.velocity : w < 0 ? 1 : w,
         eta: a.utc().format(),
         etd: a.utc().format()
       };
     } else
-      u = {
+      d = {
         wxFactor: 0,
         cFactor: 0,
         speed: t.velocity && e ? t.velocity : Math.round(s.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, { ...u, ...t };
+    return delete t.meteo, delete t.wxFactor, delete t.cFactor, delete t.speed, delete t.etd, { ...d, ...t };
   }
   /**
    * 基于步长计算失速样本
@@ -922,53 +922,53 @@ class O {
    * @param options
    * @private
    */
-  static async speedLoseInHoursStep(s, t, a, i, n, o, e = "", c = !0, u = !1, h = {}) {
+  static async speedLoseInHoursStep(s, t, a, i, n, o, e = "", r = !0, d = !1, h = {}) {
     t.utc();
-    const d = t.clone().add(14, "days"), y = [], v = [];
-    let M = 0, j = 0, I, w;
-    for (let g = 0; g < o.length - 1; g++) {
-      let r = o[g];
-      r.distanceFromStart = Math.round((n + j) * 1e3) / 1e3;
-      const b = o[g + 1];
-      if (s.bearing = W.calculateBearing(r, b, !b.gcToPrevious), r.bearing = s.bearing, r.suspend && u) {
-        r.eta = r.eta || t.utc().format(), r.elapsed = r.elapsed ?? 0;
-        const k = r.suspend - r.elapsed;
-        if (i - M > k)
-          i = i - M - k, t.add(k, "hour"), r.elapsed = r.suspend;
+    const c = t.clone().add(14, "days"), M = [], w = [], b = [];
+    let j = 0, T = 0, g, p;
+    for (let f = 0; f < o.length - 1; f++) {
+      let u = o[f];
+      u.distanceFromStart = Math.round((n + T) * 1e3) / 1e3;
+      const l = o[f + 1];
+      if (s.bearing = V.calculateBearing(u, l, !l.gcToPrevious), u.bearing = s.bearing, u.suspend && d) {
+        u.eta = u.eta || t.utc().format(), u.elapsed = u.elapsed ?? 0;
+        const k = u.suspend - u.elapsed;
+        if (i - j > k)
+          i = i - j - k, t.add(k, "hour"), u.elapsed = u.suspend;
         else {
-          const S = i - M;
-          r.elapsed += S, t.add(S, "hour"), i = 0;
+          const F = i - j;
+          u.elapsed += F, t.add(F, "hour"), i = 0;
         }
-        if (C == null || C.info(`[%s] suspend ${r.elapsed} hours at %j, and remain ${i} hours need to go...`, h.requestId, r), i === 0)
-          return r.distanceFromPrevious = j, { etd: t, from: w || r, to: r, next: o.filter((S) => S), wps: y, days: v };
+        if (C == null || C.info(`[%s] suspend ${u.elapsed} hours at %j, and remain ${i} hours need to go...`, h.requestId, u), i === 0)
+          return u.distanceFromPrevious = T, { etd: t, from: p || u, to: u, next: o.filter((F) => F), wps: M, days: w, all: b };
       } else
-        r.suspend = 0;
-      c = t.isAfter(d) ? !1 : c, r = await O.speedLoseAt(s, r, t, e, 0, c, u, h), w = w || r, r.important && y.push(r), t.isSameOrAfter(a) && (v.push(r), a.add(24, "hour"));
-      const m = W.calculateDistance(r, b, !b.gcToPrevious);
-      let l = Math.round(m / w.speed * 1e5) / 1e5;
-      if (M + l < i) {
-        if (M += l, t.add(l, "hour"), delete o[g], C == null || C.debug(
-          `[%s] go to %j from %j with ${m}nm, and cost ${l} hours`,
+        u.suspend = 0;
+      r = t.isAfter(c) ? !1 : r, u = await R.speedLoseAt(s, u, t, e, 0, r, d, h), b.push(u), p = p || u, u.important && M.push(u), t.isSameOrAfter(a) && (w.push(u), a.add(24, "hour"));
+      const m = V.calculateDistance(u, l, !l.gcToPrevious);
+      let I = Math.round(m / p.speed * 1e5) / 1e5;
+      if (j + I < i) {
+        if (j += I, t.add(I, "hour"), delete o[f], C == null || C.debug(
+          `[%s] go to %j from %j with ${m}nm, and cost ${I} hours`,
           h.requestId,
-          { lat: b.lat, lng: b.lng },
-          { lat: w.lat, lng: w.lng, etd: w.etd }
-        ), j += m, o.filter((k) => k).length <= 1) {
-          I = b, I.eta = t.utc().format(), I.distanceFromPrevious = m, I.distanceFromStart = Math.round((n + j) * 1e4) / 1e4, y.push(I), delete o[g + 1];
+          { lat: l.lat, lng: l.lng },
+          { lat: p.lat, lng: p.lng, etd: p.etd }
+        ), T += m, o.filter((k) => k).length <= 1) {
+          g = l, g.eta = t.utc().format(), g.distanceFromPrevious = m, g.distanceFromStart = Math.round((n + T) * 1e4) / 1e4, M.push(g), b.push(g), delete o[f + 1];
           break;
         }
       } else {
-        l = i - M, t.add(l, "hour");
-        const k = z.roundPrecision(w.speed * l, 5);
-        I = W.calculateCoordinate(r, s.bearing, k, "nauticalmiles", !b.gcToPrevious), I.eta = t.utc().format(), o[g] = I, C == null || C.debug(
-          `[%s] go to %j from %j with ${k}nm, and cost ${l} hours`,
+        I = i - j, t.add(I, "hour");
+        const k = z.roundPrecision(p.speed * I, 5);
+        g = V.calculateCoordinate(u, s.bearing, k, "nauticalmiles", !l.gcToPrevious), g.eta = t.utc().format(), o[f] = g, C == null || C.debug(
+          `[%s] go to %j from %j with ${k}nm, and cost ${I} hours`,
           h.requestId,
-          { lat: I.lat, lng: I.lng },
-          { lat: r.lat, lng: r.lng, etd: r.etd }
-        ), j += k, I.distanceFromPrevious = Math.round(j * 1e4) / 1e4, I.distanceFromStart = Math.round((n + j) * 1e4) / 1e4;
+          { lat: g.lat, lng: g.lng },
+          { lat: u.lat, lng: u.lng, etd: u.etd }
+        ), T += k, g.distanceFromPrevious = Math.round(T * 1e4) / 1e4, g.distanceFromStart = Math.round((n + T) * 1e4) / 1e4;
         break;
       }
     }
-    return { etd: t, from: w, to: I, next: o.filter((g) => g), wps: y, days: v };
+    return { etd: t, from: p, to: g, next: o.filter((f) => f), wps: M, days: w, all: b };
   }
   /**
    * 洋流影响因子
@@ -990,16 +990,16 @@ class O {
    * @param cFactor 洋流因子
    */
   static weatherFactor(s, t, a = 0) {
-    var v, M, j, I, w, g, r;
+    var w, b, j, T, g, p, f;
     C == null || C.debug("calculate weather factor via: %j", { ...s, ...t });
-    const i = O.blockCoefficient(s.displacement, s.lbp, s.breadthMoulded, s.draught), n = z.roundPrecision(a * 1852 / 3600, 6), o = O.froudeNumber(s.speed - n, s.lbp), e = O.amendFactor(i, o, s.loadCondition);
-    let c = Math.abs(s.bearing % 360 - (((v = t == null ? void 0 : t.wind) == null ? void 0 : v.degree) % 360 || 0));
-    c = c > 180 ? 360 - c : c;
-    const u = O.directionFactor(c, (M = t == null ? void 0 : t.wind) == null ? void 0 : M.scale), h = O.vesselTagFactor(s.displacement, s.loadCondition, s.tag, (j = t == null ? void 0 : t.wind) == null ? void 0 : j.kts);
-    let d = u * e * h / 100 * (s.speed - n);
-    d = Math.round(d * 1.943844 * 1e4) / 1e4 * -1, s.tag === "tugs" && Math.abs(d) > 1 && (d = d / (Math.abs(Math.round(d)) + 1)), C == null || C.debug("wind wx factor = %d", d), c = Math.abs(s.bearing % 360 - (((w = (I = t == null ? void 0 : t.wave) == null ? void 0 : I.sig) == null ? void 0 : w.degree) % 360 || 0)), c = c > 180 ? 360 - c : c;
-    const y = O.waveHeightFactor(((r = (g = t == null ? void 0 : t.wave) == null ? void 0 : g.sig) == null ? void 0 : r.height) ?? 1, c);
-    return C == null || C.debug("wave wx factor = %d", y), d = Math.abs(d) > Math.abs(y) ? d : d * 0.3 + y * 0.7, C == null || C.debug("weather factor = %d", d), d = Math.abs(d) > 3 ? 3 * (Math.abs(d) / d) + Math.abs(d) / d * (Math.abs(d) - 2) * 0.1 : d, Math.round((d || 0) * 100) / 100;
+    const i = R.blockCoefficient(s.displacement, s.lbp, s.breadthMoulded, s.draught), n = z.roundPrecision(a * 1852 / 3600, 6), o = R.froudeNumber(s.speed - n, s.lbp), e = R.amendFactor(i, o, s.loadCondition);
+    let r = Math.abs(s.bearing % 360 - (((w = t == null ? void 0 : t.wind) == null ? void 0 : w.degree) % 360 || 0));
+    r = r > 180 ? 360 - r : r;
+    const d = R.directionFactor(r, (b = t == null ? void 0 : t.wind) == null ? void 0 : b.scale), h = R.vesselTagFactor(s.displacement, s.loadCondition, s.tag, (j = t == null ? void 0 : t.wind) == null ? void 0 : j.kts);
+    let c = d * e * h / 100 * (s.speed - n);
+    c = Math.round(c * 1.943844 * 1e4) / 1e4 * -1, s.tag === "tugs" && Math.abs(c) > 1 && (c = c / (Math.abs(Math.round(c)) + 1)), C == null || C.debug("wind wx factor = %d", c), r = Math.abs(s.bearing % 360 - (((g = (T = t == null ? void 0 : t.wave) == null ? void 0 : T.sig) == null ? void 0 : g.degree) % 360 || 0)), r = r > 180 ? 360 - r : r;
+    const M = R.waveHeightFactor(((f = (p = t == null ? void 0 : t.wave) == null ? void 0 : p.sig) == null ? void 0 : f.height) ?? 1, r);
+    return C == null || C.debug("wave wx factor = %d", M), c = Math.abs(c) > Math.abs(M) ? c : c * 0.3 + M * 0.7, C == null || C.debug("weather factor = %d", c), c = Math.abs(c) > 3 ? 3 * (Math.abs(c) / c) + Math.abs(c) / c * (Math.abs(c) - 2) * 0.1 : c, Math.round((c || 0) * 100) / 100;
   }
   /**
    * 全程失速分析(走完航程)
@@ -1014,14 +1014,14 @@ class O {
    * @param useRouteParam
    * @param options
    */
-  static async analyseInstant(s, t, a, i, n, o = "", e = 0, c = !0, u = !1, h = {}) {
-    var K, G, X, Q, Z, $;
-    const d = p().valueOf();
+  static async analyseInstant(s, t, a, i, n, o = "", e = 0, r = !0, d = !1, h = {}) {
+    var K, G, X, Q, Z, $, tt;
+    const c = v().valueOf();
     s.lng = z.convertToStdLng(s.lng);
-    const { route: y, waypoints: v } = n.points, M = W.calculateSubRoute(s, y);
-    if (((K = M[0]) == null ? void 0 : K.length) <= 1)
+    const { route: M, waypoints: w } = n.points, b = V.calculateSubRoute(s, M);
+    if (((K = b[0]) == null ? void 0 : K.length) <= 1)
       return;
-    const { v0: j, label: I } = s.sog ? {
+    const { v0: j, label: T } = s.sog ? {
       v0: s.sog,
       label: s.label || "Other"
       /* Instruct */
@@ -1029,66 +1029,67 @@ class O {
       v0: i.speed,
       label: "CP"
       /* Cp */
-    }, w = O.assembleProperties(a, i.loadCondition, j, 0), g = v.length ? W.calculateSubWaypoints(s, v) : [];
-    g.forEach((Y) => Y.important = !0);
-    const r = {
+    }, g = R.assembleProperties(a, i.loadCondition, j, 0), p = w.length ? V.calculateSubWaypoints(s, w) : [];
+    p.forEach((q) => q.important = !0);
+    const f = {
       from: { ...s },
-      route: M,
-      waypoints: g,
+      route: b,
+      waypoints: p,
       v0: j,
-      label: I
-    }, b = {
+      label: T
+    }, u = {
       hours: [],
       days: [],
-      wps: []
+      wps: [],
+      all: []
     };
-    e || (W.calculateRouteDistance(M) / i.speed <= 72 ? e = 3 : e = 6);
-    let m = W.simplifyRouteToCoordinates(M, g, 0), l = 0, k = 0, S = 0, D = 0;
-    t = p(t).utc();
-    const P = t.clone();
-    for (; m.length > 0; ) {
-      const Y = e - t.hour() % e, B = Math.ceil(t.clone().add(Y, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4, F = await O.speedLoseInHoursStep(
-        w,
+    e || (V.calculateRouteDistance(b) / i.speed <= 72 ? e = 3 : e = 6);
+    let l = V.simplifyRouteToCoordinates(b, p, 0), m = 0, I = 0, k = 0, F = 0;
+    t = v(t).utc();
+    const H = t.clone();
+    for (; l.length > 0; ) {
+      const q = e - t.hour() % e, W = Math.ceil(t.clone().add(q, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4, S = await R.speedLoseInHoursStep(
+        g,
         t,
-        P,
-        B,
-        l,
+        H,
+        W,
         m,
+        l,
         o,
-        c,
-        u,
+        r,
+        d,
         h
       );
-      if ((G = F.from) != null && G.speed && (b.hours.push(F.from), b.wps.push(...F.wps), b.days.push(...F.days)), m = F == null ? void 0 : F.next, !m.length) {
-        const L = await O.speedLoseAt(w, F.to, p(F.to.eta), o, 0, c, u, h);
-        L.bearing = w.bearing, b.hours.push(L);
+      if (u.all.push(...S.all), (G = S.from) != null && G.speed && (u.hours.push(S.from), u.wps.push(...S.wps), u.days.push(...S.days)), l = S == null ? void 0 : S.next, !l.length) {
+        const O = await R.speedLoseAt(g, S.to, v(S.to.eta), o, 0, r, d, h);
+        O.bearing = g.bearing, u.hours.push(O), u.all.push(O);
       }
-      l += Math.round((((X = F == null ? void 0 : F.to) == null ? void 0 : X.distanceFromPrevious) ?? 0) * 1e4) / 1e4;
+      m += Math.round((((X = S == null ? void 0 : S.to) == null ? void 0 : X.distanceFromPrevious) ?? 0) * 1e4) / 1e4;
     }
-    const N = b.hours;
-    for (let Y = 0; Y < N.length - 1; Y++) {
-      const B = p(N[Y + 1].eta).diff(N[Y].etd, "hour", !0) || 1;
-      k += (N[Y].wxFactor || 0) * B, S += (N[Y].cFactor || 0) * B, D += B;
+    const x = u.hours;
+    for (let q = 0; q < x.length - 1; q++) {
+      const W = v(x[q + 1].eta).diff(x[q].etd, "hour", !0) || 1;
+      I += (x[q].wxFactor || 0) * W, k += (x[q].cFactor || 0) * W, F += W;
     }
-    (Q = b.wps) == null || Q.forEach((Y, B) => {
-      Y.positionTime = p.utc(Y.etd || Y.eta).unix();
-      const F = b.wps[B - 1];
-      if (F) {
-        const L = Y.distanceFromStart - F.distanceFromStart, H = p(Y.eta || Y.etd).diff(p(F.etd || F.eta), "h", !0);
-        Y.avgSpd = Math.round(L / H * 100) / 100, F.bearing = W.calculateBearing(F, Y);
+    (Q = u.wps) == null || Q.forEach((q, W) => {
+      q.positionTime = v.utc(q.etd || q.eta).unix();
+      const S = u.wps[W - 1];
+      if (S) {
+        const O = q.distanceFromStart - S.distanceFromStart, P = v(q.eta || q.etd).diff(v(S.etd || S.eta), "h", !0);
+        q.avgSpd = Math.round(O / P * 100) / 100, S.bearing = V.calculateBearing(S, q);
       }
-    }), b.wps = (Z = b.wps) == null ? void 0 : Z.reduce((Y, B) => (Y.some((F) => Math.round(F.positionTime / 60) === Math.round(B.positionTime / 60)) || Y.push(B), Y), []), r.sample = b;
-    const A = b.hours.at(0), x = b.hours.at(-1);
-    r.distance = Math.round(x.distanceFromStart * 1e3) / 1e3, r.etd = p(A.eta).utc().format(), r.eta = p(x.eta).utc().format(), r.wxFactor = Math.round(k / D * 1e3) / 1e3, r.cFactor = Math.round(S / D * 1e3) / 1e3, r.avgSpeed = Math.round(x.distanceFromStart / D * 1e3) / 1e3, r.totalHrs = Math.round(D * 1e3) / 1e3;
-    const { distanceInECA: T, hoursInECA: q, totalDgoConsInECA: R, eca: J } = await this.calculateECA(r, i, h), tt = z.roundPrecision(i.fo / 24 * (D - q), 3), at = z.roundPrecision(i.dgo / 24 * D, 3);
-    r.extend = {
+    }), u.wps = (Z = u.wps) == null ? void 0 : Z.reduce((q, W) => (q.some((S) => Math.round(S.positionTime / 60) === Math.round(W.positionTime / 60)) || q.push(W), q), []), u.all = ($ = u.all) == null ? void 0 : $.reduce((q, W) => (W.positionTime = v.utc(W.etd || W.eta).unix(), q.some((S) => Math.round(S.positionTime / 60) === Math.round(W.positionTime / 60)) || q.push(W), q), []), f.sample = u;
+    const A = u.hours.at(0), D = u.hours.at(-1);
+    f.distance = Math.round(D.distanceFromStart * 1e3) / 1e3, f.etd = v(A.eta).utc().format(), f.eta = v(D.eta).utc().format(), f.wxFactor = Math.round(I / F * 1e3) / 1e3, f.cFactor = Math.round(k / F * 1e3) / 1e3, f.avgSpeed = Math.round(D.distanceFromStart / F * 1e3) / 1e3, f.totalHrs = Math.round(F * 1e3) / 1e3;
+    const { distanceInECA: N, hoursInECA: Y, totalDgoConsInECA: L, eca: J } = await this.calculateECA(f, i, h), et = z.roundPrecision(i.fo / 24 * (F - Y), 3), nt = z.roundPrecision(i.dgo / 24 * F, 3);
+    f.extend = {
       eca: J,
-      distanceInECA: T,
-      hoursInECA: q,
-      totalDgoConsInECA: R
-    }, r.totalFoCons = tt < 0 ? 0 : tt, r.totalDgoCons = at;
-    const et = p().valueOf() - d, ot = (($ = b == null ? void 0 : b.hours) == null ? void 0 : $.length) || 1;
-    return C == null || C.info("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", h == null ? void 0 : h.requestId, et, ot, Math.round(et / ot * 1e3) / 1e3), r;
+      distanceInECA: N,
+      hoursInECA: Y,
+      totalDgoConsInECA: L
+    }, f.totalFoCons = et < 0 ? 0 : et, f.totalDgoCons = nt;
+    const st = v().valueOf() - c, it = ((tt = u == null ? void 0 : u.hours) == null ? void 0 : tt.length) || 1;
+    return C == null || C.info("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", h == null ? void 0 : h.requestId, st, it, Math.round(st / it * 1e3) / 1e3), f;
   }
   /**
    * 分段失速分析（最多走hours 小时）
@@ -1105,11 +1106,11 @@ class O {
    * @param useRouteParam
    * @param options
    */
-  static async analyseInstantWithThreshed(s, t, a, i, n, o, e, c = "", u = 3, h = !0, d = !1, y = {}) {
-    var X, Q, Z, $, Y, B;
-    const v = p().valueOf();
+  static async analyseInstantWithThreshed(s, t, a, i, n, o, e, r = "", d = 3, h = !0, c = !1, M = {}) {
+    var X, Q, Z, $, tt, q, W;
+    const w = v().valueOf();
     s.lng = z.convertToStdLng(s.lng);
-    const { v0: M, label: j } = s.sog ? {
+    const { v0: b, label: j } = s.sog ? {
       v0: s.sog,
       label: s.label || "Other"
       /* Instruct */
@@ -1117,66 +1118,65 @@ class O {
       v0: n.speed,
       label: "CP"
       /* Cp */
-    }, I = O.assembleProperties(i, n.loadCondition, M, 0), w = W.calculateSubRoute(s, o);
-    if (((X = w[0]) == null ? void 0 : X.length) <= 1)
+    }, T = R.assembleProperties(i, n.loadCondition, b, 0), g = V.calculateSubRoute(s, o);
+    if (((X = g[0]) == null ? void 0 : X.length) <= 1)
       return;
-    const g = e.length ? W.calculateSubWaypoints(s, e) : [];
-    g.forEach((F) => F.important = !0);
-    let r = W.simplifyRouteToCoordinates(w, g, 0), b = 0, m = 0, l = 0, k = 0;
-    const S = {
+    const p = e.length ? V.calculateSubWaypoints(s, e) : [];
+    p.forEach((S) => S.important = !0);
+    let f = V.simplifyRouteToCoordinates(g, p, 0), u = 0, l = 0, m = 0, I = 0;
+    const k = {
       hours: [],
       wps: [],
-      days: []
+      days: [],
+      all: []
     };
-    t = p(t).utc();
-    const D = t.clone();
-    for (; r.length > 0; ) {
-      const F = u - t.hour() % u;
-      let L = Math.ceil(t.clone().add(F, "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 H = await O.speedLoseInHoursStep(I, t, D, L, b, r, c, h, d, y);
-      if ((Q = H.from) != null && Q.speed && (S.hours.push(H.from), H != null && H.wps && S.wps.push(...H.wps), S.days.push(...H.days)), r = H == null ? void 0 : H.next, r.length || S.hours.push(H == null ? void 0 : H.to), b += Math.round((((Z = H == null ? void 0 : H.to) == null ? void 0 : Z.distanceFromPrevious) ?? 0) * 1e4) / 1e4, !L)
+    t = v(t).utc();
+    const F = t.clone();
+    for (; f.length > 0; ) {
+      const S = d - t.hour() % d;
+      let O = Math.ceil(t.clone().add(S, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4;
+      O = t.clone().add(O, "h").isSameOrAfter(a) ? a.diff(t, "h", !0) * 1e4 / 1e4 : O;
+      const P = await R.speedLoseInHoursStep(T, t, F, O, u, f, r, h, c, M);
+      if (k.all.push(...P.all), (Q = P.from) != null && Q.speed && (k.hours.push(P.from), P != null && P.wps && k.wps.push(...P.wps), k.days.push(...P.days)), f = P == null ? void 0 : P.next, f.length || k.hours.push(P == null ? void 0 : P.to), u += Math.round((((Z = P == null ? void 0 : P.to) == null ? void 0 : Z.distanceFromPrevious) ?? 0) * 1e4) / 1e4, !O)
         break;
     }
-    S.wps = ($ = S.wps) == null ? void 0 : $.reduce((F, L) => (F.some((H) => Math.round(p(H.etd).unix() / 60) === Math.round(p(L.etd).unix() / 60)) || F.push(L), F), []), (Y = S.wps) == null || Y.forEach((F, L) => {
-      const H = S.wps[L - 1];
-      if (H) {
-        const rt = F.distanceFromStart - H.distanceFromStart, dt = p(F.eta || F.etd).diff(p(H.etd || H.eta), "h", !0);
-        F.avgSpd = Math.round(rt / dt * 100) / 100;
-        const ut = W.calculateBearing(H, F);
-        H.bearing = ut;
+    k.wps = ($ = k.wps) == null ? void 0 : $.reduce((S, O) => (S.some((P) => Math.round(v(P.etd).unix() / 60) === Math.round(v(O.etd).unix() / 60)) || S.push(O), S), []), k.all = (tt = k.all) == null ? void 0 : tt.reduce((S, O) => (O.positionTime = v.utc(O.etd || O.eta).unix(), S.some((P) => Math.round(v(P.etd).unix() / 60) === Math.round(v(O.etd).unix() / 60)) || S.push(O), S), []), (q = k.wps) == null || q.forEach((S, O) => {
+      const P = k.wps[O - 1];
+      if (P) {
+        const dt = S.distanceFromStart - P.distanceFromStart, ut = v(S.eta || S.etd).diff(v(P.etd || P.eta), "h", !0);
+        S.avgSpd = Math.round(dt / ut * 100) / 100, P.bearing = V.calculateBearing(P, S);
       }
     });
-    const P = S.hours;
-    for (let F = 0; F < P.length - 1; F++) {
-      const L = p(P[F + 1].eta).diff(P[F].etd, "hour", !0);
-      m += P[F].wxFactor * L, l += P[F].cFactor * L, k += L;
+    const H = k.hours;
+    for (let S = 0; S < H.length - 1; S++) {
+      const O = v(H[S + 1].eta).diff(H[S].etd, "hour", !0);
+      l += H[S].wxFactor * O, m += H[S].cFactor * O, I += O;
     }
-    const N = S.hours.at(0), A = S.hours.at(-1), x = await W.calculateRangeRoute(N, A, w), T = await W.calculateRangeWaypoints(N, A, w, g), q = {
-      sample: S,
+    const x = k.hours.at(0), A = k.hours.at(-1), D = await V.calculateRangeRoute(x, A, g), N = await V.calculateRangeWaypoints(x, A, g, p), Y = {
+      sample: k,
       distance: Math.round(((A == null ? void 0 : A.distanceFromStart) || 0) * 1e4) / 1e4,
       // 注意，可能会在first节点Drift,所有采用eta做为初始出发时间
-      etd: p(N.eta).utc().format(),
-      eta: p(A == null ? void 0 : A.eta).utc().format(),
-      wxFactor: Math.round(m / k * 1e3) / 1e3,
-      cFactor: Math.round(l / k * 1e3) / 1e3,
-      avgSpeed: Math.round(((A == null ? void 0 : A.distanceFromStart) || 0) / k * 1e3) / 1e3,
-      totalHrs: Math.round(k * 1e3) / 1e3,
-      from: N,
+      etd: v(x.eta).utc().format(),
+      eta: v(A == null ? void 0 : A.eta).utc().format(),
+      wxFactor: Math.round(l / I * 1e3) / 1e3,
+      cFactor: Math.round(m / I * 1e3) / 1e3,
+      avgSpeed: Math.round(((A == null ? void 0 : A.distanceFromStart) || 0) / I * 1e3) / 1e3,
+      totalHrs: Math.round(I * 1e3) / 1e3,
+      from: x,
       to: A,
-      route: x,
-      waypoints: T,
-      v0: M,
+      route: D,
+      waypoints: N,
+      v0: b,
       label: j
-    }, { distanceInECA: R, hoursInECA: J, totalDgoConsInECA: tt, eca: at } = await this.calculateECA(q, n, y), nt = z.roundPrecision(n.fo / 24 * (k - J), 3), et = z.roundPrecision(n.dgo / 24 * k, 3);
-    q.extend = {
-      eca: at,
-      distanceInECA: R,
+    }, { distanceInECA: L, hoursInECA: J, totalDgoConsInECA: et, eca: nt } = await this.calculateECA(Y, n, M), ot = z.roundPrecision(n.fo / 24 * (I - J), 3), st = z.roundPrecision(n.dgo / 24 * I, 3);
+    Y.extend = {
+      eca: nt,
+      distanceInECA: L,
       hoursInECA: J,
-      totalDgoConsInECA: tt
-    }, q.totalDgoCons = et, q.totalFoCons = nt < 0 ? 0 : nt;
-    const K = p().valueOf() - v, G = ((B = S == null ? void 0 : S.hours) == null ? void 0 : B.length) || 1;
-    return C == null || C.debug("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", y == null ? void 0 : y.requestId, K, G, Math.round(K / G * 1e3) / 1e3), q;
+      totalDgoConsInECA: et
+    }, Y.totalDgoCons = st, Y.totalFoCons = ot < 0 ? 0 : ot;
+    const K = v().valueOf() - w, G = ((W = k == null ? void 0 : k.hours) == null ? void 0 : W.length) || 1;
+    return C == null || C.debug("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", M == null ? void 0 : M.requestId, K, G, Math.round(K / G * 1e3) / 1e3), Y;
   }
   /**
    * 在指定航线条件下，基于多CP，动态计算最优成本(租金+油费)方案
@@ -1194,58 +1194,58 @@ class O {
    * @param options
    */
   static async analyseCost(s, t, a, i, n = {}) {
-    var w, g;
-    const o = p().valueOf(), e = [];
+    var g, p;
+    const o = v().valueOf(), e = [];
     s.speedStep = s.speedStep || 3, s.alterStep = s.alterStep ?? 1;
-    const c = W.calculateRouteDistance(i.route);
-    let u = 0;
-    a.forEach((r) => {
-      const b = Math.ceil(c / r.speed / 24);
-      u = u < b ? b : u;
-    }), u = u * 1.3;
-    const h = p.utc(s.etd).add(u ?? 14, "day");
-    let d = 1;
-    for (const r of a) {
-      const b = JSON.parse(JSON.stringify(i.route)), m = JSON.parse(JSON.stringify(i.waypoints)), l = await O.analyseInstantWithThreshed(
+    const r = V.calculateRouteDistance(i.route);
+    let d = 0;
+    a.forEach((f) => {
+      const u = Math.ceil(r / f.speed / 24);
+      d = d < u ? u : d;
+    }), d = d * 1.3;
+    const h = v.utc(s.etd).add(d ?? 14, "day");
+    let c = 1;
+    for (const f of a) {
+      const u = JSON.parse(JSON.stringify(i.route)), l = JSON.parse(JSON.stringify(i.waypoints)), m = await R.analyseInstantWithThreshed(
         { lat: s.lat, lng: s.lng },
         s.etd,
         h,
         t,
-        r,
-        b,
-        m,
+        f,
+        u,
+        l,
         s.meteoVendor,
         s.speedStep,
         s.useMeteo,
         s.useRouteParam,
         n
       );
-      l && (await O.calculateCost(l, r, s, n), e.push(l), C == null || C.info("[%s][L%d-%d] analyse from %s to %s cost: %j", n.requestId, 1, d, s.etd, h.format(), {
-        cost: l.cost.total,
-        hire: l.cost.hire,
-        bunker: l.cost.bunker,
-        distance: l.distance,
-        hours: l.totalHrs,
-        cp: `${r.speed}/${r.fo}/${r.dgo}`
-      })), d++;
+      m && (await R.calculateCost(m, f, s, n), e.push(m), C == null || C.info("[%s][L%d-%d] analyse from %s to %s cost: %j", n.requestId, 1, c, s.etd, h.format(), {
+        cost: m.cost.total,
+        hire: m.cost.hire,
+        bunker: m.cost.bunker,
+        distance: m.distance,
+        hours: m.totalHrs,
+        cp: `${f.speed}/${f.fo}/${f.dgo}`
+      })), c++;
     }
-    e.sort((r, b) => r.cost.total - b.cost.total);
-    const y = e.at(0), v = e.at(1), M = [];
-    if (M.push({ combined: !1, speeds: [y], cost: (w = y.cost) == null ? void 0 : w.total }), v) {
-      const r = y.cost.cp, b = v.cost.cp, m = p(y.eta), l = p(y.etd), k = m.diff(l, "days", !0);
-      let S = Math.ceil(k / 2);
-      S = S > 7 ? 7 : S < s.alterStep ? s.alterStep : S;
-      let D = 2, P = { combined: !1, speeds: [v], cost: (g = v.cost) == null ? void 0 : g.total }, N;
-      for (; S >= s.alterStep; ) {
-        const A = await O.combinedAnalyse(s, t, h, [r, b], i, S, { ...n, level: D });
-        if (P.cost > A.cost ? N ? (N == null ? void 0 : N.cost) > A.cost && (N = A) : (N = P, P = A) : (!N || (N == null ? void 0 : N.cost) > A.cost) && (N = A), S <= s.alterStep)
+    e.sort((f, u) => f.cost.total - u.cost.total);
+    const M = e.at(0), w = e.at(1), b = [];
+    if (b.push({ combined: !1, speeds: [M], cost: (g = M.cost) == null ? void 0 : g.total }), w) {
+      const f = M.cost.cp, u = w.cost.cp, l = v(M.eta), m = v(M.etd), I = l.diff(m, "days", !0);
+      let k = Math.ceil(I / 2);
+      k = k > 7 ? 7 : k < s.alterStep ? s.alterStep : k;
+      let F = 2, H = { combined: !1, speeds: [w], cost: (p = w.cost) == null ? void 0 : p.total }, x;
+      for (; k >= s.alterStep; ) {
+        const A = await R.combinedAnalyse(s, t, h, [f, u], i, k, { ...n, level: F });
+        if (H.cost > A.cost ? x ? (x == null ? void 0 : x.cost) > A.cost && (x = A) : (x = H, H = A) : (!x || (x == null ? void 0 : x.cost) > A.cost) && (x = A), k <= s.alterStep)
           break;
-        S = Math.ceil(S / 2), D += 1;
+        k = Math.ceil(k / 2), F += 1;
       }
-      M.push(P), N && M.push(N);
+      b.push(H), x && b.push(x);
     }
-    const I = p().valueOf() - o;
-    return C == null || C.info("[%s] analyse elapsed: %d ms", n == null ? void 0 : n.requestId, I), M.sort((r, b) => r.cost - b.cost);
+    const T = v().valueOf() - o;
+    return C == null || C.info("[%s] analyse elapsed: %d ms", n == null ? void 0 : n.requestId, T), b.sort((f, u) => f.cost - u.cost);
   }
   /**
    * 按步长多次减半，分别用7,4,2,1天步长及cpa,cpb交替计算各种组合下的成本
@@ -1259,22 +1259,22 @@ class O {
    */
   static async combinedAnalyse(s, t, a, i, n, o, e = {}) {
     e.counter = 1, C == null || C.info("[%s][L%d] analyse with alternate cp in every %d days", e.requestId, e.level, o);
-    const c = await O.alternateAnalyse(s, t, a, i, 0, n, o, e), u = c.reduce((b, m) => b + m.cost.total, 0), h = c.reduce((b, m) => b + m.cost.hire, 0), d = c.reduce((b, m) => b + m.cost.bunker, 0), y = c.reduce((b, m) => b + m.distance, 0), v = c.reduce((b, m) => b + m.totalHrs, 0);
+    const r = await R.alternateAnalyse(s, t, a, i, 0, n, o, e), d = r.reduce((u, l) => u + l.cost.total, 0), h = r.reduce((u, l) => u + l.cost.hire, 0), c = r.reduce((u, l) => u + l.cost.bunker, 0), M = r.reduce((u, l) => u + l.distance, 0), w = r.reduce((u, l) => u + l.totalHrs, 0);
     C == null || C.info("[%s][L%d] cost with cpa/cpb turn: %j", e.requestId, e.level, {
-      cost: u,
+      cost: d,
       hire: h,
-      bunker: d,
-      distance: y,
-      hours: v
+      bunker: c,
+      distance: M,
+      hours: w
     });
-    const M = await O.alternateAnalyse(s, t, a, i, 1, n, o, e), j = M.reduce((b, m) => b + m.cost.total, 0), I = M.reduce((b, m) => b + m.cost.hire, 0), w = M.reduce((b, m) => b + m.cost.bunker, 0), g = M.reduce((b, m) => b + m.distance, 0), r = M.reduce((b, m) => b + m.totalHrs, 0);
+    const b = await R.alternateAnalyse(s, t, a, i, 1, n, o, e), j = b.reduce((u, l) => u + l.cost.total, 0), T = b.reduce((u, l) => u + l.cost.hire, 0), g = b.reduce((u, l) => u + l.cost.bunker, 0), p = b.reduce((u, l) => u + l.distance, 0), f = b.reduce((u, l) => u + l.totalHrs, 0);
     return C == null || C.info("[%s][L%d] cost with cpb/cpa turn: %j", e.requestId, e.level, {
       cost: j,
-      hire: I,
-      bunker: w,
-      distance: g,
-      hours: r
-    }), u < j ? { combined: !0, cost: Math.round(u * 1e3) / 1e3, speeds: c, step: o } : { combined: !0, cost: Math.round(j * 1e3) / 1e3, speeds: M, step: o };
+      hire: T,
+      bunker: g,
+      distance: p,
+      hours: f
+    }), d < j ? { combined: !0, cost: Math.round(d * 1e3) / 1e3, speeds: r, step: o } : { combined: !0, cost: Math.round(j * 1e3) / 1e3, speeds: b, step: o };
   }
   /**
    * 基于cp索引，交替计算指定步长下的成本
@@ -1287,48 +1287,48 @@ class O {
    * @param step 步长，7，4，2，1
    * @param options
    */
-  static async alternateAnalyse(s, t, a, i, n, o, e, c = {}) {
-    var y, v;
-    let u = p.utc(s.etd);
-    const h = { lat: s.lat, lng: s.lng }, d = [];
-    for (; u.isBefore(a); ) {
-      const M = u.clone().utc().add(e, "day"), j = JSON.parse(JSON.stringify(o.route)), I = JSON.parse(JSON.stringify(o.waypoints)), w = i[n], g = await O.analyseInstantWithThreshed(
+  static async alternateAnalyse(s, t, a, i, n, o, e, r = {}) {
+    var M, w;
+    let d = v.utc(s.etd);
+    const h = { lat: s.lat, lng: s.lng }, c = [];
+    for (; d.isBefore(a); ) {
+      const b = d.clone().utc().add(e, "day"), j = JSON.parse(JSON.stringify(o.route)), T = JSON.parse(JSON.stringify(o.waypoints)), g = i[n], p = await R.analyseInstantWithThreshed(
         h,
-        u.utc().format(),
-        M,
+        d.utc().format(),
+        b,
         t,
-        w,
+        g,
         j,
-        I,
+        T,
         s.meteoVendor,
         s.speedStep,
         s.useMeteo,
         s.useRouteParam,
-        c
+        r
       );
-      g && (await O.calculateCost(g, w, s, c), C == null || C.info(
+      p && (await R.calculateCost(p, g, s, r), C == null || C.info(
         "[%s][L%d-%d] analyse from %s to %s cost: %j",
-        c.requestId,
-        c.level,
-        c.counter,
-        u.utc().format(),
-        M.utc().format(),
+        r.requestId,
+        r.level,
+        r.counter,
+        d.utc().format(),
+        b.utc().format(),
         {
-          cost: g.cost.total,
-          hire: g.cost.hire,
-          bunker: g.cost.bunker,
-          distance: g.distance,
-          hours: g.totalHrs,
-          cp: `${w.speed}/${w.fo}/${w.dgo}`
+          cost: p.cost.total,
+          hire: p.cost.hire,
+          bunker: p.cost.bunker,
+          distance: p.distance,
+          hours: p.totalHrs,
+          cp: `${g.speed}/${g.fo}/${g.dgo}`
         }
-      )), c.counter = c.counter + 1;
-      const r = (v = (y = g == null ? void 0 : g.sample) == null ? void 0 : y.hours) == null ? void 0 : v.at(-1);
-      if (r)
-        h.lat = r.lat, h.lng = r.lng, u = p(r.eta), d.push(g), n = n ? 0 : 1;
+      )), r.counter = r.counter + 1;
+      const f = (w = (M = p == null ? void 0 : p.sample) == null ? void 0 : M.hours) == null ? void 0 : w.at(-1);
+      if (f)
+        h.lat = f.lat, h.lng = f.lng, d = v(f.eta), c.push(p), n = n ? 0 : 1;
       else
         break;
     }
-    return d;
+    return c;
   }
   /**
    * 计算Speed的cost
@@ -1340,11 +1340,11 @@ class O {
   static async calculateCost(s, t, a, i = {}) {
     var n;
     if (s) {
-      const o = (a.addComm || 0) >= 1 ? (a.addComm || 0) / 100 : a.addComm || 0, e = Math.round(s.totalHrs / 24 * (a.dailyHire || 0) * (1 - o) * 1e3) / 1e3, c = Math.round(s.totalFoCons * (a.priceFO || 0) * 1e3) / 1e3, u = Math.round((s.totalDgoCons + (((n = s.extend) == null ? void 0 : n.totalDgoConsInECA) || 0)) * (a.priceDGO || 0) * 1e3) / 1e3;
+      const o = (a.addComm || 0) >= 1 ? (a.addComm || 0) / 100 : a.addComm || 0, e = Math.round(s.totalHrs / 24 * (a.dailyHire || 0) * (1 - o) * 1e3) / 1e3, r = Math.round(s.totalFoCons * (a.priceFO || 0) * 1e3) / 1e3, d = Math.round((s.totalDgoCons + (((n = s.extend) == null ? void 0 : n.totalDgoConsInECA) || 0)) * (a.priceDGO || 0) * 1e3) / 1e3;
       s.cost = {
-        total: Math.round((e + c + u) * 1e3) / 1e3,
+        total: Math.round((e + r + d) * 1e3) / 1e3,
         hire: e,
-        bunker: Math.round((c + u) * 1e3) / 1e3,
+        bunker: Math.round((r + d) * 1e3) / 1e3,
         cp: t
       };
     }
@@ -1355,16 +1355,16 @@ class O {
    *
    */
   static async calculateECA(s, t, a = {}) {
-    var c, u, h, d;
-    const i = await W.intersectInECA((s == null ? void 0 : s.route) || []);
+    var r, d, h, c;
+    const i = await V.intersectInECA((s == null ? void 0 : s.route) || []);
     let n = 0, o = 0, e = 0;
-    (u = (c = s == null ? void 0 : s.sample) == null ? void 0 : c.wps) == null || u.forEach((y) => {
-      y.positionTime = p.utc(y.etd || y.eta).unix();
+    (d = (r = s == null ? void 0 : s.sample) == null ? void 0 : r.wps) == null || d.forEach((M) => {
+      M.positionTime = v.utc(M.etd || M.eta).unix();
     });
-    for (const y of i) {
-      n += y.distance;
-      const v = await W.deadReckoningTime((h = y.waypoints) == null ? void 0 : h.at(0), s.sample.wps), M = await W.deadReckoningTime((d = y.waypoints) == null ? void 0 : d.at(-1), s.sample.wps);
-      y.in = v, y.out = M, y.totalHrs = z.roundPrecision((M.positionTime - v.positionTime) / 3600, 3), y.totalDgoCons = z.roundPrecision(t.fo / 24 * y.totalHrs, 3), o += y.totalHrs, e += y.totalDgoCons;
+    for (const M of i) {
+      n += M.distance;
+      const w = await V.deadReckoningTime((h = M.waypoints) == null ? void 0 : h.at(0), s.sample.all || s.sample.wps), b = await V.deadReckoningTime((c = M.waypoints) == null ? void 0 : c.at(-1), s.sample.all || s.sample.wps);
+      M.in = w, M.out = b, M.totalHrs = z.roundPrecision((b.positionTime - w.positionTime) / 3600, 3), M.totalDgoCons = z.roundPrecision(t.fo / 24 * M.totalHrs, 3), o += M.totalHrs, e += M.totalDgoCons;
     }
     return n = z.roundPrecision(n, 3), o = z.roundPrecision(o, 3), e = z.roundPrecision(e, 3), {
       distanceInECA: n,
@@ -1379,55 +1379,55 @@ class O {
    * @param options
    */
   static async mergeSpeeds(s, t = {}) {
-    var r, b;
+    var f, u;
     const a = {
       hours: [],
       wps: [],
       days: []
-    }, i = s.reduce((m, l) => m + l.distance, 0), n = s.reduce((m, l) => {
-      var k;
-      return m + (((k = l.extend) == null ? void 0 : k.distanceInECA) || 0);
-    }, 0), o = s.reduce((m, l) => m + l.totalHrs, 0), e = s.reduce((m, l) => {
-      var k;
-      return m + (((k = l.extend) == null ? void 0 : k.hoursInECA) || 0);
-    }, 0), c = s.reduce((m, l) => {
-      var k;
-      return m + (((k = l.extend) == null ? void 0 : k.totalDgoConsInECA) || 0);
-    }, 0), u = s.reduce((m, l) => m + l.wxFactor * l.totalHrs / o, 0), h = s.reduce((m, l) => m + l.cFactor * l.totalHrs / o, 0), d = s.reduce((m, l) => m + l.totalFoCons, 0), y = s.reduce((m, l) => m + l.totalDgoCons, 0), v = s.reduce((m, l) => m + l.cost.total, 0), M = s.reduce((m, l) => m + l.cost.hire, 0), j = s.reduce((m, l) => m + l.cost.bunker, 0), I = [], w = [];
-    let g;
-    for (const m of s) {
-      w.push(...((r = m.extend) == null ? void 0 : r.eca) || []);
-      const l = m.sample.hours, k = m.sample.wps, S = m.sample.days, D = l.at(0);
-      g && (D.distanceFromPrevious = g.distanceFromPrevious, D.distanceFromStart = g.distanceFromStart, l.forEach((x, T) => {
-        T && (x.distanceFromStart = x.distanceFromStart + g.distanceFromStart);
-      }), k.at(0).distanceFromPrevious = g.distanceFromPrevious, k.at(0).distanceFromStart = g.distanceFromStart, k.forEach((x, T) => {
-        T && (x.distanceFromStart = x.distanceFromStart + g.distanceFromStart);
-      }), S.at(0).distanceFromPrevious = g.distanceFromPrevious, S.at(0).distanceFromStart = g.distanceFromStart, S.forEach((x, T) => {
-        T && (x.distanceFromStart = x.distanceFromStart + g.distanceFromStart);
-      })), D.cp = m.cost.cp;
-      const P = [m.etd, m.eta], N = I.findIndex((x) => x.id === D.cp.id);
-      N === -1 ? (D.cp.segment = [P], I.push(D.cp)) : I[N].segment.push(P), l.forEach((x) => {
-        var q;
-        ((q = a.hours) == null ? void 0 : q.findIndex((R) => R.eta === x.eta)) === -1 && a.hours.push(x);
-      }), k.forEach((x) => {
-        var q;
-        ((q = a.wps) == null ? void 0 : q.findIndex((R) => R.eta === x.eta)) === -1 && a.wps.push(x);
-      }), S.forEach((x) => {
-        var q;
-        ((q = a == null ? void 0 : a.days) == null ? void 0 : q.findIndex((R) => R.eta === x.eta)) === -1 && a.days.push(x);
+    }, i = s.reduce((l, m) => l + m.distance, 0), n = s.reduce((l, m) => {
+      var I;
+      return l + (((I = m.extend) == null ? void 0 : I.distanceInECA) || 0);
+    }, 0), o = s.reduce((l, m) => l + m.totalHrs, 0), e = s.reduce((l, m) => {
+      var I;
+      return l + (((I = m.extend) == null ? void 0 : I.hoursInECA) || 0);
+    }, 0), r = s.reduce((l, m) => {
+      var I;
+      return l + (((I = m.extend) == null ? void 0 : I.totalDgoConsInECA) || 0);
+    }, 0), d = s.reduce((l, m) => l + m.wxFactor * m.totalHrs / o, 0), h = s.reduce((l, m) => l + m.cFactor * m.totalHrs / o, 0), c = s.reduce((l, m) => l + m.totalFoCons, 0), M = s.reduce((l, m) => l + m.totalDgoCons, 0), w = s.reduce((l, m) => l + m.cost.total, 0), b = s.reduce((l, m) => l + m.cost.hire, 0), j = s.reduce((l, m) => l + m.cost.bunker, 0), T = [], g = [];
+    let p;
+    for (const l of s) {
+      g.push(...((f = l.extend) == null ? void 0 : f.eca) || []);
+      const m = l.sample.hours, I = l.sample.wps, k = l.sample.days, F = m.at(0);
+      p && (F.distanceFromPrevious = p.distanceFromPrevious, F.distanceFromStart = p.distanceFromStart, m.forEach((D, N) => {
+        N && (D.distanceFromStart = D.distanceFromStart + p.distanceFromStart);
+      }), I.at(0).distanceFromPrevious = p.distanceFromPrevious, I.at(0).distanceFromStart = p.distanceFromStart, I.forEach((D, N) => {
+        N && (D.distanceFromStart = D.distanceFromStart + p.distanceFromStart);
+      }), k.at(0).distanceFromPrevious = p.distanceFromPrevious, k.at(0).distanceFromStart = p.distanceFromStart, k.forEach((D, N) => {
+        N && (D.distanceFromStart = D.distanceFromStart + p.distanceFromStart);
+      })), F.cp = l.cost.cp;
+      const H = [l.etd, l.eta], x = T.findIndex((D) => D.id === F.cp.id);
+      x === -1 ? (F.cp.segment = [H], T.push(F.cp)) : T[x].segment.push(H), m.forEach((D) => {
+        var Y;
+        ((Y = a.hours) == null ? void 0 : Y.findIndex((L) => L.eta === D.eta)) === -1 && a.hours.push(D);
+      }), I.forEach((D) => {
+        var Y;
+        ((Y = a.wps) == null ? void 0 : Y.findIndex((L) => L.eta === D.eta)) === -1 && a.wps.push(D);
+      }), k.forEach((D) => {
+        var Y;
+        ((Y = a == null ? void 0 : a.days) == null ? void 0 : Y.findIndex((L) => L.eta === D.eta)) === -1 && a.days.push(D);
       });
-      const A = (b = a.wps) == null ? void 0 : b.findIndex((x) => x.eta === D.eta);
-      A === -1 ? a.wps.push(D) : a.wps[A] = D, g = l.at(-1);
+      const A = (u = a.wps) == null ? void 0 : u.findIndex((D) => D.eta === F.eta);
+      A === -1 ? a.wps.push(F) : a.wps[A] = F, p = m.at(-1);
     }
-    return a.wps.sort((m, l) => {
-      p(m.etd).unix() - p(l.etd).unix();
-    }), a.wps.forEach((m, l) => {
-      const k = a.wps[l - 1];
-      if (k) {
-        const S = m.distanceFromStart - (k.distanceFromStart || 0), D = p(m.eta || m.etd).diff(p(k.etd || k.eta), "hour", !0), P = Math.round(S / D * 100) / 100;
-        m.avgSpd = P;
-        const N = W.calculateBearing(k, m);
-        k.bearing = N;
+    return a.wps.sort((l, m) => {
+      v(l.etd).unix() - v(m.etd).unix();
+    }), a.wps.forEach((l, m) => {
+      const I = a.wps[m - 1];
+      if (I) {
+        const k = l.distanceFromStart - (I.distanceFromStart || 0), F = v(l.eta || l.etd).diff(v(I.etd || I.eta), "hour", !0), H = Math.round(k / F * 100) / 100;
+        l.avgSpd = H;
+        const x = V.calculateBearing(I, l);
+        I.bearing = x;
       }
     }), {
       sample: a,
@@ -1440,37 +1440,37 @@ class O {
       distance: Math.round(i * 1e3) / 1e3,
       totalHrs: Math.round(o * 1e3) / 1e3,
       avgSpeed: Math.round(i / o * 1e3) / 1e3,
-      wxFactor: Math.round(u * 1e3) / 1e3,
+      wxFactor: Math.round(d * 1e3) / 1e3,
       cFactor: Math.round(h * 1e3) / 1e3,
-      totalFoCons: Math.round(d * 1e3) / 1e3,
-      totalDgoCons: Math.round(y * 1e3) / 1e3,
+      totalFoCons: Math.round(c * 1e3) / 1e3,
+      totalDgoCons: Math.round(M * 1e3) / 1e3,
       cost: {
-        total: Math.round(v * 1e3) / 1e3,
-        hire: Math.round(M * 1e3) / 1e3,
+        total: Math.round(w * 1e3) / 1e3,
+        hire: Math.round(b * 1e3) / 1e3,
         bunker: Math.round(j * 1e3) / 1e3
       },
       extend: {
-        cps: I,
-        eca: w,
+        cps: T,
+        eca: g,
         distanceInECA: Math.round(n * 1e3) / 1e3,
         hoursInECA: Math.round(e * 1e3) / 1e3,
-        totalDgoConsInECA: Math.round(c * 1e3) / 1e3,
+        totalDgoConsInECA: Math.round(r * 1e3) / 1e3,
         speeds: s
       }
     };
   }
 }
 export {
-  st as AISImpl,
+  at as AISImpl,
   yt as AlertHelper,
   ft as AlertLevel,
-  Et as HifleetImpl,
+  Ft as HifleetImpl,
   gt as LoadCondition,
-  Tt as MyShipImpl,
-  Ft as MyVesselImpl,
-  Nt as ShipxyImpl,
-  O as SpeedHelper,
+  xt as MyShipImpl,
+  Tt as MyVesselImpl,
+  Et as ShipxyImpl,
+  R as SpeedHelper,
   vt as SpeedLabel,
   bt as VesselTag,
-  xt as alertHelper
+  Nt as alertHelper
 };