@idm-plugin/vessel 2.3.4 → 2.3.6

package/dist/index.js

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