@idm-plugin/vessel 1.9.6 → 1.9.7

package/dist/index.js

@@ -1,12 +1,12 @@
 var ht = Object.defineProperty;
-var lt = (j, e, t) => e in j ? ht(j, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : j[e] = t;
-var z = (j, e, t) => (lt(j, typeof e != "symbol" ? e + "" : e, t), t);
+var lt = (E, e, t) => e in E ? ht(E, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : E[e] = t;
+var K = (E, e, t) => (lt(E, typeof e != "symbol" ? e + "" : e, t), t);
 import B from "got";
 import rt from "@log4js-node/log4js-api";
 import g from "moment";
 import { LngLatHelper as J, LaneHelper as W } from "@idm-plugin/geo2";
-import { MeteoHelper2 as ft, MeteoHelper as mt } from "@idm-plugin/meteo2";
-import { Meteo2Assist as ct } from "@idm-plugin/meteo";
+import { MeteoHelper2 as ft } from "@idm-plugin/meteo2";
+import { Meteo2Assist as it } from "@idm-plugin/meteo";
 let p;
 try {
   p = rt.getLogger("vessel");
@@ -54,45 +54,45 @@ class et {
     return { labelCn: t, labelEn: n };
   }
 }
-class jt extends et {
+class xt extends et {
   constructor(t, n) {
     super();
-    z(this, "clientId");
-    z(this, "clientSecret");
-    z(this, "token");
+    K(this, "clientId");
+    K(this, "clientSecret");
+    K(this, "token");
     this.clientId = t, this.clientSecret = n;
   }
   async authToken(t = {}) {
-    const n = "https://svc.data.myvessel.cn/ada/oauth/token", r = {
+    const n = "https://svc.data.myvessel.cn/ada/oauth/token", i = {
       searchParams: {
         client_id: this.clientId,
         client_secret: this.clientSecret,
         grant_type: "client_credentials"
       }
-    }, a = await B.post(n, r).json();
-    p == null || p.info("[%s] fetch access token from: %s - %j", t.requestId, n, a), a.error || (this.token = {
-      accessToken: a.access_token,
-      tokenType: a.token_type,
-      expiresIn: a.expires_in,
-      scope: a.scope,
-      jti: a.jti,
+    }, o = await B.post(n, i).json();
+    p == null || p.info("[%s] fetch access token from: %s - %j", t.requestId, n, o), o.error || (this.token = {
+      accessToken: o.access_token,
+      tokenType: o.token_type,
+      expiresIn: o.expires_in,
+      scope: o.scope,
+      jti: o.jti,
       issuedAt: g().utc().format()
     });
   }
   async realTimePosition(t, n = {}) {
-    var d, i, h;
+    var d, r, h;
     (!this.token || g().diff(g(this.token.issuedAt), "seconds") > ((d = this.token) == null ? void 0 : d.expiresIn) - 300) && await this.authToken(n);
-    const r = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/location/unit", a = {
+    const i = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/location/unit", o = {
       headers: {
-        Authorization: `${(i = this.token) == null ? void 0 : i.tokenType} ${(h = this.token) == null ? void 0 : h.accessToken}`
+        Authorization: `${(r = this.token) == null ? void 0 : r.tokenType} ${(h = this.token) == null ? void 0 : h.accessToken}`
       },
       searchParams: { mmsi: t }
     };
-    p == null || p.info("[%s] fetch realtime position from: %s - %j", n.requestId, r, a);
-    const o = await B.get(r, a).json();
-    if (o.code)
-      return p == null || p.warn("[%s] fetch realtime position failed: %j", n.requestId, r, { message: o.message, status: o.status, code: o.code }), o;
-    const s = o.data;
+    p == null || p.info("[%s] fetch realtime position from: %s - %j", n.requestId, i, o);
+    const a = await B.get(i, o).json();
+    if (a.code)
+      return p == null || p.warn("[%s] fetch realtime position failed: %j", n.requestId, i, { message: a.message, status: a.status, code: a.code }), a;
+    const s = a.data;
     for (const M in s)
       !isNaN(s[M]) && Number(s[M]) !== 1 / 0 && (s[M] = Number(s[M]));
     if (s) {
@@ -131,37 +131,37 @@ class jt extends et {
     } else
       return {};
   }
-  async trajectory(t, n, r, a, o = !0, s = {}) {
+  async trajectory(t, n, i, o, a = !0, s = {}) {
     (!this.token || g().diff(g(this.token.issuedAt), "seconds") > this.token.expiresIn - 300) && await this.authToken(s);
-    const d = await this.realTimePosition(t, s), i = g(n), h = g(r), M = [];
-    for (; h.diff(i, "day", !0) > 30; )
-      await this.trajectoryIn30Day(t, i, i.clone().add(30, "day"), d, a, M, s), i.add(30, "day");
-    return await this.trajectoryIn30Day(t, i, h, d, a, M, s), M;
+    const d = await this.realTimePosition(t, s), r = g(n), h = g(i), M = [];
+    for (; h.diff(r, "day", !0) > 30; )
+      await this.trajectoryIn30Day(t, r, r.clone().add(30, "day"), d, o, M, s), r.add(30, "day");
+    return await this.trajectoryIn30Day(t, r, h, d, o, M, s), M;
   }
-  async trajectoryIn30Day(t, n, r, a, o, s, d = {}) {
-    var m, F, x, v, b;
-    const i = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/track", h = {
+  async trajectoryIn30Day(t, n, i, o, a, s, d = {}) {
+    var m, C, S, w, b;
+    const r = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/track", h = {
       headers: {
-        Authorization: `${(m = this.token) == null ? void 0 : m.tokenType} ${(F = this.token) == null ? void 0 : F.accessToken}`
+        Authorization: `${(m = this.token) == null ? void 0 : m.tokenType} ${(C = this.token) == null ? void 0 : C.accessToken}`
       },
       json: {
         mmsi: t,
         startTime: n.utcOffset(8).format("YYYY-MM-DD HH:mm:ss"),
-        endTime: r.utcOffset(8).format("YYYY-MM-DD HH:mm:ss")
+        endTime: i.utcOffset(8).format("YYYY-MM-DD HH:mm:ss")
       }
     };
-    p == null || p.info("[%s] fetch trajectory from: %s - %j", d.requestId, i, h);
-    const M = await B.post(i, h).json();
+    p == null || p.info("[%s] fetch trajectory from: %s - %j", d.requestId, r, h);
+    const M = await B.post(r, h).json();
     if (M.code)
-      return p == null || p.warn("[%s] fetch trajectory failed: %j", d.requestId, i, { message: M.message, status: M.status, code: M.code }), M;
+      return p == null || p.warn("[%s] fetch trajectory failed: %j", d.requestId, r, { message: M.message, status: M.status, code: M.code }), M;
     let y = -1;
-    const w = g(`${(v = (x = M.data) == null ? void 0 : x[0]) == null ? void 0 : v.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    const v = g(`${(w = (S = M.data) == null ? void 0 : S[0]) == null ? void 0 : w.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
     return (b = M.data) == null || b.forEach((c) => {
       for (const Y in c)
         !isNaN(c[Y]) && Number(c[Y]) !== 1 / 0 && (c[Y] = Number(c[Y]));
-      const f = g(`${c.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00"), l = c.status, { labelCn: u, labelEn: I } = this.parseStatus(l), S = {
+      const f = g(`${c.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00"), l = c.status, { labelCn: u, labelEn: I } = this.parseStatus(l), k = {
         mmsi: c.mmsi,
-        imo: a == null ? void 0 : a.imo,
+        imo: o == null ? void 0 : o.imo,
         lat: c.lat,
         lng: c.lon,
         sog: c.sog,
@@ -177,32 +177,32 @@ class jt extends et {
         method: "trajectory",
         vendor: "myVessel",
         utc: f.utc().format()
-      }, D = Math.floor(f.diff(w, "minute", !0) / (o || 1));
-      D !== y && (y = D, s.push(S));
+      }, D = Math.floor(f.diff(v, "minute", !0) / (a || 1));
+      D !== y && (y = D, s.push(k));
     }), s;
   }
 }
 class Et extends et {
   constructor(t) {
     super();
-    z(this, "token");
+    K(this, "token");
     this.token = t;
   }
   async realTimePosition(t, n = {}) {
-    const r = "https://api.hifleet.com/position/position/get/token", a = {
+    const i = "https://api.hifleet.com/position/position/get/token", o = {
       searchParams: {
         mmsi: t,
         usertoken: this.token
       }
-    }, o = await B.post(r, a).json();
-    p == null || p.info("[%s] fetch realtime position from: %s - %j", n.requestId, r, a);
-    const s = o == null ? void 0 : o.list;
+    }, a = await B.post(i, o).json();
+    p == null || p.info("[%s] fetch realtime position from: %s - %j", n.requestId, i, o);
+    const s = a == null ? void 0 : a.list;
     if (!s)
-      return p == null || p.warn("[%s] fetch realtime position failed: %j", n.requestId, r, o), o;
-    for (const w in s)
-      !isNaN(s[w]) && Number(s[w]) !== 1 / 0 && (s[w] = Number(s[w]));
+      return p == null || p.warn("[%s] fetch realtime position failed: %j", n.requestId, i, a), a;
+    for (const v in s)
+      !isNaN(s[v]) && Number(s[v]) !== 1 / 0 && (s[v] = Number(s[v]));
     s.status = s.sp > 3 ? 0 : 1;
-    const d = s.status, { labelCn: i, labelEn: h } = this.parseStatus(d), M = g(`${s.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    const d = s.status, { labelCn: r, labelEn: h } = this.parseStatus(d), M = g(`${s.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
     return {
       mmsi: s.m,
       name: s.n,
@@ -226,15 +226,15 @@ class Et extends et {
       positionTime: M.unix(),
       utc: M.utc().format(),
       status: d,
-      labelCn: i,
+      labelCn: r,
       labelEn: h,
       method: "position",
       vendor: "hifleet"
     };
   }
   async search(t, n = {}) {
-    let r = "https://www.hifleet.com/hifleetapi/searchVesselOL.do";
-    const a = {
+    let i = "https://www.hifleet.com/hifleetapi/searchVesselOL.do";
+    const o = {
       searchParams: {
         keyword: t
       },
@@ -244,24 +244,24 @@ class Et extends et {
         Host: "www.hifleet.com"
       }
     };
-    let o = await B.post(r, a).json();
-    p == null || p.info("[%s] fetch vessel props from: %s - %j", n.requestId, r, a), o instanceof Array && (o = o[0]);
-    for (const d in o)
-      !isNaN(o[d]) && Number(o[d]) !== 1 / 0 && (o[d] = Number(o[d]));
+    let a = await B.post(i, o).json();
+    p == null || p.info("[%s] fetch vessel props from: %s - %j", n.requestId, i, o), 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 s = {
-      mmsi: o.m,
-      name: o.n,
-      imo: o.i,
-      callSign: o.c,
-      length: o.l,
-      breadth: o.b,
-      draught: o.dr,
-      type: o.t
+      mmsi: a.m,
+      name: a.n,
+      imo: a.i,
+      callSign: a.c,
+      length: a.l,
+      breadth: a.b,
+      draught: a.dr,
+      type: a.t
     };
-    return r = "https://www.hifleet.com/hifleetapi/sameShipSearch.do", o = await B.post(r, a).json(), p == null || p.info("[%s] search vessel dead weight from: %s - %j", n.requestId, r, a), o instanceof Array && (o = o[0]), o && (s.deadweight = Number(o.dwt)), s;
+    return i = "https://www.hifleet.com/hifleetapi/sameShipSearch.do", a = await B.post(i, o).json(), p == null || p.info("[%s] search vessel dead weight from: %s - %j", n.requestId, i, o), a instanceof Array && (a = a[0]), a && (s.deadweight = Number(a.dwt)), s;
   }
   async suggest(t, n = {}) {
-    const r = "https://www.hifleet.com/hifleetapi/getShipSuggest.do", a = {
+    const i = "https://www.hifleet.com/hifleetapi/getShipSuggest.do", o = {
       searchParams: {
         q: t
       },
@@ -270,10 +270,10 @@ class Et extends et {
         Origin: "https://www.hifleet.com",
         Host: "www.hifleet.com"
       }
-    }, o = await B.post(r, a).json();
-    p == null || p.info("[%s] suggest vessel props from: %s - %j", n.requestId, r, a);
+    }, a = await B.post(i, o).json();
+    p == null || p.info("[%s] suggest vessel props from: %s - %j", n.requestId, i, o);
     const s = [];
-    for (const d of o)
+    for (const d of a)
       s.push({
         mmsi: !d.mmsi || isNaN(d.mmsi) ? null : Number(d.mmsi),
         name: d.name,
@@ -281,37 +281,37 @@ class Et extends et {
         imo: !d.imo || isNaN(d.imo) ? null : Number(d.imo),
         score: d._score
       });
-    return s.sort((d, i) => i.score - d.score), s;
+    return s.sort((d, r) => r.score - d.score), s;
   }
-  async trajectory(t, n, r, a, o = !0, s = {}) {
+  async trajectory(t, n, i, o, a = !0, s = {}) {
     var c, f, l;
     const d = await this.realTimePosition(t, s);
-    let i = g(n);
-    const h = g(r), M = g();
-    if (o) {
-      let u = h.diff(i, "d", !0);
-      u < 0 ? i = h.clone().subtract(40, "d") : u < 30 ? i.subtract(10, "d") : u < 60 ? i.subtract(5, "d") : i = h.clone().subtract(80, "d"), u = M.diff(h, "d", !0), h.add(u > 10 ? 240 : u * 24, "h");
+    let r = g(n);
+    const h = g(i), M = g();
+    if (a) {
+      let u = h.diff(r, "d", !0);
+      u < 0 ? r = h.clone().subtract(40, "d") : u < 30 ? r.subtract(10, "d") : u < 60 ? r.subtract(5, "d") : r = h.clone().subtract(80, "d"), u = M.diff(h, "d", !0), h.add(u > 10 ? 240 : u * 24, "h");
     }
     const y = {
       searchParams: {
         endtime: h.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
-        starttime: i.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
       }
-    }, w = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", m = await B.get(w, y).json();
-    p == null || p.info("[%s] fetch trajectory from: %s - %j", s.requestId, w, y);
-    let F;
-    m && (F = ((f = (c = m.ships) == null ? void 0 : c.offors) == null ? void 0 : f.ship) || [], F.length || p == null || p.warn("[%s] fetch trajectory failed: %j", s.requestId, m));
-    const x = [];
-    let v = -1;
-    const b = g(`${(l = F == null ? void 0 : F[0]) == null ? void 0 : l.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-    for (const u of F) {
+    }, v = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", m = await B.get(v, y).json();
+    p == null || p.info("[%s] fetch trajectory from: %s - %j", s.requestId, v, y);
+    let C;
+    m && (C = ((f = (c = m.ships) == null ? void 0 : c.offors) == null ? void 0 : f.ship) || [], C.length || p == null || p.warn("[%s] fetch trajectory failed: %j", s.requestId, m));
+    const S = [];
+    let w = -1;
+    const b = g(`${(l = C == null ? void 0 : C[0]) == null ? void 0 : l.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    for (const u of C) {
       for (const P in u)
         !isNaN(u[P]) && Number(u[P]) !== 1 / 0 && (u[P] = Number(u[P]));
       const I = g(`${u.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
       u.status = u.sp > 4 ? 0 : 1;
-      const { labelEn: S, labelCn: D } = this.parseStatus(u.status), Y = {
+      const { labelEn: k, labelCn: D } = this.parseStatus(u.status), Y = {
         mmsi: u.m,
         name: u.n,
         imo: d == null ? void 0 : d.imo,
@@ -325,35 +325,35 @@ class Et extends et {
         utc: I.utc().format(),
         status: u.status,
         labelCn: D,
-        labelEn: S,
+        labelEn: k,
         method: "trajectory",
         vendor: "hifleet"
-      }, E = Math.floor(I.diff(b, "minute", !0) / (a || 1));
-      E !== v && (v = E, x.push(Y));
+      }, j = Math.floor(I.diff(b, "minute", !0) / (o || 1));
+      j !== w && (w = j, S.push(Y));
     }
-    return x;
+    return S;
   }
 }
-class Nt extends et {
+class jt extends et {
   constructor(t) {
     super();
-    z(this, "token");
+    K(this, "token");
     this.token = t;
   }
   async realTimePosition(t, n = {}) {
-    const r = {
+    const i = {
       searchParams: {
         id: t,
         k: this.token,
         enc: 1
       }
-    }, a = "https://api.shipxy.com/apicall/GetSingleShip", o = await B.get(a, r).json();
-    if (p == null || p.info("[%s] fetch realtime position from: %s - %j", n.requestId, a, r), (o == null ? void 0 : o.status) !== 0)
-      return o;
-    const s = o.data[0];
+    }, o = "https://api.shipxy.com/apicall/GetSingleShip", a = await B.get(o, i).json();
+    if (p == null || p.info("[%s] fetch realtime position from: %s - %j", n.requestId, o, i), (a == null ? void 0 : a.status) !== 0)
+      return a;
+    const s = a.data[0];
     for (const y in s)
       !isNaN(s[y]) && Number(s[y]) !== 1 / 0 && (s[y] = Number(s[y]));
-    const { labelCn: d, labelEn: i } = await this.parseStatus(s.navistat), h = g.unix(s.lasttime);
+    const { labelCn: d, labelEn: r } = await this.parseStatus(s.navistat), h = g.unix(s.lasttime);
     return {
       mmsi: s.ShipID,
       name: s.name,
@@ -371,28 +371,28 @@ class Nt extends et {
       positionTime: s.lasttime,
       utc: h.utc().format(),
       status: s.navistat,
-      labelEn: i,
+      labelEn: r,
       labelCn: d,
       method: "position",
       vendor: "shipxy"
     };
   }
-  async trajectory(t, n, r, a, o = !0, s = {}) {
+  async trajectory(t, n, i, o, a = !0, s = {}) {
     var b;
-    const d = await this.realTimePosition(t, s), i = g(n), h = g(r), M = "https://api.shipxy.com/apicall/GetShipTrack", y = {
+    const d = await this.realTimePosition(t, s), r = g(n), h = g(i), M = "https://api.shipxy.com/apicall/GetShipTrack", y = {
       searchParams: {
         id: t,
         k: this.token,
         enc: 1,
         cut: 0,
-        btm: i.unix(),
+        btm: r.unix(),
         etm: h.unix()
       }
-    }, w = await B.get(M, y).json();
-    if (p == null || p.info("[%s] fetch trajectory from: %s - %j", s.requestId, M, y), (w == null ? void 0 : w.status) !== 0)
-      return w;
-    const m = w == null ? void 0 : w.points, F = [], x = g.unix((b = m[0]) == null ? void 0 : b.utc);
-    let v = -1;
+    }, v = await B.get(M, y).json();
+    if (p == null || p.info("[%s] fetch trajectory from: %s - %j", s.requestId, M, y), (v == null ? void 0 : v.status) !== 0)
+      return v;
+    const m = v == null ? void 0 : v.points, C = [], S = g.unix((b = m[0]) == null ? void 0 : b.utc);
+    let w = -1;
     for (const c of m) {
       const f = g.unix(c.utc), l = {
         imo: d == null ? void 0 : d.imo,
@@ -405,41 +405,41 @@ class Nt extends et {
         utc: f.utc().format(),
         method: "trajectory",
         vendor: "shipxy"
-      }, u = Math.floor(f.diff(x, "minute", !0) / (a || 1));
-      u !== v && (v = u, F.push(l));
+      }, u = Math.floor(f.diff(S, "minute", !0) / (o || 1));
+      u !== w && (w = u, C.push(l));
     }
-    return F;
+    return C;
   }
 }
-class Tt extends et {
+class Nt extends et {
   constructor(t) {
     super();
-    z(this, "token");
+    K(this, "token");
     this.token = t;
   }
   async getShipId(t, n = {}) {
-    const r = {
+    const i = {
       headers: {
         appKey: this.token
       },
       json: {
         mmsiList: t
       }
-    }, a = "https://api3.myships.com/sp/ships/getShipIdByMMSI", o = await B.post(a, r).json();
-    return p == null || p.info("[%s] fetch ship id from: %s - %j", n.requestId, a, r), o.code !== "0" ? o : o.data[0].shipId;
+    }, o = "https://api3.myships.com/sp/ships/getShipIdByMMSI", a = await B.post(o, i).json();
+    return p == null || p.info("[%s] fetch ship id from: %s - %j", n.requestId, o, i), a.code !== "0" ? a : a.data[0].shipId;
   }
   async getShipInfo(t, n = {}) {
-    const r = {
+    const i = {
       headers: {
         appKey: this.token
       },
       json: {
         shipId: t
       }
-    }, a = "https://api3.myships.com/sp/ships/aissta", o = await B.post(a, r).json();
-    if (p == null || p.info("[%s] fetch ship info from: %s - %j", n.requestId, a, r), o.code !== "0")
-      return o;
-    const s = o.data;
+    }, o = "https://api3.myships.com/sp/ships/aissta", a = await B.post(o, i).json();
+    if (p == null || p.info("[%s] fetch ship info from: %s - %j", n.requestId, o, i), a.code !== "0")
+      return a;
+    const s = a.data;
     let d = s.imo;
     return t === "407170" && (d = "9198379", p == null || p.warn("[%s] ship(%s) imo error: %s, should be %s", n.requestId, t, s.imo, d)), {
       mmsi: s.mmsi,
@@ -452,45 +452,45 @@ class Tt extends et {
     };
   }
   async realTimePosition(t, n = {}) {
-    const r = await this.getShipId(t, n), a = await this.getShipInfo(r, n), o = {
+    const i = await this.getShipId(t, n), o = await this.getShipInfo(i, n), a = {
       headers: {
         appKey: this.token
       },
       json: {
-        shipId: r
+        shipId: i
       }
-    }, s = "https://api3.myships.com/sp/ships/position/latest", d = await B.post(s, o).json();
-    p == null || p.info("[%s] fetch realtime position from: %s - %j", n.requestId, s, o);
-    const i = d.data[0];
-    for (const m in i)
-      !isNaN(i[m]) && Number(i[m]) !== 1 / 0 && (i[m] = Number(i[m]));
-    const { labelCn: h, labelEn: M } = await this.parseStatus(i.aisNavStatus), y = g.unix(i.posTime);
+    }, s = "https://api3.myships.com/sp/ships/position/latest", d = await B.post(s, a).json();
+    p == null || p.info("[%s] fetch realtime position from: %s - %j", n.requestId, s, a);
+    const r = d.data[0];
+    for (const m in r)
+      !isNaN(r[m]) && Number(r[m]) !== 1 / 0 && (r[m] = Number(r[m]));
+    const { labelCn: h, labelEn: M } = await this.parseStatus(r.aisNavStatus), y = g.unix(r.posTime);
     return {
-      ...a,
+      ...o,
       mmsi: t,
-      lat: Math.round(i.lat / 1e4 / 60 * 1e5) / 1e5,
-      lng: Math.round(i.lon / 1e4 / 60 * 1e5) / 1e5,
-      sog: Math.round(i.sog / 10 * 100) / 100,
-      cog: Math.round(i.cog / 10 * 100) / 100,
-      hdg: Math.round(i.heading * 100) / 100,
-      rot: Math.round(i.rot * 100) / 100,
-      positionTime: i.posTime,
+      lat: Math.round(r.lat / 1e4 / 60 * 1e5) / 1e5,
+      lng: Math.round(r.lon / 1e4 / 60 * 1e5) / 1e5,
+      sog: Math.round(r.sog / 10 * 100) / 100,
+      cog: Math.round(r.cog / 10 * 100) / 100,
+      hdg: Math.round(r.heading * 100) / 100,
+      rot: Math.round(r.rot * 100) / 100,
+      positionTime: r.posTime,
       utc: y.utc().format(),
-      status: i.aisNavStatus,
+      status: r.aisNavStatus,
       labelEn: M,
       labelCn: h,
       method: "position",
       vendor: "myship"
     };
   }
-  async trajectory(t, n, r, a, o = !0, s = {}) {
-    const d = g(n), i = g(r), h = await this.getShipId(t), M = await this.getShipInfo(h), y = [];
-    for (; i.diff(d, "day", !0) > 30; )
-      await this.trajectoryIn30Day(h, d.unix(), d.add(30, "day").unix(), M, t, a, y);
-    return await this.trajectoryIn30Day(h, d.unix(), i.unix(), M, t, a, y), y;
+  async trajectory(t, n, i, o, a = !0, s = {}) {
+    const d = g(n), r = g(i), h = await this.getShipId(t), M = await this.getShipInfo(h), y = [];
+    for (; r.diff(d, "day", !0) > 30; )
+      await this.trajectoryIn30Day(h, d.unix(), d.add(30, "day").unix(), M, t, o, y);
+    return await this.trajectoryIn30Day(h, d.unix(), r.unix(), M, t, o, y), y;
   }
-  async trajectoryIn30Day(t, n, r, a, o, s, d, i = {}) {
-    var x;
+  async trajectoryIn30Day(t, n, i, o, a, s, d, r = {}) {
+    var S;
     const h = {
       headers: {
         appKey: this.token
@@ -498,32 +498,32 @@ class Tt extends et {
       json: {
         shipId: t,
         startTime: n,
-        endTime: r
+        endTime: i
       }
     }, M = "https://api3.myships.com/sp/ships/position/history", y = await B.post(M, h).json();
-    if (p == null || p.info("[%s] fetch trajectory from: %s - %j", i.requestId, M, h), y.code !== "0")
-      return p == null || p.warn("[%s] invoke myship trajectory failed: %j", i.requestId, y), y;
-    const w = y.data;
-    for (const v in w)
-      !isNaN(w[v]) && Number(w[v]) !== 1 / 0 && (w[v] = Number(w[v]));
-    const m = g.unix((x = w[0]) == null ? void 0 : x.posTime);
-    let F = -1;
-    for (const v of w) {
-      const b = g.unix(v.posTime), c = {
-        imo: a == null ? void 0 : a.imo,
-        mmsi: o,
-        lat: Math.round(v.lat / 1e4 / 60 * 1e5) / 1e5,
-        lng: Math.round(v.lon / 1e4 / 60 * 1e5) / 1e5,
-        sog: Math.round(v.sog / 10 * 100) / 100,
-        cog: Math.round(v.cog / 10 * 100) / 100,
-        hdg: Math.round(v.heading * 100) / 100,
-        rot: Math.round(v.rot * 100) / 100,
+    if (p == null || p.info("[%s] fetch trajectory from: %s - %j", r.requestId, M, h), y.code !== "0")
+      return p == null || p.warn("[%s] invoke myship trajectory failed: %j", r.requestId, y), y;
+    const v = y.data;
+    for (const w in v)
+      !isNaN(v[w]) && Number(v[w]) !== 1 / 0 && (v[w] = Number(v[w]));
+    const m = g.unix((S = v[0]) == null ? void 0 : S.posTime);
+    let C = -1;
+    for (const w of v) {
+      const b = g.unix(w.posTime), c = {
+        imo: o == null ? void 0 : o.imo,
+        mmsi: a,
+        lat: Math.round(w.lat / 1e4 / 60 * 1e5) / 1e5,
+        lng: Math.round(w.lon / 1e4 / 60 * 1e5) / 1e5,
+        sog: Math.round(w.sog / 10 * 100) / 100,
+        cog: Math.round(w.cog / 10 * 100) / 100,
+        hdg: Math.round(w.heading * 100) / 100,
+        rot: Math.round(w.rot * 100) / 100,
         positionTime: b.unix(),
         utc: b.utc().format(),
         method: "trajectory",
         vendor: "myship"
       }, f = Math.floor(b.diff(m, "minute", !0) / (s || 1));
-      f !== F && (F = f, d.push(c));
+      f !== C && (C = f, d.push(c));
     }
     return d;
   }
@@ -534,8 +534,8 @@ try {
 } catch {
 } finally {
 }
-var yt = /* @__PURE__ */ ((j) => (j.NOTICE = "NOTICE", j.WARN = "WARN", j.HEAVY = "HEAVY", j.SEVERE = "SEVERE", j.ERROR = "ERROR", j.FATAL = "FATAL", j))(yt || {});
-class Mt {
+var mt = /* @__PURE__ */ ((E) => (E.NOTICE = "NOTICE", E.WARN = "WARN", E.HEAVY = "HEAVY", E.SEVERE = "SEVERE", E.ERROR = "ERROR", E.FATAL = "FATAL", E))(mt || {});
+class yt {
   /**
    * 解析告警规则, 多规则场景
    * @param rule
@@ -545,23 +545,23 @@ class Mt {
    * @param options
    */
   parsePrinciple(e, t = {}) {
-    var s, d, i;
+    var s, d, r;
     _ == null || _.info("[%s] parse rule: %s", t.requestId, e);
-    const n = new RegExp("(?<=\\[)(.+)(?=])", "g"), r = e.match(n) ? (s = e.match(n)) == null ? void 0 : s[0] : void 0, a = r == null ? void 0 : r.split(";");
-    if (!a)
+    const n = new RegExp("(?<=\\[)(.+)(?=])", "g"), i = e.match(n) ? (s = e.match(n)) == null ? void 0 : s[0] : void 0, o = i == null ? void 0 : i.split(";");
+    if (!o)
       return;
-    const o = {};
-    for (let h = 0; h < (a == null ? void 0 : a.length); h++) {
-      const M = (i = (d = a[h].match(n)) == null ? void 0 : d[0]) == null ? void 0 : i.split("],");
+    const a = {};
+    for (let h = 0; h < (o == null ? void 0 : o.length); h++) {
+      const M = (r = (d = o[h].match(n)) == null ? void 0 : d[0]) == null ? void 0 : r.split("],");
       if (h === 0 && !M)
-        o.scope = a[0];
+        a.scope = o[0];
       else if (M)
-        for (let y = 0, w = M.length; y < w; y++) {
+        for (let y = 0, v = M.length; y < v; y++) {
           const m = this.parseRule(M[y]);
-          m && (o[m.level] ? m.key ? o[m.level][m == null ? void 0 : m.key] = m : o[m.level] = m : m.key ? o[m.level] = { [m == null ? void 0 : m.key]: m } : o[m.level] = m);
+          m && (a[m.level] ? m.key ? a[m.level][m == null ? void 0 : m.key] = m : a[m.level] = m : m.key ? a[m.level] = { [m == null ? void 0 : m.key]: m } : a[m.level] = m);
         }
     }
-    return o;
+    return a;
   }
   /**
    * 解析单一告警规则
@@ -570,16 +570,16 @@ class Mt {
    * @param options
    */
   parseRule(e, t = {}) {
-    var o;
+    var a;
     _ == null || _.info("[%s] parse rule: %s", t.requestId, e), e = e.startsWith("[") ? e : `[${e}`, e = e.endsWith("]") ? e : `${e}]`;
-    const n = new RegExp("(?<=\\[)(.+?)(?=])", "g"), r = (o = e == null ? void 0 : e.match(n)) == null ? void 0 : o[0], a = r == null ? void 0 : r.split(",");
-    if (a)
+    const n = new RegExp("(?<=\\[)(.+?)(?=])", "g"), i = (a = e == null ? void 0 : e.match(n)) == null ? void 0 : a[0], o = i == null ? void 0 : i.split(",");
+    if (o)
       return {
-        operator: a[0],
-        number: Number.isNaN(Number(a[1])) ? a[1] : Number(a[1]),
-        level: a[2],
-        time: Number(a[3]),
-        key: a[4]
+        operator: o[0],
+        number: Number.isNaN(Number(o[1])) ? o[1] : Number(o[1]),
+        level: o[2],
+        time: Number(o[3]),
+        key: o[4]
       };
   }
   /**
@@ -589,25 +589,25 @@ class Mt {
    * @param options
    */
   checkWeather(e, t, n = {}) {
-    var m, F, x, v, b, c, f, l, u, I, S, D, Y, E, P;
-    let r = 0, a = 0, o = 0, s = 0;
-    const d = Math.round(((F = (m = t == null ? void 0 : t.SEVERE) == null ? void 0 : m.sigWave) == null ? void 0 : F.number) * 1.6 * 100) / 100, i = (v = (x = t == null ? void 0 : t.SEVERE) == null ? void 0 : x.sigWave) == null ? void 0 : v.number, h = (c = (b = t == null ? void 0 : t.HEAVY) == null ? void 0 : b.sigWave) == null ? void 0 : c.number, M = Math.round((((l = (f = t == null ? void 0 : t.SEVERE) == null ? void 0 : f.wind) == null ? void 0 : l.number) + 2) * 100) / 100, y = (I = (u = t == null ? void 0 : t.SEVERE) == null ? void 0 : u.wind) == null ? void 0 : I.number, w = (D = (S = t == null ? void 0 : t.HEAVY) == null ? void 0 : S.wind) == null ? void 0 : D.number;
+    var m, C, S, w, b, c, f, l, u, I, k, D, Y, j, P;
+    let i = 0, o = 0, a = 0, s = 0;
+    const d = Math.round(((C = (m = t == null ? void 0 : t.SEVERE) == null ? void 0 : m.sigWave) == null ? void 0 : C.number) * 1.6 * 100) / 100, r = (w = (S = t == null ? void 0 : t.SEVERE) == null ? void 0 : S.sigWave) == null ? void 0 : w.number, h = (c = (b = t == null ? void 0 : t.HEAVY) == null ? void 0 : b.sigWave) == null ? void 0 : c.number, M = Math.round((((l = (f = t == null ? void 0 : t.SEVERE) == null ? void 0 : f.wind) == null ? void 0 : l.number) + 2) * 100) / 100, y = (I = (u = t == null ? void 0 : t.SEVERE) == null ? void 0 : u.wind) == null ? void 0 : I.number, v = (D = (k = t == null ? void 0 : t.HEAVY) == null ? void 0 : k.wind) == null ? void 0 : D.number;
     for (let T = 0; T < (e == null ? void 0 : e.length); T++) {
-      const N = e[T], A = (E = (Y = N == null ? void 0 : N.meteo) == null ? void 0 : Y.wave) == null ? void 0 : E.sig, R = (P = N == null ? void 0 : N.meteo) == null ? void 0 : P.wind, K = T ? g(N.eta).diff(g(e[T - 1].eta), "hour", !0) : 0;
-      s = K > s ? K : s, _ == null || _.info("[%s] check sig.wave: %j", n.requestId, { ...A, dgThd4Wv: d, svThd4Wv: i, hvThd4Wv: h }), (A == null ? void 0 : A.height) >= d ? N.isDangerous = !0 : (A == null ? void 0 : A.height) >= i ? N.isSevere = !0 : (A == null ? void 0 : A.height) >= h && (N.isHeavy = !0), _ == null || _.info("[%s] check wind: %j", n.requestId, { ...R, dgThd4Wd: M, svThd4Wd: y, hvThd4Wd: w }), (R == null ? void 0 : R.scale) >= M ? (N.isDangerous = !0, delete N.isSevere, delete N.isHeavy) : (R == null ? void 0 : R.scale) > y ? (N.isDangerous || (N.isSevere = !0), delete N.isHeavy) : (R == null ? void 0 : R.scale) === w && !N.isDangerous && !N.isSevere && (N.isHeavy = !0), r += N.isDangerous ? K : 0, a += N.isSevere ? K : 0, o += N.isHeavy ? K : 0;
+      const N = e[T], A = (j = (Y = N == null ? void 0 : N.meteo) == null ? void 0 : Y.wave) == null ? void 0 : j.sig, R = (P = N == null ? void 0 : N.meteo) == null ? void 0 : P.wind, U = T ? g(N.eta).diff(g(e[T - 1].eta), "hour", !0) : 0;
+      s = U > s ? U : s, _ == null || _.info("[%s] check sig.wave: %j", n.requestId, { ...A, dgThd4Wv: d, svThd4Wv: r, hvThd4Wv: h }), (A == null ? void 0 : A.height) >= d ? N.isDangerous = !0 : (A == null ? void 0 : A.height) >= r ? N.isSevere = !0 : (A == null ? void 0 : A.height) >= h && (N.isHeavy = !0), _ == null || _.info("[%s] check wind: %j", n.requestId, { ...R, dgThd4Wd: M, svThd4Wd: y, hvThd4Wd: v }), (R == null ? void 0 : R.scale) >= M ? (N.isDangerous = !0, delete N.isSevere, delete N.isHeavy) : (R == null ? void 0 : R.scale) > y ? (N.isDangerous || (N.isSevere = !0), delete N.isHeavy) : (R == null ? void 0 : R.scale) === v && !N.isDangerous && !N.isSevere && (N.isHeavy = !0), i += N.isDangerous ? U : 0, o += N.isSevere ? U : 0, a += N.isHeavy ? U : 0;
     }
-    return r = Math.round(r * 100) / 100, a = Math.round(a * 100) / 100, o = Math.round(o * 100) / 100, s = Math.round(s), { sample: e, dangerous: r, severe: a, heavy: o, step: s < 3 ? 3 : s, wind: { dgThd4Wd: M, svThd4Wd: y, hvThd4Wd: w }, sig: { dgThd4Wv: d, svThd4Wv: i, hvThd4Wv: h } };
+    return i = Math.round(i * 100) / 100, o = Math.round(o * 100) / 100, a = Math.round(a * 100) / 100, s = Math.round(s), { sample: e, dangerous: i, severe: o, heavy: a, step: s < 3 ? 3 : s, wind: { dgThd4Wd: M, svThd4Wd: y, hvThd4Wd: v }, sig: { dgThd4Wv: d, svThd4Wv: r, hvThd4Wv: h } };
   }
 }
-const Dt = new Mt();
-let k;
+const Tt = new yt();
+let F;
 try {
-  k = rt.getLogger("vessel");
+  F = rt.getLogger("vessel");
 } catch {
 } finally {
 }
-const gt = new ft("", !0);
-var bt = /* @__PURE__ */ ((j) => (j.common = "common", j.container = "container", j.tugs = "tugs", j))(bt || {}), pt = /* @__PURE__ */ ((j) => (j.Ballast = "Ballast", j.Laden = "Laden", j))(pt || {}), wt = /* @__PURE__ */ ((j) => (j.Cp = "CP", j.Perf = "Basis", j.Instruct = "Other", j))(wt || {});
+const Mt = new ft("", !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 || {}), pt = /* @__PURE__ */ ((E) => (E.Cp = "CP", E.Perf = "Basis", E.Instruct = "Other", E))(pt || {});
 class O {
   /**
    * @see https://baike.baidu.com/item/%E6%96%B9%E5%BD%A2%E7%B3%BB%E6%95%B0/4965568?fr=aladdin
@@ -621,11 +621,11 @@ class O {
    * @param draught 吃水 m
    * @return [0.55, 0.85]
    */
-  static blockCoefficient(e, t, n, r) {
-    let a = Math.round(e / (t * n * r) * 100) / 100;
-    a = a < 0.55 ? 0.55 : a > 0.85 ? 0.85 : a;
-    const o = [0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85], s = o.map((d) => Math.abs(d - a));
-    return o[s.indexOf(Math.min(...s))];
+  static blockCoefficient(e, t, n, i) {
+    let o = Math.round(e / (t * n * i) * 100) / 100;
+    o = o < 0.55 ? 0.55 : o > 0.85 ? 0.85 : o;
+    const a = [0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85], s = a.map((d) => Math.abs(d - o));
+    return a[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
@@ -639,8 +639,8 @@ class O {
    * @return [0.05, 0.30]
    */
   static froudeNumber(e, t, n = 9.8) {
-    let r = Math.round(Math.sqrt(e * e / (n * t)) * 100) / 100;
-    return r = r < 0.05 ? 0.05 : r > 0.3 ? 0.3 : r, r;
+    let i = Math.round(Math.sqrt(e * e / (n * t)) * 100) / 100;
+    return i = i < 0.05 ? 0.05 : i > 0.3 ? 0.3 : i, i;
   }
   /**
    * 失速修正系數
@@ -650,7 +650,7 @@ class O {
    * @private
    */
   static amendFactor(e, t, n) {
-    const r = {
+    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],
@@ -659,7 +659,7 @@ class O {
       0.8: [2.6, -13.1, -15.1],
       0.85: [3.1, -18.7, 28]
     };
-    let o = {
+    let a = {
       0.55: [1.7, -1.4, -7.4],
       0.6: [2.2, -2.5, -9.7],
       0.65: [2.6, -3.7, -11.6],
@@ -668,7 +668,7 @@ class O {
       0.8: [3, -16.3, -21.6],
       0.85: [3.4, -20.9, 31.8]
     }[e];
-    return n === "Laden" && (o = r[e]), o[0] + o[1] * t + o[2] * Math.pow(t, 2);
+    return n === "Laden" && (a = i[e]), a[0] + a[1] * t + a[2] * Math.pow(t, 2);
   }
   /**
    * 失速方向因子
@@ -696,10 +696,10 @@ class O {
    * @param bn
    * @private
    */
-  static vesselTagFactor(e, t, n, r = 0) {
-    r = r > 6 ? r - 0.9 * (r - 6) : r;
-    let a;
-    return n === "container" ? a = 0.7 * r + Math.pow(r, 6.5) / (22 * Math.pow(e, 2 / 3)) : t === "Ballast" ? a = 0.7 * r + Math.pow(r, 6.5) / (2.7 * Math.pow(e, 2 / 3)) : a = 0.5 * r + Math.pow(r, 6.5) / (2.7 * Math.pow(e, 2 / 3)), a;
+  static vesselTagFactor(e, t, n, i = 0) {
+    i = i > 6 ? i - 0.9 * (i - 6) : i;
+    let o;
+    return n === "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;
   }
   /**
    * 浪高影响因子
@@ -719,21 +719,21 @@ class O {
    * @param bearing 方位角
    * @private
    */
-  static assembleProperties(e, t, n, r) {
+  static assembleProperties(e, t, n, i) {
     var y;
-    const a = e.lbp ?? e.length ?? e.lengthOverall ?? 198.9642, o = e.draught ?? 8, s = e.breadthMoulded ?? e.breadth ?? e.breadthExtreme ?? 32.4572, d = e.deadweight ?? 67035.7773, i = ((y = e == null ? void 0 : e.type) == null ? void 0 : y.toLowerCase()) || "common";
+    const o = e.lbp ?? e.length ?? e.lengthOverall ?? 198.9642, a = e.draught ?? 8, s = e.breadthMoulded ?? e.breadth ?? e.breadthExtreme ?? 32.4572, d = e.deadweight ?? 67035.7773, r = ((y = e == null ? void 0 : e.type) == null ? void 0 : y.toLowerCase()) || "common";
     return {
-      tag: i.indexOf("container") > -1 ? "container" : i.indexOf("tugs") > -1 ? "tugs" : "common",
-      lbp: a,
+      tag: r.indexOf("container") > -1 ? "container" : r.indexOf("tugs") > -1 ? "tugs" : "common",
+      lbp: o,
       loadCondition: t,
-      draught: o,
+      draught: a,
       breadthMoulded: s,
       // 排水量（吨）= 载重量（吨）/ 1.025 + 吃水（米）× 船舶型宽（米）× 船舶型长（米）× 0.7
       // 其中，1.025是指海水的密度，吨是指公吨，吃水是指船舶的最大吃水深度。船舶型宽是指船舶的最大型宽，船舶型长是指船舶的设计型长。上述公式是针对常规船舶适用的，不同类型的船舶可能会有一些差异。
-      displacement: Math.round((d / 1.025 + o * s * a * 0.7) * 1e4) / 1e4,
+      displacement: Math.round((d / 1.025 + a * s * o * 0.7) * 1e4) / 1e4,
       // 换算为m/s
       speed: Math.round((n ?? 14.1382) * 1852 / 3600 * 1e4) / 1e4,
-      bearing: r || 90
+      bearing: i || 90
     };
   }
   /**
@@ -746,37 +746,39 @@ class O {
    * @param useMeteo true 启用气象分析
    * @param useRouteParam true 启用设置速度
    */
-  static async speedLoseAt(e, t, n, r = "", a = 2, o = !0, s = !1, d = {}) {
-    let i;
-    if (t.velocity && s && (e.speed = J.roundPrecision(t.velocity * 1852 / 3600, 6)), o) {
+  static async speedLoseAt(e, t, n, i = "", o = 2, a = !0, s = !1, d = {}) {
+    let r;
+    if (t.velocity && s && (e.speed = J.roundPrecision(t.velocity * 1852 / 3600, 6)), a) {
       let h;
-      if (d.meteo2)
-        try {
-          const m = await gt.spotForecast(t.lat, t.lng, n.utc().format(), !1, !1, !0, d), [F] = ct.pickHourly(m, n);
-          h = ct.toLegacy(F);
-        } catch (m) {
-          k.warn("[%s] meteo2 spot(%j) forecast failed: %s", d.requestId, { ...t, eta: n.utc().format() }, m);
-        }
-      else
-        h = await mt.queryPointFactor(t.lng, t.lat, n.valueOf(), "wind,wave,current,watertemp", r, d);
-      const M = O.weatherFactor(e, h), y = O.currentFactor(e.bearing, h == null ? void 0 : h.current, a), w = Math.round((e.speed * 1.943844 + M + y) * 100) / 100;
-      i = {
+      try {
+        i = (i == null ? void 0 : i.toUpperCase()) === "CMEMS" ? "ECMWF" : i, i = (i == null ? void 0 : i.toUpperCase()) === "METEO2" ? "best_match" : i;
+        const { weatherModels: m, marineModels: C } = await it.autoPickMeteoModel(i), S = await Mt.spotForecast(t.lat, t.lng, n.utc().format(), !1, !1, !0, {
+          ...d,
+          weatherModels: m,
+          marineModels: C
+        }), [w] = it.pickHourly(S, n);
+        h = it.toLegacy(w);
+      } catch (m) {
+        F.warn("[%s] meteo2 spot(%j) forecast failed: %s", d.requestId, { ...t, eta: n.utc().format(), source: i }, m);
+      }
+      const M = O.weatherFactor(e, h), y = O.currentFactor(e.bearing, h == null ? void 0 : h.current, o), v = Math.round((e.speed * 1.943844 + M + y) * 100) / 100;
+      r = {
         meteo: { ...h },
         wxFactor: M,
         cFactor: y,
-        speed: t.velocity && s ? t.velocity : w < 0 ? 1 : w,
+        speed: t.velocity && s ? t.velocity : v < 0 ? 1 : v,
         eta: n.utc().format(),
         etd: n.utc().format()
       };
     } else
-      i = {
+      r = {
         wxFactor: 0,
         cFactor: 0,
         speed: t.velocity && s ? t.velocity : Math.round((e.speed * 1.943844 + 0 + 0) * 100) / 100,
         eta: n.utc().format(),
         etd: n.utc().format()
       };
-    return delete t.meteo, delete t.wxFactor, delete t.cFactor, delete t.speed, delete t.etd, { ...i, ...t };
+    return delete t.meteo, delete t.wxFactor, delete t.cFactor, delete t.speed, delete t.etd, { ...r, ...t };
   }
   /**
    * 基于步长计算失速样本
@@ -791,53 +793,53 @@ class O {
    * @param useRouteParam true 启用航线上设置的参数 { suspend: 停留时长（小时）, velocity: 速度（kts）}
    * @private
    */
-  static async speedLoseInHoursStep(e, t, n, r, a, o, s = "", d = !0, i = !1, h = {}) {
+  static async speedLoseInHoursStep(e, t, n, i, o, a, s = "", d = !0, r = !1, h = {}) {
     t.utc();
-    const M = t.clone().add(14, "days"), y = [], w = [];
-    let m = 0, F = 0, x, v;
-    for (let b = 0; b < o.length - 1; b++) {
-      let c = o[b];
-      c.distanceFromStart = Math.round((a + F) * 1e4) / 1e4;
-      const f = o[b + 1];
-      if (e.bearing = W.calculateBearing(c, f, !f.gcToPrevious), c.bearing = e.bearing, c.suspend && i) {
+    const M = t.clone().add(14, "days"), y = [], v = [];
+    let m = 0, C = 0, S, w;
+    for (let b = 0; b < a.length - 1; b++) {
+      let c = a[b];
+      c.distanceFromStart = Math.round((o + C) * 1e4) / 1e4;
+      const f = a[b + 1];
+      if (e.bearing = W.calculateBearing(c, f, !f.gcToPrevious), c.bearing = e.bearing, c.suspend && r) {
         c.eta = c.eta || t.utc().format(), c.elapsed = c.elapsed ?? 0;
         const I = c.suspend - c.elapsed;
-        if (r - m > I)
-          r = r - m - I, t.add(I, "hour"), c.elapsed = c.suspend;
+        if (i - m > I)
+          i = i - m - I, t.add(I, "hour"), c.elapsed = c.suspend;
         else {
-          const S = r - m;
-          c.elapsed += S, t.add(S, "hour"), r = 0;
+          const k = i - m;
+          c.elapsed += k, t.add(k, "hour"), i = 0;
         }
-        if (k == null || k.info(`[%s] suspend ${c.elapsed} hours at %j, and remain ${r} hours need to go...`, h.requestId, c), r === 0)
-          return c.distanceFromPrevious = F, { etd: t, from: v || c, to: c, next: o.filter((S) => S), wps: y, days: w };
+        if (F == null || F.info(`[%s] suspend ${c.elapsed} hours at %j, and remain ${i} hours need to go...`, h.requestId, c), i === 0)
+          return c.distanceFromPrevious = C, { etd: t, from: w || c, to: c, next: a.filter((k) => k), wps: y, days: v };
       } else
         c.suspend = 0;
-      d = t.isAfter(M) ? !1 : d, c = await O.speedLoseAt(e, c, t, s, 0, d, i, h), v = v || c, c.important && y.push(c), t.isSameOrAfter(n) && (w.push(c), n.add(24, "hour"));
+      d = t.isAfter(M) ? !1 : d, c = await O.speedLoseAt(e, c, t, s, 0, d, r, h), w = w || c, c.important && y.push(c), t.isSameOrAfter(n) && (v.push(c), n.add(24, "hour"));
       const l = W.calculateDistance(c, f, !f.gcToPrevious);
-      let u = Math.round(l / v.speed * 1e5) / 1e5;
-      if (m + u < r) {
-        if (m += u, t.add(u, "hour"), delete o[b], k == null || k.debug(
+      let u = Math.round(l / w.speed * 1e5) / 1e5;
+      if (m + u < i) {
+        if (m += u, t.add(u, "hour"), delete a[b], F == null || F.debug(
           `[%s] go to %j from %j with ${l}nm, and cost ${u} hours`,
           h.requestId,
           { lat: f.lat, lng: f.lng },
-          { lat: v.lat, lng: v.lng, etd: v.etd }
-        ), F += l, o.filter((I) => I).length <= 1) {
-          x = f, x.eta = t.utc().format(), x.distanceFromPrevious = l, x.distanceFromStart = Math.round((a + F) * 1e4) / 1e4, y.push(x), delete o[b + 1];
+          { lat: w.lat, lng: w.lng, etd: w.etd }
+        ), C += l, a.filter((I) => I).length <= 1) {
+          S = f, S.eta = t.utc().format(), S.distanceFromPrevious = l, S.distanceFromStart = Math.round((o + C) * 1e4) / 1e4, y.push(S), delete a[b + 1];
           break;
         }
       } else {
-        u = r - m, t.add(u, "hour");
-        const I = J.roundPrecision(v.speed * u, 5);
-        x = W.calculateCoordinate(c, e.bearing, I, "nauticalmiles", !f.gcToPrevious), x.eta = t.utc().format(), o[b] = x, k == null || k.debug(
+        u = i - m, t.add(u, "hour");
+        const I = J.roundPrecision(w.speed * u, 5);
+        S = W.calculateCoordinate(c, e.bearing, I, "nauticalmiles", !f.gcToPrevious), S.eta = t.utc().format(), a[b] = S, F == null || F.debug(
           `[%s] go to %j from %j with ${I}nm, and cost ${u} hours`,
           h.requestId,
-          { lat: x.lat, lng: x.lng },
+          { lat: S.lat, lng: S.lng },
           { lat: c.lat, lng: c.lng, etd: c.etd }
-        ), F += I, x.distanceFromPrevious = Math.round(F * 1e4) / 1e4, x.distanceFromStart = Math.round((a + F) * 1e4) / 1e4;
+        ), C += I, S.distanceFromPrevious = Math.round(C * 1e4) / 1e4, S.distanceFromStart = Math.round((o + C) * 1e4) / 1e4;
         break;
       }
     }
-    return { etd: t, from: v, to: x, next: o.filter((b) => b), wps: y, days: w };
+    return { etd: t, from: w, to: S, next: a.filter((b) => b), wps: y, days: v };
   }
   /**
    * 洋流影响因子
@@ -846,11 +848,11 @@ class O {
    * @param role  1: 船东, 2: 租家, 0: 未知
    */
   static currentFactor(e, t, n = 0) {
-    const r = (e - (t == null ? void 0 : t.degree) || 0) / 180 * Math.PI;
-    if (Math.abs(r) === Math.PI / 2)
+    const i = (e - (t == null ? void 0 : t.degree) || 0) / 180 * Math.PI;
+    if (Math.abs(i) === Math.PI / 2)
       return 0;
-    let a = ((t == null ? void 0 : t.kts) || 0) * Math.cos(r);
-    return n & 2 ? a = Math.ceil(a * 100) / 100 : n & 1 ? a = Math.floor(a * 100) / 100 : a = Math.round(a * 100) / 100, Math.abs(a) > 5 ? 0 : a;
+    let o = ((t == null ? void 0 : t.kts) || 0) * Math.cos(i);
+    return n & 2 ? o = Math.ceil(o * 100) / 100 : n & 1 ? o = Math.floor(o * 100) / 100 : o = Math.round(o * 100) / 100, Math.abs(o) > 5 ? 0 : o;
   }
   /**
    * 风浪影响因子
@@ -858,16 +860,16 @@ class O {
    * @param wwc 气象要素
    */
   static weatherFactor(e, t) {
-    var M, y, w, m, F, x, v;
-    k == null || k.debug("calculate weather factor via: %j", { ...e, ...t });
-    const n = O.blockCoefficient(e.displacement, e.lbp, e.breadthMoulded, e.draught), r = O.froudeNumber(e.speed, e.lbp), a = O.amendFactor(n, r, e.loadCondition);
-    let o = Math.abs(e.bearing % 360 - (((M = t == null ? void 0 : t.wind) == null ? void 0 : M.degree) % 360 || 0));
-    o = o > 180 ? 360 - o : o;
-    const s = O.directionFactor(o, (y = t == null ? void 0 : t.wind) == null ? void 0 : y.scale), d = O.vesselTagFactor(e.displacement, e.loadCondition, e.tag, (w = t == null ? void 0 : t.wind) == null ? void 0 : w.scale);
-    let i = s * a * d / 100 * e.speed;
-    i = Math.round(i * 1.943844 * 1e4) / 1e4 * -1, e.tag === "tugs" && Math.abs(i) > 1 && (i = i / (Math.abs(Math.round(i)) + 1)), k == null || k.debug("wind wx factor = %d", i), o = Math.abs(e.bearing % 360 - (((F = (m = t == null ? void 0 : t.wave) == null ? void 0 : m.sig) == null ? void 0 : F.degree) % 360 || 0));
-    const h = O.waveHeightFactor(((v = (x = t == null ? void 0 : t.wave) == null ? void 0 : x.sig) == null ? void 0 : v.height) ?? 1, o);
-    return k == null || k.debug("wave wx factor = %d", h), i = i * 0.4 + h, k == null || k.debug("weather factor = %d", i), i = Math.abs(i) > 4 ? 4 * (Math.abs(i) / i) + Math.abs(i) / i * (Math.abs(i) - 4) * 0.1 : i, Math.round((i || 0) * 100) / 100;
+    var M, y, v, m, C, S, w;
+    F == null || F.debug("calculate weather factor via: %j", { ...e, ...t });
+    const n = O.blockCoefficient(e.displacement, e.lbp, e.breadthMoulded, e.draught), i = O.froudeNumber(e.speed, e.lbp), o = O.amendFactor(n, i, e.loadCondition);
+    let a = Math.abs(e.bearing % 360 - (((M = t == null ? void 0 : t.wind) == null ? void 0 : M.degree) % 360 || 0));
+    a = a > 180 ? 360 - a : a;
+    const s = O.directionFactor(a, (y = t == null ? void 0 : t.wind) == null ? void 0 : y.scale), d = O.vesselTagFactor(e.displacement, e.loadCondition, e.tag, (v = t == null ? void 0 : t.wind) == null ? void 0 : v.scale);
+    let r = s * o * 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)), F == null || F.debug("wind wx factor = %d", r), a = Math.abs(e.bearing % 360 - (((C = (m = t == null ? void 0 : t.wave) == null ? void 0 : m.sig) == null ? void 0 : C.degree) % 360 || 0));
+    const h = O.waveHeightFactor(((w = (S = t == null ? void 0 : t.wave) == null ? void 0 : S.sig) == null ? void 0 : w.height) ?? 1, a);
+    return F == null || F.debug("wave wx factor = %d", h), r = r * 0.4 + h, F == null || F.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;
   }
   /**
    * 全程失速分析(走完航程)
@@ -881,79 +883,79 @@ class O {
    * @param useMeteo true 启用气象分析
    * @param useRouteParam
    */
-  static async analyseInstant(e, t, n, r, a, o = "", s = 0, d = !0, i = !1, h = {}) {
-    var G, U, Q, X, Z, $;
+  static async analyseInstant(e, t, n, i, o, a = "", s = 0, d = !0, r = !1, h = {}) {
+    var z, G, Q, X, Z, $;
     const M = g().valueOf();
     e.lng = J.convertToStdLng(e.lng);
-    const { route: y, waypoints: w } = a.points, m = W.calculateSubRoute(e, y);
-    if (((G = m[0]) == null ? void 0 : G.length) <= 1)
+    const { route: y, waypoints: v } = o.points, m = W.calculateSubRoute(e, y);
+    if (((z = m[0]) == null ? void 0 : z.length) <= 1)
       return;
-    const { v0: F, label: x } = e.sog ? {
+    const { v0: C, label: S } = e.sog ? {
       v0: e.sog,
-      label: "Other"
+      label: e.label || "Other"
       /* Instruct */
     } : {
-      v0: r.speed,
+      v0: i.speed,
       label: "CP"
       /* Cp */
-    }, v = O.assembleProperties(n, r.loadCondition, F, 0), b = w.length ? W.calculateSubWaypoints(e, w) : [];
+    }, w = O.assembleProperties(n, i.loadCondition, C, 0), b = v.length ? W.calculateSubWaypoints(e, v) : [];
     b.forEach((q) => q.important = !0);
     const c = {
       from: { ...e },
       route: m,
       waypoints: b,
-      v0: F,
-      label: x
+      v0: C,
+      label: S
     }, f = {
       hours: [],
       days: [],
       wps: []
     };
-    s || (W.calculateRouteDistance(m) / r.speed <= 72 ? s = 3 : s = 6);
-    let l = W.simplifyRouteToCoordinates(m, b, 0), u = 0, I = 0, S = 0, D = 0;
+    s || (W.calculateRouteDistance(m) / i.speed <= 72 ? s = 3 : s = 6);
+    let l = W.simplifyRouteToCoordinates(m, b, 0), u = 0, I = 0, k = 0, D = 0;
     t = g(t).utc();
     const Y = t.clone();
     for (; l.length > 0; ) {
-      const q = s - t.hour() % s, V = Math.ceil(t.clone().add(q, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4, C = await O.speedLoseInHoursStep(
-        v,
+      const q = s - t.hour() % s, V = Math.ceil(t.clone().add(q, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4, x = await O.speedLoseInHoursStep(
+        w,
         t,
         Y,
         V,
         u,
         l,
-        o,
+        a,
         d,
-        i,
+        r,
         h
       );
-      (U = C.from) != null && U.speed && (f.hours.push(C.from), f.wps.push(...C.wps), f.days.push(...C.days)), l = C == null ? void 0 : C.next, l.length || f.hours.push(C == null ? void 0 : C.to), u += Math.round((((Q = C == null ? void 0 : C.to) == null ? void 0 : Q.distanceFromPrevious) ?? 0) * 1e4) / 1e4;
+      (G = x.from) != null && G.speed && (f.hours.push(x.from), f.wps.push(...x.wps), f.days.push(...x.days)), l = x == null ? void 0 : x.next, l.length || f.hours.push(x == null ? void 0 : x.to), u += Math.round((((Q = x == null ? void 0 : x.to) == null ? void 0 : Q.distanceFromPrevious) ?? 0) * 1e4) / 1e4;
     }
-    const E = f.hours;
-    for (let q = 0; q < E.length - 1; q++) {
-      const V = g(E[q + 1].eta).diff(E[q].etd, "hour", !0) || 1;
-      I += (E[q].wxFactor || 0) * V, S += (E[q].cFactor || 0) * V, D += V;
+    const j = f.hours;
+    for (let q = 0; q < j.length - 1; q++) {
+      const V = g(j[q + 1].eta).diff(j[q].etd, "hour", !0) || 1;
+      I += (j[q].wxFactor || 0) * V, k += (j[q].cFactor || 0) * V, D += V;
     }
     (X = f.wps) == null || X.forEach((q, V) => {
       q.positionTime = g.utc(q.etd || q.eta).unix();
-      const C = f.wps[V - 1];
-      if (C) {
-        const L = q.distanceFromStart - C.distanceFromStart, H = g(q.eta || q.etd).diff(g(C.etd || C.eta), "h", !0);
+      const x = f.wps[V - 1];
+      if (x) {
+        const L = q.distanceFromStart - x.distanceFromStart, H = g(q.eta || q.etd).diff(g(x.etd || x.eta), "h", !0);
         q.avgSpd = Math.round(L / H * 100) / 100;
-        const nt = W.calculateBearing(C, q);
-        C.bearing = nt;
+        const nt = W.calculateBearing(x, q);
+        x.bearing = nt;
       }
-    }), f.wps = (Z = f.wps) == null ? void 0 : Z.reduce((q, V) => (q.some((C) => Math.round(C.positionTime / 60) === Math.round(V.positionTime / 60)) || q.push(V), q), []), c.sample = f;
+    }), f.wps = (Z = f.wps) == null ? void 0 : Z.reduce((q, V) => (q.some((x) => Math.round(x.positionTime / 60) === Math.round(V.positionTime / 60)) || q.push(V), q), []), c.sample = f;
     const P = f.hours.at(0), T = f.hours.at(-1);
-    c.distance = Math.round(T.distanceFromStart * 1e4) / 1e4, c.etd = g(P.eta).utc().format(), c.eta = g(T.eta).utc().format(), c.wxFactor = Math.round(I / D * 1e4) / 1e4, c.cFactor = Math.round(S / D * 1e4) / 1e4, c.avgSpeed = Math.round(T.distanceFromStart / D * 1e4) / 1e4, c.totalHrs = Math.round(D * 1e4) / 1e4;
-    const { distanceInECA: N, hoursInECA: A, totalDgoConsInECA: R, eca: K } = await this.calculateECA(c, r, h), st = J.roundPrecision(r.fo / 24 * (D - A), 3), at = J.roundPrecision(r.dgo / 24 * D, 3);
+    c.distance = Math.round(T.distanceFromStart * 1e4) / 1e4, c.etd = g(P.eta).utc().format(), c.eta = g(T.eta).utc().format(), c.wxFactor = Math.round(I / D * 1e4) / 1e4, c.cFactor = Math.round(k / D * 1e4) / 1e4, c.avgSpeed = Math.round(T.distanceFromStart / D * 1e4) / 1e4, c.totalHrs = Math.round(D * 1e4) / 1e4;
+    const { distanceInECA: N, hoursInECA: A, totalDgoConsInECA: R, eca: U } = await this.calculateECA(c, i, h), st = J.roundPrecision(i.fo / 24 * (D - A), 3), at = J.roundPrecision(i.dgo / 24 * D, 3);
     c.extend = {
-      eca: K,
+      eca: U,
       distanceInECA: N,
       hoursInECA: A,
       totalDgoConsInECA: R
     }, c.totalFoCons = st, c.totalDgoCons = at;
     const tt = g().valueOf() - M, ot = (($ = f == null ? void 0 : f.hours) == null ? void 0 : $.length) || 1;
-    return k == null || k.info("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", h == null ? void 0 : h.requestId, tt, ot, Math.round(tt / ot * 1e3) / 1e3), c;
+    return F == null || F.info("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", h == null ? void 0 : h.requestId, tt, ot, Math.round(tt / ot * 1e3) / 1e3), c;
   }
   /**
    * 分段失速分析（最多走hours 小时）
@@ -968,25 +970,25 @@ class O {
    * @param useMeteo true 启用气象分析
    * @param useRouteParam
    */
-  static async analyseInstantWithThreshed(e, t, n, r, a, o, s, d = "", i = 3, h = !0, M = !1, y = {}) {
+  static async analyseInstantWithThreshed(e, t, n, i, o, a, s, d = "", r = 3, h = !0, M = !1, y = {}) {
     var Q, X, Z, $, q, V;
-    const w = g().valueOf();
+    const v = g().valueOf();
     e.lng = J.convertToStdLng(e.lng);
-    const { v0: m, label: F } = e.sog ? {
+    const { v0: m, label: C } = e.sog ? {
       v0: e.sog,
-      label: "Other"
+      label: e.label || "Other"
       /* Instruct */
     } : {
-      v0: a.speed,
+      v0: o.speed,
       label: "CP"
       /* Cp */
-    }, x = O.assembleProperties(r, a.loadCondition, m, 0), v = W.calculateSubRoute(e, o);
-    if (((Q = v[0]) == null ? void 0 : Q.length) <= 1)
+    }, S = O.assembleProperties(i, o.loadCondition, m, 0), w = W.calculateSubRoute(e, a);
+    if (((Q = w[0]) == null ? void 0 : Q.length) <= 1)
       return;
     const b = s.length ? W.calculateSubWaypoints(e, s) : [];
-    b.forEach((C) => C.important = !0);
-    let c = W.simplifyRouteToCoordinates(v, b, 0), f = 0, l = 0, u = 0, I = 0;
-    const S = {
+    b.forEach((x) => x.important = !0);
+    let c = W.simplifyRouteToCoordinates(w, b, 0), f = 0, l = 0, u = 0, I = 0;
+    const k = {
       hours: [],
       wps: [],
       days: []
@@ -994,52 +996,52 @@ class O {
     t = g(t).utc();
     const D = t.clone();
     for (; c.length > 0; ) {
-      const C = i - t.hour() % i;
-      let L = Math.ceil(t.clone().add(C, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4;
+      const x = r - t.hour() % r;
+      let L = Math.ceil(t.clone().add(x, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4;
       L = t.clone().add(L, "h").isSameOrAfter(n) ? n.diff(t, "h", !0) * 1e4 / 1e4 : L;
-      const H = await O.speedLoseInHoursStep(x, t, D, L, f, c, d, h, M, y);
-      if ((X = H.from) != null && X.speed && (S.hours.push(H.from), H != null && H.wps && S.wps.push(...H.wps), S.days.push(...H.days)), c = H == null ? void 0 : H.next, c.length || S.hours.push(H == null ? void 0 : H.to), f += Math.round((((Z = H == null ? void 0 : H.to) == null ? void 0 : Z.distanceFromPrevious) ?? 0) * 1e4) / 1e4, !L)
+      const H = await O.speedLoseInHoursStep(S, t, D, L, f, c, d, h, M, y);
+      if ((X = H.from) != null && X.speed && (k.hours.push(H.from), H != null && H.wps && k.wps.push(...H.wps), k.days.push(...H.days)), c = H == null ? void 0 : H.next, c.length || k.hours.push(H == null ? void 0 : H.to), f += Math.round((((Z = H == null ? void 0 : H.to) == null ? void 0 : Z.distanceFromPrevious) ?? 0) * 1e4) / 1e4, !L)
         break;
     }
-    S.wps = ($ = S.wps) == null ? void 0 : $.reduce((C, L) => (C.some((H) => Math.round(g(H.etd).unix() / 60) === Math.round(g(L.etd).unix() / 60)) || C.push(L), C), []), (q = S.wps) == null || q.forEach((C, L) => {
-      const H = S.wps[L - 1];
+    k.wps = ($ = k.wps) == null ? void 0 : $.reduce((x, L) => (x.some((H) => Math.round(g(H.etd).unix() / 60) === Math.round(g(L.etd).unix() / 60)) || x.push(L), x), []), (q = k.wps) == null || q.forEach((x, L) => {
+      const H = k.wps[L - 1];
       if (H) {
-        const nt = C.distanceFromStart - H.distanceFromStart, dt = g(C.eta || C.etd).diff(g(H.etd || H.eta), "h", !0);
-        C.avgSpd = Math.round(nt / dt * 100) / 100;
-        const ut = W.calculateBearing(H, C);
+        const nt = x.distanceFromStart - H.distanceFromStart, dt = g(x.eta || x.etd).diff(g(H.etd || H.eta), "h", !0);
+        x.avgSpd = Math.round(nt / dt * 100) / 100;
+        const ut = W.calculateBearing(H, x);
         H.bearing = ut;
       }
     });
-    const Y = S.hours;
-    for (let C = 0; C < Y.length - 1; C++) {
-      const L = g(Y[C + 1].eta).diff(Y[C].etd, "hour", !0);
-      l += Y[C].wxFactor * L, u += Y[C].cFactor * L, I += L;
+    const Y = k.hours;
+    for (let x = 0; x < Y.length - 1; x++) {
+      const L = g(Y[x + 1].eta).diff(Y[x].etd, "hour", !0);
+      l += Y[x].wxFactor * L, u += Y[x].cFactor * L, I += L;
     }
-    const E = S.hours.at(0), P = S.hours.at(-1), T = await W.calculateRangeRoute(E, P, v), N = await W.calculateRangeWaypoints(E, P, v, b), A = {
-      sample: S,
+    const j = k.hours.at(0), P = k.hours.at(-1), T = await W.calculateRangeRoute(j, P, w), N = await W.calculateRangeWaypoints(j, P, w, b), A = {
+      sample: k,
       distance: Math.round(((P == null ? void 0 : P.distanceFromStart) || 0) * 1e4) / 1e4,
       // 注意，可能会在first节点Drift,所有采用eta做为初始出发时间
-      etd: g(E.eta).utc().format(),
+      etd: g(j.eta).utc().format(),
       eta: g(P == null ? void 0 : P.eta).utc().format(),
       wxFactor: Math.round(l / I * 1e4) / 1e4,
       cFactor: Math.round(u / I * 1e4) / 1e4,
       avgSpeed: Math.round(((P == null ? void 0 : P.distanceFromStart) || 0) / I * 1e4) / 1e4,
       totalHrs: Math.round(I * 1e4) / 1e4,
-      from: E,
+      from: j,
       to: P,
       route: T,
       waypoints: N,
       v0: m,
-      label: F
-    }, { distanceInECA: R, hoursInECA: K, totalDgoConsInECA: st, eca: at } = await this.calculateECA(A, a, y), it = J.roundPrecision(a.fo / 24 * (I - K), 3), tt = J.roundPrecision(a.dgo / 24 * I, 3);
+      label: C
+    }, { distanceInECA: R, hoursInECA: U, totalDgoConsInECA: st, eca: at } = await this.calculateECA(A, o, y), ct = J.roundPrecision(o.fo / 24 * (I - U), 3), tt = J.roundPrecision(o.dgo / 24 * I, 3);
     A.extend = {
       eca: at,
       distanceInECA: R,
-      hoursInECA: K,
+      hoursInECA: U,
       totalDgoConsInECA: st
-    }, A.totalDgoCons = tt, A.totalFoCons = it;
-    const G = g().valueOf() - w, U = ((V = S == null ? void 0 : S.hours) == null ? void 0 : V.length) || 1;
-    return k == null || k.debug("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", y == null ? void 0 : y.requestId, G, U, Math.round(G / U * 1e3) / 1e3), A;
+    }, A.totalDgoCons = tt, A.totalFoCons = ct;
+    const z = g().valueOf() - v, G = ((V = k == null ? void 0 : k.hours) == null ? void 0 : V.length) || 1;
+    return F == null || F.debug("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", y == null ? void 0 : y.requestId, z, G, Math.round(z / G * 1e3) / 1e3), A;
   }
   /**
    * 在指定航线条件下，基于多CP，动态计算最优成本(租金+油费)方案
@@ -1056,20 +1058,20 @@ class O {
    * @param lane 基础航线（重要转向点）
    * @param options
    */
-  static async analyseCost(e, t, n, r, a = {}) {
-    var v, b;
-    const o = g().valueOf(), s = [];
-    a.meteo2 = a.meteo2 || !0, e.speedStep = e.speedStep || 3, e.alterStep = e.alterStep ?? 1;
-    const d = W.calculateRouteDistance(r.route);
-    let i = 0;
+  static async analyseCost(e, t, n, i, o = {}) {
+    var w, b;
+    const a = g().valueOf(), s = [];
+    e.speedStep = e.speedStep || 3, e.alterStep = e.alterStep ?? 1;
+    const d = W.calculateRouteDistance(i.route);
+    let r = 0;
     n.forEach((c) => {
       const f = Math.ceil(d / c.speed / 24);
-      i = i < f ? f : i;
-    }), i = i * 1.3;
-    const h = g.utc(e.etd).add(i ?? 14, "day");
+      r = r < f ? f : r;
+    }), r = r * 1.3;
+    const h = g.utc(e.etd).add(r ?? 14, "day");
     let M = 1;
     for (const c of n) {
-      const f = JSON.parse(JSON.stringify(r.route)), l = JSON.parse(JSON.stringify(r.waypoints)), u = await O.analyseInstantWithThreshed(
+      const f = JSON.parse(JSON.stringify(i.route)), l = JSON.parse(JSON.stringify(i.waypoints)), u = await O.analyseInstantWithThreshed(
         { lat: e.lat, lng: e.lng },
         e.etd,
         h,
@@ -1081,9 +1083,9 @@ class O {
         e.speedStep,
         e.useMeteo,
         e.useRouteParam,
-        a
+        o
       );
-      u && (await O.calculateCost(u, c, e, a), s.push(u), k == null || k.info("[%s][L%d-%d] analyse from %s to %s cost: %j", a.requestId, 1, M, e.etd, h.format(), {
+      u && (await O.calculateCost(u, c, e, o), s.push(u), F == null || F.info("[%s][L%d-%d] analyse from %s to %s cost: %j", o.requestId, 1, M, e.etd, h.format(), {
         cost: u.cost.total,
         hire: u.cost.hire,
         bunker: u.cost.bunker,
@@ -1093,22 +1095,22 @@ class O {
       })), M++;
     }
     s.sort((c, f) => c.cost.total - f.cost.total);
-    const y = s.at(0), w = s.at(1), m = [];
-    if (m.push({ combined: !1, speeds: [y], cost: (v = y.cost) == null ? void 0 : v.total }), w) {
-      const c = y.cost.cp, f = w.cost.cp, l = g(y.eta), u = g(y.etd), I = l.diff(u, "days", !0);
-      let S = Math.ceil(I / 2);
-      S = S > 7 ? 7 : S < e.alterStep ? e.alterStep : S;
-      let D = 2, Y = { combined: !1, speeds: [w], cost: (b = w.cost) == null ? void 0 : b.total }, E;
-      for (; S >= e.alterStep; ) {
-        const P = await O.combinedAnalyse(e, t, h, [c, f], r, S, { ...a, level: D });
-        if (Y.cost > P.cost ? E ? (E == null ? void 0 : E.cost) > P.cost && (E = P) : (E = Y, Y = P) : (!E || (E == null ? void 0 : E.cost) > P.cost) && (E = P), S <= e.alterStep)
+    const y = s.at(0), v = s.at(1), m = [];
+    if (m.push({ combined: !1, speeds: [y], cost: (w = y.cost) == null ? void 0 : w.total }), v) {
+      const c = y.cost.cp, f = v.cost.cp, l = g(y.eta), u = g(y.etd), I = l.diff(u, "days", !0);
+      let k = Math.ceil(I / 2);
+      k = k > 7 ? 7 : k < e.alterStep ? e.alterStep : k;
+      let D = 2, Y = { combined: !1, speeds: [v], cost: (b = v.cost) == null ? void 0 : b.total }, j;
+      for (; k >= e.alterStep; ) {
+        const P = await O.combinedAnalyse(e, t, h, [c, f], i, k, { ...o, level: D });
+        if (Y.cost > P.cost ? j ? (j == null ? void 0 : j.cost) > P.cost && (j = P) : (j = Y, Y = P) : (!j || (j == null ? void 0 : j.cost) > P.cost) && (j = P), k <= e.alterStep)
           break;
-        S = Math.ceil(S / 2), D += 1;
+        k = Math.ceil(k / 2), D += 1;
       }
-      m.push(Y), E && m.push(E);
+      m.push(Y), j && m.push(j);
     }
-    const x = g().valueOf() - o;
-    return k == null || k.info("[%s] analyse elapsed: %d ms", a == null ? void 0 : a.requestId, x), m.sort((c, f) => c.cost - f.cost);
+    const S = g().valueOf() - a;
+    return F == null || F.info("[%s] analyse elapsed: %d ms", o == null ? void 0 : o.requestId, S), m.sort((c, f) => c.cost - f.cost);
   }
   /**
    * 按步长多次减半，分别用7,4,2,1天步长及cpa,cpb交替计算各种组合下的成本
@@ -1120,24 +1122,24 @@ class O {
    * @param step 步长，7，4，2，1
    * @param options
    */
-  static async combinedAnalyse(e, t, n, r, a, o, s = {}) {
-    s.counter = 1, k == null || k.info("[%s][L%d] analyse with alternate cp in every %d days", s.requestId, s.level, o);
-    const d = await O.alternateAnalyse(e, t, n, r, 0, a, o, s), i = d.reduce((f, l) => f + l.cost.total, 0), h = d.reduce((f, l) => f + l.cost.hire, 0), M = d.reduce((f, l) => f + l.cost.bunker, 0), y = d.reduce((f, l) => f + l.distance, 0), w = d.reduce((f, l) => f + l.totalHrs, 0);
-    k == null || k.info("[%s][L%d] cost with cpa/cpb turn: %j", s.requestId, s.level, {
-      cost: i,
+  static async combinedAnalyse(e, t, n, i, o, a, s = {}) {
+    s.counter = 1, F == null || F.info("[%s][L%d] analyse with alternate cp in every %d days", s.requestId, s.level, a);
+    const d = await O.alternateAnalyse(e, t, n, i, 0, o, a, s), r = d.reduce((f, l) => f + l.cost.total, 0), h = d.reduce((f, l) => f + l.cost.hire, 0), M = d.reduce((f, l) => f + l.cost.bunker, 0), y = d.reduce((f, l) => f + l.distance, 0), v = d.reduce((f, l) => f + l.totalHrs, 0);
+    F == null || F.info("[%s][L%d] cost with cpa/cpb turn: %j", s.requestId, s.level, {
+      cost: r,
       hire: h,
       bunker: M,
       distance: y,
-      hours: w
+      hours: v
     });
-    const m = await O.alternateAnalyse(e, t, n, r, 1, a, o, s), F = m.reduce((f, l) => f + l.cost.total, 0), x = m.reduce((f, l) => f + l.cost.hire, 0), v = m.reduce((f, l) => f + l.cost.bunker, 0), b = m.reduce((f, l) => f + l.distance, 0), c = m.reduce((f, l) => f + l.totalHrs, 0);
-    return k == null || k.info("[%s][L%d] cost with cpb/cpa turn: %j", s.requestId, s.level, {
-      cost: F,
-      hire: x,
-      bunker: v,
+    const m = await O.alternateAnalyse(e, t, n, i, 1, o, a, s), C = m.reduce((f, l) => f + l.cost.total, 0), S = m.reduce((f, l) => f + l.cost.hire, 0), w = m.reduce((f, l) => f + l.cost.bunker, 0), b = m.reduce((f, l) => f + l.distance, 0), c = m.reduce((f, l) => f + l.totalHrs, 0);
+    return F == null || F.info("[%s][L%d] cost with cpb/cpa turn: %j", s.requestId, s.level, {
+      cost: C,
+      hire: S,
+      bunker: w,
       distance: b,
       hours: c
-    }), i < F ? { combined: !0, cost: Math.round(i * 1e3) / 1e3, speeds: d, step: o } : { combined: !0, cost: Math.round(F * 1e3) / 1e3, speeds: m, step: o };
+    }), r < C ? { combined: !0, cost: Math.round(r * 1e3) / 1e3, speeds: d, step: a } : { combined: !0, cost: Math.round(C * 1e3) / 1e3, speeds: m, step: a };
   }
   /**
    * 基于cp索引，交替计算指定步长下的成本
@@ -1150,31 +1152,31 @@ class O {
    * @param step 步长，7，4，2，1
    * @param options
    */
-  static async alternateAnalyse(e, t, n, r, a, o, s, d = {}) {
-    var y, w;
-    let i = g.utc(e.etd);
+  static async alternateAnalyse(e, t, n, i, o, a, s, d = {}) {
+    var y, v;
+    let r = g.utc(e.etd);
     const h = { lat: e.lat, lng: e.lng }, M = [];
-    for (; i.isBefore(n); ) {
-      const m = i.clone().utc().add(s, "day"), F = JSON.parse(JSON.stringify(o.route)), x = JSON.parse(JSON.stringify(o.waypoints)), v = r[a], b = await O.analyseInstantWithThreshed(
+    for (; r.isBefore(n); ) {
+      const m = r.clone().utc().add(s, "day"), C = JSON.parse(JSON.stringify(a.route)), S = JSON.parse(JSON.stringify(a.waypoints)), w = i[o], b = await O.analyseInstantWithThreshed(
         h,
-        i.utc().format(),
+        r.utc().format(),
         m,
         t,
-        v,
-        F,
-        x,
+        w,
+        C,
+        S,
         e.meteoVendor,
         e.speedStep,
         e.useMeteo,
         e.useRouteParam,
         d
       );
-      b && (await O.calculateCost(b, v, e, d), k == null || k.info(
+      b && (await O.calculateCost(b, w, e, d), F == null || F.info(
         "[%s][L%d-%d] analyse from %s to %s cost: %j",
         d.requestId,
         d.level,
         d.counter,
-        i.utc().format(),
+        r.utc().format(),
         m.utc().format(),
         {
           cost: b.cost.total,
@@ -1182,12 +1184,12 @@ class O {
           bunker: b.cost.bunker,
           distance: b.distance,
           hours: b.totalHrs,
-          cp: `${v.speed}/${v.fo}/${v.dgo}`
+          cp: `${w.speed}/${w.fo}/${w.dgo}`
         }
       )), d.counter = d.counter + 1;
-      const c = (w = (y = b == null ? void 0 : b.sample) == null ? void 0 : y.hours) == null ? void 0 : w.at(-1);
+      const c = (v = (y = b == null ? void 0 : b.sample) == null ? void 0 : y.hours) == null ? void 0 : v.at(-1);
       if (c)
-        h.lat = c.lat, h.lng = c.lng, i = g(c.eta), M.push(b), a = a ? 0 : 1;
+        h.lat = c.lat, h.lng = c.lng, r = g(c.eta), M.push(b), o = o ? 0 : 1;
       else
         break;
     }
@@ -1200,13 +1202,13 @@ class O {
    * @param props
    * @param options
    */
-  static async calculateCost(e, t, n, r = {}) {
-    var a;
+  static async calculateCost(e, t, n, i = {}) {
+    var o;
     if (e) {
-      const o = Math.round(e.totalHrs / 24 * (n.dailyHire || 0) * (1 - (n.addComm || 0)) * 1e3) / 1e3, s = Math.round(e.totalFoCons * (n.priceFO || 0) * 1e3) / 1e3, d = Math.round((e.totalDgoCons + (((a = e.extend) == null ? void 0 : a.totalDgoConsInECA) || 0)) * (n.priceDGO || 0) * 1e3) / 1e3;
+      const a = Math.round(e.totalHrs / 24 * (n.dailyHire || 0) * (1 - (n.addComm || 0)) * 1e3) / 1e3, s = Math.round(e.totalFoCons * (n.priceFO || 0) * 1e3) / 1e3, d = Math.round((e.totalDgoCons + (((o = e.extend) == null ? void 0 : o.totalDgoConsInECA) || 0)) * (n.priceDGO || 0) * 1e3) / 1e3;
       e.cost = {
-        total: Math.round((o + s + d) * 1e3) / 1e3,
-        hire: o,
+        total: Math.round((a + s + d) * 1e3) / 1e3,
+        hire: a,
         bunker: Math.round((s + d) * 1e3) / 1e3,
         cp: t
       };
@@ -1217,22 +1219,22 @@ class O {
    * 计算单cp模式下的ECA属性
    */
   static async calculateECA(e, t, n = {}) {
-    var d, i;
-    const r = await W.intersectInECA(e.route);
-    let a = 0, o = 0, s = 0;
+    var d, r;
+    const i = await W.intersectInECA(e.route);
+    let o = 0, a = 0, s = 0;
     e.sample.wps.forEach((h) => {
       h.positionTime = g.utc(h.etd || h.eta).unix();
     });
-    for (const h of r) {
-      a += h.distance;
-      const M = await W.deadReckoningTime((d = h.waypoints) == null ? void 0 : d.at(0), e.sample.wps), y = await W.deadReckoningTime((i = h.waypoints) == null ? void 0 : i.at(-1), e.sample.wps);
-      h.in = M, h.out = y, h.totalHrs = J.roundPrecision((y.positionTime - M.positionTime) / 3600, 2), h.totalDgoCons = J.roundPrecision(t.fo / 24 * h.totalHrs, 3), o += h.totalHrs, s += h.totalDgoCons;
+    for (const h of i) {
+      o += h.distance;
+      const M = await W.deadReckoningTime((d = h.waypoints) == null ? void 0 : d.at(0), e.sample.wps), y = await W.deadReckoningTime((r = h.waypoints) == null ? void 0 : r.at(-1), e.sample.wps);
+      h.in = M, h.out = y, h.totalHrs = J.roundPrecision((y.positionTime - M.positionTime) / 3600, 2), h.totalDgoCons = J.roundPrecision(t.fo / 24 * h.totalHrs, 3), a += h.totalHrs, s += h.totalDgoCons;
     }
-    return a = J.roundPrecision(a, 3), o = J.roundPrecision(o, 3), s = J.roundPrecision(s, 3), {
-      distanceInECA: a,
-      hoursInECA: o,
+    return o = J.roundPrecision(o, 3), a = J.roundPrecision(a, 3), s = J.roundPrecision(s, 3), {
+      distanceInECA: o,
+      hoursInECA: a,
       totalDgoConsInECA: s,
-      eca: r
+      eca: i
     };
   }
   /**
@@ -1246,35 +1248,35 @@ class O {
       hours: [],
       wps: [],
       days: []
-    }, r = e.reduce((l, u) => l + u.distance, 0), a = e.reduce((l, u) => {
+    }, i = e.reduce((l, u) => l + u.distance, 0), o = e.reduce((l, u) => {
       var I;
       return l + (((I = u.extend) == null ? void 0 : I.distanceInECA) || 0);
-    }, 0), o = e.reduce((l, u) => l + u.totalHrs, 0), s = e.reduce((l, u) => {
+    }, 0), a = e.reduce((l, u) => l + u.totalHrs, 0), s = e.reduce((l, u) => {
       var I;
       return l + (((I = u.extend) == null ? void 0 : I.hoursInECA) || 0);
     }, 0), d = e.reduce((l, u) => {
       var I;
       return l + (((I = u.extend) == null ? void 0 : I.totalDgoConsInECA) || 0);
-    }, 0), i = e.reduce((l, u) => l + u.wxFactor * u.totalHrs / o, 0), h = e.reduce((l, u) => l + u.cFactor * u.totalHrs / o, 0), M = e.reduce((l, u) => l + u.totalFoCons, 0), y = e.reduce((l, u) => l + u.totalDgoCons, 0), w = e.reduce((l, u) => l + u.cost.total, 0), m = e.reduce((l, u) => l + u.cost.hire, 0), F = e.reduce((l, u) => l + u.cost.bunker, 0), x = [], v = [];
+    }, 0), r = e.reduce((l, u) => l + u.wxFactor * u.totalHrs / a, 0), h = e.reduce((l, u) => l + u.cFactor * u.totalHrs / a, 0), M = e.reduce((l, u) => l + u.totalFoCons, 0), y = e.reduce((l, u) => l + u.totalDgoCons, 0), v = e.reduce((l, u) => l + u.cost.total, 0), m = e.reduce((l, u) => l + u.cost.hire, 0), C = e.reduce((l, u) => l + u.cost.bunker, 0), S = [], w = [];
     let b;
     for (const l of e) {
-      v.push(...((c = l.extend) == null ? void 0 : c.eca) || []);
-      const u = l.sample.hours, I = l.sample.wps, S = l.sample.days, D = u.at(0);
+      w.push(...((c = l.extend) == null ? void 0 : c.eca) || []);
+      const u = l.sample.hours, I = l.sample.wps, k = l.sample.days, D = u.at(0);
       b && (D.distanceFromPrevious = b.distanceFromPrevious, D.distanceFromStart = b.distanceFromStart, u.forEach((T, N) => {
         N && (T.distanceFromStart = T.distanceFromStart + b.distanceFromStart);
       }), I.at(0).distanceFromPrevious = b.distanceFromPrevious, I.at(0).distanceFromStart = b.distanceFromStart, I.forEach((T, N) => {
         N && (T.distanceFromStart = T.distanceFromStart + b.distanceFromStart);
-      }), S.at(0).distanceFromPrevious = b.distanceFromPrevious, S.at(0).distanceFromStart = b.distanceFromStart, S.forEach((T, N) => {
+      }), k.at(0).distanceFromPrevious = b.distanceFromPrevious, k.at(0).distanceFromStart = b.distanceFromStart, k.forEach((T, N) => {
         N && (T.distanceFromStart = T.distanceFromStart + b.distanceFromStart);
       })), D.cp = l.cost.cp;
-      const Y = [l.etd, l.eta], E = x.findIndex((T) => T.id === D.cp.id);
-      E === -1 ? (D.cp.segment = [Y], x.push(D.cp)) : x[E].segment.push(Y), u.forEach((T) => {
+      const Y = [l.etd, l.eta], j = S.findIndex((T) => T.id === D.cp.id);
+      j === -1 ? (D.cp.segment = [Y], S.push(D.cp)) : S[j].segment.push(Y), u.forEach((T) => {
         var A;
         ((A = n.hours) == null ? void 0 : A.findIndex((R) => R.eta === T.eta)) === -1 && n.hours.push(T);
       }), I.forEach((T) => {
         var A;
         ((A = n.wps) == null ? void 0 : A.findIndex((R) => R.eta === T.eta)) === -1 && n.wps.push(T);
-      }), S.forEach((T) => {
+      }), k.forEach((T) => {
         var A;
         ((A = n == null ? void 0 : n.days) == null ? void 0 : A.findIndex((R) => R.eta === T.eta)) === -1 && n.days.push(T);
       });
@@ -1286,10 +1288,10 @@ class O {
     }), n.wps.forEach((l, u) => {
       const I = n.wps[u - 1];
       if (I) {
-        const S = l.distanceFromStart - (I.distanceFromStart || 0), D = g(l.eta || l.etd).diff(g(I.etd || I.eta), "hour", !0), Y = Math.round(S / D * 100) / 100;
+        const k = l.distanceFromStart - (I.distanceFromStart || 0), D = g(l.eta || l.etd).diff(g(I.etd || I.eta), "hour", !0), Y = Math.round(k / D * 100) / 100;
         l.avgSpd = Y;
-        const E = W.calculateBearing(I, l);
-        I.bearing = E;
+        const j = W.calculateBearing(I, l);
+        I.bearing = j;
       }
     }), {
       sample: n,
@@ -1299,22 +1301,22 @@ class O {
       to: e.at(-1).to,
       v0: e.at(0).v0,
       label: "Combined",
-      distance: Math.round(r * 1e4) / 1e4,
-      totalHrs: Math.round(o * 1e3) / 1e3,
-      avgSpeed: Math.round(r / o * 1e3) / 1e3,
-      wxFactor: Math.round(i * 1e3) / 1e3,
+      distance: Math.round(i * 1e4) / 1e4,
+      totalHrs: Math.round(a * 1e3) / 1e3,
+      avgSpeed: Math.round(i / a * 1e3) / 1e3,
+      wxFactor: Math.round(r * 1e3) / 1e3,
       cFactor: Math.round(h * 1e3) / 1e3,
       totalFoCons: Math.round(M * 1e3) / 1e3,
       totalDgoCons: Math.round(y * 1e3) / 1e3,
       cost: {
-        total: Math.round(w * 1e3) / 1e3,
+        total: Math.round(v * 1e3) / 1e3,
         hire: Math.round(m * 1e3) / 1e3,
-        bunker: Math.round(F * 1e3) / 1e3
+        bunker: Math.round(C * 1e3) / 1e3
       },
       extend: {
-        cps: x,
-        eca: v,
-        distanceInECA: Math.round(a * 1e4) / 1e4,
+        cps: S,
+        eca: w,
+        distanceInECA: Math.round(o * 1e4) / 1e4,
         hoursInECA: Math.round(s * 1e3) / 1e3,
         totalDgoConsInECA: Math.round(d * 1e3) / 1e3,
         speeds: e
@@ -1324,15 +1326,15 @@ class O {
 }
 export {
   et as AISImpl,
-  Mt as AlertHelper,
-  yt as AlertLevel,
+  yt as AlertHelper,
+  mt as AlertLevel,
   Et as HifleetImpl,
-  pt as LoadCondition,
-  Tt as MyShipImpl,
-  jt as MyVesselImpl,
-  Nt as ShipxyImpl,
+  bt as LoadCondition,
+  Nt as MyShipImpl,
+  xt as MyVesselImpl,
+  jt as ShipxyImpl,
   O as SpeedHelper,
-  wt as SpeedLabel,
-  bt as VesselTag,
-  Dt as alertHelper
+  pt as SpeedLabel,
+  gt as VesselTag,
+  Tt as alertHelper
 };