@idm-plugin/vessel 1.2.0 → 1.2.2

package/dist/index.js

@@ -1,95 +1,100 @@
-var Q = Object.defineProperty;
-var X = (I, s, t) => s in I ? Q(I, s, { enumerable: !0, configurable: !0, writable: !0, value: t }) : I[s] = t;
-var L = (I, s, t) => (X(I, typeof s != "symbol" ? s + "" : s, t), t);
-import P from "got";
-import K from "@log4js-node/log4js-api";
-import y from "moment";
-import { LngLatHelper as _, LaneHelper as R } from "@idm-plugin/geo";
+var X = Object.defineProperty;
+var $ = (k, s, t) => s in k ? X(k, s, { enumerable: !0, configurable: !0, writable: !0, value: t }) : k[s] = t;
+var B = (k, s, t) => ($(k, typeof s != "symbol" ? s + "" : s, t), t);
+import R from "got";
+import z from "@log4js-node/log4js-api";
+import b from "moment";
+import { LngLatHelper as Z, LaneHelper as O } from "@idm-plugin/geo";
 import { MeteoHelper as tt } from "@idm-plugin/meteo";
-const S = K.getLogger("vessel");
-class Z {
+let m;
+try {
+  m = z.getLogger("vessel");
+} catch {
+} finally {
+}
+class K {
   /**
    * 解析AIS状态码
    * @param status
    */
   parseStatus(s) {
-    let t, r;
+    let t, i;
     switch (s) {
       case 0:
-        t = "在航（主机推动）", r = "The engine is in use";
+        t = "在航（主机推动）", i = "The engine is in use";
         break;
       case 1:
-        t = "锚泊", r = "Anchored";
+        t = "锚泊", i = "Anchored";
         break;
       case 2:
-        t = "失控", r = "Not operated";
+        t = "失控", i = "Not operated";
         break;
       case 3:
-        t = "操纵受限", r = "Limited airworthiness";
+        t = "操纵受限", i = "Limited airworthiness";
         break;
       case 4:
-        t = "吃水受限", r = "Limited by ship's draft";
+        t = "吃水受限", i = "Limited by ship's draft";
         break;
       case 5:
-        t = "靠泊", r = "Mooring";
+        t = "靠泊", i = "Mooring";
         break;
       case 6:
-        t = "搁浅", r = "Stranded";
+        t = "搁浅", i = "Stranded";
         break;
       case 7:
-        t = "捕捞作业", r = "Engaged in fishing";
+        t = "捕捞作业", i = "Engaged in fishing";
         break;
       case 8:
-        t = "靠帆船提供动力", r = "Sailing";
+        t = "靠帆船提供动力", i = "Sailing";
         break;
       default:
-        t = "未定义", r = "Undefined";
+        t = "未定义", i = "Undefined";
     }
-    return { labelCn: t, labelEn: r };
+    return { labelCn: t, labelEn: i };
   }
 }
-class lt extends Z {
-  constructor(t, r) {
+class lt extends K {
+  constructor(t, i) {
     super();
-    L(this, "clientId");
-    L(this, "clientSecret");
-    L(this, "token");
-    this.clientId = t, this.clientSecret = r;
+    B(this, "clientId");
+    B(this, "clientSecret");
+    B(this, "token");
+    this.clientId = t, this.clientSecret = i;
   }
   async authToken(t = {}) {
-    const r = "https://svc.data.myvessel.cn/ada/oauth/token", o = {
+    const i = "https://svc.data.myvessel.cn/ada/oauth/token", o = {
       searchParams: {
         client_id: this.clientId,
         client_secret: this.clientSecret,
         grant_type: "client_credentials"
       }
-    }, n = await P.post(r, o).json();
-    S.info("[%s] fetch access token from: %s - %j", t.requestId, r, n), n.error || (this.token = {
+    }, n = await R.post(i, o).json();
+    m == null || m.info("[%s] fetch access token from: %s - %j", t.requestId, i, n), n.error || (this.token = {
       accessToken: n.access_token,
       tokenType: n.token_type,
       expiresIn: n.expires_in,
       scope: n.scope,
       jti: n.jti,
-      issuedAt: y().utc().format()
+      issuedAt: b().utc().format()
     });
   }
-  async realTimePosition(t, r = {}) {
-    var m, f, M;
-    (!this.token || y().diff(y(this.token.issuedAt), "seconds") > ((m = this.token) == null ? void 0 : m.expiresIn) - 300) && await this.authToken(r);
+  async realTimePosition(t, i = {}) {
+    var p, M, y;
+    (!this.token || b().diff(b(this.token.issuedAt), "seconds") > ((p = this.token) == null ? void 0 : p.expiresIn) - 300) && await this.authToken(i);
     const o = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/location/unit", n = {
       headers: {
-        Authorization: `${(f = this.token) == null ? void 0 : f.tokenType} ${(M = this.token) == null ? void 0 : M.accessToken}`
+        Authorization: `${(M = this.token) == null ? void 0 : M.tokenType} ${(y = this.token) == null ? void 0 : y.accessToken}`
       },
       searchParams: { mmsi: t }
     };
-    S.info("[%s] fetch realtime position from: %s - %j", r.requestId, o, n);
-    const a = await P.get(o, n).json();
+    m == null || m.info("[%s] fetch realtime position from: %s - %j", i.requestId, o, n);
+    const a = await R.get(o, n).json();
     if (a.code)
-      return S.warn("[%s] fetch realtime position failed: %j", r.requestId, o, { message: a.message, status: a.status, code: a.code }), a;
+      return m == null || m.warn("[%s] fetch realtime position failed: %j", i.requestId, o, { message: a.message, status: a.status, code: a.code }), a;
     const e = a.data;
-    for (const h in e)
-      !isNaN(e[h]) && Number(e[h]) !== 1 / 0 && (e[h] = Number(e[h]));
-    const c = y(`${e.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    for (const f in e)
+      !isNaN(e[f]) && Number(e[f]) !== 1 / 0 && (e[f] = Number(e[f]));
+    const d = b(`${e.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
     return {
       mmsi: e.mmsi,
       name: e.vesselName,
@@ -106,87 +111,87 @@ class lt extends Z {
       rot: e.rot,
       eta: e.eta,
       destination: e.dest,
-      positionTime: c.unix(),
+      positionTime: d.unix(),
       status: e.status,
       labelCn: e.statusNameCn,
       labelEn: e.statusNameEn,
       method: "position",
       vendor: "myVessel",
-      utc: c.utc().format()
+      utc: d.utc().format()
     };
   }
-  async trajectory(t, r, o, n, a = !0, e = {}) {
-    (!this.token || y().diff(y(this.token.issuedAt), "seconds") > this.token.expiresIn - 300) && await this.authToken(e);
-    const c = await this.realTimePosition(t, e), i = y(r), m = y(o), f = [];
-    for (; m.diff(i, "day", !0) > 30; )
-      await this.trajectoryIn30Day(t, i, i.clone().add(30, "day"), c, n, f, e), i.add(30, "day");
-    return await this.trajectoryIn30Day(t, i, m, c, n, f, e), f;
+  async trajectory(t, i, o, n, a = !0, e = {}) {
+    (!this.token || b().diff(b(this.token.issuedAt), "seconds") > this.token.expiresIn - 300) && await this.authToken(e);
+    const d = await this.realTimePosition(t, e), r = b(i), p = b(o), M = [];
+    for (; p.diff(r, "day", !0) > 30; )
+      await this.trajectoryIn30Day(t, r, r.clone().add(30, "day"), d, n, M, e), r.add(30, "day");
+    return await this.trajectoryIn30Day(t, r, p, d, n, M, e), M;
   }
-  async trajectoryIn30Day(t, r, o, n, a, e, c = {}) {
-    var u, b, Y, d, g;
-    const i = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/track", m = {
+  async trajectoryIn30Day(t, i, o, n, a, e, d = {}) {
+    var l, v, Y, u, c;
+    const r = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/track", p = {
       headers: {
-        Authorization: `${(u = this.token) == null ? void 0 : u.tokenType} ${(b = this.token) == null ? void 0 : b.accessToken}`
+        Authorization: `${(l = this.token) == null ? void 0 : l.tokenType} ${(v = this.token) == null ? void 0 : v.accessToken}`
       },
       json: {
         mmsi: t,
-        startTime: r.utcOffset(8).format("YYYY-MM-DD HH:mm:ss"),
+        startTime: i.utcOffset(8).format("YYYY-MM-DD HH:mm:ss"),
         endTime: o.utcOffset(8).format("YYYY-MM-DD HH:mm:ss")
       }
     };
-    S.info("[%s] fetch trajectory from: %s - %j", c.requestId, i, m);
-    const f = await P.post(i, m).json();
-    if (f.code)
-      return S.warn("[%s] fetch trajectory failed: %j", c.requestId, i, { message: f.message, status: f.status, code: f.code }), f;
-    let M = -1;
-    const h = y(`${(d = (Y = f.data) == null ? void 0 : Y[0]) == null ? void 0 : d.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-    return (g = f.data) == null || g.forEach((l) => {
-      for (const w in l)
-        !isNaN(l[w]) && Number(l[w]) !== 1 / 0 && (l[w] = Number(l[w]));
-      const v = y(`${l.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00"), k = l.eta ? y(`${l.eta} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00") : void 0, p = l.status, { labelCn: x, labelEn: N } = this.parseStatus(p), C = {
-        mmsi: l.mmsi,
+    m == null || m.info("[%s] fetch trajectory from: %s - %j", d.requestId, r, p);
+    const M = await R.post(r, p).json();
+    if (M.code)
+      return m == null || m.warn("[%s] fetch trajectory failed: %j", d.requestId, r, { message: M.message, status: M.status, code: M.code }), M;
+    let y = -1;
+    const f = b(`${(u = (Y = M.data) == null ? void 0 : Y[0]) == null ? void 0 : u.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    return (c = M.data) == null || c.forEach((h) => {
+      for (const S in h)
+        !isNaN(h[S]) && Number(h[S]) !== 1 / 0 && (h[S] = Number(h[S]));
+      const w = b(`${h.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00"), I = h.eta ? b(`${h.eta} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00") : void 0, g = h.status, { labelCn: F, labelEn: x } = this.parseStatus(g), A = {
+        mmsi: h.mmsi,
         imo: n == null ? void 0 : n.imo,
-        lat: l.lat,
-        lng: l.lon,
-        sog: l.sog,
-        cog: l.cog,
-        hdg: l.hdg,
-        draught: l.draught,
-        status: p,
-        eta: k == null ? void 0 : k.unix(),
-        destination: l.dest,
-        positionTime: v.unix(),
-        labelCn: x,
-        labelEn: N,
+        lat: h.lat,
+        lng: h.lon,
+        sog: h.sog,
+        cog: h.cog,
+        hdg: h.hdg,
+        draught: h.draught,
+        status: g,
+        eta: I == null ? void 0 : I.unix(),
+        destination: h.dest,
+        positionTime: w.unix(),
+        labelCn: F,
+        labelEn: x,
         method: "trajectory",
         vendor: "myVessel",
-        utc: v.utc().format()
-      }, T = Math.floor(v.diff(h, "minute", !0) / (a || 1));
-      T !== M && (M = T, e.push(C));
+        utc: w.utc().format()
+      }, T = Math.floor(w.diff(f, "minute", !0) / (a || 1));
+      T !== y && (y = T, e.push(A));
     }), e;
   }
 }
-class mt extends Z {
+class ft extends K {
   constructor(t) {
     super();
-    L(this, "token");
+    B(this, "token");
     this.token = t;
   }
-  async realTimePosition(t, r = {}) {
+  async realTimePosition(t, i = {}) {
     const o = "https://api.hifleet.com/position/position/get/token", n = {
       searchParams: {
         mmsi: t,
         usertoken: this.token
       }
-    }, a = await P.post(o, n).json();
-    S.info("[%s] fetch realtime position from: %s - %j", r.requestId, o, n);
+    }, a = await R.post(o, n).json();
+    m == null || m.info("[%s] fetch realtime position from: %s - %j", i.requestId, o, n);
     const e = a == null ? void 0 : a.list;
     if (!e)
-      return S.warn("[%s] fetch realtime position failed: %j", r.requestId, o, a), a;
-    for (const h in e)
-      !isNaN(e[h]) && Number(e[h]) !== 1 / 0 && (e[h] = Number(e[h]));
+      return m == null || m.warn("[%s] fetch realtime position failed: %j", i.requestId, o, a), a;
+    for (const f in e)
+      !isNaN(e[f]) && Number(e[f]) !== 1 / 0 && (e[f] = Number(e[f]));
     e.status = e.sp > 3 ? 0 : 1;
-    const c = e.status, { labelCn: i, labelEn: m } = this.parseStatus(c), f = y(`${e.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    const d = e.status, { labelCn: r, labelEn: p } = this.parseStatus(d), M = b(`${e.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
     return {
       mmsi: e.m,
       name: e.n,
@@ -201,18 +206,18 @@ class mt extends Z {
       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) ? y(`${e.eta} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00").unix() : void 0,
+      eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(e.eta) ? b(`${e.eta} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00").unix() : void 0,
       destination: e.destination,
-      positionTime: f.unix(),
-      utc: f.utc().format(),
-      status: c,
-      labelCn: i,
-      labelEn: m,
+      positionTime: M.unix(),
+      utc: M.utc().format(),
+      status: d,
+      labelCn: r,
+      labelEn: p,
       method: "position",
       vendor: "hifleet"
     };
   }
-  async search(t, r = {}) {
+  async search(t, i = {}) {
     let o = "https://www.hifleet.com/hifleetapi/searchVesselOL.do";
     const n = {
       searchParams: {
@@ -224,10 +229,10 @@ class mt extends Z {
         Host: "www.hifleet.com"
       }
     };
-    let a = await P.post(o, n).json();
-    S.info("[%s] fetch vessel props from: %s - %j", r.requestId, o, n), a instanceof Array && (a = a[0]);
-    for (const c in a)
-      !isNaN(a[c]) && Number(a[c]) !== 1 / 0 && (a[c] = Number(a[c]));
+    let a = await R.post(o, n).json();
+    m == null || m.info("[%s] fetch vessel props from: %s - %j", i.requestId, o, n), a instanceof Array && (a = a[0]);
+    for (const d in a)
+      !isNaN(a[d]) && Number(a[d]) !== 1 / 0 && (a[d] = Number(a[d]));
     const e = {
       mmsi: a.m,
       name: a.n,
@@ -237,79 +242,79 @@ class mt extends Z {
       breadth: a.b,
       draught: a.dr
     };
-    return o = "https://www.hifleet.com/hifleetapi/sameShipSearch.do", a = await P.post(o, n).json(), S.info("[%s] fetch vessel dead weight from: %s - %j", r.requestId, o, n), a instanceof Array && (a = a[0]), a && (e.deadweight = Number(a.dwt)), e;
+    return o = "https://www.hifleet.com/hifleetapi/sameShipSearch.do", a = await R.post(o, n).json(), m == null || m.info("[%s] fetch vessel dead weight from: %s - %j", i.requestId, o, n), a instanceof Array && (a = a[0]), a && (e.deadweight = Number(a.dwt)), e;
   }
-  async trajectory(t, r, o, n, a = !0, e = {}) {
-    var l, v, k;
-    const c = await this.realTimePosition(t, e);
-    let i = y(r);
-    const m = y(o), f = y();
+  async trajectory(t, i, o, n, a = !0, e = {}) {
+    var h, w, I;
+    const d = await this.realTimePosition(t, e);
+    let r = b(i);
+    const p = b(o), M = b();
     if (a) {
-      let p = m.diff(i, "d", !0);
-      p < 0 ? i = m.clone().subtract(40, "d") : p < 30 ? i.subtract(10, "d") : p < 60 ? i.subtract(5, "d") : i = m.clone().subtract(80, "d"), p = f.diff(m, "d", !0), m.add(p > 10 ? 240 : p * 24, "h");
+      let g = p.diff(r, "d", !0);
+      g < 0 ? r = p.clone().subtract(40, "d") : g < 30 ? r.subtract(10, "d") : g < 60 ? r.subtract(5, "d") : r = p.clone().subtract(80, "d"), g = M.diff(p, "d", !0), p.add(g > 10 ? 240 : g * 24, "h");
     }
-    const M = {
+    const y = {
       searchParams: {
-        endtime: m.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
-        starttime: i.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
+        endtime: p.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
+        starttime: r.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
         mmsi: t,
         usertoken: this.token
       }
-    }, h = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", u = await P.get(h, M).json();
-    S.info("[%s] fetch trajectory from: %s - %j", e.requestId, h, M);
-    let b;
-    u && (b = ((v = (l = u.ships) == null ? void 0 : l.offors) == null ? void 0 : v.ship) || [], b.length || S.warn("[%s] fetch trajectory failed: %j", e.requestId, u));
+    }, f = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", l = await R.get(f, y).json();
+    m == null || m.info("[%s] fetch trajectory from: %s - %j", e.requestId, f, y);
+    let v;
+    l && (v = ((w = (h = l.ships) == null ? void 0 : h.offors) == null ? void 0 : w.ship) || [], v.length || m == null || m.warn("[%s] fetch trajectory failed: %j", e.requestId, l));
     const Y = [];
-    let d = -1;
-    const g = y(`${(k = b == null ? void 0 : b[0]) == null ? void 0 : k.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-    for (const p of b) {
-      for (const A in p)
-        !isNaN(p[A]) && Number(p[A]) !== 1 / 0 && (p[A] = Number(p[A]));
-      const x = y(`${p.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-      p.status = p.sp > 4 ? 0 : 1;
-      const { labelEn: N, labelCn: C } = this.parseStatus(p.status), T = {
-        mmsi: p.m,
-        name: p.n,
-        imo: c == null ? void 0 : c.imo,
-        lat: p.la,
-        lng: p.lo,
-        draught: p.draught,
-        sog: p.sp,
-        cog: p.co,
-        hdg: p.hdg,
-        positionTime: x.unix(),
-        utc: x.utc().format(),
-        status: p.status,
-        labelCn: C,
-        labelEn: N,
+    let u = -1;
+    const c = b(`${(I = v == null ? void 0 : v[0]) == null ? void 0 : I.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    for (const g of v) {
+      for (const L in g)
+        !isNaN(g[L]) && Number(g[L]) !== 1 / 0 && (g[L] = Number(g[L]));
+      const F = b(`${g.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+      g.status = g.sp > 4 ? 0 : 1;
+      const { labelEn: x, labelCn: A } = this.parseStatus(g.status), T = {
+        mmsi: g.m,
+        name: g.n,
+        imo: d == null ? void 0 : d.imo,
+        lat: g.la,
+        lng: g.lo,
+        draught: g.draught,
+        sog: g.sp,
+        cog: g.co,
+        hdg: g.hdg,
+        positionTime: F.unix(),
+        utc: F.utc().format(),
+        status: g.status,
+        labelCn: A,
+        labelEn: x,
         method: "trajectory",
         vendor: "hifleet"
-      }, w = Math.floor(x.diff(g, "minute", !0) / (n || 1));
-      w !== d && (d = w, Y.push(T));
+      }, S = Math.floor(F.diff(c, "minute", !0) / (n || 1));
+      S !== u && (u = S, Y.push(T));
     }
     return Y;
   }
 }
-class ft extends Z {
+class mt extends K {
   constructor(t) {
     super();
-    L(this, "token");
+    B(this, "token");
     this.token = t;
   }
-  async realTimePosition(t, r = {}) {
+  async realTimePosition(t, i = {}) {
     const o = {
       searchParams: {
         id: t,
         k: this.token,
         enc: 1
       }
-    }, n = "https://api.shipxy.com/apicall/GetSingleShip", a = await P.get(n, o).json();
-    if (S.info("[%s] fetch realtime position from: %s - %j", r.requestId, n, o), (a == null ? void 0 : a.status) !== 0)
+    }, n = "https://api.shipxy.com/apicall/GetSingleShip", a = await R.get(n, o).json();
+    if (m == null || m.info("[%s] fetch realtime position from: %s - %j", i.requestId, n, o), (a == null ? void 0 : a.status) !== 0)
       return a;
     const e = a.data[0];
-    for (const M in e)
-      !isNaN(e[M]) && Number(e[M]) !== 1 / 0 && (e[M] = Number(e[M]));
-    const { labelCn: c, labelEn: i } = await this.parseStatus(e.navistat), m = y.unix(e.lasttime);
+    for (const y in e)
+      !isNaN(e[y]) && Number(e[y]) !== 1 / 0 && (e[y] = Number(e[y]));
+    const { labelCn: d, labelEn: r } = await this.parseStatus(e.navistat), p = b.unix(e.lasttime);
     return {
       mmsi: e.ShipID,
       name: e.name,
@@ -325,55 +330,55 @@ class ft extends Z {
       hdg: Math.round(e.hdg / 100 * 100) / 100,
       rot: Math.round(e.rot / 100 * 100) / 100,
       positionTime: e.lasttime,
-      utc: m.utc().format(),
+      utc: p.utc().format(),
       status: e.navistat,
-      labelEn: i,
-      labelCn: c,
+      labelEn: r,
+      labelCn: d,
       method: "position",
       vendor: "shipxy"
     };
   }
-  async trajectory(t, r, o, n, a = !0, e = {}) {
-    var g;
-    const c = await this.realTimePosition(t, e), i = y(r), m = y(o), f = "https://api.shipxy.com/apicall/GetShipTrack", M = {
+  async trajectory(t, i, o, n, a = !0, e = {}) {
+    var c;
+    const d = await this.realTimePosition(t, e), r = b(i), p = b(o), M = "https://api.shipxy.com/apicall/GetShipTrack", y = {
       searchParams: {
         id: t,
         k: this.token,
         enc: 1,
         cut: 0,
-        btm: i.unix(),
-        etm: m.unix()
+        btm: r.unix(),
+        etm: p.unix()
       }
-    }, h = await P.get(f, M).json();
-    if (S.info("[%s] fetch trajectory from: %s - %j", e.requestId, f, M), (h == null ? void 0 : h.status) !== 0)
-      return h;
-    const u = h == null ? void 0 : h.points, b = [], Y = y.unix((g = u[0]) == null ? void 0 : g.utc);
-    let d = -1;
-    for (const l of u) {
-      const v = y.unix(l.utc), k = {
-        imo: c == null ? void 0 : c.imo,
+    }, f = await R.get(M, y).json();
+    if (m == null || m.info("[%s] fetch trajectory from: %s - %j", e.requestId, M, y), (f == null ? void 0 : f.status) !== 0)
+      return f;
+    const l = f == null ? void 0 : f.points, v = [], Y = b.unix((c = l[0]) == null ? void 0 : c.utc);
+    let u = -1;
+    for (const h of l) {
+      const w = b.unix(h.utc), I = {
+        imo: d == null ? void 0 : d.imo,
         mmsi: t,
-        sog: Math.round(l.sog * 3600 / 1e3 / 1852 * 100) / 100,
-        cog: Math.round(l.cog / 100 * 100) / 100,
-        lat: Math.round(l.lat / 1e6 * 1e5) / 1e5,
-        lng: Math.round(l.lon / 1e6 * 1e5) / 1e5,
-        positionTime: v.unix(),
-        utc: v.utc().format(),
+        sog: Math.round(h.sog * 3600 / 1e3 / 1852 * 100) / 100,
+        cog: Math.round(h.cog / 100 * 100) / 100,
+        lat: Math.round(h.lat / 1e6 * 1e5) / 1e5,
+        lng: Math.round(h.lon / 1e6 * 1e5) / 1e5,
+        positionTime: w.unix(),
+        utc: w.utc().format(),
         method: "trajectory",
         vendor: "shipxy"
-      }, p = Math.floor(v.diff(Y, "minute", !0) / (n || 1));
-      p !== d && (d = p, b.push(k));
+      }, g = Math.floor(w.diff(Y, "minute", !0) / (n || 1));
+      g !== u && (u = g, v.push(I));
     }
-    return b;
+    return v;
   }
 }
-class gt extends Z {
+class pt extends K {
   constructor(t) {
     super();
-    L(this, "token");
+    B(this, "token");
     this.token = t;
   }
-  async getShipId(t, r = {}) {
+  async getShipId(t, i = {}) {
     const o = {
       headers: {
         appKey: this.token
@@ -381,10 +386,10 @@ class gt extends Z {
       json: {
         mmsiList: t
       }
-    }, n = "https://api3.myships.com/sp/ships/getShipIdByMMSI", a = await P.post(n, o).json();
-    return S.info("[%s] fetch ship id from: %s - %j", r.requestId, n, o), a.code !== "0" ? a : a.data[0].shipId;
+    }, n = "https://api3.myships.com/sp/ships/getShipIdByMMSI", a = await R.post(n, o).json();
+    return m == null || m.info("[%s] fetch ship id from: %s - %j", i.requestId, n, o), a.code !== "0" ? a : a.data[0].shipId;
   }
-  async getShipInfo(t, r = {}) {
+  async getShipInfo(t, i = {}) {
     const o = {
       headers: {
         appKey: this.token
@@ -392,100 +397,105 @@ class gt extends Z {
       json: {
         shipId: t
       }
-    }, n = "https://api3.myships.com/sp/ships/aissta", a = await P.post(n, o).json();
-    if (S.info("[%s] fetch ship info from: %s - %j", r.requestId, n, o), a.code !== "0")
+    }, n = "https://api3.myships.com/sp/ships/aissta", a = await R.post(n, o).json();
+    if (m == null || m.info("[%s] fetch ship info from: %s - %j", i.requestId, n, o), a.code !== "0")
       return a;
     const e = a.data;
-    let c = e.imo;
-    return t === "407170" && (c = "9198379", S.warn("[%s] ship(%s) imo error: %s, should be %s", r.requestId, t, e.imo, c)), {
+    let d = e.imo;
+    return t === "407170" && (d = "9198379", m == null || m.warn("[%s] ship(%s) imo error: %s, should be %s", i.requestId, t, e.imo, d)), {
       mmsi: e.mmsi,
       name: e.shipnameEn,
-      imo: c,
+      imo: d,
       callSign: e.callSign,
       length: e.length,
       width: e.breadth,
       draught: (e.draught || 100) / 10
     };
   }
-  async realTimePosition(t, r = {}) {
-    const o = await this.getShipId(t, r), n = await this.getShipInfo(o, r), a = {
+  async realTimePosition(t, i = {}) {
+    const o = await this.getShipId(t, i), n = await this.getShipInfo(o, i), a = {
       headers: {
         appKey: this.token
       },
       json: {
         shipId: o
       }
-    }, e = "https://api3.myships.com/sp/ships/position/latest", c = await P.post(e, a).json();
-    S.info("[%s] fetch realtime position from: %s - %j", r.requestId, e, a);
-    const i = c.data[0];
-    for (const u in i)
-      !isNaN(i[u]) && Number(i[u]) !== 1 / 0 && (i[u] = Number(i[u]));
-    const { labelCn: m, labelEn: f } = await this.parseStatus(i.aisNavStatus), M = y.unix(i.posTime);
+    }, e = "https://api3.myships.com/sp/ships/position/latest", d = await R.post(e, a).json();
+    m == null || m.info("[%s] fetch realtime position from: %s - %j", i.requestId, e, a);
+    const r = d.data[0];
+    for (const l in r)
+      !isNaN(r[l]) && Number(r[l]) !== 1 / 0 && (r[l] = Number(r[l]));
+    const { labelCn: p, labelEn: M } = await this.parseStatus(r.aisNavStatus), y = b.unix(r.posTime);
     return {
       ...n,
       mmsi: t,
-      lat: Math.round(i.lat / 1e4 / 60 * 1e5) / 1e5,
-      lng: Math.round(i.lon / 1e4 / 60 * 1e5) / 1e5,
-      sog: Math.round(i.sog / 10 * 100) / 100,
-      cog: Math.round(i.cog / 10 * 100) / 100,
-      hdg: Math.round(i.heading * 100) / 100,
-      rot: Math.round(i.rot * 100) / 100,
-      positionTime: i.posTime,
-      utc: M.utc().format(),
-      status: i.aisNavStatus,
-      labelEn: f,
-      labelCn: m,
+      lat: Math.round(r.lat / 1e4 / 60 * 1e5) / 1e5,
+      lng: Math.round(r.lon / 1e4 / 60 * 1e5) / 1e5,
+      sog: Math.round(r.sog / 10 * 100) / 100,
+      cog: Math.round(r.cog / 10 * 100) / 100,
+      hdg: Math.round(r.heading * 100) / 100,
+      rot: Math.round(r.rot * 100) / 100,
+      positionTime: r.posTime,
+      utc: y.utc().format(),
+      status: r.aisNavStatus,
+      labelEn: M,
+      labelCn: p,
       method: "position",
       vendor: "myship"
     };
   }
-  async trajectory(t, r, o, n, a = !0, e = {}) {
-    const c = y(r), i = y(o), m = await this.getShipId(t), f = await this.getShipInfo(m), M = [];
-    for (; i.diff(c, "day", !0) > 30; )
-      await this.trajectoryIn30Day(m, c.unix(), c.add(30, "day").unix(), f, t, n, M);
-    return await this.trajectoryIn30Day(m, c.unix(), i.unix(), f, t, n, M), M;
+  async trajectory(t, i, o, n, a = !0, e = {}) {
+    const d = b(i), r = b(o), p = await this.getShipId(t), M = await this.getShipInfo(p), y = [];
+    for (; r.diff(d, "day", !0) > 30; )
+      await this.trajectoryIn30Day(p, d.unix(), d.add(30, "day").unix(), M, t, n, y);
+    return await this.trajectoryIn30Day(p, d.unix(), r.unix(), M, t, n, y), y;
   }
-  async trajectoryIn30Day(t, r, o, n, a, e, c, i = {}) {
+  async trajectoryIn30Day(t, i, o, n, a, e, d, r = {}) {
     var Y;
-    const m = {
+    const p = {
       headers: {
         appKey: this.token
       },
       json: {
         shipId: t,
-        startTime: r,
+        startTime: i,
         endTime: o
       }
-    }, f = "https://api3.myships.com/sp/ships/position/history", M = await P.post(f, m).json();
-    if (S.info("[%s] fetch trajectory from: %s - %j", i.requestId, f, m), M.code !== "0")
-      return S.warn("[%s] invoke myship trajectory failed: %j", i.requestId, M), M;
-    const h = M.data;
-    for (const d in h)
-      !isNaN(h[d]) && Number(h[d]) !== 1 / 0 && (h[d] = Number(h[d]));
-    const u = y.unix((Y = h[0]) == null ? void 0 : Y.posTime);
-    let b = -1;
-    for (const d of h) {
-      const g = y.unix(d.posTime), l = {
+    }, M = "https://api3.myships.com/sp/ships/position/history", y = await R.post(M, p).json();
+    if (m == null || m.info("[%s] fetch trajectory from: %s - %j", r.requestId, M, p), y.code !== "0")
+      return m == null || m.warn("[%s] invoke myship trajectory failed: %j", r.requestId, y), y;
+    const f = y.data;
+    for (const u in f)
+      !isNaN(f[u]) && Number(f[u]) !== 1 / 0 && (f[u] = Number(f[u]));
+    const l = b.unix((Y = f[0]) == null ? void 0 : Y.posTime);
+    let v = -1;
+    for (const u of f) {
+      const c = b.unix(u.posTime), h = {
         imo: n == null ? void 0 : n.imo,
         mmsi: a,
-        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: g.unix(),
-        utc: g.utc().format(),
+        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: c.unix(),
+        utc: c.utc().format(),
         method: "trajectory",
         vendor: "myship"
-      }, v = Math.floor(g.diff(u, "minute", !0) / (e || 1));
-      v !== b && (b = v, c.push(l));
+      }, w = Math.floor(c.diff(l, "minute", !0) / (e || 1));
+      w !== v && (v = w, d.push(h));
     }
-    return c;
+    return d;
   }
 }
-const B = K.getLogger("vessel");
-var et = /* @__PURE__ */ ((I) => (I.NOTICE = "NOTICE", I.WARN = "WARN", I.HEAVY = "HEAVY", I.SEVERE = "SEVERE", I.ERROR = "ERROR", I.FATAL = "FATAL", I))(et || {});
+let C;
+try {
+  C = z.getLogger("vessel");
+} catch {
+} finally {
+}
+var et = /* @__PURE__ */ ((k) => (k.NOTICE = "NOTICE", k.WARN = "WARN", k.HEAVY = "HEAVY", k.SEVERE = "SEVERE", k.ERROR = "ERROR", k.FATAL = "FATAL", k))(et || {});
 class st {
   /**
    * 解析告警规则, 多规则场景
@@ -496,20 +506,20 @@ class st {
    * @param options
    */
   parsePrinciple(s, t = {}) {
-    var e, c, i;
-    B.info("[%s] parse rule: %s", t.requestId, s);
-    const r = new RegExp("(?<=\\[)(.+)(?=])", "g"), o = s.match(r) ? (e = s.match(r)) == null ? void 0 : e[0] : void 0, n = o == null ? void 0 : o.split(";");
+    var e, d, r;
+    C == null || C.info("[%s] parse rule: %s", t.requestId, s);
+    const i = new RegExp("(?<=\\[)(.+)(?=])", "g"), o = s.match(i) ? (e = s.match(i)) == null ? void 0 : e[0] : void 0, n = o == null ? void 0 : o.split(";");
     if (!n)
       return;
     const a = {};
-    for (let m = 0; m < (n == null ? void 0 : n.length); m++) {
-      const f = (i = (c = n[m].match(r)) == null ? void 0 : c[0]) == null ? void 0 : i.split("],");
-      if (m === 0 && !f)
+    for (let p = 0; p < (n == null ? void 0 : n.length); p++) {
+      const M = (r = (d = n[p].match(i)) == null ? void 0 : d[0]) == null ? void 0 : r.split("],");
+      if (p === 0 && !M)
         a.scope = n[0];
-      else if (f)
-        for (let M = 0, h = f.length; M < h; M++) {
-          const u = this.parseRule(f[M]);
-          u && (a[u.level] ? u.key ? a[u.level][u == null ? void 0 : u.key] = u : a[u.level] = u : u.key ? a[u.level] = { [u == null ? void 0 : u.key]: u } : a[u.level] = u);
+      else if (M)
+        for (let y = 0, f = M.length; y < f; y++) {
+          const l = this.parseRule(M[y]);
+          l && (a[l.level] ? l.key ? a[l.level][l == null ? void 0 : l.key] = l : a[l.level] = l : l.key ? a[l.level] = { [l == null ? void 0 : l.key]: l } : a[l.level] = l);
         }
     }
     return a;
@@ -522,8 +532,8 @@ class st {
    */
   parseRule(s, t = {}) {
     var a;
-    B.info("[%s] parse rule: %s", t.requestId, s), s = s.startsWith("[") ? s : `[${s}`, s = s.endsWith("]") ? s : `${s}]`;
-    const r = new RegExp("(?<=\\[)(.+?)(?=])", "g"), o = (a = s == null ? void 0 : s.match(r)) == null ? void 0 : a[0], n = o == null ? void 0 : o.split(",");
+    C == null || C.info("[%s] parse rule: %s", t.requestId, s), s = s.startsWith("[") ? s : `[${s}`, s = s.endsWith("]") ? s : `${s}]`;
+    const i = new RegExp("(?<=\\[)(.+?)(?=])", "g"), o = (a = s == null ? void 0 : s.match(i)) == null ? void 0 : a[0], n = o == null ? void 0 : o.split(",");
     if (n)
       return {
         operator: n[0],
@@ -539,20 +549,26 @@ class st {
    * @param principle 告警规则
    * @param options
    */
-  checkWeather(s, t, r = {}) {
-    var u, b, Y, d, g, l, v, k, p, x, N, C, T, w, A;
+  checkWeather(s, t, i = {}) {
+    var l, v, Y, u, c, h, w, I, g, F, x, A, T, S, L;
     let o = 0, n = 0, a = 0, e = 0;
-    const c = Math.round(((b = (u = t == null ? void 0 : t.SEVERE) == null ? void 0 : u.sigWave) == null ? void 0 : b.number) * 1.6 * 100) / 100, i = (d = (Y = t == null ? void 0 : t.SEVERE) == null ? void 0 : Y.sigWave) == null ? void 0 : d.number, m = (l = (g = t == null ? void 0 : t.HEAVY) == null ? void 0 : g.sigWave) == null ? void 0 : l.number, f = Math.round((((k = (v = t == null ? void 0 : t.SEVERE) == null ? void 0 : v.wind) == null ? void 0 : k.number) + 2) * 100) / 100, M = (x = (p = t == null ? void 0 : t.SEVERE) == null ? void 0 : p.wind) == null ? void 0 : x.number, h = (C = (N = t == null ? void 0 : t.HEAVY) == null ? void 0 : N.wind) == null ? void 0 : C.number;
-    for (let O = 0; O < (s == null ? void 0 : s.length); O++) {
-      const j = s[O], E = (w = (T = j == null ? void 0 : j.meteo) == null ? void 0 : T.wave) == null ? void 0 : w.sig, q = (A = j == null ? void 0 : j.meteo) == null ? void 0 : A.wind, W = O ? y(j.eta).diff(y(s[O - 1].eta), "hour", !0) : 0;
-      e = W > e ? W : e, B.info("[%s] check sig.wave: %j", r.requestId, { ...E, dgThd4Wv: c, svThd4Wv: i, hvThd4Wv: m }), (E == null ? void 0 : E.height) >= c ? j.isDangerous = !0 : (E == null ? void 0 : E.height) >= i ? j.isSevere = !0 : (E == null ? void 0 : E.height) >= m && (j.isHeavy = !0), B.info("[%s] check wind: %j", r.requestId, { ...q, dgThd4Wd: f, svThd4Wd: M, hvThd4Wd: h }), (q == null ? void 0 : q.scale) >= f ? (j.isDangerous = !0, delete j.isSevere, delete j.isHeavy) : (q == null ? void 0 : q.scale) > M ? (j.isDangerous || (j.isSevere = !0), delete j.isHeavy) : (q == null ? void 0 : q.scale) === h && !j.isDangerous && !j.isSevere && (j.isHeavy = !0), o += j.isDangerous ? W : 0, n += j.isSevere ? W : 0, a += j.isHeavy ? W : 0;
+    const d = Math.round(((v = (l = t == null ? void 0 : t.SEVERE) == null ? void 0 : l.sigWave) == null ? void 0 : v.number) * 1.6 * 100) / 100, r = (u = (Y = t == null ? void 0 : t.SEVERE) == null ? void 0 : Y.sigWave) == null ? void 0 : u.number, p = (h = (c = t == null ? void 0 : t.HEAVY) == null ? void 0 : c.sigWave) == null ? void 0 : h.number, M = Math.round((((I = (w = t == null ? void 0 : t.SEVERE) == null ? void 0 : w.wind) == null ? void 0 : I.number) + 2) * 100) / 100, y = (F = (g = t == null ? void 0 : t.SEVERE) == null ? void 0 : g.wind) == null ? void 0 : F.number, f = (A = (x = t == null ? void 0 : t.HEAVY) == null ? void 0 : x.wind) == null ? void 0 : A.number;
+    for (let V = 0; V < (s == null ? void 0 : s.length); V++) {
+      const j = s[V], q = (S = (T = j == null ? void 0 : j.meteo) == null ? void 0 : T.wave) == null ? void 0 : S.sig, P = (L = j == null ? void 0 : j.meteo) == null ? void 0 : L.wind, _ = V ? b(j.eta).diff(b(s[V - 1].eta), "hour", !0) : 0;
+      e = _ > e ? _ : e, C == null || C.info("[%s] check sig.wave: %j", i.requestId, { ...q, dgThd4Wv: d, svThd4Wv: r, hvThd4Wv: p }), (q == null ? void 0 : q.height) >= d ? j.isDangerous = !0 : (q == null ? void 0 : q.height) >= r ? j.isSevere = !0 : (q == null ? void 0 : q.height) >= p && (j.isHeavy = !0), C == null || C.info("[%s] check wind: %j", i.requestId, { ...P, dgThd4Wd: M, svThd4Wd: y, hvThd4Wd: f }), (P == null ? void 0 : P.scale) >= M ? (j.isDangerous = !0, delete j.isSevere, delete j.isHeavy) : (P == null ? void 0 : P.scale) > y ? (j.isDangerous || (j.isSevere = !0), delete j.isHeavy) : (P == null ? void 0 : P.scale) === f && !j.isDangerous && !j.isSevere && (j.isHeavy = !0), o += j.isDangerous ? _ : 0, n += j.isSevere ? _ : 0, a += j.isHeavy ? _ : 0;
     }
-    return o = Math.round(o * 100) / 100, n = Math.round(n * 100) / 100, a = Math.round(a * 100) / 100, e = Math.round(e), { sample: s, dangerous: o, severe: n, heavy: a, step: e < 3 ? 3 : e, wind: { dgThd4Wd: f, svThd4Wd: M, hvThd4Wd: h }, sig: { dgThd4Wv: c, svThd4Wv: i, hvThd4Wv: m } };
+    return o = Math.round(o * 100) / 100, n = Math.round(n * 100) / 100, a = Math.round(a * 100) / 100, e = Math.round(e), { sample: s, dangerous: o, severe: n, heavy: a, step: e < 3 ? 3 : e, wind: { dgThd4Wd: M, svThd4Wd: y, hvThd4Wd: f }, sig: { dgThd4Wv: d, svThd4Wv: r, hvThd4Wv: p } };
   }
 }
-const Mt = new st(), V = K.getLogger("vessel");
-var at = /* @__PURE__ */ ((I) => (I.common = "common", I.container = "container", I))(at || {}), ot = /* @__PURE__ */ ((I) => (I.Ballast = "Ballast", I.Laden = "Laden", I))(ot || {}), nt = /* @__PURE__ */ ((I) => (I.Cp = "CP", I.Perf = "Basis", I.Instruct = "Other", I))(nt || {});
-class H {
+const Mt = new st();
+let D;
+try {
+  D = z.getLogger("vessel");
+} catch {
+} finally {
+}
+var at = /* @__PURE__ */ ((k) => (k.common = "common", k.container = "container", k))(at || {}), ot = /* @__PURE__ */ ((k) => (k.Ballast = "Ballast", k.Laden = "Laden", k))(ot || {}), nt = /* @__PURE__ */ ((k) => (k.Cp = "CP", k.Perf = "Basis", k.Instruct = "Other", k))(nt || {});
+class E {
   /**
    * @see https://baike.baidu.com/item/%E6%96%B9%E5%BD%A2%E7%B3%BB%E6%95%B0/4965568?fr=aladdin
    * 方形系数（block coefficient）
@@ -565,10 +581,10 @@ class H {
    * @param draught 吃水 m
    * @return [0.55, 0.85]
    */
-  static blockCoefficient(s, t, r, o) {
-    let n = Math.round(s / (t * r * o) * 100) / 100;
+  static blockCoefficient(s, t, i, o) {
+    let n = Math.round(s / (t * i * o) * 100) / 100;
     n = n < 0.55 ? 0.55 : n > 0.85 ? 0.85 : n;
-    const a = [0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85], e = a.map((c) => Math.abs(c - n));
+    const a = [0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85], e = a.map((d) => Math.abs(d - n));
     return a[e.indexOf(Math.min(...e))];
   }
   /**
@@ -582,8 +598,8 @@ class H {
    * @param g 重力加速度 9.80 m/s^2
    * @return [0.05, 0.30]
    */
-  static froudeNumber(s, t, r = 9.8) {
-    let o = Math.round(Math.sqrt(s * s / (r * t)) * 100) / 100;
+  static froudeNumber(s, t, i = 9.8) {
+    let o = Math.round(Math.sqrt(s * s / (i * t)) * 100) / 100;
     return o = o < 0.05 ? 0.05 : o > 0.3 ? 0.3 : o, o;
   }
   /**
@@ -593,7 +609,7 @@ class H {
    * @param loadCondition
    * @private
    */
-  static amendFactor(s, t, r) {
+  static amendFactor(s, t, i) {
     const o = {
       0.55: [1.7, -1.4, -7.4],
       0.6: [2.2, -2.5, -9.7],
@@ -612,7 +628,7 @@ class H {
       0.8: [3, -16.3, -21.6],
       0.85: [3.4, -20.9, 31.8]
     }[s];
-    return r === "Laden" && (a = o[s]), a[0] + a[1] * t + a[2] * Math.pow(t, 2);
+    return i === "Laden" && (a = o[s]), a[0] + a[1] * t + a[2] * Math.pow(t, 2);
   }
   /**
    * 失速方向因子
@@ -626,8 +642,8 @@ class H {
    * @private
    */
   static directionFactor(s, t = 0) {
-    let r;
-    return s > 30 && s <= 60 ? r = (1.7 - 0.03 * Math.pow(t - 4, 2)) / 2 : s > 60 && s <= 150 ? r = (0.9 - 0.06 * Math.pow(t - 6, 2)) / 2 : r = (0.4 - 0.03 * Math.pow(t - 8, 2)) / 2, Math.round(r * 1e5) / 1e5;
+    let i;
+    return s > 30 && s <= 60 ? i = (1.7 - 0.03 * Math.pow(t - 4, 2)) / 2 : s > 60 && s <= 150 ? i = (0.9 - 0.06 * Math.pow(t - 6, 2)) / 2 : i = (0.4 - 0.03 * Math.pow(t - 8, 2)) / 2, Math.round(i * 1e5) / 1e5;
   }
   /**
    * 失速船型因子
@@ -640,10 +656,10 @@ class H {
    * @param bn
    * @private
    */
-  static vesselTagFactor(s, t, r, o = 0) {
+  static vesselTagFactor(s, t, i, o = 0) {
     o = o > 5 ? o - 0.9 * (o - 5) : o;
     let n;
-    return r === "container" ? n = 0.7 * o + Math.pow(o, 6.5) / (22 * Math.pow(s, 2 / 3)) : t === "Ballast" ? n = 0.7 * o + Math.pow(o, 6.5) / (2.7 * Math.pow(s, 2 / 3)) : n = 0.5 * o + Math.pow(o, 6.5) / (2.7 * Math.pow(s, 2 / 3)), n;
+    return i === "container" ? n = 0.7 * o + Math.pow(o, 6.5) / (22 * Math.pow(s, 2 / 3)) : t === "Ballast" ? n = 0.7 * o + Math.pow(o, 6.5) / (2.7 * Math.pow(s, 2 / 3)) : n = 0.5 * o + Math.pow(o, 6.5) / (2.7 * Math.pow(s, 2 / 3)), n;
   }
   /**
    * 浪高影响因子
@@ -661,21 +677,21 @@ class H {
    * @param bearing 方位角
    * @private
    */
-  static assembleProperties(s, t, r, o) {
-    var m, f;
-    const n = s.lbp ?? s.length ?? s.lengthOverall ?? 198.9642, a = s.draught ?? 8, e = s.breadthMoulded ?? s.breadth ?? s.breadthExtreme ?? 32.4572, c = s.deadweight ?? 67035.7773;
+  static assembleProperties(s, t, i, o) {
+    var p, M;
+    const n = s.lbp ?? s.length ?? s.lengthOverall ?? 198.9642, a = s.draught ?? 8, e = s.breadthMoulded ?? s.breadth ?? s.breadthExtreme ?? 32.4572, d = s.deadweight ?? 67035.7773;
     return {
       // @ts-ignore
-      tag: ((f = (m = s == null ? void 0 : s.type) == null ? void 0 : m.toLowerCase()) == null ? void 0 : f.indexOf("container")) > -1 ? "container" : "common",
+      tag: ((M = (p = s == null ? void 0 : s.type) == null ? void 0 : p.toLowerCase()) == null ? void 0 : M.indexOf("container")) > -1 ? "container" : "common",
       lbp: n,
       loadCondition: t,
       draught: a,
       breadthMoulded: e,
       // 排水量（吨）= 载重量（吨）/ 1.025 + 吃水（米）× 船舶型宽（米）× 船舶型长（米）× 0.7
       // 其中，1.025是指海水的密度，吨是指公吨，吃水是指船舶的最大吃水深度。船舶型宽是指船舶的最大型宽，船舶型长是指船舶的设计型长。上述公式是针对常规船舶适用的，不同类型的船舶可能会有一些差异。
-      displacement: Math.round((c / 1.025 + a * e * n * 0.7) * 1e4) / 1e4,
+      displacement: Math.round((d / 1.025 + a * e * n * 0.7) * 1e4) / 1e4,
       // 换算为m/s
-      speed: Math.round((r ?? 14.1382) * 1852 / 3600 * 1e4) / 1e4,
+      speed: Math.round((i ?? 14.1382) * 1852 / 3600 * 1e4) / 1e4,
       bearing: o || 90
     };
   }
@@ -688,17 +704,17 @@ class H {
    * @param role 1: 船东, 2: 租家, 0: 未知
    * @param useRouteParam true 启用设置速度
    */
-  static async speedLoseAt(s, t, r, o = "", n = 2, a = !1, e = {}) {
-    t.velocity && !t.noFactor && a && (s.speed = _.roundPrecision(t.velocity * 1852 / 3600, 6));
-    const c = await tt.queryPointFactor(t.lng, t.lat, r.valueOf(), "wind,wave,current,watertemp", o, e), i = H.weatherFactor(s, c), m = H.currentFactor(s.bearing, c == null ? void 0 : c.current, n), f = {
-      meteo: { ...c },
-      wxFactor: i,
-      cFactor: m,
-      speed: t.velocity && a ? t.velocity : Math.round((s.speed * 1.943844 + i + m) * 100) / 100,
-      eta: r.utc().format("YYYY-MM-DDTHH:mm[Z]"),
-      etd: r.utc().format("YYYY-MM-DDTHH:mm[Z]")
+  static async speedLoseAt(s, t, i, o = "", n = 2, a = !1, e = {}) {
+    t.velocity && !t.noFactor && a && (s.speed = Z.roundPrecision(t.velocity * 1852 / 3600, 6));
+    const d = await tt.queryPointFactor(t.lng, t.lat, i.valueOf(), "wind,wave,current,watertemp", o, e), r = E.weatherFactor(s, d), p = E.currentFactor(s.bearing, d == null ? void 0 : d.current, n), M = {
+      meteo: { ...d },
+      wxFactor: r,
+      cFactor: p,
+      speed: t.velocity && a ? t.velocity : Math.round((s.speed * 1.943844 + r + p) * 100) / 100,
+      eta: i.utc().format("YYYY-MM-DDTHH:mm[Z]"),
+      etd: i.utc().format("YYYY-MM-DDTHH:mm[Z]")
     };
-    return delete t.meteo, delete t.wxFactor, delete t.cFactor, delete t.speed, delete t.etd, { ...f, ...t };
+    return delete t.meteo, delete t.wxFactor, delete t.cFactor, delete t.speed, delete t.etd, { ...M, ...t };
   }
   /**
    * 基于步长计算失速样本
@@ -712,52 +728,52 @@ class H {
    * @param useRouteParam true 启用航线上设置的参数 { suspend: 停留时长（小时）, velocity: 速度（kts）}
    * @private
    */
-  static async speedLoseInHoursStep(s, t, r, o, n, a, e = "", c = !1, i = {}) {
+  static async speedLoseInHoursStep(s, t, i, o, n, a, e = "", d = !1, r = {}) {
     t.utc();
-    const m = [], f = [];
-    let M = 0, h = 0, u, b;
+    const p = [], M = [];
+    let y = 0, f = 0, l, v;
     for (let Y = 0; Y < a.length - 1; Y++) {
-      let d = a[Y];
-      d.distanceFromStart = n + h;
-      const g = a[Y + 1];
-      if (s.bearing = R.calculateBearing(d, g, !g.gcToPrevious), d.bearing = s.bearing, d.suspend && c) {
-        d.eta = d.eta || t.format("YYYY-MM-DDTHH:mm[Z]"), d.elapsed = d.elapsed ?? 0;
-        const k = d.suspend - d.elapsed;
-        if (o - M > k)
-          o = o - M - k, t.add(k, "hour"), d.elapsed = d.suspend;
+      let u = a[Y];
+      u.distanceFromStart = n + f;
+      const c = a[Y + 1];
+      if (s.bearing = O.calculateBearing(u, c, !c.gcToPrevious), u.bearing = s.bearing, u.suspend && d) {
+        u.eta = u.eta || t.format("YYYY-MM-DDTHH:mm[Z]"), u.elapsed = u.elapsed ?? 0;
+        const I = u.suspend - u.elapsed;
+        if (o - y > I)
+          o = o - y - I, t.add(I, "hour"), u.elapsed = u.suspend;
         else {
-          const p = o - M;
-          d.elapsed += p, t.add(p, "hour"), o = 0;
+          const g = o - y;
+          u.elapsed += g, t.add(g, "hour"), o = 0;
         }
-        if (V.info(`[%s] suspend ${d.elapsed} hours at %j, and remain ${o} hours need to go...`, i.requestId, d), o === 0)
-          return d.distanceFromPrevious = h, { etd: t, from: b || d, to: d, next: a.filter((p) => p), wps: m, days: f };
+        if (D == null || D.info(`[%s] suspend ${u.elapsed} hours at %j, and remain ${o} hours need to go...`, r.requestId, u), o === 0)
+          return u.distanceFromPrevious = f, { etd: t, from: v || u, to: u, next: a.filter((g) => g), wps: p, days: M };
       }
-      d = await H.speedLoseAt(s, d, t, e, 0, c, i), b = b || d, d.important && m.push(d), t.isSameOrAfter(r) && (f.push(d), r.add(24, "hour"));
-      const l = R.calculateDistance(d, g, !g.gcToPrevious);
-      let v = Math.ceil(l / b.speed * 1e4) / 1e4;
-      if (M + v < o) {
-        if (M += v, t.add(v, "hour"), delete a[Y], V.info(
-          `[%s] go to %j from %j with ${l}nm, and cost ${v} hours`,
-          i.requestId,
-          { lat: g.lat, lng: g.lng },
-          { lat: b.lat, lng: b.lng, etd: b.etd }
-        ), h += l, a.filter((k) => k).length <= 1) {
-          u = g, u.eta = t.format("YYYY-MM-DDTHH:mm[Z]"), u.distanceFromPrevious = l, u.distanceFromStart = n + h, m.push(u), delete a[Y + 1];
+      u = await E.speedLoseAt(s, u, t, e, 0, d, r), v = v || u, u.important && p.push(u), t.isSameOrAfter(i) && (M.push(u), i.add(24, "hour"));
+      const h = O.calculateDistance(u, c, !c.gcToPrevious);
+      let w = Math.ceil(h / v.speed * 1e4) / 1e4;
+      if (y + w < o) {
+        if (y += w, t.add(w, "hour"), delete a[Y], D == null || D.info(
+          `[%s] go to %j from %j with ${h}nm, and cost ${w} hours`,
+          r.requestId,
+          { lat: c.lat, lng: c.lng },
+          { lat: v.lat, lng: v.lng, etd: v.etd }
+        ), f += h, a.filter((I) => I).length <= 1) {
+          l = c, l.eta = t.format("YYYY-MM-DDTHH:mm[Z]"), l.distanceFromPrevious = h, l.distanceFromStart = n + f, p.push(l), delete a[Y + 1];
           break;
         }
       } else {
-        v = o - M, t.add(v, "hour");
-        const k = _.roundPrecision(b.speed * v, 4);
-        u = R.calculateCoordinate(d, s.bearing, k, "nauticalmiles", !g.gcToPrevious), u.eta = t.format("YYYY-MM-DDTHH:mm[Z]"), a[Y] = u, V.info(
-          `[%s] go to %j from %j with ${k}nm, and cost ${v} hours`,
-          i.requestId,
-          { lat: u.lat, lng: u.lng },
-          { lat: d.lat, lng: d.lng, etd: d.etd }
-        ), h += k, u.distanceFromPrevious = h, u.distanceFromStart = n + h;
+        w = o - y, t.add(w, "hour");
+        const I = Z.roundPrecision(v.speed * w, 4);
+        l = O.calculateCoordinate(u, s.bearing, I, "nauticalmiles", !c.gcToPrevious), l.eta = t.format("YYYY-MM-DDTHH:mm[Z]"), a[Y] = l, D == null || D.info(
+          `[%s] go to %j from %j with ${I}nm, and cost ${w} hours`,
+          r.requestId,
+          { lat: l.lat, lng: l.lng },
+          { lat: u.lat, lng: u.lng, etd: u.etd }
+        ), f += I, l.distanceFromPrevious = f, l.distanceFromStart = n + f;
         break;
       }
     }
-    return { etd: t, from: b, to: u, next: a.filter((Y) => Y), wps: m, days: f };
+    return { etd: t, from: v, to: l, next: a.filter((Y) => Y), wps: p, days: M };
   }
   /**
    * 洋流影响因子
@@ -765,12 +781,12 @@ class H {
    * @param current 洋流要素
    * @param role  1: 船东, 2: 租家, 0: 未知
    */
-  static currentFactor(s, t, r = 0) {
+  static currentFactor(s, t, i = 0) {
     const o = (s - (t == null ? void 0 : t.degree) || 0) / 180 * Math.PI;
     if (Math.abs(o) === Math.PI / 2)
       return 0;
     let n = ((t == null ? void 0 : t.kts) || 0) * Math.cos(o);
-    return r & 2 ? n = Math.ceil(n * 100) / 100 : r & 1 ? n = Math.floor(n * 100) / 100 : n = Math.round(n * 100) / 100, Math.abs(n) > 5 ? 0 : n;
+    return i & 2 ? n = Math.ceil(n * 100) / 100 : i & 1 ? n = Math.floor(n * 100) / 100 : n = Math.round(n * 100) / 100, Math.abs(n) > 5 ? 0 : n;
   }
   /**
    * 风浪影响因子
@@ -778,16 +794,16 @@ class H {
    * @param wwc 气象要素
    */
   static weatherFactor(s, t) {
-    var f, M, h, u, b;
-    V.debug("calculate weather factor via: %j", { ...s, ...t });
-    const r = H.blockCoefficient(s.displacement, s.lbp, s.breadthMoulded, s.draught), o = H.froudeNumber(s.speed, s.lbp), n = H.amendFactor(r, o, s.loadCondition);
-    let a = Math.abs(s.bearing % 360 - (((f = t == null ? void 0 : t.wind) == null ? void 0 : f.degree) % 360 || 0));
+    var M, y, f, l, v;
+    D == null || D.debug("calculate weather factor via: %j", { ...s, ...t });
+    const i = E.blockCoefficient(s.displacement, s.lbp, s.breadthMoulded, s.draught), o = E.froudeNumber(s.speed, s.lbp), n = E.amendFactor(i, o, s.loadCondition);
+    let a = Math.abs(s.bearing % 360 - (((M = t == null ? void 0 : t.wind) == null ? void 0 : M.degree) % 360 || 0));
     a = a > 180 ? 360 - a : a;
-    const e = H.directionFactor(a, (M = t == null ? void 0 : t.wind) == null ? void 0 : M.scale), c = H.vesselTagFactor(s.displacement, s.loadCondition, s.tag, (h = t == null ? void 0 : t.wind) == null ? void 0 : h.scale);
-    let i = e * n * c / 100 * s.speed;
-    i = Math.round(i * 1.943844 * 1e4) / 1e4 * -1;
-    const m = H.waveHeightFactor(((b = (u = t == null ? void 0 : t.wave) == null ? void 0 : u.sig) == null ? void 0 : b.height) ?? 1);
-    return i = i * 0.24 + m * 0.76, V.debug("weather factor = %s", i), Math.round(i * 100) / 100;
+    const e = E.directionFactor(a, (y = t == null ? void 0 : t.wind) == null ? void 0 : y.scale), d = E.vesselTagFactor(s.displacement, s.loadCondition, s.tag, (f = t == null ? void 0 : t.wind) == null ? void 0 : f.scale);
+    let r = e * n * d / 100 * s.speed;
+    r = Math.round(r * 1.943844 * 1e4) / 1e4 * -1;
+    const p = E.waveHeightFactor(((v = (l = t == null ? void 0 : t.wave) == null ? void 0 : l.sig) == null ? void 0 : v.height) ?? 1);
+    return r = r * 0.24 + p * 0.76, D == null || D.debug("weather factor = %s", r), Math.round(r * 100) / 100;
   }
   /**
    * 全程失速分析(走完航程)
@@ -800,14 +816,14 @@ class H {
    * @param stepHrs 样本步长, 0表示动态计算(6 or 3 hrs)
    * @param useRouteParam
    */
-  static async analyseInstant(s, t, r, o, n, a = "", e = 0, c = !1, i = {}) {
-    var E, q, W, z, G;
-    const m = y().valueOf();
-    s.lng = _.convertToStdLng(s.lng);
-    const { route: f, waypoints: M } = n.points, h = R.calculateSubRoute(s, f);
-    if (((E = h[0]) == null ? void 0 : E.length) <= 1)
+  static async analyseInstant(s, t, i, o, n, a = "", e = 0, d = !1, r = {}) {
+    var q, P, _, G, U;
+    const p = b().valueOf();
+    s.lng = Z.convertToStdLng(s.lng);
+    const { route: M, waypoints: y } = n.points, f = O.calculateSubRoute(s, M);
+    if (((q = f[0]) == null ? void 0 : q.length) <= 1)
       return;
-    const { v0: u, label: b } = s.sog ? {
+    const { v0: l, label: v } = s.sog ? {
       v0: s.sog,
       label: "Other"
       /* Instruct */
@@ -815,40 +831,40 @@ class H {
       v0: o.speed,
       label: "CP"
       /* Cp */
-    }, Y = H.assembleProperties(r, o.loadCondition, u, 0), d = M.length ? R.calculateSubWaypoints(s, M) : [], g = {
+    }, Y = E.assembleProperties(i, o.loadCondition, l, 0), u = y.length ? O.calculateSubWaypoints(s, y) : [], c = {
       from: { ...s },
-      route: h,
-      waypoints: d,
-      v0: u,
-      label: b
-    }, l = {
+      route: f,
+      waypoints: u,
+      v0: l,
+      label: v
+    }, h = {
       hours: [],
       days: [],
       wps: []
     };
-    e || (R.calculateRouteDistance(h) / o.speed <= 72 ? e = 3 : e = 6);
-    let v = R.simplifyRouteToCoordinates(h, d, 0), k = 0, p = 0, x = 0, N = 0;
-    t = y(t).utc();
-    const C = t.clone();
-    for (; v.length > 0; ) {
-      const F = e - t.hour() % e, $ = Math.ceil(t.clone().add(F, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4, D = await H.speedLoseInHoursStep(Y, t, C, $, k, v, a, c, i);
-      (q = D.from) != null && q.speed && (l.hours.push(D.from), l.wps.push(...D.wps), l.days.push(...D.days)), v = D == null ? void 0 : D.next, v.length || l.hours.push(D == null ? void 0 : D.to), k += ((W = D == null ? void 0 : D.to) == null ? void 0 : W.distanceFromPrevious) ?? 0;
+    e || (O.calculateRouteDistance(f) / o.speed <= 72 ? e = 3 : e = 6);
+    let w = O.simplifyRouteToCoordinates(f, u, 0), I = 0, g = 0, F = 0, x = 0;
+    t = b(t).utc();
+    const A = t.clone();
+    for (; w.length > 0; ) {
+      const H = e - t.hour() % e, W = Math.ceil(t.clone().add(H, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4, N = await E.speedLoseInHoursStep(Y, t, A, W, I, w, a, d, r);
+      (P = N.from) != null && P.speed && (h.hours.push(N.from), h.wps.push(...N.wps), h.days.push(...N.days)), w = N == null ? void 0 : N.next, w.length || h.hours.push(N == null ? void 0 : N.to), I += ((_ = N == null ? void 0 : N.to) == null ? void 0 : _.distanceFromPrevious) ?? 0;
     }
-    const T = l.hours;
-    for (let F = 0; F < T.length - 1; F++) {
-      const $ = y(T[F + 1].eta).diff(T[F].etd, "hour", !0) || 1;
-      p += T[F].wxFactor * $, x += T[F].cFactor * $, N += $;
+    const T = h.hours;
+    for (let H = 0; H < T.length - 1; H++) {
+      const W = b(T[H + 1].eta).diff(T[H].etd, "hour", !0) || 1;
+      g += T[H].wxFactor * W, F += T[H].cFactor * W, x += W;
     }
-    (z = l.wps) == null || z.forEach((F, $) => {
-      if ($) {
-        const D = l.wps[$ - 1], J = F.distanceFromStart - D.distanceFromStart, U = y(F.eta).diff(y(D.etd), "h", !0);
-        U < 1 ? F.avgSpd = D.speed : F.avgSpd = Math.round(J / U * 100) / 100;
+    (G = h.wps) == null || G.forEach((H, W) => {
+      if (W) {
+        const N = h.wps[W - 1], Q = H.distanceFromStart - N.distanceFromStart, J = b(H.eta).diff(b(N.etd), "h", !0);
+        J < 1 ? H.avgSpd = N.speed : H.avgSpd = Math.round(Q / J * 100) / 100;
       }
-    }), g.sample = l;
-    const w = l.hours.at(-1);
-    g.distance = Math.round(w.distanceFromStart * 1e4) / 1e4, g.eta = y(w.eta).toDate(), g.wxFactor = Math.round(p / N * 1e4) / 1e4, g.cFactor = Math.round(x / N * 1e4) / 1e4, g.avgSpeed = Math.round(w.distanceFromStart / N * 1e4) / 1e4, g.totalHrs = Math.round(N * 1e4) / 1e4, g.totalFoCons = Math.round((o == null ? void 0 : o.fo) / 24 * g.totalHrs * 1e3) / 1e3, g.totalDgoCons = Math.round((o == null ? void 0 : o.dgo) / 24 * g.totalHrs * 1e3) / 1e3;
-    const O = y().valueOf() - m, j = ((G = l == null ? void 0 : l.hours) == null ? void 0 : G.length) || 1;
-    return V.info("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", i == null ? void 0 : i.requestId, O, j, Math.round(O / j * 1e3) / 1e3), g;
+    }), c.sample = h;
+    const S = h.hours.at(-1);
+    c.distance = Math.round(S.distanceFromStart * 1e4) / 1e4, c.eta = b(S.eta).toDate(), c.wxFactor = Math.round(g / x * 1e4) / 1e4, c.cFactor = Math.round(F / x * 1e4) / 1e4, c.avgSpeed = Math.round(S.distanceFromStart / x * 1e4) / 1e4, c.totalHrs = Math.round(x * 1e4) / 1e4, c.totalFoCons = Math.round((o == null ? void 0 : o.fo) / 24 * c.totalHrs * 1e3) / 1e3, c.totalDgoCons = Math.round((o == null ? void 0 : o.dgo) / 24 * c.totalHrs * 1e3) / 1e3;
+    const V = b().valueOf() - p, j = ((U = h == null ? void 0 : h.hours) == null ? void 0 : U.length) || 1;
+    return D == null || D.info("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", r == null ? void 0 : r.requestId, V, j, Math.round(V / j * 1e3) / 1e3), c;
   }
   /**
    * 分段失速分析（最多走hours 小时）
@@ -861,56 +877,59 @@ class H {
    * @param source 气象数据源，GFS or CMEMES, 默认CMEMS
    * @param stepHrs
    */
-  static async analyseInstantWithThreshed(s, t, r, o, n, a, e = "", c = 3, i = !1, m = {}) {
-    var x, N, C;
-    s.lng = _.convertToStdLng(s.lng);
-    const f = H.assembleProperties(o, n.loadCondition, n.speed, 0), M = R.calculateSubRoute(s, a);
-    if (((x = M[0]) == null ? void 0 : x.length) <= 1)
+  static async analyseInstantWithThreshed(s, t, i, o, n, a, e = "", d = 3, r = !1, p = {}) {
+    var F, x, A;
+    s.lng = Z.convertToStdLng(s.lng);
+    const M = E.assembleProperties(o, n.loadCondition, n.speed, 0), y = O.calculateSubRoute(s, a);
+    if (((F = y[0]) == null ? void 0 : F.length) <= 1)
       return;
-    let h = R.simplifyRouteToCoordinates(M, [], 0), u = 0, b = 0, Y = 0, d = 0, g;
-    const l = {
+    let f = O.simplifyRouteToCoordinates(y, [], 0);
+    f.forEach((T) => T.important = !0);
+    let l = 0, v = 0, Y = 0, u = 0, c;
+    const h = {
       hours: [],
+      wps: [],
       days: []
     };
-    for (t = y(t).utc(); h.length > 0; ) {
-      const T = c - t.hour() % c;
-      let w = Math.ceil(t.clone().add(T, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4;
-      if (w = t.clone().add(w, "h").isAfter(r) ? r.diff(t, "h", !0) * 1e4 / 1e4 : w, w)
-        g = await H.speedLoseInHoursStep(f, t, r.clone(), w, u, h, e, i, m), (N = g.from) != null && N.speed && l.hours.push(g.from), h = g == null ? void 0 : g.next, h.length || (l.hours.push(g == null ? void 0 : g.to), l.days.push(g.to)), u += ((C = g == null ? void 0 : g.to) == null ? void 0 : C.distanceFromPrevious) ?? 0;
+    for (t = b(t).utc(); f.length > 0; ) {
+      const T = d - t.hour() % d;
+      let S = Math.ceil(t.clone().add(T, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4;
+      if (S = t.clone().add(S, "h").isAfter(i) ? i.diff(t, "h", !0) * 1e4 / 1e4 : S, S)
+        c = await E.speedLoseInHoursStep(M, t, i.clone(), S, l, f, e, r, p), (x = c.from) != null && x.speed && (h.hours.push(c.from), c != null && c.wps && h.wps.push(...c.wps), h.days.push(...c.days)), f = c == null ? void 0 : c.next, f.length || (h.hours.push(c == null ? void 0 : c.to), c != null && c.wps && h.wps.push(...c.wps), h.days.push(c == null ? void 0 : c.to)), l += ((A = c == null ? void 0 : c.to) == null ? void 0 : A.distanceFromPrevious) ?? 0;
       else {
-        g && (l.hours.push(g.to), l.days.push(g.to));
+        c && (h.hours.push(c.to), c != null && c.wps && h.wps.push(...c.wps), h.days.push(c.to));
         break;
       }
     }
-    const v = l.hours;
-    for (let T = 0; T < v.length - 1; T++) {
-      const w = y(v[T + 1].eta).diff(v[T].etd, "hour", !0);
-      b += v[T].wxFactor * w, Y += v[T].cFactor * w, d += w;
+    const w = h.hours;
+    for (let T = 0; T < w.length - 1; T++) {
+      const S = b(w[T + 1].eta).diff(w[T].etd, "hour", !0);
+      v += w[T].wxFactor * S, Y += w[T].cFactor * S, u += S;
     }
-    const k = l.hours.at(-1);
+    const I = h.hours.at(-1);
     return {
-      sample: l,
-      distance: Math.round(((k == null ? void 0 : k.distanceFromStart) || 0) * 1e4) / 1e4,
-      eta: y(k == null ? void 0 : k.eta).utc().format(),
-      wxFactor: Math.round(b / d * 1e4) / 1e4,
-      cFactor: Math.round(Y / d * 1e4) / 1e4,
-      avgSpeed: Math.round(((k == null ? void 0 : k.distanceFromStart) || 0) / d * 1e4) / 1e4,
-      totalHrs: Math.round(d * 1e4) / 1e4,
-      to: k,
-      route: R.generateRouteAccordingToWaypoints(h)
+      sample: h,
+      distance: Math.round(((I == null ? void 0 : I.distanceFromStart) || 0) * 1e4) / 1e4,
+      eta: b(I == null ? void 0 : I.eta).utc().format(),
+      wxFactor: Math.round(v / u * 1e4) / 1e4,
+      cFactor: Math.round(Y / u * 1e4) / 1e4,
+      avgSpeed: Math.round(((I == null ? void 0 : I.distanceFromStart) || 0) / u * 1e4) / 1e4,
+      totalHrs: Math.round(u * 1e4) / 1e4,
+      to: I,
+      route: O.generateRouteAccordingToWaypoints(f)
     };
   }
 }
 export {
-  Z as AISImpl,
+  K as AISImpl,
   st as AlertHelper,
   et as AlertLevel,
-  mt as HifleetImpl,
+  ft as HifleetImpl,
   ot as LoadCondition,
-  gt as MyShipImpl,
+  pt as MyShipImpl,
   lt as MyVesselImpl,
-  ft as ShipxyImpl,
-  H as SpeedHelper,
+  mt as ShipxyImpl,
+  E as SpeedHelper,
   nt as SpeedLabel,
   at as VesselTag,
   Mt as alertHelper