@idm-plugin/vessel 1.5.8 → 1.6.0

package/dist/index.js

@@ -1,157 +1,157 @@
 var st = Object.defineProperty;
-var at = (w, s, t) => s in w ? st(w, s, { enumerable: !0, configurable: !0, writable: !0, value: t }) : w[s] = t;
-var Z = (w, s, t) => (at(w, typeof s != "symbol" ? s + "" : s, t), t);
-import O from "got";
-import z from "@log4js-node/log4js-api";
-import g from "moment";
-import { LngLatHelper as B, LaneHelper as V } from "@idm-plugin/geo";
+var at = (j, e, t) => e in j ? st(j, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : j[e] = t;
+var Z = (j, e, t) => (at(j, typeof e != "symbol" ? e + "" : e, t), t);
+import L from "got";
+import Q from "@log4js-node/log4js-api";
+import I from "moment";
+import { LngLatHelper as z, LaneHelper as B } from "@idm-plugin/geo";
 import { MeteoHelper2 as ot, MeteoHelper as nt } from "@idm-plugin/meteo2";
 import { Meteo2Assist as tt } from "@idm-plugin/meteo";
-let h;
+let b;
 try {
-  h = z.getLogger("vessel");
+  b = Q.getLogger("vessel");
 } catch {
 } finally {
 }
-class K {
+class U {
   /**
    * 解析AIS状态码
    * @param status
    */
-  parseStatus(s) {
-    let t, i;
-    switch (s) {
+  parseStatus(e) {
+    let t, o;
+    switch (e) {
       case 0:
-        t = "在航（主机推动）", i = "The engine is in use";
+        t = "在航（主机推动）", o = "The engine is in use";
         break;
       case 1:
-        t = "锚泊", i = "Anchored";
+        t = "锚泊", o = "Anchored";
         break;
       case 2:
-        t = "失控", i = "Not operated";
+        t = "失控", o = "Not operated";
         break;
       case 3:
-        t = "操纵受限", i = "Limited airworthiness";
+        t = "操纵受限", o = "Limited airworthiness";
         break;
       case 4:
-        t = "吃水受限", i = "Limited by ship's draft";
+        t = "吃水受限", o = "Limited by ship's draft";
         break;
       case 5:
-        t = "靠泊", i = "Mooring";
+        t = "靠泊", o = "Mooring";
         break;
       case 6:
-        t = "搁浅", i = "Stranded";
+        t = "搁浅", o = "Stranded";
         break;
       case 7:
-        t = "捕捞作业", i = "Engaged in fishing";
+        t = "捕捞作业", o = "Engaged in fishing";
         break;
       case 8:
-        t = "靠帆船提供动力", i = "Sailing";
+        t = "靠帆船提供动力", o = "Sailing";
         break;
       default:
-        t = "未定义", i = "Undefined";
+        t = "未定义", o = "Undefined";
     }
-    return { labelCn: t, labelEn: i };
+    return { labelCn: t, labelEn: o };
   }
 }
-class bt extends K {
-  constructor(t, i) {
+class wt extends U {
+  constructor(t, o) {
     super();
     Z(this, "clientId");
     Z(this, "clientSecret");
     Z(this, "token");
-    this.clientId = t, this.clientSecret = i;
+    this.clientId = t, this.clientSecret = o;
   }
   async authToken(t = {}) {
-    const i = "https://svc.data.myvessel.cn/ada/oauth/token", o = {
+    const o = "https://svc.data.myvessel.cn/ada/oauth/token", i = {
       searchParams: {
         client_id: this.clientId,
         client_secret: this.clientSecret,
         grant_type: "client_credentials"
       }
-    }, n = await O.post(i, o).json();
-    h == null || h.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: g().utc().format()
+    }, a = await L.post(o, i).json();
+    b == null || b.info("[%s] fetch access token from: %s - %j", t.requestId, o, a), a.error || (this.token = {
+      accessToken: a.access_token,
+      tokenType: a.token_type,
+      expiresIn: a.expires_in,
+      scope: a.scope,
+      jti: a.jti,
+      issuedAt: I().utc().format()
     });
   }
-  async realTimePosition(t, i = {}) {
-    var u, m, f;
-    (!this.token || g().diff(g(this.token.issuedAt), "seconds") > ((u = this.token) == null ? void 0 : u.expiresIn) - 300) && await this.authToken(i);
-    const o = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/location/unit", n = {
+  async realTimePosition(t, o = {}) {
+    var l, m, f;
+    (!this.token || I().diff(I(this.token.issuedAt), "seconds") > ((l = this.token) == null ? void 0 : l.expiresIn) - 300) && await this.authToken(o);
+    const i = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/location/unit", a = {
       headers: {
         Authorization: `${(m = this.token) == null ? void 0 : m.tokenType} ${(f = this.token) == null ? void 0 : f.accessToken}`
       },
       searchParams: { mmsi: t }
     };
-    h == null || h.info("[%s] fetch realtime position from: %s - %j", i.requestId, o, n);
-    const a = await O.get(o, n).json();
-    if (a.code)
-      return h == null || h.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 p in e)
-      !isNaN(e[p]) && Number(e[p]) !== 1 / 0 && (e[p] = Number(e[p]));
-    const d = g(`${e.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    b == null || b.info("[%s] fetch realtime position from: %s - %j", o.requestId, i, a);
+    const n = await L.get(i, a).json();
+    if (n.code)
+      return b == null || b.warn("[%s] fetch realtime position failed: %j", o.requestId, i, { message: n.message, status: n.status, code: n.code }), n;
+    const s = n.data;
+    for (const h in s)
+      !isNaN(s[h]) && Number(s[h]) !== 1 / 0 && (s[h] = Number(s[h]));
+    const d = I(`${s.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
     return {
-      mmsi: e.mmsi,
-      name: e.vesselName,
-      imo: e.imo,
-      callSign: e.callsign,
-      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) ? g.utc(e.eta).format() : void 0,
-      destination: e.dest,
+      mmsi: s.mmsi,
+      name: s.vesselName,
+      imo: s.imo,
+      callSign: s.callsign,
+      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) ? I.utc(s.eta).format() : void 0,
+      destination: s.dest,
       positionTime: d.unix(),
-      status: e.status,
-      labelCn: e.statusNameCn,
-      labelEn: e.statusNameEn,
+      status: s.status,
+      labelCn: s.statusNameCn,
+      labelEn: s.statusNameEn,
       method: "position",
       vendor: "myVessel",
       utc: d.utc().format()
     };
   }
-  async trajectory(t, i, o, n, a = !0, e = {}) {
-    (!this.token || g().diff(g(this.token.issuedAt), "seconds") > this.token.expiresIn - 300) && await this.authToken(e);
-    const d = await this.realTimePosition(t, e), r = g(i), u = g(o), m = [];
-    for (; u.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, u, d, n, m, e), m;
+  async trajectory(t, o, i, a, n = !0, s = {}) {
+    (!this.token || I().diff(I(this.token.issuedAt), "seconds") > this.token.expiresIn - 300) && await this.authToken(s);
+    const d = await this.realTimePosition(t, s), r = I(o), l = I(i), m = [];
+    for (; l.diff(r, "day", !0) > 30; )
+      await this.trajectoryIn30Day(t, r, r.clone().add(30, "day"), d, a, m, s), r.add(30, "day");
+    return await this.trajectoryIn30Day(t, r, l, d, a, m, s), m;
   }
-  async trajectoryIn30Day(t, i, o, n, a, e, d = {}) {
-    var l, Y, k, b, I;
-    const r = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/track", u = {
+  async trajectoryIn30Day(t, o, i, a, n, s, d = {}) {
+    var u, p, k, y, w;
+    const r = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/track", l = {
       headers: {
-        Authorization: `${(l = this.token) == null ? void 0 : l.tokenType} ${(Y = this.token) == null ? void 0 : Y.accessToken}`
+        Authorization: `${(u = this.token) == null ? void 0 : u.tokenType} ${(p = this.token) == null ? void 0 : p.accessToken}`
       },
       json: {
         mmsi: t,
-        startTime: i.utcOffset(8).format("YYYY-MM-DD HH:mm:ss"),
-        endTime: o.utcOffset(8).format("YYYY-MM-DD HH:mm:ss")
+        startTime: o.utcOffset(8).format("YYYY-MM-DD HH:mm:ss"),
+        endTime: i.utcOffset(8).format("YYYY-MM-DD HH:mm:ss")
       }
     };
-    h == null || h.info("[%s] fetch trajectory from: %s - %j", d.requestId, r, u);
-    const m = await O.post(r, u).json();
+    b == null || b.info("[%s] fetch trajectory from: %s - %j", d.requestId, r, l);
+    const m = await L.post(r, l).json();
     if (m.code)
-      return h == null || h.warn("[%s] fetch trajectory failed: %j", d.requestId, r, { message: m.message, status: m.status, code: m.code }), m;
+      return b == null || b.warn("[%s] fetch trajectory failed: %j", d.requestId, r, { message: m.message, status: m.status, code: m.code }), m;
     let f = -1;
-    const p = g(`${(b = (k = m.data) == null ? void 0 : k[0]) == null ? void 0 : b.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-    return (I = m.data) == null || I.forEach((c) => {
-      for (const R in c)
-        !isNaN(c[R]) && Number(c[R]) !== 1 / 0 && (c[R] = Number(c[R]));
-      const v = g(`${c.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00"), D = c.status, { labelCn: y, labelEn: M } = this.parseStatus(D), j = {
+    const h = I(`${(y = (k = m.data) == null ? void 0 : k[0]) == null ? void 0 : y.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    return (w = m.data) == null || w.forEach((c) => {
+      for (const C in c)
+        !isNaN(c[C]) && Number(c[C]) !== 1 / 0 && (c[C] = Number(c[C]));
+      const M = I(`${c.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00"), D = c.status, { labelCn: g, labelEn: Y } = this.parseStatus(D), S = {
         mmsi: c.mmsi,
-        imo: n == null ? void 0 : n.imo,
+        imo: a == null ? void 0 : a.imo,
         lat: c.lat,
         lng: c.lon,
         sog: c.sog,
@@ -159,68 +159,68 @@ class bt extends K {
         hdg: c.hdg,
         draught: c.draught,
         status: D,
-        eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(c.eta) ? g(`${c.eta} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00").utc().format() : void 0,
+        eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(c.eta) ? I(`${c.eta} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00").utc().format() : void 0,
         destination: c.dest,
-        positionTime: v.unix(),
-        labelCn: y,
-        labelEn: M,
+        positionTime: M.unix(),
+        labelCn: g,
+        labelEn: Y,
         method: "trajectory",
         vendor: "myVessel",
-        utc: v.utc().format()
-      }, F = Math.floor(v.diff(p, "minute", !0) / (a || 1));
-      F !== f && (f = F, e.push(j));
-    }), e;
+        utc: M.utc().format()
+      }, x = Math.floor(M.diff(h, "minute", !0) / (n || 1));
+      x !== f && (f = x, s.push(S));
+    }), s;
   }
 }
-class vt extends K {
+class gt extends U {
   constructor(t) {
     super();
     Z(this, "token");
     this.token = t;
   }
-  async realTimePosition(t, i = {}) {
-    const o = "https://api.hifleet.com/position/position/get/token", n = {
+  async realTimePosition(t, o = {}) {
+    const i = "https://api.hifleet.com/position/position/get/token", a = {
       searchParams: {
         mmsi: t,
         usertoken: this.token
       }
-    }, a = await O.post(o, n).json();
-    h == null || h.info("[%s] fetch realtime position from: %s - %j", i.requestId, o, n);
-    const e = a == null ? void 0 : a.list;
-    if (!e)
-      return h == null || h.warn("[%s] fetch realtime position failed: %j", i.requestId, o, a), a;
-    for (const p in e)
-      !isNaN(e[p]) && Number(e[p]) !== 1 / 0 && (e[p] = Number(e[p]));
-    e.status = e.sp > 3 ? 0 : 1;
-    const d = e.status, { labelCn: r, labelEn: u } = this.parseStatus(d), m = g(`${e.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    }, n = await L.post(i, a).json();
+    b == null || b.info("[%s] fetch realtime position from: %s - %j", o.requestId, i, a);
+    const s = n == null ? void 0 : n.list;
+    if (!s)
+      return b == null || b.warn("[%s] fetch realtime position failed: %j", o.requestId, i, n), n;
+    for (const h in s)
+      !isNaN(s[h]) && Number(s[h]) !== 1 / 0 && (s[h] = Number(s[h]));
+    s.status = s.sp > 3 ? 0 : 1;
+    const d = s.status, { labelCn: r, labelEn: l } = this.parseStatus(d), m = I(`${s.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
     return {
-      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) ? g.utc(e.eta).format() : void 0,
-      destination: e.destination,
+      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) ? I.utc(s.eta).format() : void 0,
+      destination: s.destination,
       positionTime: m.unix(),
       utc: m.utc().format(),
       status: d,
       labelCn: r,
-      labelEn: u,
+      labelEn: l,
       method: "position",
       vendor: "hifleet"
     };
   }
-  async search(t, i = {}) {
-    let o = "https://www.hifleet.com/hifleetapi/searchVesselOL.do";
-    const n = {
+  async search(t, o = {}) {
+    let i = "https://www.hifleet.com/hifleetapi/searchVesselOL.do";
+    const a = {
       searchParams: {
         keyword: t
       },
@@ -230,24 +230,24 @@ class vt extends K {
         Host: "www.hifleet.com"
       }
     };
-    let a = await O.post(o, n).json();
-    h == null || h.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,
-      imo: a.i,
-      callSign: a.c,
-      length: a.l,
-      breadth: a.b,
-      draught: a.dr,
-      type: a.t
+    let n = await L.post(i, a).json();
+    b == null || b.info("[%s] fetch vessel props from: %s - %j", o.requestId, i, a), n instanceof Array && (n = n[0]);
+    for (const d in n)
+      !isNaN(n[d]) && Number(n[d]) !== 1 / 0 && (n[d] = Number(n[d]));
+    const s = {
+      mmsi: n.m,
+      name: n.n,
+      imo: n.i,
+      callSign: n.c,
+      length: n.l,
+      breadth: n.b,
+      draught: n.dr,
+      type: n.t
     };
-    return o = "https://www.hifleet.com/hifleetapi/sameShipSearch.do", a = await O.post(o, n).json(), h == null || h.info("[%s] search vessel dead weight from: %s - %j", i.requestId, o, n), a instanceof Array && (a = a[0]), a && (e.deadweight = Number(a.dwt)), e;
+    return i = "https://www.hifleet.com/hifleetapi/sameShipSearch.do", n = await L.post(i, a).json(), b == null || b.info("[%s] search vessel dead weight from: %s - %j", o.requestId, i, a), n instanceof Array && (n = n[0]), n && (s.deadweight = Number(n.dwt)), s;
   }
-  async suggest(t, i = {}) {
-    const o = "https://www.hifleet.com/hifleetapi/getShipSuggest.do", n = {
+  async suggest(t, o = {}) {
+    const i = "https://www.hifleet.com/hifleetapi/getShipSuggest.do", a = {
       searchParams: {
         q: t
       },
@@ -256,203 +256,203 @@ class vt extends K {
         Origin: "https://www.hifleet.com",
         Host: "www.hifleet.com"
       }
-    }, a = await O.post(o, n).json();
-    h == null || h.info("[%s] suggest vessel props from: %s - %j", i.requestId, o, n);
-    const e = [];
-    for (const d of a)
-      e.push({
+    }, n = await L.post(i, a).json();
+    b == null || b.info("[%s] suggest vessel props from: %s - %j", o.requestId, i, a);
+    const s = [];
+    for (const d of n)
+      s.push({
         mmsi: !d.mmsi || isNaN(d.mmsi) ? null : Number(d.mmsi),
         name: d.name,
         callSign: d.callsign,
         imo: !d.imo || isNaN(d.imo) ? null : Number(d.imo),
         score: d._score
       });
-    return e.sort((d, r) => r.score - d.score), e;
+    return s.sort((d, r) => r.score - d.score), s;
   }
-  async trajectory(t, i, o, n, a = !0, e = {}) {
-    var c, v, D;
-    const d = await this.realTimePosition(t, e);
-    let r = g(i);
-    const u = g(o), m = g();
-    if (a) {
-      let y = u.diff(r, "d", !0);
-      y < 0 ? r = u.clone().subtract(40, "d") : y < 30 ? r.subtract(10, "d") : y < 60 ? r.subtract(5, "d") : r = u.clone().subtract(80, "d"), y = m.diff(u, "d", !0), u.add(y > 10 ? 240 : y * 24, "h");
+  async trajectory(t, o, i, a, n = !0, s = {}) {
+    var c, M, D;
+    const d = await this.realTimePosition(t, s);
+    let r = I(o);
+    const l = I(i), m = I();
+    if (n) {
+      let g = l.diff(r, "d", !0);
+      g < 0 ? r = l.clone().subtract(40, "d") : g < 30 ? r.subtract(10, "d") : g < 60 ? r.subtract(5, "d") : r = l.clone().subtract(80, "d"), g = m.diff(l, "d", !0), l.add(g > 10 ? 240 : g * 24, "h");
     }
     const f = {
       searchParams: {
-        endtime: u.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
+        endtime: l.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
       }
-    }, p = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", l = await O.get(p, f).json();
-    h == null || h.info("[%s] fetch trajectory from: %s - %j", e.requestId, p, f);
-    let Y;
-    l && (Y = ((v = (c = l.ships) == null ? void 0 : c.offors) == null ? void 0 : v.ship) || [], Y.length || h == null || h.warn("[%s] fetch trajectory failed: %j", e.requestId, l));
+    }, h = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", u = await L.get(h, f).json();
+    b == null || b.info("[%s] fetch trajectory from: %s - %j", s.requestId, h, f);
+    let p;
+    u && (p = ((M = (c = u.ships) == null ? void 0 : c.offors) == null ? void 0 : M.ship) || [], p.length || b == null || b.warn("[%s] fetch trajectory failed: %j", s.requestId, u));
     const k = [];
-    let b = -1;
-    const I = g(`${(D = Y == null ? void 0 : Y[0]) == null ? void 0 : D.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-    for (const y of Y) {
-      for (const L in y)
-        !isNaN(y[L]) && Number(y[L]) !== 1 / 0 && (y[L] = Number(y[L]));
-      const M = g(`${y.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-      y.status = y.sp > 4 ? 0 : 1;
-      const { labelEn: j, labelCn: F } = this.parseStatus(y.status), R = {
-        mmsi: y.m,
-        name: y.n,
+    let y = -1;
+    const w = I(`${(D = p == null ? void 0 : p[0]) == null ? void 0 : D.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    for (const g of p) {
+      for (const q in g)
+        !isNaN(g[q]) && Number(g[q]) !== 1 / 0 && (g[q] = Number(g[q]));
+      const Y = I(`${g.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+      g.status = g.sp > 4 ? 0 : 1;
+      const { labelEn: S, labelCn: x } = this.parseStatus(g.status), C = {
+        mmsi: g.m,
+        name: g.n,
         imo: d == null ? void 0 : d.imo,
-        lat: y.la,
-        lng: y.lo,
-        draught: y.draught,
-        sog: y.sp,
-        cog: y.co,
-        hdg: y.hdg,
-        positionTime: M.unix(),
-        utc: M.utc().format(),
-        status: y.status,
-        labelCn: F,
-        labelEn: j,
+        lat: g.la,
+        lng: g.lo,
+        draught: g.draught,
+        sog: g.sp,
+        cog: g.co,
+        hdg: g.hdg,
+        positionTime: Y.unix(),
+        utc: Y.utc().format(),
+        status: g.status,
+        labelCn: x,
+        labelEn: S,
         method: "trajectory",
         vendor: "hifleet"
-      }, H = Math.floor(M.diff(I, "minute", !0) / (n || 1));
-      H !== b && (b = H, k.push(R));
+      }, A = Math.floor(Y.diff(w, "minute", !0) / (a || 1));
+      A !== y && (y = A, k.push(C));
     }
     return k;
   }
 }
-class wt extends K {
+class It extends U {
   constructor(t) {
     super();
     Z(this, "token");
     this.token = t;
   }
-  async realTimePosition(t, i = {}) {
-    const o = {
+  async realTimePosition(t, o = {}) {
+    const i = {
       searchParams: {
         id: t,
         k: this.token,
         enc: 1
       }
-    }, n = "https://api.shipxy.com/apicall/GetSingleShip", a = await O.get(n, o).json();
-    if (h == null || h.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 f in e)
-      !isNaN(e[f]) && Number(e[f]) !== 1 / 0 && (e[f] = Number(e[f]));
-    const { labelCn: d, labelEn: r } = await this.parseStatus(e.navistat), u = g.unix(e.lasttime);
+    }, a = "https://api.shipxy.com/apicall/GetSingleShip", n = await L.get(a, i).json();
+    if (b == null || b.info("[%s] fetch realtime position from: %s - %j", o.requestId, a, 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: d, labelEn: r } = await this.parseStatus(s.navistat), l = I.unix(s.lasttime);
     return {
-      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: e.navistat,
+      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,
+      utc: l.utc().format(),
+      status: s.navistat,
       labelEn: r,
       labelCn: d,
       method: "position",
       vendor: "shipxy"
     };
   }
-  async trajectory(t, i, o, n, a = !0, e = {}) {
-    var I;
-    const d = await this.realTimePosition(t, e), r = g(i), u = g(o), m = "https://api.shipxy.com/apicall/GetShipTrack", f = {
+  async trajectory(t, o, i, a, n = !0, s = {}) {
+    var w;
+    const d = await this.realTimePosition(t, s), r = I(o), l = I(i), m = "https://api.shipxy.com/apicall/GetShipTrack", f = {
       searchParams: {
         id: t,
         k: this.token,
         enc: 1,
         cut: 0,
         btm: r.unix(),
-        etm: u.unix()
+        etm: l.unix()
       }
-    }, p = await O.get(m, f).json();
-    if (h == null || h.info("[%s] fetch trajectory from: %s - %j", e.requestId, m, f), (p == null ? void 0 : p.status) !== 0)
-      return p;
-    const l = p == null ? void 0 : p.points, Y = [], k = g.unix((I = l[0]) == null ? void 0 : I.utc);
-    let b = -1;
-    for (const c of l) {
-      const v = g.unix(c.utc), D = {
+    }, h = await L.get(m, f).json();
+    if (b == null || b.info("[%s] fetch trajectory from: %s - %j", s.requestId, m, f), (h == null ? void 0 : h.status) !== 0)
+      return h;
+    const u = h == null ? void 0 : h.points, p = [], k = I.unix((w = u[0]) == null ? void 0 : w.utc);
+    let y = -1;
+    for (const c of u) {
+      const M = I.unix(c.utc), D = {
         imo: d == null ? void 0 : d.imo,
         mmsi: t,
         sog: Math.round(c.sog * 3600 / 1e3 / 1852 * 100) / 100,
         cog: Math.round(c.cog / 100 * 100) / 100,
         lat: Math.round(c.lat / 1e6 * 1e5) / 1e5,
         lng: Math.round(c.lon / 1e6 * 1e5) / 1e5,
-        positionTime: v.unix(),
-        utc: v.utc().format(),
+        positionTime: M.unix(),
+        utc: M.utc().format(),
         method: "trajectory",
         vendor: "shipxy"
-      }, y = Math.floor(v.diff(k, "minute", !0) / (n || 1));
-      y !== b && (b = y, Y.push(D));
+      }, g = Math.floor(M.diff(k, "minute", !0) / (a || 1));
+      g !== y && (y = g, p.push(D));
     }
-    return Y;
+    return p;
   }
 }
-class Yt extends K {
+class pt extends U {
   constructor(t) {
     super();
     Z(this, "token");
     this.token = t;
   }
-  async getShipId(t, i = {}) {
-    const o = {
+  async getShipId(t, o = {}) {
+    const i = {
       headers: {
         appKey: this.token
       },
       json: {
         mmsiList: t
       }
-    }, n = "https://api3.myships.com/sp/ships/getShipIdByMMSI", a = await O.post(n, o).json();
-    return h == null || h.info("[%s] fetch ship id from: %s - %j", i.requestId, n, o), a.code !== "0" ? a : a.data[0].shipId;
+    }, a = "https://api3.myships.com/sp/ships/getShipIdByMMSI", n = await L.post(a, i).json();
+    return b == null || b.info("[%s] fetch ship id from: %s - %j", o.requestId, a, i), n.code !== "0" ? n : n.data[0].shipId;
   }
-  async getShipInfo(t, i = {}) {
-    const o = {
+  async getShipInfo(t, o = {}) {
+    const i = {
       headers: {
         appKey: this.token
       },
       json: {
         shipId: t
       }
-    }, n = "https://api3.myships.com/sp/ships/aissta", a = await O.post(n, o).json();
-    if (h == null || h.info("[%s] fetch ship info from: %s - %j", i.requestId, n, o), a.code !== "0")
-      return a;
-    const e = a.data;
-    let d = e.imo;
-    return t === "407170" && (d = "9198379", h == null || h.warn("[%s] ship(%s) imo error: %s, should be %s", i.requestId, t, e.imo, d)), {
-      mmsi: e.mmsi,
-      name: e.shipnameEn,
+    }, a = "https://api3.myships.com/sp/ships/aissta", n = await L.post(a, i).json();
+    if (b == null || b.info("[%s] fetch ship info from: %s - %j", o.requestId, a, i), n.code !== "0")
+      return n;
+    const s = n.data;
+    let d = s.imo;
+    return t === "407170" && (d = "9198379", b == null || b.warn("[%s] ship(%s) imo error: %s, should be %s", o.requestId, t, s.imo, d)), {
+      mmsi: s.mmsi,
+      name: s.shipnameEn,
       imo: d,
-      callSign: e.callSign,
-      length: e.length,
-      width: e.breadth,
-      draught: (e.draught || 100) / 10
+      callSign: s.callSign,
+      length: s.length,
+      width: s.breadth,
+      draught: (s.draught || 100) / 10
     };
   }
-  async realTimePosition(t, i = {}) {
-    const o = await this.getShipId(t, i), n = await this.getShipInfo(o, i), a = {
+  async realTimePosition(t, o = {}) {
+    const i = await this.getShipId(t, o), a = await this.getShipInfo(i, o), n = {
       headers: {
         appKey: this.token
       },
       json: {
-        shipId: o
+        shipId: i
       }
-    }, e = "https://api3.myships.com/sp/ships/position/latest", d = await O.post(e, a).json();
-    h == null || h.info("[%s] fetch realtime position from: %s - %j", i.requestId, e, a);
+    }, s = "https://api3.myships.com/sp/ships/position/latest", d = await L.post(s, n).json();
+    b == null || b.info("[%s] fetch realtime position from: %s - %j", o.requestId, s, n);
     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: u, labelEn: m } = await this.parseStatus(r.aisNavStatus), f = g.unix(r.posTime);
+    for (const u in r)
+      !isNaN(r[u]) && Number(r[u]) !== 1 / 0 && (r[u] = Number(r[u]));
+    const { labelCn: l, labelEn: m } = await this.parseStatus(r.aisNavStatus), f = I.unix(r.posTime);
     return {
-      ...n,
+      ...a,
       mmsi: t,
       lat: Math.round(r.lat / 1e4 / 60 * 1e5) / 1e5,
       lng: Math.round(r.lon / 1e4 / 60 * 1e5) / 1e5,
@@ -464,63 +464,63 @@ class Yt extends K {
       utc: f.utc().format(),
       status: r.aisNavStatus,
       labelEn: m,
-      labelCn: u,
+      labelCn: l,
       method: "position",
       vendor: "myship"
     };
   }
-  async trajectory(t, i, o, n, a = !0, e = {}) {
-    const d = g(i), r = g(o), u = await this.getShipId(t), m = await this.getShipInfo(u), f = [];
+  async trajectory(t, o, i, a, n = !0, s = {}) {
+    const d = I(o), r = I(i), l = await this.getShipId(t), m = await this.getShipInfo(l), f = [];
     for (; r.diff(d, "day", !0) > 30; )
-      await this.trajectoryIn30Day(u, d.unix(), d.add(30, "day").unix(), m, t, n, f);
-    return await this.trajectoryIn30Day(u, d.unix(), r.unix(), m, t, n, f), f;
+      await this.trajectoryIn30Day(l, d.unix(), d.add(30, "day").unix(), m, t, a, f);
+    return await this.trajectoryIn30Day(l, d.unix(), r.unix(), m, t, a, f), f;
   }
-  async trajectoryIn30Day(t, i, o, n, a, e, d, r = {}) {
+  async trajectoryIn30Day(t, o, i, a, n, s, d, r = {}) {
     var k;
-    const u = {
+    const l = {
       headers: {
         appKey: this.token
       },
       json: {
         shipId: t,
-        startTime: i,
-        endTime: o
+        startTime: o,
+        endTime: i
       }
-    }, m = "https://api3.myships.com/sp/ships/position/history", f = await O.post(m, u).json();
-    if (h == null || h.info("[%s] fetch trajectory from: %s - %j", r.requestId, m, u), f.code !== "0")
-      return h == null || h.warn("[%s] invoke myship trajectory failed: %j", r.requestId, f), f;
-    const p = f.data;
-    for (const b in p)
-      !isNaN(p[b]) && Number(p[b]) !== 1 / 0 && (p[b] = Number(p[b]));
-    const l = g.unix((k = p[0]) == null ? void 0 : k.posTime);
-    let Y = -1;
-    for (const b of p) {
-      const I = g.unix(b.posTime), c = {
-        imo: n == null ? void 0 : n.imo,
-        mmsi: a,
-        lat: Math.round(b.lat / 1e4 / 60 * 1e5) / 1e5,
-        lng: Math.round(b.lon / 1e4 / 60 * 1e5) / 1e5,
-        sog: Math.round(b.sog / 10 * 100) / 100,
-        cog: Math.round(b.cog / 10 * 100) / 100,
-        hdg: Math.round(b.heading * 100) / 100,
-        rot: Math.round(b.rot * 100) / 100,
-        positionTime: I.unix(),
-        utc: I.utc().format(),
+    }, m = "https://api3.myships.com/sp/ships/position/history", f = await L.post(m, l).json();
+    if (b == null || b.info("[%s] fetch trajectory from: %s - %j", r.requestId, m, l), f.code !== "0")
+      return b == null || b.warn("[%s] invoke myship trajectory failed: %j", r.requestId, f), f;
+    const h = f.data;
+    for (const y in h)
+      !isNaN(h[y]) && Number(h[y]) !== 1 / 0 && (h[y] = Number(h[y]));
+    const u = I.unix((k = h[0]) == null ? void 0 : k.posTime);
+    let p = -1;
+    for (const y of h) {
+      const w = I.unix(y.posTime), c = {
+        imo: a == null ? void 0 : a.imo,
+        mmsi: n,
+        lat: Math.round(y.lat / 1e4 / 60 * 1e5) / 1e5,
+        lng: Math.round(y.lon / 1e4 / 60 * 1e5) / 1e5,
+        sog: Math.round(y.sog / 10 * 100) / 100,
+        cog: Math.round(y.cog / 10 * 100) / 100,
+        hdg: Math.round(y.heading * 100) / 100,
+        rot: Math.round(y.rot * 100) / 100,
+        positionTime: w.unix(),
+        utc: w.utc().format(),
         method: "trajectory",
         vendor: "myship"
-      }, v = Math.floor(I.diff(l, "minute", !0) / (e || 1));
-      v !== Y && (Y = v, d.push(c));
+      }, M = Math.floor(w.diff(u, "minute", !0) / (s || 1));
+      M !== p && (p = M, d.push(c));
     }
     return d;
   }
 }
-let A;
+let W;
 try {
-  A = z.getLogger("vessel");
+  W = Q.getLogger("vessel");
 } catch {
 } finally {
 }
-var it = /* @__PURE__ */ ((w) => (w.NOTICE = "NOTICE", w.WARN = "WARN", w.HEAVY = "HEAVY", w.SEVERE = "SEVERE", w.ERROR = "ERROR", w.FATAL = "FATAL", w))(it || {});
+var it = /* @__PURE__ */ ((j) => (j.NOTICE = "NOTICE", j.WARN = "WARN", j.HEAVY = "HEAVY", j.SEVERE = "SEVERE", j.ERROR = "ERROR", j.FATAL = "FATAL", j))(it || {});
 class rt {
   /**
    * 解析告警规则, 多规则场景
@@ -530,24 +530,24 @@ class rt {
    *
    * @param options
    */
-  parsePrinciple(s, t = {}) {
-    var e, d, r;
-    A == null || A.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)
+  parsePrinciple(e, t = {}) {
+    var s, d, r;
+    W == null || W.info("[%s] parse rule: %s", t.requestId, e);
+    const o = new RegExp("(?<=\\[)(.+)(?=])", "g"), i = e.match(o) ? (s = e.match(o)) == null ? void 0 : s[0] : void 0, a = i == null ? void 0 : i.split(";");
+    if (!a)
       return;
-    const a = {};
-    for (let u = 0; u < (n == null ? void 0 : n.length); u++) {
-      const m = (r = (d = n[u].match(i)) == null ? void 0 : d[0]) == null ? void 0 : r.split("],");
-      if (u === 0 && !m)
-        a.scope = n[0];
+    const n = {};
+    for (let l = 0; l < (a == null ? void 0 : a.length); l++) {
+      const m = (r = (d = a[l].match(o)) == null ? void 0 : d[0]) == null ? void 0 : r.split("],");
+      if (l === 0 && !m)
+        n.scope = a[0];
       else if (m)
-        for (let f = 0, p = m.length; f < p; f++) {
-          const l = this.parseRule(m[f]);
-          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);
+        for (let f = 0, h = m.length; f < h; f++) {
+          const u = this.parseRule(m[f]);
+          u && (n[u.level] ? u.key ? n[u.level][u == null ? void 0 : u.key] = u : n[u.level] = u : u.key ? n[u.level] = { [u == null ? void 0 : u.key]: u } : n[u.level] = u);
         }
     }
-    return a;
+    return n;
   }
   /**
    * 解析单一告警规则
@@ -555,17 +555,17 @@ class rt {
    * @param rule
    * @param options
    */
-  parseRule(s, t = {}) {
-    var a;
-    A == null || A.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)
+  parseRule(e, t = {}) {
+    var n;
+    W == null || W.info("[%s] parse rule: %s", t.requestId, e), e = e.startsWith("[") ? e : `[${e}`, e = e.endsWith("]") ? e : `${e}]`;
+    const o = new RegExp("(?<=\\[)(.+?)(?=])", "g"), i = (n = e == null ? void 0 : e.match(o)) == null ? void 0 : n[0], a = i == null ? void 0 : i.split(",");
+    if (a)
       return {
-        operator: n[0],
-        number: Number.isNaN(Number(n[1])) ? n[1] : Number(n[1]),
-        level: n[2],
-        time: Number(n[3]),
-        key: n[4]
+        operator: a[0],
+        number: Number.isNaN(Number(a[1])) ? a[1] : Number(a[1]),
+        level: a[2],
+        time: Number(a[3]),
+        key: a[4]
       };
   }
   /**
@@ -574,27 +574,27 @@ class rt {
    * @param principle 告警规则
    * @param options
    */
-  checkWeather(s, t, i = {}) {
-    var l, Y, k, b, I, c, v, D, y, M, j, F, R, H, L;
-    let o = 0, n = 0, a = 0, e = 0;
-    const d = Math.round(((Y = (l = t == null ? void 0 : t.SEVERE) == null ? void 0 : l.sigWave) == null ? void 0 : Y.number) * 1.6 * 100) / 100, r = (b = (k = t == null ? void 0 : t.SEVERE) == null ? void 0 : k.sigWave) == null ? void 0 : b.number, u = (c = (I = t == null ? void 0 : t.HEAVY) == null ? void 0 : I.sigWave) == null ? void 0 : c.number, m = Math.round((((D = (v = t == null ? void 0 : t.SEVERE) == null ? void 0 : v.wind) == null ? void 0 : D.number) + 2) * 100) / 100, f = (M = (y = t == null ? void 0 : t.SEVERE) == null ? void 0 : y.wind) == null ? void 0 : M.number, p = (F = (j = t == null ? void 0 : t.HEAVY) == null ? void 0 : j.wind) == null ? void 0 : F.number;
-    for (let W = 0; W < (s == null ? void 0 : s.length); W++) {
-      const S = s[W], P = (H = (R = S == null ? void 0 : S.meteo) == null ? void 0 : R.wave) == null ? void 0 : H.sig, N = (L = S == null ? void 0 : S.meteo) == null ? void 0 : L.wind, E = W ? g(S.eta).diff(g(s[W - 1].eta), "hour", !0) : 0;
-      e = E > e ? E : e, A == null || A.info("[%s] check sig.wave: %j", i.requestId, { ...P, dgThd4Wv: d, svThd4Wv: r, hvThd4Wv: u }), (P == null ? void 0 : P.height) >= d ? S.isDangerous = !0 : (P == null ? void 0 : P.height) >= r ? S.isSevere = !0 : (P == null ? void 0 : P.height) >= u && (S.isHeavy = !0), A == null || A.info("[%s] check wind: %j", i.requestId, { ...N, dgThd4Wd: m, svThd4Wd: f, hvThd4Wd: p }), (N == null ? void 0 : N.scale) >= m ? (S.isDangerous = !0, delete S.isSevere, delete S.isHeavy) : (N == null ? void 0 : N.scale) > f ? (S.isDangerous || (S.isSevere = !0), delete S.isHeavy) : (N == null ? void 0 : N.scale) === p && !S.isDangerous && !S.isSevere && (S.isHeavy = !0), o += S.isDangerous ? E : 0, n += S.isSevere ? E : 0, a += S.isHeavy ? E : 0;
+  checkWeather(e, t, o = {}) {
+    var u, p, k, y, w, c, M, D, g, Y, S, x, C, A, q;
+    let i = 0, a = 0, n = 0, s = 0;
+    const d = Math.round(((p = (u = t == null ? void 0 : t.SEVERE) == null ? void 0 : u.sigWave) == null ? void 0 : p.number) * 1.6 * 100) / 100, r = (y = (k = t == null ? void 0 : t.SEVERE) == null ? void 0 : k.sigWave) == null ? void 0 : y.number, l = (c = (w = t == null ? void 0 : t.HEAVY) == null ? void 0 : w.sigWave) == null ? void 0 : c.number, m = Math.round((((D = (M = t == null ? void 0 : t.SEVERE) == null ? void 0 : M.wind) == null ? void 0 : D.number) + 2) * 100) / 100, f = (Y = (g = t == null ? void 0 : t.SEVERE) == null ? void 0 : g.wind) == null ? void 0 : Y.number, h = (x = (S = t == null ? void 0 : t.HEAVY) == null ? void 0 : S.wind) == null ? void 0 : x.number;
+    for (let V = 0; V < (e == null ? void 0 : e.length); V++) {
+      const T = e[V], O = (A = (C = T == null ? void 0 : T.meteo) == null ? void 0 : C.wave) == null ? void 0 : A.sig, P = (q = T == null ? void 0 : T.meteo) == null ? void 0 : q.wind, J = V ? I(T.eta).diff(I(e[V - 1].eta), "hour", !0) : 0;
+      s = J > s ? J : s, W == null || W.info("[%s] check sig.wave: %j", o.requestId, { ...O, dgThd4Wv: d, svThd4Wv: r, hvThd4Wv: l }), (O == null ? void 0 : O.height) >= d ? T.isDangerous = !0 : (O == null ? void 0 : O.height) >= r ? T.isSevere = !0 : (O == null ? void 0 : O.height) >= l && (T.isHeavy = !0), W == null || W.info("[%s] check wind: %j", o.requestId, { ...P, dgThd4Wd: m, svThd4Wd: f, hvThd4Wd: h }), (P == null ? void 0 : P.scale) >= m ? (T.isDangerous = !0, delete T.isSevere, delete T.isHeavy) : (P == null ? void 0 : P.scale) > f ? (T.isDangerous || (T.isSevere = !0), delete T.isHeavy) : (P == null ? void 0 : P.scale) === h && !T.isDangerous && !T.isSevere && (T.isHeavy = !0), i += T.isDangerous ? J : 0, a += T.isSevere ? J : 0, n += T.isHeavy ? J : 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: m, svThd4Wd: f, hvThd4Wd: p }, sig: { dgThd4Wv: d, svThd4Wv: r, hvThd4Wv: u } };
+    return i = Math.round(i * 100) / 100, a = Math.round(a * 100) / 100, n = Math.round(n * 100) / 100, s = Math.round(s), { sample: e, dangerous: i, severe: a, heavy: n, step: s < 3 ? 3 : s, wind: { dgThd4Wd: m, svThd4Wd: f, hvThd4Wd: h }, sig: { dgThd4Wv: d, svThd4Wv: r, hvThd4Wv: l } };
   }
 }
 const kt = new rt();
-let T;
+let v;
 try {
-  T = z.getLogger("vessel");
+  v = Q.getLogger("vessel");
 } catch {
 } finally {
 }
 const ct = new ot("", !0);
-var dt = /* @__PURE__ */ ((w) => (w.common = "common", w.container = "container", w.tugs = "tugs", w))(dt || {}), ut = /* @__PURE__ */ ((w) => (w.Ballast = "Ballast", w.Laden = "Laden", w))(ut || {}), ht = /* @__PURE__ */ ((w) => (w.Cp = "CP", w.Perf = "Basis", w.Instruct = "Other", w))(ht || {});
-class C {
+var dt = /* @__PURE__ */ ((j) => (j.common = "common", j.container = "container", j.tugs = "tugs", j))(dt || {}), ut = /* @__PURE__ */ ((j) => (j.Ballast = "Ballast", j.Laden = "Laden", j))(ut || {}), ht = /* @__PURE__ */ ((j) => (j.Cp = "CP", j.Perf = "Basis", j.Instruct = "Other", j))(ht || {});
+class H {
   /**
    * @see https://baike.baidu.com/item/%E6%96%B9%E5%BD%A2%E7%B3%BB%E6%95%B0/4965568?fr=aladdin
    * 方形系数（block coefficient）
@@ -607,11 +607,11 @@ class C {
    * @param draught 吃水 m
    * @return [0.55, 0.85]
    */
-  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((d) => Math.abs(d - n));
-    return a[e.indexOf(Math.min(...e))];
+  static blockCoefficient(e, t, o, i) {
+    let a = Math.round(e / (t * o * i) * 100) / 100;
+    a = a < 0.55 ? 0.55 : a > 0.85 ? 0.85 : a;
+    const n = [0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85], s = n.map((d) => Math.abs(d - a));
+    return n[s.indexOf(Math.min(...s))];
   }
   /**
    * @see https://baike.baidu.com/item/%E5%BC%97%E5%8A%B3%E5%BE%B7%E6%95%B0/228891?fromModule=search-result_lemma-recommend
@@ -624,9 +624,9 @@ class C {
    * @param g 重力加速度 9.80 m/s^2
    * @return [0.05, 0.30]
    */
-  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;
+  static froudeNumber(e, t, o = 9.8) {
+    let i = Math.round(Math.sqrt(e * e / (o * t)) * 100) / 100;
+    return i = i < 0.05 ? 0.05 : i > 0.3 ? 0.3 : i, i;
   }
   /**
    * 失速修正系數
@@ -635,8 +635,8 @@ class C {
    * @param loadCondition
    * @private
    */
-  static amendFactor(s, t, i) {
-    const o = {
+  static amendFactor(e, t, o) {
+    const i = {
       0.55: [1.7, -1.4, -7.4],
       0.6: [2.2, -2.5, -9.7],
       0.65: [2.6, -3.7, -11.6],
@@ -645,7 +645,7 @@ class C {
       0.8: [2.6, -13.1, -15.1],
       0.85: [3.1, -18.7, 28]
     };
-    let a = {
+    let n = {
       0.55: [1.7, -1.4, -7.4],
       0.6: [2.2, -2.5, -9.7],
       0.65: [2.6, -3.7, -11.6],
@@ -653,8 +653,8 @@ class C {
       0.75: [2.6, -12.5, -13.5],
       0.8: [3, -16.3, -21.6],
       0.85: [3.4, -20.9, 31.8]
-    }[s];
-    return i === "Laden" && (a = o[s]), a[0] + a[1] * t + a[2] * Math.pow(t, 2);
+    }[e];
+    return o === "Laden" && (n = i[e]), n[0] + n[1] * t + n[2] * Math.pow(t, 2);
   }
   /**
    * 失速方向因子
@@ -667,9 +667,9 @@ class C {
    * @param bn
    * @private
    */
-  static directionFactor(s, t = 0) {
-    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 : s > 150 && s <= 180 ? i = (0.4 - 0.03 * Math.pow(t - 8, 2)) / 2 : i = 1, Math.round(i * 1e5) / 1e5;
+  static directionFactor(e, t = 0) {
+    let o;
+    return e > 30 && e <= 60 ? o = (1.7 - 0.03 * Math.pow(t - 4, 2)) / 2 : e > 60 && e <= 150 ? o = (0.9 - 0.06 * Math.pow(t - 6, 2)) / 2 : e > 150 && e <= 180 ? o = (0.4 - 0.03 * Math.pow(t - 8, 2)) / 2 : o = 1, Math.round(o * 1e5) / 1e5;
   }
   /**
    * 失速船型因子
@@ -682,20 +682,20 @@ class C {
    * @param bn
    * @private
    */
-  static vesselTagFactor(s, t, i, o = 0) {
-    o = o > 6 ? o - 0.9 * (o - 6) : o;
-    let 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;
+  static vesselTagFactor(e, t, o, i = 0) {
+    i = i > 6 ? i - 0.9 * (i - 6) : i;
+    let a;
+    return o === "container" ? a = 0.7 * i + Math.pow(i, 6.5) / (22 * Math.pow(e, 2 / 3)) : t === "Ballast" ? a = 0.7 * i + Math.pow(i, 6.5) / (2.7 * Math.pow(e, 2 / 3)) : a = 0.5 * i + Math.pow(i, 6.5) / (2.7 * Math.pow(e, 2 / 3)), a;
   }
   /**
    * 浪高影响因子
    * @param ht 浪高，单位m
    * @private
    */
-  static waveHeightFactor(s, t) {
-    s = s < 0 ? 0.2 : s, s = s > 6 ? s - 0.9 * (s - 6) : s, s = s > 9 ? 9 : s;
-    let i;
-    return t > 30 && t <= 60 ? i = -0.6 : t > 60 && t <= 90 ? i = -0.4 : t > 90 && t <= 120 ? i = s < 3 ? 0.4 : -0.3 : t > 120 && t <= 150 ? i = s < 3 ? 0.6 : -0.5 : t > 150 && t <= 180 ? i = s < 3 ? 0.7 : -0.6 : i = -0.7, Math.round(i * (0.144 * Math.pow(s, 2) + 0.178 * s) * 1e4) / 1e4;
+  static waveHeightFactor(e, t) {
+    e = e < 0 ? 0.2 : e, e = e > 6 ? e - 0.9 * (e - 6) : e, e = e > 9 ? 9 : e;
+    let o;
+    return t > 30 && t <= 60 ? o = -0.6 : t > 60 && t <= 90 ? o = -0.4 : t > 90 && t <= 120 ? o = e < 3 ? 0.4 : -0.3 : t > 120 && t <= 150 ? o = e < 3 ? 0.6 : -0.5 : t > 150 && t <= 180 ? o = e < 3 ? 0.7 : -0.6 : o = -0.7, Math.round(o * (0.144 * Math.pow(e, 2) + 0.178 * e) * 1e4) / 1e4;
   }
   /**
    * 组装船舶运行参数
@@ -705,21 +705,21 @@ class C {
    * @param bearing 方位角
    * @private
    */
-  static assembleProperties(s, t, i, o) {
+  static assembleProperties(e, t, o, i) {
     var f;
-    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, r = ((f = s == null ? void 0 : s.type) == null ? void 0 : f.toLowerCase()) || "common";
+    const a = e.lbp ?? e.length ?? e.lengthOverall ?? 198.9642, n = e.draught ?? 8, s = e.breadthMoulded ?? e.breadth ?? e.breadthExtreme ?? 32.4572, d = e.deadweight ?? 67035.7773, r = ((f = e == null ? void 0 : e.type) == null ? void 0 : f.toLowerCase()) || "common";
     return {
       tag: r.indexOf("container") > -1 ? "container" : r.indexOf("tugs") > -1 ? "tugs" : "common",
-      lbp: n,
+      lbp: a,
       loadCondition: t,
-      draught: a,
-      breadthMoulded: e,
+      draught: n,
+      breadthMoulded: s,
       // 排水量（吨）= 载重量（吨）/ 1.025 + 吃水（米）× 船舶型宽（米）× 船舶型长（米）× 0.7
       // 其中，1.025是指海水的密度，吨是指公吨，吃水是指船舶的最大吃水深度。船舶型宽是指船舶的最大型宽，船舶型长是指船舶的设计型长。上述公式是针对常规船舶适用的，不同类型的船舶可能会有一些差异。
-      displacement: Math.round((d / 1.025 + a * e * n * 0.7) * 1e4) / 1e4,
+      displacement: Math.round((d / 1.025 + n * s * a * 0.7) * 1e4) / 1e4,
       // 换算为m/s
-      speed: Math.round((i ?? 14.1382) * 1852 / 3600 * 1e4) / 1e4,
-      bearing: o || 90
+      speed: Math.round((o ?? 14.1382) * 1852 / 3600 * 1e4) / 1e4,
+      bearing: i || 90
     };
   }
   /**
@@ -732,35 +732,35 @@ class C {
    * @param useMeteo true 启用气象分析
    * @param useRouteParam true 启用设置速度
    */
-  static async speedLoseAt(s, t, i, o = "", n = 2, a = !0, e = !1, d = {}) {
+  static async speedLoseAt(e, t, o, i = "", a = 2, n = !0, s = !1, d = {}) {
     let r;
-    if (t.velocity && e && (s.speed = B.roundPrecision(t.velocity * 1852 / 3600, 6)), a) {
-      let u;
+    if (t.velocity && s && (e.speed = z.roundPrecision(t.velocity * 1852 / 3600, 6)), n) {
+      let l;
       if (d.meteo2)
         try {
-          const l = await ct.spotForecast(t.lat, t.lng, i.utc().format(), !1, !1, !0, d), [Y] = tt.pickHourly(l, i);
-          u = tt.toLegacy(Y);
-        } catch (l) {
-          T.warn("[%s] meteo2 spot(%j) forecast failed: %s", d.requestId, { ...t, eta: i.utc().format() }, l);
+          const u = await ct.spotForecast(t.lat, t.lng, o.utc().format(), !1, !1, !0, d), [p] = tt.pickHourly(u, o);
+          l = tt.toLegacy(p);
+        } catch (u) {
+          v.warn("[%s] meteo2 spot(%j) forecast failed: %s", d.requestId, { ...t, eta: o.utc().format() }, u);
         }
       else
-        u = await nt.queryPointFactor(t.lng, t.lat, i.valueOf(), "wind,wave,current,watertemp", o, d);
-      const m = C.weatherFactor(s, u), f = C.currentFactor(s.bearing, u == null ? void 0 : u.current, n), p = Math.round((s.speed * 1.943844 + m + f) * 100) / 100;
+        l = await nt.queryPointFactor(t.lng, t.lat, o.valueOf(), "wind,wave,current,watertemp", i, d);
+      const m = H.weatherFactor(e, l), f = H.currentFactor(e.bearing, l == null ? void 0 : l.current, a), h = Math.round((e.speed * 1.943844 + m + f) * 100) / 100;
       r = {
-        meteo: { ...u },
+        meteo: { ...l },
         wxFactor: m,
         cFactor: f,
-        speed: t.velocity && e ? t.velocity : p < 0 ? 1 : p,
-        eta: i.utc().format("YYYY-MM-DDTHH:mm[Z]"),
-        etd: i.utc().format("YYYY-MM-DDTHH:mm[Z]")
+        speed: t.velocity && s ? t.velocity : h < 0 ? 1 : h,
+        eta: o.utc().format("YYYY-MM-DDTHH:mm[Z]"),
+        etd: o.utc().format("YYYY-MM-DDTHH:mm[Z]")
       };
     } else
       r = {
         wxFactor: 0,
         cFactor: 0,
-        speed: t.velocity && e ? t.velocity : Math.round((s.speed * 1.943844 + 0 + 0) * 100) / 100,
-        eta: i.utc().format("YYYY-MM-DDTHH:mm[Z]"),
-        etd: i.utc().format("YYYY-MM-DDTHH:mm[Z]")
+        speed: t.velocity && s ? t.velocity : Math.round((e.speed * 1.943844 + 0 + 0) * 100) / 100,
+        eta: o.utc().format("YYYY-MM-DDTHH:mm[Z]"),
+        etd: o.utc().format("YYYY-MM-DDTHH:mm[Z]")
       };
     return delete t.meteo, delete t.wxFactor, delete t.cFactor, delete t.speed, delete t.etd, { ...r, ...t };
   }
@@ -777,53 +777,53 @@ class C {
    * @param useRouteParam true 启用航线上设置的参数 { suspend: 停留时长（小时）, velocity: 速度（kts）}
    * @private
    */
-  static async speedLoseInHoursStep(s, t, i, o, n, a, e = "", d = !0, r = !1, u = {}) {
+  static async speedLoseInHoursStep(e, t, o, i, a, n, s = "", d = !0, r = !1, l = {}) {
     t.utc();
-    const m = g().add(14, "days"), f = [], p = [];
-    let l = 0, Y = 0, k, b;
-    for (let I = 0; I < a.length - 1; I++) {
-      let c = a[I];
-      c.distanceFromStart = n + Y;
-      const v = a[I + 1];
-      if (s.bearing = V.calculateBearing(c, v, !v.gcToPrevious), c.bearing = s.bearing, c.suspend && r) {
+    const m = t.clone().add(14, "days"), f = [], h = [];
+    let u = 0, p = 0, k, y;
+    for (let w = 0; w < n.length - 1; w++) {
+      let c = n[w];
+      c.distanceFromStart = Math.round((a + p) * 1e4) / 1e4;
+      const M = n[w + 1];
+      if (e.bearing = B.calculateBearing(c, M, !M.gcToPrevious), c.bearing = e.bearing, c.suspend && r) {
         c.eta = c.eta || t.format("YYYY-MM-DDTHH:mm[Z]"), c.elapsed = c.elapsed ?? 0;
-        const M = c.suspend - c.elapsed;
-        if (o - l > M)
-          o = o - l - M, t.add(M, "hour"), c.elapsed = c.suspend;
+        const Y = c.suspend - c.elapsed;
+        if (i - u > Y)
+          i = i - u - Y, t.add(Y, "hour"), c.elapsed = c.suspend;
         else {
-          const j = o - l;
-          c.elapsed += j, t.add(j, "hour"), o = 0;
+          const S = i - u;
+          c.elapsed += S, t.add(S, "hour"), i = 0;
         }
-        if (T == null || T.info(`[%s] suspend ${c.elapsed} hours at %j, and remain ${o} hours need to go...`, u.requestId, c), o === 0)
-          return c.distanceFromPrevious = Y, { etd: t, from: b || c, to: c, next: a.filter((j) => j), wps: f, days: p };
+        if (v == null || v.info(`[%s] suspend ${c.elapsed} hours at %j, and remain ${i} hours need to go...`, l.requestId, c), i === 0)
+          return c.distanceFromPrevious = p, { etd: t, from: y || c, to: c, next: n.filter((S) => S), wps: f, days: h };
       } else
         c.suspend = 0;
-      d = t.isAfter(m) ? !1 : d, c = await C.speedLoseAt(s, c, t, e, 0, d, r, u), b = b || c, c.important && f.push(c), t.isSameOrAfter(i) && (p.push(c), i.add(24, "hour"));
-      const D = V.calculateDistance(c, v, !v.gcToPrevious);
-      let y = Math.ceil(D / b.speed * 1e4) / 1e4;
-      if (l + y < o) {
-        if (l += y, t.add(y, "hour"), delete a[I], T == null || T.info(
-          `[%s] go to %j from %j with ${D}nm, and cost ${y} hours`,
-          u.requestId,
-          { lat: v.lat, lng: v.lng },
-          { lat: b.lat, lng: b.lng, etd: b.etd }
-        ), Y += D, a.filter((M) => M).length <= 1) {
-          k = v, k.eta = t.format("YYYY-MM-DDTHH:mm[Z]"), k.distanceFromPrevious = D, k.distanceFromStart = n + Y, f.push(k), delete a[I + 1];
+      d = t.isAfter(m) ? !1 : d, c = await H.speedLoseAt(e, c, t, s, 0, d, r, l), y = y || c, c.important && f.push(c), t.isSameOrAfter(o) && (h.push(c), o.add(24, "hour"));
+      const D = B.calculateDistance(c, M, !M.gcToPrevious);
+      let g = Math.ceil(D / y.speed * 1e4) / 1e4;
+      if (u + g < i) {
+        if (u += g, t.add(g, "hour"), delete n[w], v == null || v.debug(
+          `[%s] go to %j from %j with ${D}nm, and cost ${g} hours`,
+          l.requestId,
+          { lat: M.lat, lng: M.lng },
+          { lat: y.lat, lng: y.lng, etd: y.etd }
+        ), p += D, n.filter((Y) => Y).length <= 1) {
+          k = M, k.eta = t.format("YYYY-MM-DDTHH:mm[Z]"), k.distanceFromPrevious = D, k.distanceFromStart = Math.round((a + p) * 1e4) / 1e4, f.push(k), delete n[w + 1];
           break;
         }
       } else {
-        y = o - l, t.add(y, "hour");
-        const M = B.roundPrecision(b.speed * y, 4);
-        k = V.calculateCoordinate(c, s.bearing, M, "nauticalmiles", !v.gcToPrevious), k.eta = t.format("YYYY-MM-DDTHH:mm[Z]"), a[I] = k, T == null || T.info(
-          `[%s] go to %j from %j with ${M}nm, and cost ${y} hours`,
-          u.requestId,
+        g = i - u, t.add(g, "hour");
+        const Y = z.roundPrecision(y.speed * g, 4);
+        k = B.calculateCoordinate(c, e.bearing, Y, "nauticalmiles", !M.gcToPrevious), k.eta = t.format("YYYY-MM-DDTHH:mm[Z]"), n[w] = k, v == null || v.debug(
+          `[%s] go to %j from %j with ${Y}nm, and cost ${g} hours`,
+          l.requestId,
           { lat: k.lat, lng: k.lng },
           { lat: c.lat, lng: c.lng, etd: c.etd }
-        ), Y += M, k.distanceFromPrevious = Y, k.distanceFromStart = n + Y;
+        ), p += Y, k.distanceFromPrevious = Math.round(p * 1e4) / 1e4, k.distanceFromStart = Math.round((a + p) * 1e4) / 1e4;
         break;
       }
     }
-    return { etd: t, from: b, to: k, next: a.filter((I) => I), wps: f, days: p };
+    return { etd: t, from: y, to: k, next: n.filter((w) => w), wps: f, days: h };
   }
   /**
    * 洋流影响因子
@@ -831,29 +831,29 @@ class C {
    * @param current 洋流要素
    * @param role  1: 船东, 2: 租家, 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)
+  static currentFactor(e, t, o = 0) {
+    const i = (e - (t == null ? void 0 : t.degree) || 0) / 180 * Math.PI;
+    if (Math.abs(i) === Math.PI / 2)
       return 0;
-    let n = ((t == null ? void 0 : t.kts) || 0) * Math.cos(o);
-    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;
+    let a = ((t == null ? void 0 : t.kts) || 0) * Math.cos(i);
+    return o & 2 ? a = Math.ceil(a * 100) / 100 : o & 1 ? a = Math.floor(a * 100) / 100 : a = Math.round(a * 100) / 100, Math.abs(a) > 5 ? 0 : a;
   }
   /**
    * 风浪影响因子
    * @param props 船舶档案
    * @param wwc 气象要素
    */
-  static weatherFactor(s, t) {
-    var m, f, p, l, Y, k, b;
-    T == null || T.debug("calculate weather factor via: %j", { ...s, ...t });
-    const i = C.blockCoefficient(s.displacement, s.lbp, s.breadthMoulded, s.draught), o = C.froudeNumber(s.speed, s.lbp), n = C.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 = C.directionFactor(a, (f = t == null ? void 0 : t.wind) == null ? void 0 : f.scale), d = C.vesselTagFactor(s.displacement, s.loadCondition, s.tag, (p = t == null ? void 0 : t.wind) == null ? void 0 : p.scale);
-    let r = e * n * d / 100 * s.speed;
-    r = Math.round(r * 1.943844 * 1e4) / 1e4 * -1, s.tag === "tugs" && Math.abs(r) > 1 && (r = r / (Math.abs(Math.round(r)) + 1)), T == null || T.debug("wind wx factor = %d", r), a = Math.abs(s.bearing % 360 - (((Y = (l = t == null ? void 0 : t.wave) == null ? void 0 : l.sig) == null ? void 0 : Y.degree) % 360 || 0));
-    const u = C.waveHeightFactor(((b = (k = t == null ? void 0 : t.wave) == null ? void 0 : k.sig) == null ? void 0 : b.height) ?? 1, a);
-    return T == null || T.debug("wave wx factor = %d", u), r = r * 0.4 + u, T == null || T.debug("weather factor = %d", r), r = Math.abs(r) > 4 ? 4 * (Math.abs(r) / r) + Math.abs(r) / r * (Math.abs(r) - 4) * 0.1 : r, Math.round((r || 0) * 100) / 100;
+  static weatherFactor(e, t) {
+    var m, f, h, u, p, k, y;
+    v == null || v.debug("calculate weather factor via: %j", { ...e, ...t });
+    const o = H.blockCoefficient(e.displacement, e.lbp, e.breadthMoulded, e.draught), i = H.froudeNumber(e.speed, e.lbp), a = H.amendFactor(o, i, e.loadCondition);
+    let n = Math.abs(e.bearing % 360 - (((m = t == null ? void 0 : t.wind) == null ? void 0 : m.degree) % 360 || 0));
+    n = n > 180 ? 360 - n : n;
+    const s = H.directionFactor(n, (f = t == null ? void 0 : t.wind) == null ? void 0 : f.scale), d = H.vesselTagFactor(e.displacement, e.loadCondition, e.tag, (h = t == null ? void 0 : t.wind) == null ? void 0 : h.scale);
+    let r = s * a * d / 100 * e.speed;
+    r = Math.round(r * 1.943844 * 1e4) / 1e4 * -1, e.tag === "tugs" && Math.abs(r) > 1 && (r = r / (Math.abs(Math.round(r)) + 1)), v == null || v.debug("wind wx factor = %d", r), n = Math.abs(e.bearing % 360 - (((p = (u = t == null ? void 0 : t.wave) == null ? void 0 : u.sig) == null ? void 0 : p.degree) % 360 || 0));
+    const l = H.waveHeightFactor(((y = (k = t == null ? void 0 : t.wave) == null ? void 0 : k.sig) == null ? void 0 : y.height) ?? 1, n);
+    return v == null || v.debug("wave wx factor = %d", l), r = r * 0.4 + l, v == null || v.debug("weather factor = %d", r), r = Math.abs(r) > 4 ? 4 * (Math.abs(r) / r) + Math.abs(r) / r * (Math.abs(r) - 4) * 0.1 : r, Math.round((r || 0) * 100) / 100;
   }
   /**
    * 全程失速分析(走完航程)
@@ -867,74 +867,74 @@ class C {
    * @param useMeteo true 启用气象分析
    * @param useRouteParam
    */
-  static async analyseInstant(s, t, i, o, n, a = "", e = 0, d = !0, r = !1, u = {}) {
-    var E, G, U, J, Q;
-    const m = g().valueOf();
-    s.lng = B.convertToStdLng(s.lng);
-    const { route: f, waypoints: p } = n.points, l = V.calculateSubRoute(s, f);
-    if (((E = l[0]) == null ? void 0 : E.length) <= 1)
+  static async analyseInstant(e, t, o, i, a, n = "", s = 0, d = !0, r = !1, l = {}) {
+    var J, K, _, G, R;
+    const m = I().valueOf();
+    e.lng = z.convertToStdLng(e.lng);
+    const { route: f, waypoints: h } = a.points, u = B.calculateSubRoute(e, f);
+    if (((J = u[0]) == null ? void 0 : J.length) <= 1)
       return;
-    const { v0: Y, label: k } = s.sog ? {
-      v0: s.sog,
+    const { v0: p, label: k } = e.sog ? {
+      v0: e.sog,
       label: "Other"
       /* Instruct */
     } : {
-      v0: o.speed,
+      v0: i.speed,
       label: "CP"
       /* Cp */
-    }, b = C.assembleProperties(i, o.loadCondition, Y, 0), I = p.length ? V.calculateSubWaypoints(s, p) : [];
-    I.forEach((x) => x.important = !0);
+    }, y = H.assembleProperties(o, i.loadCondition, p, 0), w = h.length ? B.calculateSubWaypoints(e, h) : [];
+    w.forEach((N) => N.important = !0);
     const c = {
-      from: { ...s },
-      route: l,
-      waypoints: I,
-      v0: Y,
+      from: { ...e },
+      route: u,
+      waypoints: w,
+      v0: p,
       label: k
-    }, v = {
+    }, M = {
       hours: [],
       days: [],
       wps: []
     };
-    e || (V.calculateRouteDistance(l) / o.speed <= 72 ? e = 3 : e = 6);
-    let D = V.simplifyRouteToCoordinates(l, I, 0), y = 0, M = 0, j = 0, F = 0;
-    t = g(t).utc();
-    const R = t.clone();
+    s || (B.calculateRouteDistance(u) / i.speed <= 72 ? s = 3 : s = 6);
+    let D = B.simplifyRouteToCoordinates(u, w, 0), g = 0, Y = 0, S = 0, x = 0;
+    t = I(t).utc();
+    const C = t.clone();
     for (; D.length > 0; ) {
-      const x = e - t.hour() % e, _ = Math.ceil(t.clone().add(x, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4, q = await C.speedLoseInHoursStep(
-        b,
-        t,
-        R,
-        _,
+      const N = s - t.hour() % s, F = Math.ceil(t.clone().add(N, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4, E = await H.speedLoseInHoursStep(
         y,
+        t,
+        C,
+        F,
+        g,
         D,
-        a,
+        n,
         d,
         r,
-        u
+        l
       );
-      (G = q.from) != null && G.speed && (v.hours.push(q.from), v.wps.push(...q.wps), v.days.push(...q.days)), D = q == null ? void 0 : q.next, D.length || v.hours.push(q == null ? void 0 : q.to), y += ((U = q == null ? void 0 : q.to) == null ? void 0 : U.distanceFromPrevious) ?? 0;
+      (K = E.from) != null && K.speed && (M.hours.push(E.from), M.wps.push(...E.wps), M.days.push(...E.days)), D = E == null ? void 0 : E.next, D.length || M.hours.push(E == null ? void 0 : E.to), g += Math.round((((_ = E == null ? void 0 : E.to) == null ? void 0 : _.distanceFromPrevious) ?? 0) * 1e4) / 1e4;
     }
-    const H = v.hours;
-    for (let x = 0; x < H.length - 1; x++) {
-      const _ = g(H[x + 1].eta).diff(H[x].etd, "hour", !0) || 1;
-      M += (H[x].wxFactor || 0) * _, j += (H[x].cFactor || 0) * _, F += _;
+    const A = M.hours;
+    for (let N = 0; N < A.length - 1; N++) {
+      const F = I(A[N + 1].eta).diff(A[N].etd, "hour", !0) || 1;
+      Y += (A[N].wxFactor || 0) * F, S += (A[N].cFactor || 0) * F, x += F;
     }
-    (J = v.wps) == null || J.forEach((x, _) => {
-      if (_) {
-        const q = v.wps[_ - 1], et = x.distanceFromStart - q.distanceFromStart, X = g(x.eta).diff(g(q.etd), "h", !0);
+    (G = M.wps) == null || G.forEach((N, F) => {
+      if (F) {
+        const E = M.wps[F - 1], et = N.distanceFromStart - E.distanceFromStart, X = I(N.eta).diff(I(E.etd), "h", !0);
         if (X < 1)
-          x.avgSpd = q.speed;
+          N.avgSpd = E.speed;
         else {
-          x.avgSpd = Math.round(et / X * 100) / 100;
-          const $ = Math.round((q.speed + x.speed) / 2 * 100) / 100;
-          x.avgSpd = x.avgSpd > $ ? $ : x.avgSpd;
+          N.avgSpd = Math.round(et / X * 100) / 100;
+          const $ = Math.round((E.speed + N.speed) / 2 * 100) / 100;
+          N.avgSpd = N.avgSpd > $ ? $ : N.avgSpd;
         }
       }
-    }), c.sample = v;
-    const L = v.hours.at(0), W = v.hours.at(-1);
-    c.distance = Math.round(W.distanceFromStart * 1e4) / 1e4, c.etd = g(L.eta).utc().format(), c.eta = g(W.eta).utc().format(), c.wxFactor = Math.round(M / F * 1e4) / 1e4, c.cFactor = Math.round(j / F * 1e4) / 1e4, c.avgSpeed = Math.round(W.distanceFromStart / F * 1e4) / 1e4, c.totalHrs = Math.round(F * 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 P = g().valueOf() - m, N = ((Q = v == null ? void 0 : v.hours) == null ? void 0 : Q.length) || 1;
-    return T == null || T.info("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", u == null ? void 0 : u.requestId, P, N, Math.round(P / N * 1e3) / 1e3), c;
+    }), c.sample = M;
+    const q = M.hours.at(0), V = M.hours.at(-1);
+    c.distance = Math.round(V.distanceFromStart * 1e4) / 1e4, c.etd = I(q.eta).utc().format(), c.eta = I(V.eta).utc().format(), c.wxFactor = Math.round(Y / x * 1e4) / 1e4, c.cFactor = Math.round(S / x * 1e4) / 1e4, c.avgSpeed = Math.round(V.distanceFromStart / x * 1e4) / 1e4, c.totalHrs = Math.round(x * 1e4) / 1e4, c.totalFoCons = Math.round((i == null ? void 0 : i.fo) / 24 * c.totalHrs * 1e3) / 1e3, c.totalDgoCons = Math.round((i == null ? void 0 : i.dgo) / 24 * c.totalHrs * 1e3) / 1e3;
+    const O = I().valueOf() - m, P = ((R = M == null ? void 0 : M.hours) == null ? void 0 : R.length) || 1;
+    return v == null || v.info("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", l == null ? void 0 : l.requestId, O, P, Math.round(O / P * 1e3) / 1e3), c;
   }
   /**
    * 分段失速分析（最多走hours 小时）
@@ -949,86 +949,280 @@ class C {
    * @param useMeteo true 启用气象分析
    * @param useRouteParam
    */
-  static async analyseInstantWithThreshed(s, t, i, o, n, a, e, d = "", r = 3, u = !0, m = !1, f = {}) {
-    var W, S, P;
-    s.lng = B.convertToStdLng(s.lng);
-    const { v0: p, label: l } = s.sog ? {
-      v0: s.sog,
+  static async analyseInstantWithThreshed(e, t, o, i, a, n, s, d = "", r = 3, l = !0, m = !1, f = {}) {
+    var J, K, _, G;
+    const h = I().valueOf();
+    e.lng = z.convertToStdLng(e.lng);
+    const { v0: u, label: p } = e.sog ? {
+      v0: e.sog,
       label: "Other"
       /* Instruct */
     } : {
-      v0: n.speed,
+      v0: a.speed,
       label: "CP"
       /* Cp */
-    }, Y = C.assembleProperties(o, n.loadCondition, p, 0), k = V.calculateSubRoute(s, a);
-    if (((W = k[0]) == null ? void 0 : W.length) <= 1)
+    }, k = H.assembleProperties(i, a.loadCondition, u, 0), y = B.calculateSubRoute(e, n);
+    if (((J = y[0]) == null ? void 0 : J.length) <= 1)
       return;
-    const b = e.length ? V.calculateSubWaypoints(s, e) : [];
-    b.forEach((N) => N.important = !0);
-    let I = V.simplifyRouteToCoordinates(k, b, 0), c = 0, v = 0, D = 0, y = 0, M;
-    const j = {
+    const w = s.length ? B.calculateSubWaypoints(e, s) : [];
+    w.forEach((R) => R.important = !0);
+    let c = B.simplifyRouteToCoordinates(y, w, 0), M = 0, D = 0, g = 0, Y = 0;
+    const S = {
       hours: [],
       wps: [],
       days: []
     };
-    for (t = g(t).utc(); I.length > 0; ) {
-      const N = r - t.hour() % r;
-      let E = Math.ceil(t.clone().add(N, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4;
-      if (E = t.clone().add(E, "h").isAfter(i) ? i.diff(t, "h", !0) * 1e4 / 1e4 : E, E)
-        M = await C.speedLoseInHoursStep(
-          Y,
+    t = I(t).utc();
+    const x = t.clone();
+    for (; c.length > 0; ) {
+      const R = r - t.hour() % r;
+      let N = Math.ceil(t.clone().add(R, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4;
+      if (N = t.clone().add(N, "h").isAfter(o) ? o.diff(t, "h", !0) * 1e4 / 1e4 : N, N) {
+        const F = await H.speedLoseInHoursStep(
+          k,
           t,
-          i.clone(),
-          E,
+          x,
+          N,
+          M,
           c,
-          I,
           d,
-          u,
+          l,
           m,
           f
-        ), (S = M.from) != null && S.speed && (j.hours.push(M.from), M != null && M.wps && j.wps.push(...M.wps), j.days.push(...M.days)), I = M == null ? void 0 : M.next, I.length || (j.hours.push(M == null ? void 0 : M.to), M != null && M.wps && j.wps.push(...M.wps), j.days.push(M == null ? void 0 : M.to)), c += ((P = M == null ? void 0 : M.to) == null ? void 0 : P.distanceFromPrevious) ?? 0;
-      else {
-        M && (j.hours.push(M.to), M != null && M.wps && j.wps.push(...M.wps), j.days.push(M.to));
+        );
+        (K = F.from) != null && K.speed && (S.hours.push(F.from), F != null && F.wps && S.wps.push(...F.wps), S.days.push(...F.days)), c = F == null ? void 0 : F.next, c.length || S.hours.push(F == null ? void 0 : F.to), M += Math.round((((_ = F == null ? void 0 : F.to) == null ? void 0 : _.distanceFromPrevious) ?? 0) * 1e4) / 1e4;
+      } else
         break;
+    }
+    const C = S.hours;
+    for (let R = 0; R < C.length - 1; R++) {
+      const N = I(C[R + 1].eta).diff(C[R].etd, "hour", !0);
+      D += C[R].wxFactor * N, g += C[R].cFactor * N, Y += N;
+    }
+    const A = S.hours.at(0), q = S.hours.at(-1), V = {
+      sample: S,
+      distance: Math.round(((q == null ? void 0 : q.distanceFromStart) || 0) * 1e4) / 1e4,
+      // 注意，可能会在first节点Drift,所有采用eta做为初始出发时间
+      etd: I(A.eta).utc().format(),
+      eta: I(q == null ? void 0 : q.eta).utc().format(),
+      wxFactor: Math.round(D / Y * 1e4) / 1e4,
+      cFactor: Math.round(g / Y * 1e4) / 1e4,
+      avgSpeed: Math.round(((q == null ? void 0 : q.distanceFromStart) || 0) / Y * 1e4) / 1e4,
+      totalHrs: Math.round(Y * 1e4) / 1e4,
+      totalFoCons: Math.round((a == null ? void 0 : a.fo) / 24 * Y * 1e3) / 1e3,
+      totalDgoCons: Math.round((a == null ? void 0 : a.dgo) / 24 * Y * 1e3) / 1e3,
+      from: A,
+      to: q,
+      route: y,
+      waypoints: w,
+      v0: u,
+      label: p
+    }, O = I().valueOf() - h, P = ((G = S == null ? void 0 : S.hours) == null ? void 0 : G.length) || 1;
+    return v == null || v.info("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", f == null ? void 0 : f.requestId, O, P, Math.round(O / P * 1e3) / 1e3), V;
+  }
+  /**
+   * 在指定航线条件下，基于多CP，动态计算最优成本(租金+油费)方案
+   * 1）首先分别计算单CP下的成本方案，基于成本排序，保留最省成本的两个方案，分别用 a, b 表示;
+   * 2) 选择步骤1）中a,b的CP,分别用 cpa, cpb 表示；
+   * 3) 基于当前有效天气预报时长（14天）,按步长多次减半，分别用7,4,2,1天步长及cpa,cpb交替计算各种组合下的成本；
+   * 4）保留步骤3）中的最省成本的两个方案，并与步骤1）合并按成本排序，获取成本较优的三个方案；
+   * 5) 基于步骤4），同客户沟通后，最终基于时间和成本，选择最合适的方案；
+   *
+   *
+   * @param props 基础属性（位置，出发时间等）
+   * @param vessel 船舶档案（长、宽、吃水、船舶类型等）
+   * @param cps CP条款（装载状态，速度、油耗等）
+   * @param lane 基础航线（重要转向点）
+   * @param options
+   */
+  static async analyseCost(e, t, o, i, a = {}) {
+    var p, k;
+    const n = I().valueOf(), s = [];
+    a.meteo2 = !0, e.speedStep = e.speedStep || 3;
+    const d = I.utc(e.etd).add(14, "day");
+    let r = 1;
+    for (const y of o) {
+      v == null || v.info("[%s][L%d-%d] analyse from %s to %s", a.requestId, 1, r, e.etd, d.format()), v == null || v.info("[%s][L%d-%d] analyse with cp: ", a.requestId, 1, r, y);
+      const w = JSON.parse(JSON.stringify(i.route)), c = JSON.parse(JSON.stringify(i.waypoints)), M = await H.analyseInstantWithThreshed(
+        { lat: e.lat, lng: e.lng },
+        e.etd,
+        d,
+        t,
+        y,
+        w,
+        c,
+        e.meteoVendor,
+        e.speedStep,
+        !1,
+        e.useRouteParam,
+        a
+      );
+      M && (await H.calculateCost(M, y, e, a), s.push(M), v == null || v.info("[%s][L%d-%d] cost: %j", a.requestId, 1, r, {
+        distance: M.distance,
+        totalHrs: M.totalHrs,
+        totalFoCons: M.totalFoCons,
+        totalDgoCons: M.totalDgoCons,
+        etd: M.etd,
+        eta: M.eta,
+        cost: M.cost
+      })), r++;
+    }
+    s.sort((y, w) => y.cost.total - w.cost.total);
+    const l = s.at(0), m = s.at(1), f = [];
+    if (f.push({ combined: !1, speeds: [l], cost: (p = l.cost) == null ? void 0 : p.total }), m) {
+      const y = l.cost.cp, w = m.cost.cp, c = I(l.eta), M = I(l.etd), D = c.diff(M, "days", !0);
+      let g = Math.ceil(D / 2);
+      g = g > 7 ? 7 : g;
+      let Y = 2, S = { combined: !1, speeds: [m], cost: (k = m.cost) == null ? void 0 : k.total }, x;
+      for (; g >= 1 && (x = await H.combinedAnalyse(e, t, d, [y, w], i, g, { ...a, level: Y }), !(S.cost < x.cost)); ) {
+        const C = S;
+        if (S = x, g === 1) {
+          x = C;
+          break;
+        }
+        x = void 0, g = Math.ceil(g / 2), Y += 1;
       }
+      f.push(S), x && f.push(x);
     }
-    const F = j.hours;
-    for (let N = 0; N < F.length - 1; N++) {
-      const E = g(F[N + 1].eta).diff(F[N].etd, "hour", !0);
-      v += F[N].wxFactor * E, D += F[N].cFactor * E, y += E;
+    const u = I().valueOf() - n;
+    return v == null || v.info("[%s] analyse elapsed: %d ms", a == null ? void 0 : a.requestId, u), f.sort((y, w) => y.cost - w.cost);
+  }
+  /**
+   * 按步长多次减半，分别用7,4,2,1天步长及cpa,cpb交替计算各种组合下的成本
+   * @param props 基础属性（位置，出发时间，日租金，FO/DO/GO单价等）
+   * @param vessel 船舶档案（长、宽、吃水、船舶类型等）
+   * @param cps CP条款（装载状态，速度、油耗等）
+   * @param max 最长分析未来14天
+   * @param lane 基础航线（重要转向点）
+   * @param step 步长，7，4，2，1
+   * @param options
+   */
+  static async combinedAnalyse(e, t, o, i, a, n, s = {}) {
+    v == null || v.info("[%s][L%d] analyse with alternate cp in every %d days", s.requestId, s.level, n);
+    const d = await H.alternateAnalyse(e, t, o, i, 0, a, n, s), r = d.reduce((f, h) => f + h.cost.total, 0);
+    v == null || v.info("[%s][L%d] cost with alternate cp a first: %j", s.requestId, s.level, { cost: r });
+    const l = await H.alternateAnalyse(e, t, o, i, 1, a, n, s), m = l.reduce((f, h) => f + h.cost.total, 0);
+    return v == null || v.info("[%s][L%d] cost with alternate cp b first: %j", s.requestId, s.level, { cost: m }), r < m ? { combined: !0, cost: Math.round(r * 1e3) / 1e3, speeds: d } : { combined: !0, cost: Math.round(m * 1e3) / 1e3, speeds: l };
+  }
+  /**
+   * 基于cp索引，交替计算指定步长下的成本
+   * @param props 基础属性（位置，出发时间等）
+   * @param vessel 船舶档案（长、宽、吃水、船舶类型等）
+   * @param cps CP条款（装载状态，速度、油耗等）
+   * @param cpIndex cp索引
+   * @param max 最长分析未来14天
+   * @param lane 基础航线（重要转向点）
+   * @param step 步长，7，4，2，1
+   * @param options
+   */
+  static async alternateAnalyse(e, t, o, i, a, n, s, d = {}) {
+    var h, u;
+    let r = I.utc(e.etd), l = 1;
+    const m = { lat: e.lat, lng: e.lng }, f = [];
+    for (; r.isBefore(o); ) {
+      const p = r.clone().add(s, "day");
+      v == null || v.info("[%s][L%d-%d] analyse from %s to %s", d.requestId, d.level, l, e.etd, p.format()), v == null || v.info("[%s][L%d-%d] analyse with cp: ", d.requestId, d.level, l, i[a]);
+      const k = JSON.parse(JSON.stringify(n.route)), y = JSON.parse(JSON.stringify(n.waypoints)), w = await H.analyseInstantWithThreshed(
+        m,
+        r.format(),
+        p,
+        t,
+        i[a],
+        k,
+        y,
+        e.meteoVendor,
+        e.speedStep,
+        !1,
+        e.useRouteParam,
+        d
+      );
+      w && (await H.calculateCost(w, i[a], e, d), v == null || v.info("[%s][L%d-%d] cost: %j", d.requestId, d.level, l, {
+        distance: w.distance,
+        totalHrs: w.totalHrs,
+        totalFoCons: w.totalFoCons,
+        totalDgoCons: w.totalDgoCons,
+        etd: w.etd,
+        eta: w.eta,
+        cost: w.cost
+      }));
+      const c = (u = (h = w == null ? void 0 : w.sample) == null ? void 0 : h.hours) == null ? void 0 : u.at(-1);
+      if (c)
+        m.lat = c.lat, m.lng = c.lng, r = I(c.eta), f.push(w), l += 1, a = a ? 0 : 1;
+      else
+        break;
+    }
+    return f;
+  }
+  /**
+   * 计算Speed的cost
+   * @param speed
+   * @param cp
+   * @param props
+   * @param options
+   */
+  static async calculateCost(e, t, o, i = {}) {
+    if (e) {
+      const a = Math.round(e.totalHrs / 24 * (o.dailyHire || 0) * (1 - (o.addComm || 0)) * 1e3) / 1e3, n = Math.round(e.totalFoCons * (o.priceFO || 0) * 1e3) / 1e3, s = Math.round(e.totalDgoCons * (o.priceDGO || 0) * 1e3) / 1e3;
+      e.cost = {
+        total: Math.round((a + n + s) * 1e3) / 1e3,
+        hire: a,
+        bunker: Math.round((n + s) * 1e3) / 1e3,
+        cp: t
+      };
+    }
+    return e;
+  }
+  static async mergeSpeeds(e, t = {}) {
+    const o = {
+      hours: [],
+      wps: [],
+      days: []
+    }, i = e.reduce((h, u) => h + u.distance, 0), a = e.reduce((h, u) => h + u.totalHrs, 0), n = e.reduce((h, u) => h + u.wxFactor * u.totalHrs / a, 0), s = e.reduce((h, u) => h + u.cFactor * u.totalHrs / a, 0), d = e.reduce((h, u) => h + u.totalFoCons, 0), r = e.reduce((h, u) => h + u.totalDgoCons, 0), l = e.reduce((h, u) => h + u.cost.total, 0), m = e.reduce((h, u) => h + u.cost.hire, 0), f = e.reduce((h, u) => h + u.cost.bunker, 0);
+    for (const h of e) {
+      const u = h.sample.hours, p = h.sample.wps, k = h.sample.days;
+      u.forEach((y) => {
+        var c;
+        ((c = o.hours) == null ? void 0 : c.findIndex((M) => M.eta === y.eta)) === -1 && o.hours.push(y);
+      }), p.forEach((y) => {
+        var c;
+        ((c = o.wps) == null ? void 0 : c.findIndex((M) => M.eta === y.eta)) === -1 && o.wps.push(y);
+      }), k.forEach((y) => {
+        var c;
+        ((c = o == null ? void 0 : o.days) == null ? void 0 : c.findIndex((M) => M.eta === y.eta)) === -1 && o.days.push(y);
+      });
     }
-    const R = j.hours.at(0), H = j.hours.at(-1);
     return {
-      sample: j,
-      distance: Math.round(((H == null ? void 0 : H.distanceFromStart) || 0) * 1e4) / 1e4,
-      // 注意，可能会在first节点Drift,所有采用eta做为初始出发时间
-      etd: g(R.eta).utc().format(),
-      eta: g(H == null ? void 0 : H.eta).utc().format(),
-      wxFactor: Math.round(v / y * 1e4) / 1e4,
-      cFactor: Math.round(D / y * 1e4) / 1e4,
-      avgSpeed: Math.round(((H == null ? void 0 : H.distanceFromStart) || 0) / y * 1e4) / 1e4,
-      totalHrs: Math.round(y * 1e4) / 1e4,
-      from: s,
-      to: H,
-      route: k,
-      waypoints: b,
-      v0: p,
-      label: l
+      sample: o,
+      etd: e.at(0).etd,
+      eta: e.at(-1).eta,
+      from: e.at(0).from,
+      to: e.at(-1).to,
+      label: "combined",
+      distance: Math.round(i * 1e4) / 1e4,
+      totalHrs: Math.round(a * 1e3) / 1e3,
+      avgSpeed: Math.round(i / a * 1e3) / 1e3,
+      wxFactor: Math.round(n / a * 1e3) / 1e3,
+      cFactor: Math.round(s / a * 1e3) / 1e3,
+      totalFoCons: Math.round(d * 1e3) / 1e3,
+      totalDgoCons: Math.round(r * 1e3) / 1e3,
+      cost: {
+        total: Math.round(l * 1e3) / 1e3,
+        hire: Math.round(m * 1e3) / 1e3,
+        bunker: Math.round(f * 1e3) / 1e3
+      }
     };
   }
-  static async analyseCost(s, t, i, o, n = {}) {
-  }
 }
 export {
-  K as AISImpl,
+  U as AISImpl,
   rt as AlertHelper,
   it as AlertLevel,
-  vt as HifleetImpl,
+  gt as HifleetImpl,
   ut as LoadCondition,
-  Yt as MyShipImpl,
-  bt as MyVesselImpl,
-  wt as ShipxyImpl,
-  C as SpeedHelper,
+  pt as MyShipImpl,
+  wt as MyVesselImpl,
+  It as ShipxyImpl,
+  H as SpeedHelper,
   ht as SpeedLabel,
   dt as VesselTag,
   kt as alertHelper