@idm-plugin/vessel 2.3.3 → 2.3.5

package/dist/index.js

@@ -1,15 +1,15 @@
 var ht = Object.defineProperty;
-var lt = (E, e, t) => e in E ? ht(E, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : E[e] = t;
-var U = (E, e, t) => (lt(E, typeof e != "symbol" ? e + "" : e, t), t);
+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 ct from "@log4js-node/log4js-api";
 import w from "moment";
 import { LngLatHelper as _, LaneHelper as W } from "@idm-plugin/geo2";
 import { MeteoHelper2 as mt } from "@idm-plugin/meteo2";
 import { Meteo2Assist as it } from "@idm-plugin/meteo";
-let M;
+let f;
 try {
-  M = ct.getLogger("vessel");
+  f = ct.getLogger("vessel");
 } catch {
 } finally {
 }
@@ -18,9 +18,9 @@ class st {
    * 解析AIS状态码
    * @param status
    */
-  parseStatus(e) {
+  parseStatus(s) {
     let t, a;
-    switch (e) {
+    switch (s) {
       case 0:
         t = "在航（主机推动）", a = "Underway Using Engine";
         break;
@@ -54,7 +54,7 @@ class st {
     return { labelCn: t, labelEn: a };
   }
 }
-class jt extends st {
+class Ft extends st {
   constructor(t, a) {
     super();
     U(this, "clientId");
@@ -70,7 +70,7 @@ class jt extends st {
         grant_type: "client_credentials"
       }
     }, o = await L.post(a, i).json();
-    M == null || M.info("[%s] fetch access token from: %s - %j", t.requestId, a, o), o.error || (this.token = {
+    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,
@@ -89,20 +89,20 @@ class jt extends st {
    * @param options
    */
   async suggest(t, a = {}) {
-    var s, r;
+    var e, r;
     await this.checkToken(a);
     const i = "https://market.myvessel.cn/sdc/v1/mkt/vessels/fuzzy", o = {
       headers: {
-        Authorization: `${(s = this.token) == null ? void 0 : s.tokenType} ${(r = this.token) == null ? void 0 : r.accessToken}`
+        Authorization: `${(e = this.token) == null ? void 0 : e.tokenType} ${(r = this.token) == null ? void 0 : r.accessToken}`
       },
       json: {
         kw: t,
         recordNum: a.ps || 10
       }
     };
-    M == null || M.info("[%s] fetch suggest vessels from: %s - %j", a.requestId, i, o);
+    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.code ? (M == null || M.warn("[%s] fetch suggest vessels failed: %j", a.requestId, { message: n.message, status: n.status, code: n.code }), []) : n.data.map((u) => ({
+    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,
@@ -122,16 +122,16 @@ class jt extends st {
   async search(t, a = {}) {
     var c, u;
     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 }, s = {
+    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 = {
       headers: {
         Authorization: `${(c = this.token) == null ? void 0 : c.tokenType} ${(u = this.token) == null ? void 0 : u.accessToken}`
       },
       searchParams: n
     };
-    M == null || M.info("[%s] fetch vessel from: %s - %j", a.requestId, o, s);
-    const r = await L.get(o, s).json();
+    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 M == null || M.warn("[%s] fetch suggest vessels failed: %j", a.requestId, { message: r.message, status: r.status, code: r.code }), {};
+      return f == null || f.warn("[%s] fetch suggest vessels failed: %j", a.requestId, { message: r.message, status: r.status, code: r.code }), {};
     {
       const l = r.data;
       if (l)
@@ -162,19 +162,19 @@ class jt extends st {
     return {};
   }
   async archives(t, a = {}) {
-    var s, r;
+    var e, r;
     await this.checkToken(a);
     const i = "https://svc.data.myvessel.cn/sdc/v1/ship/info/batch", o = {
       headers: {
-        Authorization: `${(s = this.token) == null ? void 0 : s.tokenType} ${(r = this.token) == null ? void 0 : r.accessToken}`
+        Authorization: `${(e = this.token) == null ? void 0 : e.tokenType} ${(r = this.token) == null ? void 0 : r.accessToken}`
       },
       json: {
         mmsiList: typeof t == "number" ? [t] : t
       }
     };
-    M == null || M.info("[%s] fetch vessel archive from: %s - %j", a.requestId, i, o);
+    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 ? (M == null || M.warn("[%s] fetch vessel archive failed: %j", a.requestId, { message: n.message, status: n.status, code: n.code }), {}) : n.data;
+    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;
   }
   async realTimePosition(t, a = {}) {
     var r, c;
@@ -185,42 +185,42 @@ class jt extends st {
       },
       searchParams: { mmsi: t }
     };
-    M == null || M.info("[%s] fetch realtime position from: %s - %j", a.requestId, i, o);
+    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 M == null || M.warn("[%s] fetch realtime position failed: %j", a.requestId, { message: n.message, status: n.status, code: n.code }), n;
-    const s = n.data;
-    for (const u in s)
-      !isNaN(s[u]) && Number(s[u]) !== 1 / 0 && (s[u] = Number(s[u]));
-    if (s) {
-      const u = w(`${s.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+      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]));
+    if (e) {
+      const u = w(`${e.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
       return {
-        mmsi: s.mmsi,
-        name: s.vesselName || s.aisVesselName,
-        imo: s.imo,
-        callSign: s.callsign || s.aisCallSign,
-        lat: s.lat,
-        lng: s.lon,
-        length: s.length,
-        width: s.width,
-        draught: s.currDraught,
-        sog: s.sog,
-        cog: s.cog,
-        hdg: s.hdg,
-        rot: s.rot,
-        eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(s.eta) ? w.utc(s.eta).format() : void 0,
-        destination: s.dest,
+        mmsi: e.mmsi,
+        name: e.vesselName || e.aisVesselName,
+        imo: e.imo,
+        callSign: e.callsign || e.aisCallSign,
+        lat: e.lat,
+        lng: e.lon,
+        length: e.length,
+        width: e.width,
+        draught: e.currDraught,
+        sog: e.sog,
+        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,
+        destination: e.dest,
         positionTime: u.unix(),
-        status: s.status,
-        labelCn: s.statusNameCn,
-        labelEn: s.statusNameEn,
-        vesselType: s.vesselTypeNameEn,
-        flag: s.flagCtryNameEn,
-        clasz: s.classSociety,
-        build: s.buildYear,
-        dwt: s.dwt,
-        grt: s.grt,
-        net: s.net,
+        status: e.status,
+        labelCn: e.statusNameCn,
+        labelEn: e.statusNameEn,
+        vesselType: e.vesselTypeNameEn,
+        flag: e.flagCtryNameEn,
+        clasz: e.classSociety,
+        build: e.buildYear,
+        dwt: e.dwt,
+        grt: e.grt,
+        net: e.net,
         method: "position",
         vendor: "myVessel",
         utc: u.utc().format()
@@ -228,18 +228,43 @@ class jt extends st {
     } else
       return {};
   }
-  async trajectory(t, a, i, o, n = !0, s = {}) {
-    await this.checkToken(s);
-    const r = await this.realTimePosition(t, s), c = w(a), u = w(i), l = [];
+  async calculateRoute(t, a, i = {}) {
+    var r, c;
+    await this.checkToken(i);
+    const o = "https://svc.data.myvessel.cn/sdc/v1/routes/routing/nodes", n = {
+      headers: {
+        Authorization: `${(r = this.token) == null ? void 0 : r.tokenType} ${(c = this.token) == null ? void 0 : c.accessToken}`
+      },
+      json: {
+        startPoint: {
+          lon: t.lng,
+          lat: t.lat
+        },
+        endPoint: {
+          lon: a.lng,
+          lat: a.lat
+        },
+        maxDraught: i.maxDraught || 10,
+        useAIModel: i.useAIModel || !1,
+        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();
+    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 = {}) {
+    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, s), c.add(30, "day");
-    return await this.trajectoryIn30Day(t, c, u, r, o, l, s), l;
+      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;
   }
-  async trajectoryIn30Day(t, a, i, o, n, s, r = {}) {
-    var y, F, I, p, v;
+  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 = {
       headers: {
-        Authorization: `${(y = this.token) == null ? void 0 : y.tokenType} ${(F = this.token) == null ? void 0 : F.accessToken}`
+        Authorization: `${(M = this.token) == null ? void 0 : M.tokenType} ${(j = this.token) == null ? void 0 : j.accessToken}`
       },
       json: {
         mmsi: t,
@@ -247,16 +272,16 @@ class jt extends st {
         endTime: i.utcOffset(8).format("YYYY-MM-DD HH:mm:ss")
       }
     };
-    M == null || M.info("[%s] fetch trajectory from: %s - %j", r.requestId, c, u);
+    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 M == null || M.warn("[%s] fetch trajectory failed: %j", r.requestId, c, { message: l.message, status: l.status, code: l.code }), l;
-    let f = -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 f == null || f.warn("[%s] fetch trajectory failed: %j", r.requestId, c, { message: l.message, status: l.status, code: l.code }), l;
+    let y = -1;
+    const g = 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 = {
+      const b = 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,
@@ -268,15 +293,15 @@ class jt extends st {
         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(),
+        positionTime: b.unix(),
         labelCn: h,
         labelEn: k,
         method: "trajectory",
         vendor: "myVessel",
-        utc: g.utc().format()
-      }, D = Math.floor(g.diff(b, "minute", !0) / (n || 1));
-      D !== f && (f = D, s.push(S));
-    }), s;
+        utc: b.utc().format()
+      }, D = Math.floor(b.diff(g, "minute", !0) / (n || 1));
+      D !== y && (y = D, e.push(S));
+    }), e;
   }
 }
 class Et extends st {
@@ -292,34 +317,34 @@ class Et extends st {
         usertoken: this.token
       }
     }, n = await L.post(i, o).json();
-    M == null || M.info("[%s] fetch realtime position from: %s - %j", a.requestId, i, o);
-    const s = n == null ? void 0 : n.list;
-    if (!s)
-      return M == null || M.warn("[%s] fetch realtime position failed: %j", a.requestId, i, n), n;
-    for (const b in s)
-      !isNaN(s[b]) && Number(s[b]) !== 1 / 0 && (s[b] = Number(s[b]));
-    s.status = s.sp > 3 ? 0 : 1;
-    const r = s.status, { labelCn: c, labelEn: u } = this.parseStatus(r), l = w(`${s.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    f == null || f.info("[%s] fetch realtime position from: %s - %j", a.requestId, i, o);
+    const e = n == null ? void 0 : n.list;
+    if (!e)
+      return f == null || f.warn("[%s] fetch realtime position failed: %j", a.requestId, i, n), n;
+    for (const g in e)
+      !isNaN(e[g]) && Number(e[g]) !== 1 / 0 && (e[g] = Number(e[g]));
+    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");
     return {
-      mmsi: s.m,
-      name: s.n,
-      imo: s.imonumber,
-      callSign: s.callsign,
-      lat: Math.round(s.la / 60 * 1e5) / 1e5,
-      lng: Math.round(s.lo / 60 * 1e5) / 1e5,
-      length: s.l,
-      width: s.w,
-      draught: s.draught,
-      sog: s.sp,
-      cog: s.co,
-      hdg: s.h,
-      rot: isNaN(s.rot) ? 0 : s.rot,
-      eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(s.eta) ? w.utc(s.eta).format() : void 0,
-      destination: s.destination,
-      vesselType: s.type,
-      dwt: s.dwt,
-      build: s.buildyear,
-      flag: s.fn,
+      mmsi: e.m,
+      name: e.n,
+      imo: e.imonumber,
+      callSign: e.callsign,
+      lat: Math.round(e.la / 60 * 1e5) / 1e5,
+      lng: Math.round(e.lo / 60 * 1e5) / 1e5,
+      length: e.l,
+      width: e.w,
+      draught: e.draught,
+      sog: e.sp,
+      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,
+      destination: e.destination,
+      vesselType: e.type,
+      dwt: e.dwt,
+      build: e.buildyear,
+      flag: e.fn,
       positionTime: l.unix(),
       utc: l.utc().format(),
       status: r,
@@ -342,10 +367,10 @@ class Et extends st {
       }
     };
     let n = await L.post(i, o).json();
-    M == null || M.info("[%s] fetch vessel props from: %s - %j", a.requestId, i, o), n instanceof Array && (n = n[0]);
+    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]));
-    const s = {
+    const e = {
       mmsi: n.m,
       name: n.n,
       imo: n.i,
@@ -355,7 +380,7 @@ class Et extends st {
       draught: n.dr,
       type: n.t
     };
-    return i = "https://www.hifleet.com/hifleetapi/sameShipSearch.do", n = await L.post(i, o).json(), M == null || M.info("[%s] search vessel dead weight from: %s - %j", a.requestId, i, o), n instanceof Array && (n = n[0]), n && (s.deadweight = Number(n.dwt)), s;
+    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;
   }
   async suggest(t, a = {}) {
     const i = "https://www.hifleet.com/hifleetapi/getShipSuggest.do", o = {
@@ -368,42 +393,42 @@ class Et extends st {
         Host: "www.hifleet.com"
       }
     }, n = await L.post(i, o).json();
-    M == null || M.info("[%s] suggest vessel props from: %s - %j", a.requestId, i, o);
-    const s = [];
+    f == null || f.info("[%s] suggest vessel props from: %s - %j", a.requestId, i, o);
+    const e = [];
     for (const r of n)
-      s.push({
+      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
       });
-    return s.sort((r, c) => c.score - r.score), s;
+    return e.sort((r, c) => c.score - r.score), e;
   }
-  async trajectory(t, a, i, o, n = !0, s = {}) {
-    var d, g, m;
-    const r = await this.realTimePosition(t, s);
+  async trajectory(t, a, i, o, n = !0, e = {}) {
+    var d, b, 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");
     }
-    const f = {
+    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"),
         mmsi: t,
         usertoken: this.token
       }
-    }, b = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", y = await L.get(b, f).json();
-    M == null || M.info("[%s] fetch trajectory from: %s - %j", s.requestId, b, f);
-    let F;
-    y && (F = ((g = (d = y.ships) == null ? void 0 : d.offors) == null ? void 0 : g.ship) || [], F.length || M == null || M.warn("[%s] fetch trajectory failed: %j", s.requestId, y));
+    }, g = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", M = await L.get(g, y).json();
+    f == null || f.info("[%s] fetch trajectory from: %s - %j", e.requestId, g, y);
+    let j;
+    M && (j = ((b = (d = M.ships) == null ? void 0 : d.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 = F == null ? void 0 : F[0]) == null ? void 0 : m.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-    for (const h of F) {
+    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");
@@ -445,38 +470,38 @@ class Nt extends st {
         enc: 1
       }
     }, o = "https://api.shipxy.com/apicall/GetSingleShip", n = await L.get(o, i).json();
-    if (M == null || M.info("[%s] fetch realtime position from: %s - %j", a.requestId, o, i), (n == null ? void 0 : n.status) !== 0)
+    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 s = n.data[0];
-    for (const f in s)
-      !isNaN(s[f]) && Number(s[f]) !== 1 / 0 && (s[f] = Number(s[f]));
-    const { labelCn: r, labelEn: c } = await this.parseStatus(s.navistat), u = w.unix(s.lasttime);
+    const e = n.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);
     return {
-      mmsi: s.ShipID,
-      name: s.name,
-      imo: s.imo,
-      callSign: s.callsign,
-      lat: Math.round(s.lat / 1e6 * 1e5) / 1e5,
-      lng: Math.round(s.lon / 1e6 * 1e5) / 1e5,
-      length: Math.round(s.length / 10 * 100) / 100,
-      width: Math.round(s.width / 10 * 100) / 100,
-      draught: Math.round(s.draught / 1e3 * 100) / 100,
-      sog: Math.round(s.sog * 3600 / 1e3 / 1852 * 100) / 100,
-      cog: Math.round(s.cog / 100 * 100) / 100,
-      hdg: Math.round(s.hdg / 100 * 100) / 100,
-      rot: Math.round(s.rot / 100 * 100) / 100,
-      positionTime: s.lasttime,
+      mmsi: e.ShipID,
+      name: e.name,
+      imo: e.imo,
+      callSign: e.callsign,
+      lat: Math.round(e.lat / 1e6 * 1e5) / 1e5,
+      lng: Math.round(e.lon / 1e6 * 1e5) / 1e5,
+      length: Math.round(e.length / 10 * 100) / 100,
+      width: Math.round(e.width / 10 * 100) / 100,
+      draught: Math.round(e.draught / 1e3 * 100) / 100,
+      sog: Math.round(e.sog * 3600 / 1e3 / 1852 * 100) / 100,
+      cog: Math.round(e.cog / 100 * 100) / 100,
+      hdg: Math.round(e.hdg / 100 * 100) / 100,
+      rot: Math.round(e.rot / 100 * 100) / 100,
+      positionTime: e.lasttime,
       utc: u.utc().format(),
-      status: s.navistat,
+      status: e.navistat,
       labelEn: c,
       labelCn: r,
       method: "position",
       vendor: "shipxy"
     };
   }
-  async trajectory(t, a, i, o, n = !0, s = {}) {
+  async trajectory(t, a, i, o, n = !0, e = {}) {
     var v;
-    const r = await this.realTimePosition(t, s), c = w(a), u = w(i), l = "https://api.shipxy.com/apicall/GetShipTrack", f = {
+    const r = await this.realTimePosition(t, e), c = w(a), u = w(i), l = "https://api.shipxy.com/apicall/GetShipTrack", y = {
       searchParams: {
         id: t,
         k: this.token,
@@ -485,27 +510,27 @@ class Nt extends st {
         btm: c.unix(),
         etm: u.unix()
       }
-    }, b = await L.get(l, f).json();
-    if (M == null || M.info("[%s] fetch trajectory from: %s - %j", s.requestId, l, f), (b == null ? void 0 : b.status) !== 0)
-      return b;
-    const y = b == null ? void 0 : b.points, F = [], I = w.unix((v = y[0]) == null ? void 0 : v.utc);
+    }, g = await L.get(l, y).json();
+    if (f == null || f.info("[%s] fetch trajectory from: %s - %j", e.requestId, l, y), (g == null ? void 0 : g.status) !== 0)
+      return g;
+    const M = g == null ? void 0 : g.points, j = [], I = w.unix((v = M[0]) == null ? void 0 : v.utc);
     let p = -1;
-    for (const d of y) {
-      const g = w.unix(d.utc), m = {
+    for (const d of M) {
+      const b = w.unix(d.utc), m = {
         imo: r == null ? void 0 : r.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(),
+        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, F.push(m));
+      }, h = Math.floor(b.diff(I, "minute", !0) / (o || 1));
+      h !== p && (p = h, j.push(m));
     }
-    return F;
+    return j;
   }
 }
 class Tt extends st {
@@ -523,7 +548,7 @@ class Tt extends st {
         mmsiList: t
       }
     }, o = "https://api3.myships.com/sp/ships/getShipIdByMMSI", n = await L.post(o, i).json();
-    return M == null || M.info("[%s] fetch ship id from: %s - %j", a.requestId, o, i), n.code !== "0" ? n : n.data[0].shipId;
+    return f == null || f.info("[%s] fetch ship id from: %s - %j", a.requestId, o, i), n.code !== "0" ? n : n.data[0].shipId;
   }
   async getShipInfo(t, a = {}) {
     const i = {
@@ -534,18 +559,18 @@ class Tt extends st {
         shipId: t
       }
     }, o = "https://api3.myships.com/sp/ships/aissta", n = await L.post(o, i).json();
-    if (M == null || M.info("[%s] fetch ship info from: %s - %j", a.requestId, o, i), n.code !== "0")
+    if (f == null || f.info("[%s] fetch ship info from: %s - %j", a.requestId, o, i), n.code !== "0")
       return n;
-    const s = n.data;
-    let r = s.imo;
-    return t === "407170" && (r = "9198379", M == null || M.warn("[%s] ship(%s) imo error: %s, should be %s", a.requestId, t, s.imo, r)), {
-      mmsi: s.mmsi,
-      name: s.shipnameEn,
+    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)), {
+      mmsi: e.mmsi,
+      name: e.shipnameEn,
       imo: r,
-      callSign: s.callSign,
-      length: s.length,
-      width: s.breadth,
-      draught: (s.draught || 100) / 10
+      callSign: e.callSign,
+      length: e.length,
+      width: e.breadth,
+      draught: (e.draught || 100) / 10
     };
   }
   async realTimePosition(t, a = {}) {
@@ -556,12 +581,12 @@ class Tt extends st {
       json: {
         shipId: i
       }
-    }, s = "https://api3.myships.com/sp/ships/position/latest", r = await L.post(s, n).json();
-    M == null || M.info("[%s] fetch realtime position from: %s - %j", a.requestId, s, n);
+    }, 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 y in c)
-      !isNaN(c[y]) && Number(c[y]) !== 1 / 0 && (c[y] = Number(c[y]));
-    const { labelCn: u, labelEn: l } = await this.parseStatus(c.aisNavStatus), f = w.unix(c.posTime);
+    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);
     return {
       ...o,
       mmsi: t,
@@ -572,7 +597,7 @@ class Tt extends st {
       hdg: Math.round(c.heading * 100) / 100,
       rot: Math.round(c.rot * 100) / 100,
       positionTime: c.posTime,
-      utc: f.utc().format(),
+      utc: y.utc().format(),
       status: c.aisNavStatus,
       labelEn: l,
       labelCn: u,
@@ -580,13 +605,13 @@ class Tt extends st {
       vendor: "myship"
     };
   }
-  async trajectory(t, a, i, o, n = !0, s = {}) {
-    const r = w(a), c = w(i), u = await this.getShipId(t), l = await this.getShipInfo(u), f = [];
+  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, f);
-    return await this.trajectoryIn30Day(u, r.unix(), c.unix(), l, t, o, f), f;
+      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 trajectoryIn30Day(t, a, i, o, n, s, r, c = {}) {
+  async trajectoryIn30Day(t, a, i, o, n, e, r, c = {}) {
     var I;
     const u = {
       headers: {
@@ -597,15 +622,15 @@ class Tt extends st {
         startTime: a,
         endTime: i
       }
-    }, l = "https://api3.myships.com/sp/ships/position/history", f = await L.post(l, u).json();
-    if (M == null || M.info("[%s] fetch trajectory from: %s - %j", c.requestId, l, u), f.code !== "0")
-      return M == null || M.warn("[%s] invoke myship trajectory failed: %j", c.requestId, f), f;
-    const b = f.data;
-    for (const p in b)
-      !isNaN(b[p]) && Number(b[p]) !== 1 / 0 && (b[p] = Number(b[p]));
-    const y = w.unix((I = b[0]) == null ? void 0 : I.posTime);
-    let F = -1;
-    for (const p of b) {
+    }, 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 g = y.data;
+    for (const p in g)
+      !isNaN(g[p]) && Number(g[p]) !== 1 / 0 && (g[p] = Number(g[p]));
+    const M = w.unix((I = g[0]) == null ? void 0 : I.posTime);
+    let j = -1;
+    for (const p of g) {
       const v = w.unix(p.posTime), d = {
         imo: o == null ? void 0 : o.imo,
         mmsi: n,
@@ -619,8 +644,8 @@ class Tt extends st {
         utc: v.utc().format(),
         method: "trajectory",
         vendor: "myship"
-      }, g = Math.floor(v.diff(y, "minute", !0) / (s || 1));
-      g !== F && (F = g, r.push(d));
+      }, b = Math.floor(v.diff(M, "minute", !0) / (e || 1));
+      b !== j && (j = b, r.push(d));
     }
     return r;
   }
@@ -641,10 +666,10 @@ class yt {
    *
    * @param options
    */
-  parsePrinciple(e, t = {}) {
-    var s, r, c;
-    z == null || z.debug("[%s] parse rule: %s", t.requestId, e);
-    const a = new RegExp("(?<=\\[)(.+)(?=])", "g"), i = e.match(a) ? (s = e.match(a)) == null ? void 0 : s[0] : void 0, o = i == null ? void 0 : i.split(";");
+  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)
       return;
     const n = {};
@@ -653,9 +678,9 @@ class yt {
       if (u === 0 && !l)
         n.scope = o[0];
       else if (l)
-        for (let f = 0, b = l.length; f < b; f++) {
-          const y = this.parseRule(l[f]);
-          y && (n[y.level] ? y.key ? n[y.level][y == null ? void 0 : y.key] = y : n[y.level] = y : y.key ? n[y.level] = { [y == null ? void 0 : y.key]: y } : n[y.level] = y);
+        for (let y = 0, g = l.length; y < g; 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);
         }
     }
     return n;
@@ -666,17 +691,17 @@ class yt {
    * @param rule
    * @param options
    */
-  parseRule(e, t = {}) {
+  parseRule(s, t = {}) {
     var n;
-    z == null || z.debug("[%s] parse rule: %s", t.requestId, e), e = e.startsWith("[") ? e : `[${e}`, e = e.endsWith("]") ? e : `${e}]`;
-    const a = new RegExp("(?<=\\[)(.+?)(?=])", "g"), i = (n = e == null ? void 0 : e.match(a)) == null ? void 0 : n[0], o = i == null ? void 0 : i.split(",");
+    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 s = o[3] === "Number.MAX_VALUE" ? 100 : Number(o[3]);
-      return s = isNaN(s) ? 1 : s, {
+      let e = o[3] === "Number.MAX_VALUE" ? 100 : Number(o[3]);
+      return e = isNaN(e) ? 1 : e, {
         operator: o[0],
         number: Number.isNaN(Number(o[1])) ? o[1] : Number(o[1]),
         level: o[2],
-        time: s,
+        time: e,
         key: o[4]
       };
     }
@@ -687,15 +712,15 @@ class yt {
    * @param principle 告警规则
    * @param options
    */
-  checkWeather(e, t, a = {}) {
-    var y, F, I, p, v, d, g, m, h, k, S, D, P, N, A;
-    let i = 0, o = 0, n = 0, s = 0;
-    const r = Math.round(((F = (y = t == null ? void 0 : t.SEVERE) == null ? void 0 : y.sigWave) == null ? void 0 : F.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, f = (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;
-    for (let x = 0; x < (e == null ? void 0 : e.length); x++) {
-      const T = e[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(e[x - 1].eta), "hour", !0) : 0;
-      s = J > s ? J : s, 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: f, hvThd4Wd: b }), (R == null ? void 0 : R.scale) >= l ? (T.isDangerous = !0, delete T.isSevere, delete T.isHeavy) : (R == null ? void 0 : R.scale) > f ? (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;
+  checkWeather(s, t, a = {}) {
+    var M, j, I, p, v, d, b, 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 = (b = t == null ? void 0 : t.SEVERE) == null ? void 0 : b.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, g = (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: g }), (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) === g && !T.isDangerous && !T.isSevere && (T.isHeavy = !0), i += T.isDangerous ? J : 0, o += T.isSevere ? J : 0, n += T.isHeavy ? J : 0;
     }
-    return i = Math.round(i * 100) / 100, o = Math.round(o * 100) / 100, n = Math.round(n * 100) / 100, s = Math.round(s), { sample: e, dangerous: i, severe: o, heavy: n, step: s < 3 ? 3 : s, wind: { dgThd4Wd: l, svThd4Wd: f, hvThd4Wd: b }, sig: { dgThd4Wv: r, svThd4Wv: c, hvThd4Wv: u } };
+    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: g }, sig: { dgThd4Wv: r, svThd4Wv: c, hvThd4Wv: u } };
   }
 }
 const xt = new yt();
@@ -706,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
@@ -720,11 +745,11 @@ class O {
    * @param draught 吃水 m
    * @return [0.55, 0.85]
    */
-  static blockCoefficient(e, t, a, i) {
-    let o = Math.round(e / (t * a * i) * 100) / 100;
+  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], s = n.map((r) => Math.abs(r - o));
-    return n[s.indexOf(Math.min(...s))];
+    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))];
   }
   /**
    * @see https://baike.baidu.com/item/%E5%BC%97%E5%8A%B3%E5%BE%B7%E6%95%B0/228891?fromModule=search-result_lemma-recommend
@@ -737,8 +762,8 @@ class O {
    * @param g 重力加速度 9.80 m/s^2
    * @return [0.05, 0.30]
    */
-  static froudeNumber(e, t, a = 9.8) {
-    let i = Math.round(Math.sqrt(e * e / (a * t)) * 100) / 100;
+  static froudeNumber(s, t, a = 9.8) {
+    let i = Math.round(Math.sqrt(s * s / (a * t)) * 100) / 100;
     return i = i < 0.05 ? 0.05 : i > 0.3 ? 0.3 : i, i;
   }
   /**
@@ -748,7 +773,7 @@ class O {
    * @param loadCondition
    * @private
    */
-  static amendFactor(e, t, a) {
+  static amendFactor(s, t, a) {
     const i = {
       0.55: [1.7, -1.4, -7.4],
       0.6: [2.2, -2.5, -9.7],
@@ -766,8 +791,8 @@ class O {
       0.75: [2.6, -12.5, -13.5],
       0.8: [3, -16.3, -21.6],
       0.85: [3.4, -20.9, 31.8]
-    }[e];
-    return a === "Laden" && (n = i[e]), n[0] + n[1] * t + n[2] * Math.pow(t, 2);
+    }[s];
+    return a === "Laden" && (n = i[s]), n[0] + n[1] * t + n[2] * Math.pow(t, 2);
   }
   /**
    * 失速方向因子
@@ -780,9 +805,9 @@ class O {
    * @param bn
    * @private
    */
-  static directionFactor(e, t = 0) {
+  static directionFactor(s, t = 0) {
     let a;
-    return e > 30 && e <= 60 ? a = (1.7 - 0.03 * Math.pow(t - 4, 2)) / 2 : e > 60 && e <= 150 ? a = (0.9 - 0.06 * Math.pow(t - 6, 2)) / 2 : e > 150 && e <= 180 ? a = (0.4 - 0.03 * Math.pow(t - 8, 2)) / 2 : a = 1, Math.round(a * 1e5) / 1e5;
+    return s > 30 && s <= 60 ? a = (1.7 - 0.03 * Math.pow(t - 4, 2)) / 2 : s > 60 && s <= 150 ? a = (0.9 - 0.06 * Math.pow(t - 6, 2)) / 2 : s > 150 && s <= 180 ? a = (0.4 - 0.03 * Math.pow(t - 8, 2)) / 2 : a = 1, Math.round(a * 1e5) / 1e5;
   }
   /**
    * 失速船型因子
@@ -792,23 +817,23 @@ class O {
    * @param displacement 排水量，m^3
    * @param loadCondition
    * @param tag
-   * @param bn
+   * // @param bn
+   * @param kts
    * @private
    */
-  static vesselTagFactor(e, t, a, i = 0) {
-    i = i > 6 ? i - 0.9 * (i - 6) : i;
+  static vesselTagFactor(s, t, a, i) {
     let o;
-    return a === "container" ? o = 0.7 * i + Math.pow(i, 6.5) / (22 * Math.pow(e, 2 / 3)) : t === "Ballast" ? o = 0.7 * i + Math.pow(i, 6.5) / (2.7 * Math.pow(e, 2 / 3)) : o = 0.5 * i + Math.pow(i, 6.5) / (2.7 * Math.pow(e, 2 / 3)), o;
+    return a === "container" ? o = 0.7 * i / 2 + Math.pow(i, 3) / (22 * Math.pow(s, 2 / 3)) : t === "Ballast" ? o = 0.7 * i / 2 + Math.pow(i, 3) / (2.7 * Math.pow(s, 2 / 3)) : o = 0.5 * i / 2 + Math.pow(i, 3) / (2.7 * Math.pow(s, 2 / 3)), o;
   }
   /**
    * 浪高影响因子
    * @param ht 浪高，单位m
    * @private
    */
-  static waveHeightFactor(e, t) {
-    e = e < 3 ? e * 0.7 : e, e = e < 0 ? 0.2 : e, e = e > 6 ? e - 0.9 * (e - 6) : e, e = e > 9 ? 9 : e;
+  static waveHeightFactor(s, t) {
+    s = s < 3 ? s * 0.7 : s, s = s < 0 ? 0.2 : s, s = s > 6 ? s - 0.9 * (s - 6) : s, s = s > 9 ? 9 : s;
     let a;
-    return t > 30 && t <= 60 ? a = -0.6 : t > 60 && t <= 90 ? a = -0.4 : t > 90 && t <= 120 ? a = e < 3 ? 0.4 : -0.3 : t > 120 && t <= 150 ? a = e < 3 ? 0.6 : -0.5 : t > 150 && t <= 180 ? a = e < 3 ? 0.7 : -0.6 : a = -0.7, Math.round(a * (0.144 * Math.pow(e, 2) + 0.278 * e) * 1e4) / 1e4;
+    return t > 30 && t <= 60 ? a = -0.6 : t > 60 && t <= 90 ? a = -0.4 : t > 90 && t <= 120 ? a = s < 3 ? 0.4 : -0.3 : t > 120 && t <= 150 ? a = s < 3 ? 0.6 : -0.5 : t > 150 && t <= 180 ? a = s < 3 ? 0.7 : -0.6 : a = -0.7, Math.round(a * (0.144 * Math.pow(s, 2) + 0.278 * s) * 1e4) / 1e4;
   }
   /**
    * 组装船舶运行参数
@@ -818,18 +843,18 @@ class O {
    * @param bearing 方位角
    * @private
    */
-  static assembleProperties(e, t, a, i) {
-    var f;
-    const o = e.lbp ?? e.length ?? e.lengthOverall ?? 198.9642, n = e.draught ?? 8, s = e.breadthMoulded ?? e.breadth ?? e.breadthExtreme ?? 32.4572, r = e.deadweight ?? 67035.7773, c = ((f = e == null ? void 0 : e.type) == null ? void 0 : f.toLowerCase()) || "common";
+  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";
     return {
       tag: c.indexOf("container") > -1 ? "container" : c.indexOf("tugs") > -1 ? "tugs" : "common",
       lbp: o,
       loadCondition: t,
       draught: n,
-      breadthMoulded: s,
+      breadthMoulded: e,
       // 排水量（吨）= 载重量（吨）/ 1.025 + 吃水（米）× 船舶型宽（米）× 船舶型长（米）× 0.7
       // 其中，1.025是指海水的密度，吨是指公吨，吃水是指船舶的最大吃水深度。船舶型宽是指船舶的最大型宽，船舶型长是指船舶的设计型长。上述公式是针对常规船舶适用的，不同类型的船舶可能会有一些差异。
-      displacement: Math.round((r / 1.025 + n * s * o * 0.7) * 1e4) / 1e4,
+      displacement: Math.round((r / 1.025 + n * e * o * 0.7) * 1e4) / 1e4,
       // 换算为m/s
       speed: Math.round((a ?? 14.1382) * 1852 / 3600 * 1e4) / 1e4,
       bearing: i || 90
@@ -846,29 +871,29 @@ class O {
    * @param useRouteParam true 启用设置速度
    * @param options
    */
-  static async speedLoseAt(e, t, a, i = "", o = 2, n = !0, s = !1, r = {}) {
+  static async speedLoseAt(s, t, a, i = "", o = 2, n = !0, e = !1, r = {}) {
     let c;
-    if (t.velocity && s && (e.speed = _.roundPrecision(t.velocity * 1852 / 3600, 6)), n) {
+    if (t.velocity && e && (s.speed = _.roundPrecision(t.velocity * 1852 / 3600, 6)), n) {
       let u;
       try {
         i = (i == null ? void 0 : i.toUpperCase()) === "CMEMS" ? "ECMWF" : i, i = (i == null ? void 0 : i.toUpperCase()) === "METEO2" ? "best_match" : i;
-        const { weatherModels: y, marineModels: F } = await it.autoPickMeteoModel(i), I = await Mt.spotForecast(t.lat, t.lng, a.utc().format(), !1, !1, !0, {
+        const { weatherModels: M, marineModels: j } = await it.autoPickMeteoModel(i), I = await Mt.spotForecast(t.lat, t.lng, a.utc().format(), !1, !1, !0, {
           ...r,
           pastDays: 1,
           forecastDays: 1,
-          weatherModels: y,
-          marineModels: F
+          weatherModels: M,
+          marineModels: j
         }), [p] = it.pickHourly(I, a);
         u = it.toLegacy(p);
-      } catch (y) {
-        C.warn("[%s] meteo2 spot(%j) forecast failed: %s", r.requestId, { ...t, eta: a.utc().format(), source: i }, y);
+      } catch (M) {
+        C.warn("[%s] meteo2 spot(%j) forecast failed: %s", r.requestId, { ...t, eta: a.utc().format(), source: i }, M);
       }
-      const l = O.weatherFactor(e, u), f = O.currentFactor(e.bearing, u == null ? void 0 : u.current, o), b = Math.round((e.speed * 1.943844 + l + f) * 100) / 100;
+      const l = O.weatherFactor(s, u), y = O.currentFactor(s.bearing, u == null ? void 0 : u.current, o), g = Math.round((s.speed * 1.943844 + l + y) * 100) / 100;
       c = {
         meteo: { ...u },
         wxFactor: l,
-        cFactor: f,
-        speed: t.velocity && s ? t.velocity : b < 0 ? 1 : b,
+        cFactor: y,
+        speed: t.velocity && e ? t.velocity : g < 0 ? 1 : g,
         eta: a.utc().format(),
         etd: a.utc().format()
       };
@@ -876,7 +901,7 @@ class O {
       c = {
         wxFactor: 0,
         cFactor: 0,
-        speed: t.velocity && s ? t.velocity : Math.round((e.speed * 1.943844 + 0 + 0) * 100) / 100,
+        speed: t.velocity && e ? t.velocity : Math.round((s.speed * 1.943844 + 0 + 0) * 100) / 100,
         eta: a.utc().format(),
         etd: a.utc().format()
       };
@@ -896,53 +921,53 @@ class O {
    * @param options
    * @private
    */
-  static async speedLoseInHoursStep(e, t, a, i, o, n, s = "", r = !0, c = !1, u = {}) {
+  static async speedLoseInHoursStep(s, t, a, i, o, n, e = "", r = !0, c = !1, u = {}) {
     t.utc();
-    const l = t.clone().add(14, "days"), f = [], b = [];
-    let y = 0, F = 0, I, p;
+    const l = t.clone().add(14, "days"), y = [], g = [];
+    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 + F) * 1e3) / 1e3;
-      const g = n[v + 1];
-      if (e.bearing = W.calculateBearing(d, g, !g.gcToPrevious), d.bearing = e.bearing, d.suspend && c) {
+      d.distanceFromStart = Math.round((o + j) * 1e3) / 1e3;
+      const b = n[v + 1];
+      if (s.bearing = W.calculateBearing(d, b, !b.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;
-        if (i - y > k)
-          i = i - y - k, t.add(k, "hour"), d.elapsed = d.suspend;
+        if (i - M > k)
+          i = i - M - k, t.add(k, "hour"), d.elapsed = d.suspend;
         else {
-          const S = i - y;
+          const S = i - M;
           d.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 = F, { etd: t, from: p || d, to: d, next: n.filter((S) => S), wps: f, days: b };
+          return d.distanceFromPrevious = j, { etd: t, from: p || d, to: d, next: n.filter((S) => S), wps: y, days: g };
       } else
         d.suspend = 0;
-      r = t.isAfter(l) ? !1 : r, d = await O.speedLoseAt(e, d, t, s, 0, r, c, u), p = p || d, d.important && f.push(d), t.isSameOrAfter(a) && (b.push(d), a.add(24, "hour"));
-      const m = W.calculateDistance(d, g, !g.gcToPrevious);
+      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) && (g.push(d), a.add(24, "hour"));
+      const m = W.calculateDistance(d, b, !b.gcToPrevious);
       let h = Math.round(m / p.speed * 1e5) / 1e5;
-      if (y + h < i) {
-        if (y += h, t.add(h, "hour"), delete n[v], C == null || C.debug(
+      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: b.lat, lng: b.lng },
           { lat: p.lat, lng: p.lng, etd: p.etd }
-        ), F += m, n.filter((k) => k).length <= 1) {
-          I = g, I.eta = t.utc().format(), I.distanceFromPrevious = m, I.distanceFromStart = Math.round((o + F) * 1e4) / 1e4, f.push(I), delete n[v + 1];
+        ), j += m, n.filter((k) => k).length <= 1) {
+          I = b, I.eta = t.utc().format(), I.distanceFromPrevious = m, I.distanceFromStart = Math.round((o + j) * 1e4) / 1e4, y.push(I), delete n[v + 1];
           break;
         }
       } else {
-        h = i - y, t.add(h, "hour");
+        h = i - M, t.add(h, "hour");
         const k = _.roundPrecision(p.speed * h, 5);
-        I = W.calculateCoordinate(d, e.bearing, k, "nauticalmiles", !g.gcToPrevious), I.eta = t.utc().format(), n[v] = I, C == null || C.debug(
+        I = W.calculateCoordinate(d, s.bearing, k, "nauticalmiles", !b.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,
           { lat: I.lat, lng: I.lng },
           { lat: d.lat, lng: d.lng, etd: d.etd }
-        ), F += k, I.distanceFromPrevious = Math.round(F * 1e4) / 1e4, I.distanceFromStart = Math.round((o + F) * 1e4) / 1e4;
+        ), j += k, I.distanceFromPrevious = Math.round(j * 1e4) / 1e4, I.distanceFromStart = Math.round((o + j) * 1e4) / 1e4;
         break;
       }
     }
-    return { etd: t, from: p, to: I, next: n.filter((v) => v), wps: f, days: b };
+    return { etd: t, from: p, to: I, next: n.filter((v) => v), wps: y, days: g };
   }
   /**
    * 洋流影响因子
@@ -950,8 +975,8 @@ class O {
    * @param current 洋流要素
    * @param role  1: 船东, 2: 租家, 0: 未知
    */
-  static currentFactor(e, t, a = 0) {
-    const i = (e - (t == null ? void 0 : t.degree) || 0) / 180 * Math.PI;
+  static currentFactor(s, t, a = 0) {
+    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);
@@ -962,15 +987,15 @@ class O {
    * @param props 船舶档案
    * @param wwc 气象要素
    */
-  static weatherFactor(e, t) {
-    var l, f, b, y, F, I, p;
-    C == null || C.debug("calculate weather factor via: %j", { ...e, ...t });
-    const a = O.blockCoefficient(e.displacement, e.lbp, e.breadthMoulded, e.draught), i = O.froudeNumber(e.speed, e.lbp), o = O.amendFactor(a, i, e.loadCondition);
-    let n = Math.abs(e.bearing % 360 - (((l = t == null ? void 0 : t.wind) == null ? void 0 : l.degree) % 360 || 0));
+  static weatherFactor(s, t) {
+    var l, y, g, M, j, I, p;
+    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 s = O.directionFactor(n, (f = t == null ? void 0 : t.wind) == null ? void 0 : f.scale), r = O.vesselTagFactor(e.displacement, e.loadCondition, e.tag, (b = t == null ? void 0 : t.wind) == null ? void 0 : b.scale);
-    let c = s * o * r / 100 * e.speed;
-    c = Math.round(c * 1.943844 * 1e4) / 1e4 * -1, e.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(e.bearing % 360 - (((F = (y = t == null ? void 0 : t.wave) == null ? void 0 : y.sig) == null ? void 0 : F.degree) % 360 || 0));
+    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, (g = t == null ? void 0 : t.wind) == null ? void 0 : g.kts);
+    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;
   }
@@ -987,40 +1012,40 @@ class O {
    * @param useRouteParam
    * @param options
    */
-  static async analyseInstant(e, t, a, i, o, n = "", s = 0, r = !0, c = !1, u = {}) {
+  static async analyseInstant(s, t, a, i, o, n = "", e = 0, r = !0, c = !1, u = {}) {
     var K, G, X, Q, Z, $;
     const l = w().valueOf();
-    e.lng = _.convertToStdLng(e.lng);
-    const { route: f, waypoints: b } = o.points, y = W.calculateSubRoute(e, f);
-    if (((K = y[0]) == null ? void 0 : K.length) <= 1)
+    s.lng = _.convertToStdLng(s.lng);
+    const { route: y, waypoints: g } = o.points, M = W.calculateSubRoute(s, y);
+    if (((K = M[0]) == null ? void 0 : K.length) <= 1)
       return;
-    const { v0: F, label: I } = e.sog ? {
-      v0: e.sog,
-      label: e.label || "Other"
+    const { v0: j, label: I } = s.sog ? {
+      v0: s.sog,
+      label: s.label || "Other"
       /* Instruct */
     } : {
       v0: i.speed,
       label: "CP"
       /* Cp */
-    }, p = O.assembleProperties(a, i.loadCondition, F, 0), v = b.length ? W.calculateSubWaypoints(e, b) : [];
+    }, p = O.assembleProperties(a, i.loadCondition, j, 0), v = g.length ? W.calculateSubWaypoints(s, g) : [];
     v.forEach((Y) => Y.important = !0);
     const d = {
-      from: { ...e },
-      route: y,
+      from: { ...s },
+      route: M,
       waypoints: v,
-      v0: F,
+      v0: j,
       label: I
-    }, g = {
+    }, b = {
       hours: [],
       days: [],
       wps: []
     };
-    s || (W.calculateRouteDistance(y) / i.speed <= 72 ? s = 3 : s = 6);
-    let m = W.simplifyRouteToCoordinates(y, v, 0), h = 0, k = 0, S = 0, D = 0;
+    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();
     const P = t.clone();
     for (; m.length > 0; ) {
-      const Y = s - t.hour() % s, B = Math.ceil(t.clone().add(Y, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4, j = await O.speedLoseInHoursStep(
+      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,
         t,
         P,
@@ -1032,22 +1057,22 @@ class O {
         c,
         u
       );
-      (G = j.from) != null && G.speed && (g.hours.push(j.from), g.wps.push(...j.wps), g.days.push(...j.days)), m = j == null ? void 0 : j.next, m.length || g.hours.push(j == null ? void 0 : j.to), h += Math.round((((X = j == null ? void 0 : j.to) == null ? void 0 : X.distanceFromPrevious) ?? 0) * 1e4) / 1e4;
+      (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 || b.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;
     }
-    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;
       k += (N[Y].wxFactor || 0) * B, S += (N[Y].cFactor || 0) * B, D += B;
     }
-    (Q = g.wps) == null || Q.forEach((Y, B) => {
+    (Q = b.wps) == null || Q.forEach((Y, B) => {
       Y.positionTime = w.utc(Y.etd || Y.eta).unix();
-      const j = g.wps[B - 1];
-      if (j) {
-        const V = Y.distanceFromStart - j.distanceFromStart, H = w(Y.eta || Y.etd).diff(w(j.etd || j.eta), "h", !0);
-        Y.avgSpd = Math.round(V / H * 100) / 100, j.bearing = W.calculateBearing(j, Y);
+      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);
       }
-    }), g.wps = (Z = g.wps) == null ? void 0 : Z.reduce((Y, B) => (Y.some((j) => Math.round(j.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);
+    }), 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), []), d.sample = b;
+    const A = b.hours.at(0), x = b.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 = {
@@ -1056,7 +1081,7 @@ class O {
       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;
+    const et = w().valueOf() - l, 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", u == null ? void 0 : u.requestId, et, ot, Math.round(et / ot * 1e3) / 1e3), d;
   }
   /**
@@ -1074,24 +1099,24 @@ class O {
    * @param useRouteParam
    * @param options
    */
-  static async analyseInstantWithThreshed(e, t, a, i, o, n, s, r = "", c = 3, u = !0, l = !1, f = {}) {
+  static async analyseInstantWithThreshed(s, t, a, i, o, n, e, r = "", c = 3, u = !0, l = !1, y = {}) {
     var X, Q, Z, $, Y, B;
-    const b = w().valueOf();
-    e.lng = _.convertToStdLng(e.lng);
-    const { v0: y, label: F } = e.sog ? {
-      v0: e.sog,
-      label: e.label || "Other"
+    const g = w().valueOf();
+    s.lng = _.convertToStdLng(s.lng);
+    const { v0: M, label: j } = s.sog ? {
+      v0: s.sog,
+      label: s.label || "Other"
       /* Instruct */
     } : {
       v0: o.speed,
       label: "CP"
       /* Cp */
-    }, I = O.assembleProperties(i, o.loadCondition, y, 0), p = W.calculateSubRoute(e, n);
+    }, I = O.assembleProperties(i, o.loadCondition, M, 0), p = W.calculateSubRoute(s, n);
     if (((X = p[0]) == null ? void 0 : X.length) <= 1)
       return;
-    const v = s.length ? W.calculateSubWaypoints(e, s) : [];
-    v.forEach((j) => j.important = !0);
-    let d = W.simplifyRouteToCoordinates(p, v, 0), g = 0, m = 0, h = 0, k = 0;
+    const v = e.length ? W.calculateSubWaypoints(s, e) : [];
+    v.forEach((F) => F.important = !0);
+    let d = W.simplifyRouteToCoordinates(p, v, 0), b = 0, m = 0, h = 0, k = 0;
     const S = {
       hours: [],
       wps: [],
@@ -1100,26 +1125,26 @@ class O {
     t = w(t).utc();
     const D = t.clone();
     for (; d.length > 0; ) {
-      const j = c - t.hour() % c;
-      let V = Math.ceil(t.clone().add(j, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4;
+      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, f);
-      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)
+      const H = await O.speedLoseInHoursStep(I, t, D, V, b, 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), b += Math.round((((Z = H == null ? void 0 : H.to) == null ? void 0 : Z.distanceFromPrevious) ?? 0) * 1e4) / 1e4, !V)
         break;
     }
-    S.wps = ($ = S.wps) == null ? void 0 : $.reduce((j, V) => (j.some((H) => Math.round(w(H.etd).unix() / 60) === Math.round(w(V.etd).unix() / 60)) || j.push(V), j), []), (Y = S.wps) == null || Y.forEach((j, V) => {
+    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];
       if (H) {
-        const rt = j.distanceFromStart - H.distanceFromStart, dt = w(j.eta || j.etd).diff(w(H.etd || H.eta), "h", !0);
-        j.avgSpd = Math.round(rt / dt * 100) / 100;
-        const ut = W.calculateBearing(H, j);
+        const rt = F.distanceFromStart - H.distanceFromStart, dt = w(F.eta || F.etd).diff(w(H.etd || H.eta), "h", !0);
+        F.avgSpd = Math.round(rt / dt * 100) / 100;
+        const ut = W.calculateBearing(H, F);
         H.bearing = ut;
       }
     });
     const P = S.hours;
-    for (let j = 0; j < P.length - 1; j++) {
-      const V = w(P[j + 1].eta).diff(P[j].etd, "hour", !0);
-      m += P[j].wxFactor * V, h += P[j].cFactor * V, k += V;
+    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 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 = {
       sample: S,
@@ -1135,17 +1160,17 @@ class O {
       to: A,
       route: x,
       waypoints: T,
-      v0: y,
-      label: F
-    }, { distanceInECA: R, hoursInECA: J, totalDgoConsInECA: tt, eca: at } = await this.calculateECA(q, o, f), nt = _.roundPrecision(o.fo / 24 * (k - J), 3), et = _.roundPrecision(o.dgo / 24 * k, 3);
+      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);
     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;
-    return C == null || C.debug("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", f == null ? void 0 : f.requestId, K, G, Math.round(K / G * 1e3) / 1e3), q;
+    const K = w().valueOf() - g, 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;
   }
   /**
    * 在指定航线条件下，基于多CP，动态计算最优成本(租金+油费)方案
@@ -1162,34 +1187,34 @@ class O {
    * @param lane 基础航线（重要转向点）
    * @param options
    */
-  static async analyseCost(e, t, a, i, o = {}) {
+  static async analyseCost(s, t, a, i, o = {}) {
     var p, v;
-    const n = w().valueOf(), s = [];
-    e.speedStep = e.speedStep || 3, e.alterStep = e.alterStep ?? 1;
+    const n = w().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;
+      const b = Math.ceil(r / d.speed / 24);
+      c = c < b ? b : c;
     }), c = c * 1.3;
-    const u = w.utc(e.etd).add(c ?? 14, "day");
+    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(
-        { lat: e.lat, lng: e.lng },
-        e.etd,
+      const b = JSON.parse(JSON.stringify(i.route)), m = JSON.parse(JSON.stringify(i.waypoints)), h = await O.analyseInstantWithThreshed(
+        { lat: s.lat, lng: s.lng },
+        s.etd,
         u,
         t,
         d,
-        g,
+        b,
         m,
-        e.meteoVendor,
-        e.speedStep,
-        e.useMeteo,
-        e.useRouteParam,
+        s.meteoVendor,
+        s.speedStep,
+        s.useMeteo,
+        s.useRouteParam,
         o
       );
-      h && (await O.calculateCost(h, d, e, o), s.push(h), C == null || C.info("[%s][L%d-%d] analyse from %s to %s cost: %j", o.requestId, 1, l, e.etd, u.format(), {
+      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,
@@ -1198,23 +1223,23 @@ class O {
         cp: `${d.speed}/${d.fo}/${d.dgo}`
       })), l++;
     }
-    s.sort((d, g) => d.cost.total - g.cost.total);
-    const f = s.at(0), b = s.at(1), y = [];
-    if (y.push({ combined: !1, speeds: [f], cost: (p = f.cost) == null ? void 0 : p.total }), b) {
-      const d = f.cost.cp, g = b.cost.cp, m = w(f.eta), h = w(f.etd), k = m.diff(h, "days", !0);
+    e.sort((d, b) => d.cost.total - b.cost.total);
+    const y = e.at(0), g = e.at(1), M = [];
+    if (M.push({ combined: !1, speeds: [y], cost: (p = y.cost) == null ? void 0 : p.total }), g) {
+      const d = y.cost.cp, b = g.cost.cp, m = w(y.eta), h = w(y.etd), k = m.diff(h, "days", !0);
       let S = Math.ceil(k / 2);
-      S = S > 7 ? 7 : S < e.alterStep ? e.alterStep : S;
-      let D = 2, P = { combined: !1, speeds: [b], cost: (v = b.cost) == null ? void 0 : v.total }, N;
-      for (; S >= e.alterStep; ) {
-        const A = await O.combinedAnalyse(e, t, u, [d, g], i, S, { ...o, 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 <= e.alterStep)
+      S = S > 7 ? 7 : S < s.alterStep ? s.alterStep : S;
+      let D = 2, P = { combined: !1, speeds: [g], cost: (v = g.cost) == null ? void 0 : v.total }, N;
+      for (; S >= s.alterStep; ) {
+        const A = await O.combinedAnalyse(s, t, u, [d, b], i, S, { ...o, 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;
       }
-      y.push(P), N && y.push(N);
+      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), y.sort((d, g) => d.cost - g.cost);
+    return C == null || C.info("[%s] analyse elapsed: %d ms", o == null ? void 0 : o.requestId, I), M.sort((d, b) => d.cost - b.cost);
   }
   /**
    * 按步长多次减半，分别用7,4,2,1天步长及cpa,cpb交替计算各种组合下的成本
@@ -1226,24 +1251,24 @@ class O {
    * @param step 步长，7，4，2，1
    * @param options
    */
-  static async combinedAnalyse(e, t, a, i, o, n, s = {}) {
-    s.counter = 1, C == null || C.info("[%s][L%d] analyse with alternate cp in every %d days", s.requestId, s.level, n);
-    const r = await O.alternateAnalyse(e, t, a, i, 0, o, n, s), 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), f = r.reduce((g, m) => g + m.distance, 0), b = r.reduce((g, m) => g + m.totalHrs, 0);
-    C == null || C.info("[%s][L%d] cost with cpa/cpb turn: %j", s.requestId, s.level, {
+  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((b, m) => b + m.cost.total, 0), u = r.reduce((b, m) => b + m.cost.hire, 0), l = r.reduce((b, m) => b + m.cost.bunker, 0), y = r.reduce((b, m) => b + m.distance, 0), g = r.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,
-      distance: f,
-      hours: b
+      distance: y,
+      hours: g
     });
-    const y = await O.alternateAnalyse(e, t, a, i, 1, o, n, s), F = y.reduce((g, m) => g + m.cost.total, 0), I = y.reduce((g, m) => g + m.cost.hire, 0), p = y.reduce((g, m) => g + m.cost.bunker, 0), v = y.reduce((g, m) => g + m.distance, 0), d = y.reduce((g, m) => g + m.totalHrs, 0);
-    return C == null || C.info("[%s][L%d] cost with cpb/cpa turn: %j", s.requestId, s.level, {
-      cost: F,
+    const M = await O.alternateAnalyse(s, t, a, i, 1, o, n, e), j = M.reduce((b, m) => b + m.cost.total, 0), I = M.reduce((b, m) => b + m.cost.hire, 0), p = M.reduce((b, m) => b + m.cost.bunker, 0), v = M.reduce((b, m) => b + m.distance, 0), d = 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 < F ? { combined: !0, cost: Math.round(c * 1e3) / 1e3, speeds: r, step: n } : { combined: !0, cost: Math.round(F * 1e3) / 1e3, speeds: y, step: n };
+    }), 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 };
   }
   /**
    * 基于cp索引，交替计算指定步长下的成本
@@ -1256,32 +1281,32 @@ class O {
    * @param step 步长，7，4，2，1
    * @param options
    */
-  static async alternateAnalyse(e, t, a, i, o, n, s, r = {}) {
-    var f, b;
-    let c = w.utc(e.etd);
-    const u = { lat: e.lat, lng: e.lng }, l = [];
+  static async alternateAnalyse(s, t, a, i, o, n, e, r = {}) {
+    var y, g;
+    let c = w.utc(s.etd);
+    const u = { lat: s.lat, lng: s.lng }, l = [];
     for (; c.isBefore(a); ) {
-      const y = c.clone().utc().add(s, "day"), F = JSON.parse(JSON.stringify(n.route)), I = JSON.parse(JSON.stringify(n.waypoints)), p = i[o], v = await O.analyseInstantWithThreshed(
+      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(),
-        y,
+        M,
         t,
         p,
-        F,
+        j,
         I,
-        e.meteoVendor,
-        e.speedStep,
-        e.useMeteo,
-        e.useRouteParam,
+        s.meteoVendor,
+        s.speedStep,
+        s.useMeteo,
+        s.useRouteParam,
         r
       );
-      v && (await O.calculateCost(v, p, e, r), C == null || C.info(
+      v && (await O.calculateCost(v, p, s, r), C == null || C.info(
         "[%s][L%d-%d] analyse from %s to %s cost: %j",
         r.requestId,
         r.level,
         r.counter,
         c.utc().format(),
-        y.utc().format(),
+        M.utc().format(),
         {
           cost: v.cost.total,
           hire: v.cost.hire,
@@ -1291,7 +1316,7 @@ class O {
           cp: `${p.speed}/${p.fo}/${p.dgo}`
         }
       )), r.counter = r.counter + 1;
-      const d = (b = (f = v == null ? void 0 : v.sample) == null ? void 0 : f.hours) == null ? void 0 : b.at(-1);
+      const d = (g = (y = v == null ? void 0 : v.sample) == null ? void 0 : y.hours) == null ? void 0 : g.at(-1);
       if (d)
         u.lat = d.lat, u.lng = d.lng, c = w(d.eta), l.push(v), o = o ? 0 : 1;
       else
@@ -1306,39 +1331,39 @@ class O {
    * @param props
    * @param options
    */
-  static async calculateCost(e, t, a, i = {}) {
+  static async calculateCost(s, t, a, i = {}) {
     var o;
-    if (e) {
-      const n = (a.addComm || 0) >= 1 ? (a.addComm || 0) / 100 : a.addComm || 0, s = Math.round(e.totalHrs / 24 * (a.dailyHire || 0) * (1 - n) * 1e3) / 1e3, r = Math.round(e.totalFoCons * (a.priceFO || 0) * 1e3) / 1e3, c = Math.round((e.totalDgoCons + (((o = e.extend) == null ? void 0 : o.totalDgoConsInECA) || 0)) * (a.priceDGO || 0) * 1e3) / 1e3;
-      e.cost = {
-        total: Math.round((s + r + c) * 1e3) / 1e3,
-        hire: s,
+    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;
+      s.cost = {
+        total: Math.round((e + r + c) * 1e3) / 1e3,
+        hire: e,
         bunker: Math.round((r + c) * 1e3) / 1e3,
         cp: t
       };
     }
-    return e;
+    return s;
   }
   /**
    * 计算单cp模式下的ECA属性
    *
    */
-  static async calculateECA(e, t, a = {}) {
+  static async calculateECA(s, t, a = {}) {
     var r, c, u, l;
-    const i = await W.intersectInECA((e == null ? void 0 : e.route) || []);
-    let o = 0, n = 0, s = 0;
-    (c = (r = e == null ? void 0 : e.sample) == null ? void 0 : r.wps) == null || c.forEach((f) => {
-      f.positionTime = w.utc(f.etd || f.eta).unix();
+    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();
     });
-    for (const f of i) {
-      o += f.distance;
-      const b = await W.deadReckoningTime((u = f.waypoints) == null ? void 0 : u.at(0), e.sample.wps), y = await W.deadReckoningTime((l = f.waypoints) == null ? void 0 : l.at(-1), e.sample.wps);
-      f.in = b, f.out = y, f.totalHrs = _.roundPrecision((y.positionTime - b.positionTime) / 3600, 3), f.totalDgoCons = _.roundPrecision(t.fo / 24 * f.totalHrs, 3), n += f.totalHrs, s += f.totalDgoCons;
+    for (const y of i) {
+      o += y.distance;
+      const g = 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 = g, y.out = M, y.totalHrs = _.roundPrecision((M.positionTime - g.positionTime) / 3600, 3), y.totalDgoCons = _.roundPrecision(t.fo / 24 * y.totalHrs, 3), n += y.totalHrs, e += y.totalDgoCons;
     }
-    return o = _.roundPrecision(o, 3), n = _.roundPrecision(n, 3), s = _.roundPrecision(s, 3), {
+    return o = _.roundPrecision(o, 3), n = _.roundPrecision(n, 3), e = _.roundPrecision(e, 3), {
       distanceInECA: o,
       hoursInECA: n,
-      totalDgoConsInECA: s,
+      totalDgoConsInECA: e,
       eca: i
     };
   }
@@ -1347,24 +1372,24 @@ class O {
    * @param speeds
    * @param options
    */
-  static async mergeSpeeds(e, t = {}) {
-    var d, g;
+  static async mergeSpeeds(s, t = {}) {
+    var d, b;
     const a = {
       hours: [],
       wps: [],
       days: []
-    }, i = e.reduce((m, h) => m + h.distance, 0), o = e.reduce((m, h) => {
+    }, i = s.reduce((m, h) => m + h.distance, 0), o = s.reduce((m, h) => {
       var k;
       return m + (((k = h.extend) == null ? void 0 : k.distanceInECA) || 0);
-    }, 0), n = e.reduce((m, h) => m + h.totalHrs, 0), s = e.reduce((m, h) => {
+    }, 0), n = s.reduce((m, h) => m + h.totalHrs, 0), e = s.reduce((m, h) => {
       var k;
       return m + (((k = h.extend) == null ? void 0 : k.hoursInECA) || 0);
-    }, 0), r = e.reduce((m, h) => {
+    }, 0), r = s.reduce((m, h) => {
       var k;
       return m + (((k = h.extend) == null ? void 0 : k.totalDgoConsInECA) || 0);
-    }, 0), c = e.reduce((m, h) => m + h.wxFactor * h.totalHrs / n, 0), u = e.reduce((m, h) => m + h.cFactor * h.totalHrs / n, 0), l = e.reduce((m, h) => m + h.totalFoCons, 0), f = e.reduce((m, h) => m + h.totalDgoCons, 0), b = e.reduce((m, h) => m + h.cost.total, 0), y = e.reduce((m, h) => m + h.cost.hire, 0), F = e.reduce((m, h) => m + h.cost.bunker, 0), I = [], p = [];
+    }, 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), g = 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;
-    for (const m of e) {
+    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) => {
@@ -1385,7 +1410,7 @@ 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);
+      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, v = h.at(-1);
     }
     return a.wps.sort((m, h) => {
@@ -1400,11 +1425,11 @@ class O {
       }
     }), {
       sample: a,
-      etd: e.at(0).etd,
-      eta: e.at(-1).eta,
-      from: e.at(0).from,
-      to: e.at(-1).to,
-      v0: e.at(0).v0,
+      etd: s.at(0).etd,
+      eta: s.at(-1).eta,
+      from: s.at(0).from,
+      to: s.at(-1).to,
+      v0: s.at(0).v0,
       label: "Combined",
       distance: Math.round(i * 1e3) / 1e3,
       totalHrs: Math.round(n * 1e3) / 1e3,
@@ -1412,19 +1437,19 @@ class O {
       wxFactor: Math.round(c * 1e3) / 1e3,
       cFactor: Math.round(u * 1e3) / 1e3,
       totalFoCons: Math.round(l * 1e3) / 1e3,
-      totalDgoCons: Math.round(f * 1e3) / 1e3,
+      totalDgoCons: Math.round(y * 1e3) / 1e3,
       cost: {
-        total: Math.round(b * 1e3) / 1e3,
-        hire: Math.round(y * 1e3) / 1e3,
-        bunker: Math.round(F * 1e3) / 1e3
+        total: Math.round(g * 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,
-        hoursInECA: Math.round(s * 1e3) / 1e3,
+        hoursInECA: Math.round(e * 1e3) / 1e3,
         totalDgoConsInECA: Math.round(r * 1e3) / 1e3,
-        speeds: e
+        speeds: s
       }
     };
   }
@@ -1434,12 +1459,12 @@ export {
   yt as AlertHelper,
   ft as AlertLevel,
   Et as HifleetImpl,
-  bt as LoadCondition,
+  gt as LoadCondition,
   Tt as MyShipImpl,
-  jt as MyVesselImpl,
+  Ft as MyVesselImpl,
   Nt as ShipxyImpl,
   O as SpeedHelper,
   vt as SpeedLabel,
-  gt as VesselTag,
+  bt as VesselTag,
   xt as alertHelper
 };