@idm-plugin/vessel 3.7.4 → 3.7.6

package/dist/index.js

@@ -63,19 +63,19 @@ class Tt extends nt {
     this.clientId = t, this.clientSecret = a;
   }
   async authToken(t = {}) {
-    const a = "https://svc.data.myvessel.cn/ada/oauth/token", n = {
+    const a = "https://svc.data.myvessel.cn/ada/oauth/token", o = {
       searchParams: {
         client_id: this.clientId,
         client_secret: this.clientSecret,
         grant_type: "client_credentials"
       }
-    }, o = await z.post(a, n).json();
-    g == null || g.info("[%s] fetch access token from: %s - %j", t.requestId, a, o), o.error || (this.token = {
-      accessToken: o.access_token,
-      tokenType: o.token_type,
-      expiresIn: o.expires_in,
-      scope: o.scope,
-      jti: o.jti,
+    }, i = await z.post(a, o).json();
+    g == null || g.info("[%s] fetch access token from: %s - %j", t.requestId, a, i), i.error || (this.token = {
+      accessToken: i.access_token,
+      tokenType: i.token_type,
+      expiresIn: i.expires_in,
+      scope: i.scope,
+      jti: i.jti,
       issuedAt: w().utc().format()
     });
   }
@@ -91,7 +91,7 @@ class Tt extends nt {
   async suggest(t, a = {}) {
     var s, r;
     await this.checkToken(a);
-    const n = "https://market.myvessel.cn/sdc/v1/mkt/vessels/fuzzy", o = {
+    const o = "https://market.myvessel.cn/sdc/v1/mkt/vessels/fuzzy", i = {
       headers: {
         Authorization: `${(s = this.token) == null ? void 0 : s.tokenType} ${(r = this.token) == null ? void 0 : r.accessToken}`
       },
@@ -100,18 +100,18 @@ class Tt extends nt {
         recordNum: a.ps || 10
       }
     };
-    g == null || g.info("[%s] fetch suggest vessels from: %s - %j", a.requestId, n, o);
-    const i = await z.post(n, o).json();
-    return i.status !== 200 ? (g == null || g.warn("[%s] fetch suggest vessels failed: %j", a.requestId, { message: i.message, status: i.status, code: i.code }), []) : (i.data || []).map((u) => ({
-      mmsi: u.mmsi,
-      name: u.nameEn,
-      nameCn: u.nameCn,
-      imo: Number.isNaN(u.imo) ? null : Number(u.imo),
-      callSign: u.callsign,
-      type: u.vesselTypeNameEn,
-      flagName: u.flagCtry,
+    g == null || g.info("[%s] fetch suggest vessels from: %s - %j", a.requestId, o, i);
+    const n = await z.post(o, i).json();
+    return n.status !== 200 ? (g == null || g.warn("[%s] fetch suggest vessels failed: %j", a.requestId, { message: n.message, status: n.status, code: n.code }), []) : (n.data || []).map((l) => ({
+      mmsi: l.mmsi,
+      name: l.nameEn,
+      nameCn: l.nameCn,
+      imo: Number.isNaN(l.imo) ? null : Number(l.imo),
+      callSign: l.callsign,
+      type: l.vesselTypeNameEn,
+      flagName: l.flagCtry,
       vendor: "myvessel",
-      raw: u
+      raw: l
     }));
   }
   /**
@@ -120,43 +120,43 @@ class Tt extends nt {
    * @param options
    */
   async search(t, a = {}) {
-    var l, u;
+    var u, l;
     await this.checkToken(a);
-    const n = /^\d{7}$/.test(t.toString()), o = n ? "https://market.myvessel.cn/sdc/v1/mkt/vessels/detail/imo" : "https://market.myvessel.cn/sdc/v1/mkt/vessels/detail/mmsi", i = n ? { imo: t } : { mmsi: t }, s = {
+    const o = /^\d{7}$/.test(t.toString()), i = o ? "https://market.myvessel.cn/sdc/v1/mkt/vessels/detail/imo" : "https://market.myvessel.cn/sdc/v1/mkt/vessels/detail/mmsi", n = o ? { imo: t } : { mmsi: t }, s = {
       headers: {
-        Authorization: `${(l = this.token) == null ? void 0 : l.tokenType} ${(u = this.token) == null ? void 0 : u.accessToken}`
+        Authorization: `${(u = this.token) == null ? void 0 : u.tokenType} ${(l = this.token) == null ? void 0 : l.accessToken}`
       },
-      searchParams: i
+      searchParams: n
     };
-    g == null || g.info("[%s] fetch vessel from: %s - %j", a.requestId, o, s);
-    const r = await z.get(o, s).json();
+    g == null || g.info("[%s] fetch vessel from: %s - %j", a.requestId, i, s);
+    const r = await z.get(i, s).json();
     if (r.status !== 200)
       return g == null || g.warn("[%s] fetch suggest vessels failed: %j", a.requestId, { message: r.message, status: r.status, code: r.code }), {};
     {
-      const c = r.data;
-      if (c)
+      const h = r.data;
+      if (h)
         return {
-          mmsi: c.mmsi,
-          imo: Number.isNaN(c.imo) ? null : Number(c.imo),
-          callSign: c.callsign,
-          name: c.nameEn,
-          nameCn: c.nameCn,
-          type: c.vesselTypeNameEn,
-          flagName: c.flagCtry,
-          clasz: c.classSociety,
-          dateOfBuild: c.buildYearMonth,
-          deadweight: c.dwt,
-          grossTonnage: c.grt,
-          netTonnage: c.net,
-          teu: c.teu,
-          length: c.length,
-          breadth: c.width,
-          height: c.height,
-          draught: c.draught,
-          speed: c.speed,
-          passengerCapacity: c.passengercapacity,
+          mmsi: h.mmsi,
+          imo: Number.isNaN(h.imo) ? null : Number(h.imo),
+          callSign: h.callsign,
+          name: h.nameEn,
+          nameCn: h.nameCn,
+          type: h.vesselTypeNameEn,
+          flagName: h.flagCtry,
+          clasz: h.classSociety,
+          dateOfBuild: h.buildYearMonth,
+          deadweight: h.dwt,
+          grossTonnage: h.grt,
+          netTonnage: h.net,
+          teu: h.teu,
+          length: h.length,
+          breadth: h.width,
+          height: h.height,
+          draught: h.draught,
+          speed: h.speed,
+          passengerCapacity: h.passengercapacity,
           vendor: "myvessel",
-          raw: c
+          raw: h
         };
     }
     return {};
@@ -164,7 +164,7 @@ class Tt extends nt {
   async archives(t, a = {}) {
     var s, r;
     await this.checkToken(a);
-    const n = "https://svc.data.myvessel.cn/sdc/v1/ship/info/batch", o = {
+    const o = "https://svc.data.myvessel.cn/sdc/v1/ship/info/batch", i = {
       headers: {
         Authorization: `${(s = this.token) == null ? void 0 : s.tokenType} ${(r = this.token) == null ? void 0 : r.accessToken}`
       },
@@ -172,28 +172,28 @@ class Tt extends nt {
         mmsiList: typeof t == "number" ? [t] : t
       }
     };
-    g == null || g.info("[%s] fetch vessel archive from: %s - %j", a.requestId, n, o);
-    const i = await z.post(n, o).json();
-    return i.status !== 200 ? (g == null || g.warn("[%s] fetch vessel archive failed: %j", a.requestId, { message: i.message, status: i.status, code: i.code }), {}) : i.data;
+    g == null || g.info("[%s] fetch vessel archive from: %s - %j", a.requestId, o, i);
+    const n = await z.post(o, i).json();
+    return n.status !== 200 ? (g == null || g.warn("[%s] fetch vessel archive failed: %j", a.requestId, { message: n.message, status: n.status, code: n.code }), {}) : n.data;
   }
   async realTimePosition(t, a = {}) {
-    var r, l;
+    var r, u;
     await this.checkToken(a);
-    const n = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/location/unit", o = {
+    const o = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/location/unit", i = {
       headers: {
-        Authorization: `${(r = this.token) == null ? void 0 : r.tokenType} ${(l = this.token) == null ? void 0 : l.accessToken}`
+        Authorization: `${(r = this.token) == null ? void 0 : r.tokenType} ${(u = this.token) == null ? void 0 : u.accessToken}`
       },
       searchParams: { mmsi: t }
     };
-    g == null || g.info("[%s] fetch realtime position from: %s - %j", a.requestId, n, o);
-    const i = await z.get(n, o).json();
-    if (i.code)
-      return g == null || g.warn("[%s] fetch realtime position failed: %j", a.requestId, { message: i.message, status: i.status, code: i.code }), i;
-    const s = i.data;
-    for (const u in s)
-      !isNaN(s[u]) && Number(s[u]) !== 1 / 0 && (s[u] = Number(s[u]));
+    g == null || g.info("[%s] fetch realtime position from: %s - %j", a.requestId, o, i);
+    const n = await z.get(o, i).json();
+    if (n.code)
+      return g == null || g.warn("[%s] fetch realtime position failed: %j", a.requestId, { message: n.message, status: n.status, code: n.code }), n;
+    const s = n.data;
+    for (const l in s)
+      !isNaN(s[l]) && Number(s[l]) !== 1 / 0 && (s[l] = Number(s[l]));
     if (s) {
-      const u = w(`${s.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+      const l = w(`${s.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
       return {
         mmsi: s.mmsi,
         name: s.vesselName || s.aisVesselName,
@@ -210,7 +210,7 @@ class Tt extends nt {
         rot: s.rot,
         eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(s.eta) ? w.utc(s.eta).format() : void 0,
         destination: s.dest,
-        positionTime: u.unix(),
+        positionTime: l.unix(),
         status: s.status,
         labelCn: s.statusNameCn,
         labelEn: s.statusNameEn,
@@ -223,7 +223,7 @@ class Tt extends nt {
         net: s.net,
         method: "position",
         vendor: "myVessel",
-        utc: u.utc().format()
+        utc: l.utc().format()
       };
     } else
       return {};
@@ -236,35 +236,35 @@ class Tt extends nt {
    * @param excludeSeas  排除水域, [sea.code]
    * @param options { requiretId: '请求ID', useAIModel: '启用AI算法', withECA: '是否计算低硫区航行距离', withSpecial: '是否计算穿越的特战区列表和海盗区列表', draught: '最大吃水' }
    */
-  async calculateRoute(t, a, n, o, i, s = {}) {
-    var k, b, F;
+  async calculateRoute(t, a, o, i, n, s = {}) {
+    var I, b, E;
     const r = w();
     await this.checkToken(s);
-    const l = "https://market.myvessel.cn/sdc/v1/mkt/routes/plan", u = {
+    const u = "https://market.myvessel.cn/sdc/v1/mkt/routes/plan", l = {
       maxDraught: s.draught || 10,
       useAIModel: s.useAIModel ?? !0,
       withECA: s.withECA || !1,
       withSpecialRegion: s.withSpecial || !1
     };
-    t.code && (u.startPortCode = t.code), t.lng !== void 0 && t.lat !== void 0 && (u.startPoint = {
+    t.code && (l.startPortCode = t.code), t.lng !== void 0 && t.lat !== void 0 && (l.startPoint = {
       lon: t.lng,
       lat: t.lat
-    }), a.code && (u.endPortCode = a.code), a.lng !== void 0 && a.lat !== void 0 && (u.endPoint = {
+    }), a.code && (l.endPortCode = a.code), a.lng !== void 0 && a.lat !== void 0 && (l.endPoint = {
       lon: a.lng,
       lat: a.lat
-    }), n != null && n.length && (u.crossMonthList = n), o != null && o.length && (u.excludeNodes = o), i != null && i.length && (u.excludeSeaAreas = i);
-    const c = {
+    }), o != null && o.length && (l.crossMonthList = o), i != null && i.length && (l.excludeNodes = i), n != null && n.length && (l.excludeSeaAreas = n);
+    const h = {
       headers: {
-        Authorization: `${(k = this.token) == null ? void 0 : k.tokenType} ${(b = this.token) == null ? void 0 : b.accessToken}`
+        Authorization: `${(I = this.token) == null ? void 0 : I.tokenType} ${(b = this.token) == null ? void 0 : b.accessToken}`
       },
-      json: u
+      json: l
     };
-    g == null || g.info("[%s] fetch route from: %s - %j", s.requestId, l, c);
-    const h = await z.post(l, c).json();
-    if (h.status !== 200)
-      return g == null || g.warn("[%s] fetch route failed: %j", s.requestId, { message: h.message, status: h.status, code: h.code }), {};
+    g == null || g.info("[%s] fetch route from: %s - %j", s.requestId, u, h);
+    const d = await z.post(u, h).json();
+    if (d.status !== 200)
+      return g == null || g.warn("[%s] fetch route failed: %j", s.requestId, { message: d.message, status: d.status, code: d.code }), {};
     {
-      const I = {
+      const k = {
         status: "Success",
         nodes: [],
         seas: [],
@@ -273,8 +273,8 @@ class Tt extends nt {
         route: [],
         distance: 0,
         memo: ""
-      }, { nodes: p, seas: v, tracks: m, specialRegions: d, ecaLength: f } = h.data;
-      I.nodes = p == null ? void 0 : p.map((M) => ({
+      }, { nodes: p, seas: v, tracks: m, specialRegions: c, ecaLength: f } = d.data;
+      k.nodes = p == null ? void 0 : p.map((M) => ({
         code: M.nodeCode,
         nameEn: M.nameEn,
         nameCn: M.nameCn,
@@ -297,7 +297,7 @@ class Tt extends nt {
         isKey: M.isKeyNode,
         // 重要枢纽节点
         isHub: M.isHubNode
-      })), I.seas = v == null ? void 0 : v.map((M) => ({
+      })), k.seas = v == null ? void 0 : v.map((M) => ({
         code: M.mrgidSea,
         nameEn: M.nameEn,
         nameCn: M.nameCn,
@@ -314,8 +314,8 @@ class Tt extends nt {
           lng: Math.round(M.maxLon * 1e6) / 1e6
         },
         level: M.mapLevel
-      })), d == null || d.map((M) => {
-        M.regionLength && I.regions.push({
+      })), c == null || c.map((M) => {
+        M.regionLength && k.regions.push({
           type: M.regionType,
           distance: M.regionLength,
           rows: M.regions.map((j) => ({
@@ -326,45 +326,45 @@ class Tt extends nt {
             distance: j.length
           }))
         });
-      }), I.waypoints = m == null ? void 0 : m.map((M) => ({
+      }), k.waypoints = m == null ? void 0 : m.map((M) => ({
         lat: Math.round(M.lat * 1e5) / 1e5,
         lng: Math.round(M.lon * 1e5) / 1e5
-      })), (F = I.waypoints) != null && F.length && (I.waypoints = R.simplifyCoordinates(I.waypoints), I.route = R.divideAccordingToLng(I.waypoints), I.distance = R.calculateRouteDistance(I.route), I.distanceInECA = f);
-      const S = w().diff(r, "second");
-      return I.memo = `time cost: ${S}s`, g.info("[%s] calculate route cost: %d seconds", s.requestId, S), I;
+      })), (E = k.waypoints) != null && E.length && (k.waypoints = R.simplifyCoordinates(k.waypoints), k.route = R.divideAccordingToLng(k.waypoints), k.distance = R.calculateRouteDistance(k.route), k.distanceInECA = f);
+      const F = w().diff(r, "second");
+      return k.memo = `time cost: ${F}s`, g.info("[%s] calculate route cost: %d seconds", s.requestId, F), k;
     }
   }
-  async trajectory(t, a, n, o, i = !0, s = {}) {
+  async trajectory(t, a, o, i, n = !0, s = {}) {
     await this.checkToken(s);
-    const r = await this.realTimePosition(t, s), l = w(a), u = w(n), c = [];
-    for (; u.diff(l, "day", !0) > 30; )
-      await this.trajectoryIn30Day(t, l, l.clone().add(30, "day"), r, o, c, s), l.add(30, "day");
-    return await this.trajectoryIn30Day(t, l, u, r, o, c, s), c;
+    const r = await this.realTimePosition(t, s), u = w(a), l = w(o), h = [];
+    for (; l.diff(u, "day", !0) > 30; )
+      await this.trajectoryIn30Day(t, u, u.clone().add(30, "day"), r, i, h, s), u.add(30, "day");
+    return await this.trajectoryIn30Day(t, u, l, r, i, h, s), h;
   }
-  async trajectoryIn30Day(t, a, n, o, i, s, r = {}) {
-    var b, F, I, p, v;
-    const l = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/track", u = {
+  async trajectoryIn30Day(t, a, o, i, n, s, r = {}) {
+    var b, E, k, p, v;
+    const u = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/track", l = {
       headers: {
-        Authorization: `${(b = this.token) == null ? void 0 : b.tokenType} ${(F = this.token) == null ? void 0 : F.accessToken}`
+        Authorization: `${(b = this.token) == null ? void 0 : b.tokenType} ${(E = this.token) == null ? void 0 : E.accessToken}`
       },
       json: {
         mmsi: t,
         startTime: a.utcOffset(8).format("YYYY-MM-DD HH:mm:ss"),
-        endTime: n.utcOffset(8).format("YYYY-MM-DD HH:mm:ss")
+        endTime: o.utcOffset(8).format("YYYY-MM-DD HH:mm:ss")
       }
     };
-    g == null || g.info("[%s] fetch trajectory from: %s - %j", r.requestId, l, u);
-    const c = await z.post(l, u).json();
-    if (c.code)
-      return g == null || g.warn("[%s] fetch trajectory failed: %j", r.requestId, l, { message: c.message, status: c.status, code: c.code }), c;
-    let h = -1;
-    const k = w(`${(p = (I = c.data) == null ? void 0 : I[0]) == null ? void 0 : p.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-    return (v = c.data) == null || v.forEach((m) => {
+    g == null || g.info("[%s] fetch trajectory from: %s - %j", r.requestId, u, l);
+    const h = await z.post(u, l).json();
+    if (h.code)
+      return g == null || g.warn("[%s] fetch trajectory failed: %j", r.requestId, u, { message: h.message, status: h.status, code: h.code }), h;
+    let d = -1;
+    const I = w(`${(p = (k = h.data) == null ? void 0 : k[0]) == null ? void 0 : p.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    return (v = h.data) == null || v.forEach((m) => {
       for (const N in m)
         !isNaN(m[N]) && Number(m[N]) !== 1 / 0 && (m[N] = Number(m[N]));
-      const d = w(`${m.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00"), f = m.status, { labelCn: y, labelEn: S } = this.parseStatus(f), M = {
+      const c = w(`${m.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00"), f = m.status, { labelCn: y, labelEn: F } = this.parseStatus(f), M = {
         mmsi: m.mmsi,
-        imo: o == null ? void 0 : o.imo,
+        imo: i == null ? void 0 : i.imo,
         lat: m.lat,
         lng: m.lon,
         sog: m.sog,
@@ -374,14 +374,14 @@ class Tt extends nt {
         status: f,
         eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(m.eta) ? w(`${m.eta} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00").utc().format() : void 0,
         destination: m.dest,
-        positionTime: d.unix(),
+        positionTime: c.unix(),
         labelCn: y,
-        labelEn: S,
+        labelEn: F,
         method: "trajectory",
         vendor: "myVessel",
-        utc: d.utc().format()
-      }, j = Math.floor(d.diff(k, "minute", !0) / (i || 1));
-      j !== h && (h = j, s.push(M));
+        utc: c.utc().format()
+      }, j = Math.floor(c.diff(I, "minute", !0) / (n || 1));
+      j !== d && (d = j, s.push(M));
     }), s;
   }
 }
@@ -392,20 +392,20 @@ class jt extends nt {
     this.token = t;
   }
   async realTimePosition(t, a = {}) {
-    const n = "https://api.hifleet.com/position/position/get/token", o = {
+    const o = "https://api.hifleet.com/position/position/get/token", i = {
       searchParams: {
         mmsi: t,
         usertoken: this.token
       }
-    }, i = await z.post(n, o).json();
-    g == null || g.info("[%s] fetch realtime position from: %s - %j", a.requestId, n, o);
-    const s = i == null ? void 0 : i.list;
+    }, n = await z.post(o, i).json();
+    g == null || g.info("[%s] fetch realtime position from: %s - %j", a.requestId, o, i);
+    const s = n == null ? void 0 : n.list;
     if (!s)
-      return g == null || g.warn("[%s] fetch realtime position failed: %j", a.requestId, n, i), i;
-    for (const k in s)
-      !isNaN(s[k]) && Number(s[k]) !== 1 / 0 && (s[k] = Number(s[k]));
+      return g == null || g.warn("[%s] fetch realtime position failed: %j", a.requestId, o, n), n;
+    for (const I in s)
+      !isNaN(s[I]) && Number(s[I]) !== 1 / 0 && (s[I] = Number(s[I]));
     s.status = s.sp > 3 ? 0 : 1;
-    const r = s.status, { labelCn: l, labelEn: u } = this.parseStatus(r), c = w(`${s.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    const r = s.status, { labelCn: u, labelEn: l } = this.parseStatus(r), h = w(`${s.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
     return {
       mmsi: s.m,
       name: s.n,
@@ -426,18 +426,18 @@ class jt extends nt {
       dwt: s.dwt,
       build: s.buildyear,
       flag: s.fn,
-      positionTime: c.unix(),
-      utc: c.utc().format(),
+      positionTime: h.unix(),
+      utc: h.utc().format(),
       status: r,
-      labelCn: l,
-      labelEn: u,
+      labelCn: u,
+      labelEn: l,
       method: "position",
       vendor: "hifleet"
     };
   }
   async search(t, a = {}) {
-    let n = "https://www.hifleet.com/hifleetapi/searchVesselOL.do";
-    const o = {
+    let o = "https://www.hifleet.com/hifleetapi/searchVesselOL.do";
+    const i = {
       searchParams: {
         keyword: t
       },
@@ -447,24 +447,24 @@ class jt extends nt {
         Host: "www.hifleet.com"
       }
     };
-    let i = await z.post(n, o).json();
-    g == null || g.info("[%s] fetch vessel props from: %s - %j", a.requestId, n, o), i instanceof Array && (i = i[0]);
-    for (const r in i)
-      !isNaN(i[r]) && Number(i[r]) !== 1 / 0 && (i[r] = Number(i[r]));
+    let n = await z.post(o, i).json();
+    g == null || g.info("[%s] fetch vessel props from: %s - %j", a.requestId, o, i), n instanceof Array && (n = n[0]);
+    for (const r in n)
+      !isNaN(n[r]) && Number(n[r]) !== 1 / 0 && (n[r] = Number(n[r]));
     const s = {
-      mmsi: i.m,
-      name: i.n,
-      imo: i.i,
-      callSign: i.c,
-      length: i.l,
-      breadth: i.b,
-      draught: i.dr,
-      type: i.t
+      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 n = "https://www.hifleet.com/hifleetapi/sameShipSearch.do", i = await z.post(n, o).json(), g == null || g.info("[%s] search vessel dead weight from: %s - %j", a.requestId, n, o), i instanceof Array && (i = i[0]), i && (s.deadweight = Number(i.dwt)), s;
+    return o = "https://www.hifleet.com/hifleetapi/sameShipSearch.do", n = await z.post(o, i).json(), g == null || g.info("[%s] search vessel dead weight from: %s - %j", a.requestId, o, i), n instanceof Array && (n = n[0]), n && (s.deadweight = Number(n.dwt)), s;
   }
   async suggest(t, a = {}) {
-    const n = "https://www.hifleet.com/hifleetapi/getShipSuggest.do", o = {
+    const o = "https://www.hifleet.com/hifleetapi/getShipSuggest.do", i = {
       searchParams: {
         q: t
       },
@@ -473,10 +473,10 @@ class jt extends nt {
         Origin: "https://www.hifleet.com",
         Host: "www.hifleet.com"
       }
-    }, i = await z.post(n, o).json();
-    g == null || g.info("[%s] suggest vessel props from: %s - %j", a.requestId, n, o);
+    }, n = await z.post(o, i).json();
+    g == null || g.info("[%s] suggest vessel props from: %s - %j", a.requestId, o, i);
     const s = [];
-    for (const r of i)
+    for (const r of n)
       s.push({
         mmsi: !r.mmsi || isNaN(r.mmsi) ? null : Number(r.mmsi),
         name: r.name,
@@ -484,35 +484,35 @@ class jt extends nt {
         imo: !r.imo || isNaN(r.imo) ? null : Number(r.imo),
         score: r._score
       });
-    return s.sort((r, l) => l.score - r.score), s;
+    return s.sort((r, u) => u.score - r.score), s;
   }
-  async trajectory(t, a, n, o, i = !0, s = {}) {
-    var m, d, f;
+  async trajectory(t, a, o, i, n = !0, s = {}) {
+    var m, c, f;
     const r = await this.realTimePosition(t, s);
-    let l = w(a);
-    const u = w(n), c = w();
-    if (i) {
-      let y = u.diff(l, "d", !0);
-      y < 0 ? l = u.clone().subtract(40, "d") : y < 30 ? l.subtract(10, "d") : y < 60 ? l.subtract(5, "d") : l = u.clone().subtract(80, "d"), y = c.diff(u, "d", !0), u.add(y > 10 ? 240 : y * 24, "h");
+    let u = w(a);
+    const l = w(o), h = w();
+    if (n) {
+      let y = l.diff(u, "d", !0);
+      y < 0 ? u = l.clone().subtract(40, "d") : y < 30 ? u.subtract(10, "d") : y < 60 ? u.subtract(5, "d") : u = l.clone().subtract(80, "d"), y = h.diff(l, "d", !0), l.add(y > 10 ? 240 : y * 24, "h");
     }
-    const h = {
+    const d = {
       searchParams: {
-        endtime: u.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
-        starttime: l.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
+        endtime: l.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
+        starttime: u.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
         mmsi: t,
         usertoken: this.token
       }
-    }, k = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", b = await z.get(k, h).json();
-    g == null || g.info("[%s] fetch trajectory from: %s - %j", s.requestId, k, h);
-    let F;
-    b && (F = ((d = (m = b.ships) == null ? void 0 : m.offors) == null ? void 0 : d.ship) || [], F.length || g == null || g.warn("[%s] fetch trajectory failed: %j", s.requestId, b));
-    const I = [];
+    }, I = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", b = await z.get(I, d).json();
+    g == null || g.info("[%s] fetch trajectory from: %s - %j", s.requestId, I, d);
+    let E;
+    b && (E = ((c = (m = b.ships) == null ? void 0 : m.offors) == null ? void 0 : c.ship) || [], E.length || g == null || g.warn("[%s] fetch trajectory failed: %j", s.requestId, b));
+    const k = [];
     let p = -1;
-    const v = w(`${(f = F == null ? void 0 : F[0]) == null ? void 0 : f.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-    for (const y of F) {
+    const v = w(`${(f = E == null ? void 0 : E[0]) == null ? void 0 : f.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    for (const y of E) {
       for (const L in y)
         !isNaN(y[L]) && Number(y[L]) !== 1 / 0 && (y[L] = Number(y[L]));
-      const S = w(`${y.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+      const F = w(`${y.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
       y.status = y.sp > 4 ? 0 : 1;
       const { labelEn: M, labelCn: j } = this.parseStatus(y.status), N = {
         mmsi: y.m,
@@ -524,17 +524,17 @@ class jt extends nt {
         sog: y.sp,
         cog: y.co,
         hdg: y.hdg,
-        positionTime: S.unix(),
-        utc: S.utc().format(),
+        positionTime: F.unix(),
+        utc: F.utc().format(),
         status: y.status,
         labelCn: j,
         labelEn: M,
         method: "trajectory",
         vendor: "hifleet"
-      }, D = Math.floor(S.diff(v, "minute", !0) / (o || 1));
-      D !== p && (p = D, I.push(N));
+      }, D = Math.floor(F.diff(v, "minute", !0) / (i || 1));
+      D !== p && (p = D, k.push(N));
     }
-    return I;
+    return k;
   }
 }
 class xt extends nt {
@@ -544,19 +544,19 @@ class xt extends nt {
     this.token = t;
   }
   async realTimePosition(t, a = {}) {
-    const n = {
+    const o = {
       searchParams: {
         id: t,
         k: this.token,
         enc: 1
       }
-    }, o = "https://api.shipxy.com/apicall/GetSingleShip", i = await z.get(o, n).json();
-    if (g == null || g.info("[%s] fetch realtime position from: %s - %j", a.requestId, o, n), (i == null ? void 0 : i.status) !== 0)
-      return i;
-    const s = i.data[0];
-    for (const h in s)
-      !isNaN(s[h]) && Number(s[h]) !== 1 / 0 && (s[h] = Number(s[h]));
-    const { labelCn: r, labelEn: l } = await this.parseStatus(s.navistat), u = w.unix(s.lasttime);
+    }, i = "https://api.shipxy.com/apicall/GetSingleShip", n = await z.get(i, o).json();
+    if (g == null || g.info("[%s] fetch realtime position from: %s - %j", a.requestId, i, o), (n == null ? void 0 : n.status) !== 0)
+      return n;
+    const s = n.data[0];
+    for (const d in s)
+      !isNaN(s[d]) && Number(s[d]) !== 1 / 0 && (s[d] = Number(s[d]));
+    const { labelCn: r, labelEn: u } = await this.parseStatus(s.navistat), l = w.unix(s.lasttime);
     return {
       mmsi: s.ShipID,
       name: s.name,
@@ -572,46 +572,46 @@ class xt extends nt {
       hdg: Math.round(s.hdg / 100 * 100) / 100,
       rot: Math.round(s.rot / 100 * 100) / 100,
       positionTime: s.lasttime,
-      utc: u.utc().format(),
+      utc: l.utc().format(),
       status: s.navistat,
-      labelEn: l,
+      labelEn: u,
       labelCn: r,
       method: "position",
       vendor: "shipxy"
     };
   }
-  async trajectory(t, a, n, o, i = !0, s = {}) {
+  async trajectory(t, a, o, i, n = !0, s = {}) {
     var v;
-    const r = await this.realTimePosition(t, s), l = w(a), u = w(n), c = "https://api.shipxy.com/apicall/GetShipTrack", h = {
+    const r = await this.realTimePosition(t, s), u = w(a), l = w(o), h = "https://api.shipxy.com/apicall/GetShipTrack", d = {
       searchParams: {
         id: t,
         k: this.token,
         enc: 1,
         cut: 0,
-        btm: l.unix(),
-        etm: u.unix()
+        btm: u.unix(),
+        etm: l.unix()
       }
-    }, k = await z.get(c, h).json();
-    if (g == null || g.info("[%s] fetch trajectory from: %s - %j", s.requestId, c, h), (k == null ? void 0 : k.status) !== 0)
-      return k;
-    const b = k == null ? void 0 : k.points, F = [], I = w.unix((v = b[0]) == null ? void 0 : v.utc);
+    }, I = await z.get(h, d).json();
+    if (g == null || g.info("[%s] fetch trajectory from: %s - %j", s.requestId, h, d), (I == null ? void 0 : I.status) !== 0)
+      return I;
+    const b = I == null ? void 0 : I.points, E = [], k = w.unix((v = b[0]) == null ? void 0 : v.utc);
     let p = -1;
     for (const m of b) {
-      const d = w.unix(m.utc), f = {
+      const c = w.unix(m.utc), f = {
         imo: r == null ? void 0 : r.imo,
         mmsi: t,
         sog: Math.round(m.sog * 3600 / 1e3 / 1852 * 100) / 100,
         cog: Math.round(m.cog / 100 * 100) / 100,
         lat: Math.round(m.lat / 1e6 * 1e5) / 1e5,
         lng: Math.round(m.lon / 1e6 * 1e5) / 1e5,
-        positionTime: d.unix(),
-        utc: d.utc().format(),
+        positionTime: c.unix(),
+        utc: c.utc().format(),
         method: "trajectory",
         vendor: "shipxy"
-      }, y = Math.floor(d.diff(I, "minute", !0) / (o || 1));
-      y !== p && (p = y, F.push(f));
+      }, y = Math.floor(c.diff(k, "minute", !0) / (i || 1));
+      y !== p && (p = y, E.push(f));
     }
-    return F;
+    return E;
   }
 }
 class Nt extends nt {
@@ -621,28 +621,28 @@ class Nt extends nt {
     this.token = t;
   }
   async getShipId(t, a = {}) {
-    const n = {
+    const o = {
       headers: {
         appKey: this.token
       },
       json: {
         mmsiList: t
       }
-    }, o = "https://api3.myships.com/sp/ships/getShipIdByMMSI", i = await z.post(o, n).json();
-    return g == null || g.info("[%s] fetch ship id from: %s - %j", a.requestId, o, n), i.code !== "0" ? i : i.data[0].shipId;
+    }, i = "https://api3.myships.com/sp/ships/getShipIdByMMSI", n = await z.post(i, o).json();
+    return g == null || g.info("[%s] fetch ship id from: %s - %j", a.requestId, i, o), n.code !== "0" ? n : n.data[0].shipId;
   }
   async getShipInfo(t, a = {}) {
-    const n = {
+    const o = {
       headers: {
         appKey: this.token
       },
       json: {
         shipId: t
       }
-    }, o = "https://api3.myships.com/sp/ships/aissta", i = await z.post(o, n).json();
-    if (g == null || g.info("[%s] fetch ship info from: %s - %j", a.requestId, o, n), i.code !== "0")
-      return i;
-    const s = i.data;
+    }, i = "https://api3.myships.com/sp/ships/aissta", n = await z.post(i, o).json();
+    if (g == null || g.info("[%s] fetch ship info from: %s - %j", a.requestId, i, o), n.code !== "0")
+      return n;
+    const s = n.data;
     let r = s.imo;
     return t === "407170" && (r = "9198379", g == null || g.warn("[%s] ship(%s) imo error: %s, should be %s", a.requestId, t, s.imo, r)), {
       mmsi: s.mmsi,
@@ -655,66 +655,66 @@ class Nt extends nt {
     };
   }
   async realTimePosition(t, a = {}) {
-    const n = await this.getShipId(t, a), o = await this.getShipInfo(n, a), i = {
+    const o = await this.getShipId(t, a), i = await this.getShipInfo(o, a), n = {
       headers: {
         appKey: this.token
       },
       json: {
-        shipId: n
+        shipId: o
       }
-    }, s = "https://api3.myships.com/sp/ships/position/latest", r = await z.post(s, i).json();
-    g == null || g.info("[%s] fetch realtime position from: %s - %j", a.requestId, s, i);
-    const l = r.data[0];
-    for (const b in l)
-      !isNaN(l[b]) && Number(l[b]) !== 1 / 0 && (l[b] = Number(l[b]));
-    const { labelCn: u, labelEn: c } = await this.parseStatus(l.aisNavStatus), h = w.unix(l.posTime);
+    }, s = "https://api3.myships.com/sp/ships/position/latest", r = await z.post(s, n).json();
+    g == null || g.info("[%s] fetch realtime position from: %s - %j", a.requestId, s, n);
+    const u = r.data[0];
+    for (const b in u)
+      !isNaN(u[b]) && Number(u[b]) !== 1 / 0 && (u[b] = Number(u[b]));
+    const { labelCn: l, labelEn: h } = await this.parseStatus(u.aisNavStatus), d = w.unix(u.posTime);
     return {
-      ...o,
+      ...i,
       mmsi: t,
-      lat: Math.round(l.lat / 1e4 / 60 * 1e5) / 1e5,
-      lng: Math.round(l.lon / 1e4 / 60 * 1e5) / 1e5,
-      sog: Math.round(l.sog / 10 * 100) / 100,
-      cog: Math.round(l.cog / 10 * 100) / 100,
-      hdg: Math.round(l.heading * 100) / 100,
-      rot: Math.round(l.rot * 100) / 100,
-      positionTime: l.posTime,
-      utc: h.utc().format(),
-      status: l.aisNavStatus,
-      labelEn: c,
-      labelCn: u,
+      lat: Math.round(u.lat / 1e4 / 60 * 1e5) / 1e5,
+      lng: Math.round(u.lon / 1e4 / 60 * 1e5) / 1e5,
+      sog: Math.round(u.sog / 10 * 100) / 100,
+      cog: Math.round(u.cog / 10 * 100) / 100,
+      hdg: Math.round(u.heading * 100) / 100,
+      rot: Math.round(u.rot * 100) / 100,
+      positionTime: u.posTime,
+      utc: d.utc().format(),
+      status: u.aisNavStatus,
+      labelEn: h,
+      labelCn: l,
       method: "position",
       vendor: "myship"
     };
   }
-  async trajectory(t, a, n, o, i = !0, s = {}) {
-    const r = w(a), l = w(n), u = await this.getShipId(t), c = await this.getShipInfo(u), h = [];
-    for (; l.diff(r, "day", !0) > 30; )
-      await this.trajectoryIn30Day(u, r.unix(), r.add(30, "day").unix(), c, t, o, h);
-    return await this.trajectoryIn30Day(u, r.unix(), l.unix(), c, t, o, h), h;
+  async trajectory(t, a, o, i, n = !0, s = {}) {
+    const r = w(a), u = w(o), l = await this.getShipId(t), h = await this.getShipInfo(l), d = [];
+    for (; u.diff(r, "day", !0) > 30; )
+      await this.trajectoryIn30Day(l, r.unix(), r.add(30, "day").unix(), h, t, i, d);
+    return await this.trajectoryIn30Day(l, r.unix(), u.unix(), h, t, i, d), d;
   }
-  async trajectoryIn30Day(t, a, n, o, i, s, r, l = {}) {
-    var I;
-    const u = {
+  async trajectoryIn30Day(t, a, o, i, n, s, r, u = {}) {
+    var k;
+    const l = {
       headers: {
         appKey: this.token
       },
       json: {
         shipId: t,
         startTime: a,
-        endTime: n
+        endTime: o
       }
-    }, c = "https://api3.myships.com/sp/ships/position/history", h = await z.post(c, u).json();
-    if (g == null || g.info("[%s] fetch trajectory from: %s - %j", l.requestId, c, u), h.code !== "0")
-      return g == null || g.warn("[%s] invoke myship trajectory failed: %j", l.requestId, h), h;
-    const k = h.data;
-    for (const p in k)
-      !isNaN(k[p]) && Number(k[p]) !== 1 / 0 && (k[p] = Number(k[p]));
-    const b = w.unix((I = k[0]) == null ? void 0 : I.posTime);
-    let F = -1;
-    for (const p of k) {
+    }, h = "https://api3.myships.com/sp/ships/position/history", d = await z.post(h, l).json();
+    if (g == null || g.info("[%s] fetch trajectory from: %s - %j", u.requestId, h, l), d.code !== "0")
+      return g == null || g.warn("[%s] invoke myship trajectory failed: %j", u.requestId, d), d;
+    const I = d.data;
+    for (const p in I)
+      !isNaN(I[p]) && Number(I[p]) !== 1 / 0 && (I[p] = Number(I[p]));
+    const b = w.unix((k = I[0]) == null ? void 0 : k.posTime);
+    let E = -1;
+    for (const p of I) {
       const v = w.unix(p.posTime), m = {
-        imo: o == null ? void 0 : o.imo,
-        mmsi: i,
+        imo: i == null ? void 0 : i.imo,
+        mmsi: n,
         lat: Math.round(p.lat / 1e4 / 60 * 1e5) / 1e5,
         lng: Math.round(p.lon / 1e4 / 60 * 1e5) / 1e5,
         sog: Math.round(p.sog / 10 * 100) / 100,
@@ -725,8 +725,8 @@ class Nt extends nt {
         utc: v.utc().format(),
         method: "trajectory",
         vendor: "myship"
-      }, d = Math.floor(v.diff(b, "minute", !0) / (s || 1));
-      d !== F && (F = d, r.push(m));
+      }, c = Math.floor(v.diff(b, "minute", !0) / (s || 1));
+      c !== E && (E = c, r.push(m));
     }
     return r;
   }
@@ -748,23 +748,23 @@ class Mt {
    * @param options
    */
   parsePrinciple(e, t = {}) {
-    var s, r, l;
+    var s, r, u;
     _ == null || _.debug("[%s] parse rule: %s", t.requestId, e);
-    const a = new RegExp("(?<=\\[)(.+)(?=])", "g"), n = e.match(a) ? (s = e.match(a)) == null ? void 0 : s[0] : void 0, o = n == null ? void 0 : n.split(";");
-    if (!o)
+    const a = new RegExp("(?<=\\[)(.+)(?=])", "g"), o = e.match(a) ? (s = e.match(a)) == null ? void 0 : s[0] : void 0, i = o == null ? void 0 : o.split(";");
+    if (!i)
       return;
-    const i = {};
-    for (let u = 0; u < (o == null ? void 0 : o.length); u++) {
-      const c = (l = (r = o[u].match(a)) == null ? void 0 : r[0]) == null ? void 0 : l.split("],");
-      if (u === 0 && !c)
-        i.scope = o[0];
-      else if (c)
-        for (let h = 0, k = c.length; h < k; h++) {
-          const b = this.parseRule(c[h]);
-          b && (i[b.level] ? b.key ? i[b.level][b == null ? void 0 : b.key] = b : i[b.level] = b : b.key ? i[b.level] = { [b == null ? void 0 : b.key]: b } : i[b.level] = b);
+    const n = {};
+    for (let l = 0; l < (i == null ? void 0 : i.length); l++) {
+      const h = (u = (r = i[l].match(a)) == null ? void 0 : r[0]) == null ? void 0 : u.split("],");
+      if (l === 0 && !h)
+        n.scope = i[0];
+      else if (h)
+        for (let d = 0, I = h.length; d < I; d++) {
+          const b = this.parseRule(h[d]);
+          b && (n[b.level] ? b.key ? n[b.level][b == null ? void 0 : b.key] = b : n[b.level] = b : b.key ? n[b.level] = { [b == null ? void 0 : b.key]: b } : n[b.level] = b);
         }
     }
-    return i;
+    return n;
   }
   /**
    * 解析单一告警规则
@@ -773,17 +773,17 @@ class Mt {
    * @param options
    */
   parseRule(e, t = {}) {
-    var i;
+    var n;
     _ == null || _.debug("[%s] parse rule: %s", t.requestId, e), e = e.startsWith("[") ? e : `[${e}`, e = e.endsWith("]") ? e : `${e}]`;
-    const a = new RegExp("(?<=\\[)(.+?)(?=])", "g"), n = (i = e == null ? void 0 : e.match(a)) == null ? void 0 : i[0], o = n == null ? void 0 : n.split(",");
-    if (o) {
-      let s = o[3] === "Number.MAX_VALUE" ? 100 : Number(o[3]);
+    const a = new RegExp("(?<=\\[)(.+?)(?=])", "g"), o = (n = e == null ? void 0 : e.match(a)) == null ? void 0 : n[0], i = o == null ? void 0 : o.split(",");
+    if (i) {
+      let s = i[3] === "Number.MAX_VALUE" ? 100 : Number(i[3]);
       return s = isNaN(s) ? 1 : s, {
-        operator: o[0],
-        number: Number.isNaN(Number(o[1])) ? o[1] : Number(o[1]),
-        level: o[2],
+        operator: i[0],
+        number: Number.isNaN(Number(i[1])) ? i[1] : Number(i[1]),
+        level: i[2],
         time: s,
-        key: o[4]
+        key: i[4]
       };
     }
   }
@@ -794,20 +794,20 @@ class Mt {
    * @param options
    */
   checkWeather(e, t, a = {}) {
-    var b, F, I, p, v, m, d, f, y, S, M, j, N, D, L;
-    let n = 0, o = 0, i = 0, s = 0;
-    const r = Math.round(((F = (b = t == null ? void 0 : t.SEVERE) == null ? void 0 : b.sigWave) == null ? void 0 : F.number) * 1.6 * 100) / 100, l = (p = (I = t == null ? void 0 : t.SEVERE) == null ? void 0 : I.sigWave) == null ? void 0 : p.number, u = (m = (v = t == null ? void 0 : t.HEAVY) == null ? void 0 : v.sigWave) == null ? void 0 : m.number, c = Math.round((((f = (d = t == null ? void 0 : t.SEVERE) == null ? void 0 : d.wind) == null ? void 0 : f.number) + 2) * 100) / 100, h = (S = (y = t == null ? void 0 : t.SEVERE) == null ? void 0 : y.wind) == null ? void 0 : S.number, k = (j = (M = t == null ? void 0 : t.HEAVY) == null ? void 0 : M.wind) == null ? void 0 : j.number;
+    var b, E, k, p, v, m, c, f, y, F, M, j, N, D, L;
+    let o = 0, i = 0, n = 0, s = 0;
+    const r = Math.round(((E = (b = t == null ? void 0 : t.SEVERE) == null ? void 0 : b.sigWave) == null ? void 0 : E.number) * 1.6 * 100) / 100, u = (p = (k = t == null ? void 0 : t.SEVERE) == null ? void 0 : k.sigWave) == null ? void 0 : p.number, l = (m = (v = t == null ? void 0 : t.HEAVY) == null ? void 0 : v.sigWave) == null ? void 0 : m.number, h = Math.round((((f = (c = t == null ? void 0 : t.SEVERE) == null ? void 0 : c.wind) == null ? void 0 : f.number) + 2) * 100) / 100, d = (F = (y = t == null ? void 0 : t.SEVERE) == null ? void 0 : y.wind) == null ? void 0 : F.number, I = (j = (M = t == null ? void 0 : t.HEAVY) == null ? void 0 : M.wind) == null ? void 0 : j.number;
     for (let W = 0; W < (e == null ? void 0 : e.length); W++) {
       const C = e[W], Y = (D = (N = C == null ? void 0 : C.meteo) == null ? void 0 : N.wave) == null ? void 0 : D.sig, A = (L = C == null ? void 0 : C.meteo) == null ? void 0 : L.wind, V = W ? w(C.eta).diff(w(e[W - 1].eta), "hour", !0) : 0;
-      s = V > s ? V : s, _ == null || _.debug("[%s] check sig.wave: %j", a.requestId, { ...Y, dgThd4Wv: r, svThd4Wv: l, hvThd4Wv: u }), (Y == null ? void 0 : Y.height) >= r ? C.isDangerous = !0 : (Y == null ? void 0 : Y.height) >= l ? C.isSevere = !0 : (Y == null ? void 0 : Y.height) >= u && (C.isHeavy = !0), _ == null || _.debug("[%s] check wind: %j", a.requestId, { ...A, dgThd4Wd: c, svThd4Wd: h, hvThd4Wd: k }), (A == null ? void 0 : A.scale) >= c ? (C.isDangerous = !0, delete C.isSevere, delete C.isHeavy) : (A == null ? void 0 : A.scale) > h ? (C.isDangerous || (C.isSevere = !0), delete C.isHeavy) : (A == null ? void 0 : A.scale) === k && !C.isDangerous && !C.isSevere && (C.isHeavy = !0), n += C.isDangerous ? V : 0, o += C.isSevere ? V : 0, i += C.isHeavy ? V : 0;
+      s = V > s ? V : s, _ == null || _.debug("[%s] check sig.wave: %j", a.requestId, { ...Y, dgThd4Wv: r, svThd4Wv: u, hvThd4Wv: l }), (Y == null ? void 0 : Y.height) >= r ? C.isDangerous = !0 : (Y == null ? void 0 : Y.height) >= u ? C.isSevere = !0 : (Y == null ? void 0 : Y.height) >= l && (C.isHeavy = !0), _ == null || _.debug("[%s] check wind: %j", a.requestId, { ...A, dgThd4Wd: h, svThd4Wd: d, hvThd4Wd: I }), (A == null ? void 0 : A.scale) >= h ? (C.isDangerous = !0, delete C.isSevere, delete C.isHeavy) : (A == null ? void 0 : A.scale) > d ? (C.isDangerous || (C.isSevere = !0), delete C.isHeavy) : (A == null ? void 0 : A.scale) === I && !C.isDangerous && !C.isSevere && (C.isHeavy = !0), o += C.isDangerous ? V : 0, i += C.isSevere ? V : 0, n += C.isHeavy ? V : 0;
     }
-    return n = Math.round(n * 100) / 100, o = Math.round(o * 100) / 100, i = Math.round(i * 100) / 100, s = Math.round(s), { sample: e, dangerous: n, severe: o, heavy: i, step: s < 3 ? 3 : s, wind: { dgThd4Wd: c, svThd4Wd: h, hvThd4Wd: k }, sig: { dgThd4Wv: r, svThd4Wv: l, hvThd4Wv: u } };
+    return o = Math.round(o * 100) / 100, i = Math.round(i * 100) / 100, n = Math.round(n * 100) / 100, s = Math.round(s), { sample: e, dangerous: o, severe: i, heavy: n, step: s < 3 ? 3 : s, wind: { dgThd4Wd: h, svThd4Wd: d, hvThd4Wd: I }, sig: { dgThd4Wv: r, svThd4Wv: u, hvThd4Wv: l } };
   }
 }
 const Dt = new Mt();
-let E;
+let S;
 try {
-  E = ut.getLogger("vessel");
+  S = ut.getLogger("vessel");
 } catch {
 } finally {
 }
@@ -826,11 +826,11 @@ class H {
    * @param draught 吃水 m
    * @return [0.55, 0.85]
    */
-  static blockCoefficient(e, t, a, n) {
-    let o = Math.round(e / (t * a * n) * 100) / 100;
-    o = o < 0.55 ? 0.55 : o > 0.85 ? 0.85 : o;
-    const i = [0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85], s = i.map((r) => Math.abs(r - o));
-    return i[s.indexOf(Math.min(...s))];
+  static blockCoefficient(e, t, a, o) {
+    let i = Math.round(e / (t * a * o) * 100) / 100;
+    i = i < 0.55 ? 0.55 : i > 0.85 ? 0.85 : i;
+    const n = [0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85], s = n.map((r) => Math.abs(r - i));
+    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
@@ -844,8 +844,8 @@ class H {
    * @return [0.05, 0.30]
    */
   static froudeNumber(e, t, a = 9.8) {
-    let n = Math.round(Math.sqrt(e * e / (a * t)) * 100) / 100;
-    return n = n < 0.05 ? 0.05 : n > 0.3 ? 0.3 : n, n;
+    let o = Math.round(Math.sqrt(e * e / (a * t)) * 100) / 100;
+    return o = o < 0.05 ? 0.05 : o > 0.3 ? 0.3 : o, o;
   }
   /**
    * 失速修正系數
@@ -855,7 +855,7 @@ class H {
    * @private
    */
   static amendFactor(e, t, a) {
-    const n = {
+    const o = {
       0.55: [1.7, -1.4, -7.4],
       0.6: [2.2, -2.5, -9.7],
       0.65: [2.6, -3.7, -11.6],
@@ -864,7 +864,7 @@ class H {
       0.8: [2.6, -13.1, -15.1],
       0.85: [3.1, -18.7, 28]
     };
-    let i = {
+    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],
@@ -873,7 +873,7 @@ class H {
       0.8: [3, -16.3, -21.6],
       0.85: [3.4, -20.9, 31.8]
     }[e];
-    return a === "Laden" && (i = n[e]), i[0] + i[1] * t + i[2] * Math.pow(t, 2);
+    return a === "Laden" && (n = o[e]), n[0] + n[1] * t + n[2] * Math.pow(t, 2);
   }
   /**
    * 失速方向因子
@@ -902,9 +902,9 @@ class H {
    * @param kts
    * @private
    */
-  static vesselTagFactor(e, t, a, n) {
-    let o;
-    return a === "container" ? o = 0.7 * n / 2 + Math.pow(n, 3) / (22 * Math.pow(e, 2 / 3)) : t === "Ballast" ? o = 0.7 * n / 2 + Math.pow(n, 3) / (2.7 * Math.pow(e, 2 / 3)) : o = 0.5 * n / 2 + Math.pow(n, 3) / (2.7 * Math.pow(e, 2 / 3)), o;
+  static vesselTagFactor(e, t, a, o) {
+    let i;
+    return a === "container" ? i = 0.7 * o / 2 + Math.pow(o, 3) / (22 * Math.pow(e, 2 / 3)) : t === "Ballast" ? i = 0.7 * o / 2 + Math.pow(o, 3) / (2.7 * Math.pow(e, 2 / 3)) : i = 0.5 * o / 2 + Math.pow(o, 3) / (2.7 * Math.pow(e, 2 / 3)), i;
   }
   /**
    * 浪高影响因子
@@ -915,8 +915,8 @@ class H {
    */
   static waveHeightFactor(e, t, a = 10) {
     e = e < 3 ? e * 0.7 : e, e = e < 0 ? 0.2 : e, e = e > 6 ? e - 0.9 * (e - 6) : e, e = e > 9 ? 9 : e;
-    let n;
-    return t > 30 && t <= 60 ? n = -0.6 : t > 60 && t <= 90 ? n = -0.4 : t > 90 && t <= 120 ? n = e < 4 ? 0.4 : -0.15 : t > 120 && t <= 150 ? n = e < 4 ? 0.6 : -0.12 : t > 150 && t <= 180 ? n = e < 4 ? 0.7 : -0.1 : n = -0.7, Math.round(n * (0.144 * Math.pow(e, 2) + 0.378 * e) * 1e4) / 1e4;
+    let o;
+    return t > 30 && t <= 60 ? o = -0.6 : t > 60 && t <= 90 ? o = -0.5 : t > 90 && t <= 120 ? o = e < 4 ? 0.4 : -0.4 : t > 120 && t <= 150 ? o = e < 4 ? 0.5 : -0.5 : t > 150 && t <= 180 ? o = e < 4 ? 0.6 : -0.6 : o = -0.7, Math.round(o * (0.144 * Math.pow(e, 2) + 0.378 * e) * 1e4) / 1e4;
   }
   /**
    * 组装船舶运行参数
@@ -926,21 +926,21 @@ class H {
    * @param bearing 方位角
    * @private
    */
-  static assembleProperties(e, t, a, n) {
-    var h;
-    const o = e.lbp ?? e.length ?? e.lengthOverall ?? 198.9642, i = e.draught ?? 8, s = e.breadthMoulded ?? e.breadth ?? e.breadthExtreme ?? 32.4572, r = e.deadweight ?? 67035.7773, l = ((h = e == null ? void 0 : e.type) == null ? void 0 : h.toLowerCase()) || "common";
+  static assembleProperties(e, t, a, o) {
+    var d;
+    const i = e.lbp ?? e.length ?? e.lengthOverall ?? 198.9642, n = e.draught ?? 8, s = e.breadthMoulded ?? e.breadth ?? e.breadthExtreme ?? 32.4572, r = e.deadweight ?? 67035.7773, u = ((d = e == null ? void 0 : e.type) == null ? void 0 : d.toLowerCase()) || "common";
     return {
-      tag: l.indexOf("container") > -1 ? "container" : l.indexOf("tugs") > -1 ? "tugs" : "common",
-      lbp: o,
+      tag: u.indexOf("container") > -1 ? "container" : u.indexOf("tugs") > -1 ? "tugs" : "common",
+      lbp: i,
       loadCondition: t,
-      draught: i,
+      draught: n,
       breadthMoulded: s,
       // 排水量（吨）= 载重量（吨）/ 1.025 + 吃水（米）× 船舶型宽（米）× 船舶型长（米）× 0.7
       // 其中，1.025是指海水的密度，吨是指公吨，吃水是指船舶的最大吃水深度。船舶型宽是指船舶的最大型宽，船舶型长是指船舶的设计型长。上述公式是针对常规船舶适用的，不同类型的船舶可能会有一些差异。
-      displacement: Math.round((r / 1.025 + i * s * o * 0.7) * 1e4) / 1e4,
+      displacement: Math.round((r / 1.025 + n * s * i * 0.7) * 1e4) / 1e4,
       // 换算为m/s
       speed: Math.round((a ?? 14.1382) * 1852 / 3600 * 1e4) / 1e4,
-      bearing: n || 90
+      bearing: o || 90
     };
   }
   /**
@@ -954,47 +954,47 @@ class H {
    * @param useRouteParam true 启用设置速度
    * @param options
    */
-  static async speedLoseAt(e, t, a, n = "", o = 2, i = !0, s = !1, r = {}) {
-    let l;
-    if (t.velocity && s && (e.speed = J.roundPrecision(t.velocity * 1852 / 3600, 6)), i) {
-      let u;
+  static async speedLoseAt(e, t, a, o = "", i = 2, n = !0, s = !1, r = {}) {
+    let u;
+    if (t.velocity && s && (e.speed = J.roundPrecision(t.velocity * 1852 / 3600, 6)), n) {
+      let l;
       try {
-        n = (n == null ? void 0 : n.toUpperCase()) === "CMEMS" ? "ECMWF" : n, n = (n == null ? void 0 : n.toUpperCase()) === "METEO2" ? "best_match" : n;
-        const { weatherModels: I, marineModels: p } = await dt.autoPickMeteoModel(n), v = a.utc().format(), m = await gt.spotForecast(t.lat, t.lng, v, !1, !1, !0, {
+        o = (o == null ? void 0 : o.toUpperCase()) === "CMEMS" ? "ECMWF" : o, o = (o == null ? void 0 : o.toUpperCase()) === "METEO2" ? "best_match" : o;
+        const { weatherModels: k, marineModels: p } = await dt.autoPickMeteoModel(o), v = a.utc().format(), m = await gt.spotForecast(t.lat, t.lng, v, !1, !1, !0, {
           ...r,
           pastDays: 1,
           forecastDays: 2,
-          weatherModels: I,
+          weatherModels: k,
           marineModels: p
-        }), [d] = dt.pickHourly(m, a);
-        u = dt.toLegacy(d);
-      } catch (I) {
-        E.warn("[%s] meteo2 spot(%j) forecast failed: %s", r.requestId, { ...t, eta: a.utc().format(), source: n }, I);
+        }), [c] = dt.pickHourly(m, a);
+        l = dt.toLegacy(c);
+      } catch (k) {
+        S.warn("[%s] meteo2 spot(%j) forecast failed: %s", r.requestId, { ...t, eta: a.utc().format(), source: o }, k);
       }
-      let c = H.currentFactor(e.bearing, u == null ? void 0 : u.current, o), h = H.weatherFactor(e, u, c);
-      const k = e.speed * 1.943844;
-      k + c + h <= 0 && (E.warn(
+      let h = H.currentFactor(e.bearing, l == null ? void 0 : l.current, i, r), d = H.weatherFactor(e, l, h, r);
+      const I = e.speed * 1.943844;
+      I + h + d <= 0 && (S.warn(
         "[%s] v0(%d) is less then factor(%d) = wxFactor(%d) + cFactor(%d), scale factor with 0.6",
         r.requestId,
-        k,
-        h + c,
-        h,
-        c
-      ), c = Math.round(c * 0.6 * 1e3) / 1e3, h = Math.round(h * 0.6 * 1e3) / 1e3);
-      const b = h <= (r.minV0Factor || -1) ? Math.max(r.maxV0Factor || -3, -1 * h * (h / 1.2)) : 0;
-      h += b;
-      let F = Math.round((k + c + h) * 100) / 100;
-      F = F <= 0 ? 1 : F, l = {
-        meteo: { ...u },
-        wxFactor: h,
+        I,
+        d + h,
+        d,
+        h
+      ), h = Math.round(h * 0.6 * 1e3) / 1e3, d = Math.round(d * 0.6 * 1e3) / 1e3);
+      const b = d <= (r.minV0Factor || -1) ? Math.max(r.maxV0Factor || -3, -1 * d * (d / 1.2)) : 0;
+      S == null || S.info("[%s] calculate speed lose with v0Factor(%d), cFactor(%d) and wxFactor(%d)", r.requestId, b, h, d), d += b;
+      let E = Math.round((I + h + d) * 100) / 100;
+      E = E <= 0 ? 1 : E, u = {
+        meteo: { ...l },
+        wxFactor: d,
         v0Factor: b,
-        cFactor: c,
-        speed: t.velocity && s ? t.velocity : F,
+        cFactor: h,
+        speed: t.velocity && s ? t.velocity : E,
         eta: a.utc().format(),
         etd: a.utc().format()
       };
     } else
-      l = {
+      u = {
         wxFactor: 0,
         v0Factor: 0,
         cFactor: 0,
@@ -1002,7 +1002,7 @@ class H {
         eta: a.utc().format(),
         etd: a.utc().format()
       };
-    return delete t.meteo, delete t.wxFactor, delete t.cFactor, delete t.speed, delete t.etd, { ...l, ...t };
+    return delete t.meteo, delete t.wxFactor, delete t.cFactor, delete t.speed, delete t.etd, { ...u, ...t };
   }
   /**
    * 基于步长计算失速样本
@@ -1018,83 +1018,83 @@ class H {
    * @param options
    * @private
    */
-  static async speedLoseInHoursStep(e, t, a, n, o, i, s = "", r = !0, l = !1, u = {}) {
+  static async speedLoseInHoursStep(e, t, a, o, i, n, s = "", r = !0, u = !1, l = {}) {
     t.utc();
-    const c = t.clone().add(14, "days"), h = [], k = [], b = [];
-    let F = 0, I = 0, p, v;
-    for (let m = 0; m < i.length - 1; m++) {
-      let d = i[m];
-      d.distanceFromStart = Math.round((o + I) * 1e3) / 1e3;
-      const f = i[m + 1];
-      if (e.bearing = R.calculateBearing(d, f, !f.gcToPrevious), d.bearing = e.bearing, d.suspend && l) {
-        d.eta = d.eta || t.utc().format(), d.elapsed = d.elapsed ?? 0;
-        const M = d.suspend - d.elapsed;
-        if (n - F > M)
-          n = n - F - M, t.add(M, "hour"), d.elapsed = d.suspend;
+    const h = t.clone().add(14, "days"), d = [], I = [], b = [];
+    let E = 0, k = 0, p, v;
+    for (let m = 0; m < n.length - 1; m++) {
+      let c = n[m];
+      c.distanceFromStart = Math.round((i + k) * 1e3) / 1e3;
+      const f = n[m + 1];
+      if (e.bearing = R.calculateBearing(c, f, !f.gcToPrevious), c.bearing = e.bearing, c.suspend && u) {
+        c.eta = c.eta || t.utc().format(), c.elapsed = c.elapsed ?? 0;
+        const M = c.suspend - c.elapsed;
+        if (o - E > M)
+          o = o - E - M, t.add(M, "hour"), c.elapsed = c.suspend;
         else {
-          const j = n - F;
-          d.elapsed += j, t.add(j, "hour"), n = 0;
+          const j = o - E;
+          c.elapsed += j, t.add(j, "hour"), o = 0;
         }
-        if (E == null || E.info(`[%s] suspend ${d.elapsed} hours at %j, and remain ${n} hours need to go...`, u.requestId, d), n === 0)
-          return d.distanceFromPrevious = I, { etd: t, from: v || d, to: d, next: i.filter((j) => j), wps: h, days: k, all: b };
+        if (S == null || S.info(`[%s] suspend ${c.elapsed} hours at %j, and remain ${o} hours need to go...`, l.requestId, c), o === 0)
+          return c.distanceFromPrevious = k, { etd: t, from: v || c, to: c, next: n.filter((j) => j), wps: d, days: I, all: b };
       } else
-        d.suspend = 0;
-      r = t.isAfter(c) ? !1 : r, d = await H.speedLoseAt(e, d, t, s, 0, r, l, u), b.push(d), v = v || d, d.important && h.push(d), t.isSameOrAfter(a) && (k.push(d), a.add(24, "hour"));
-      const y = R.calculateDistance(d, f, !f.gcToPrevious);
-      let S = Math.round(y / v.speed * 1e5) / 1e5;
-      if (F + S < n) {
-        if (F += S, t.add(S, "hour"), delete i[m], E == null || E.debug(
-          `[%s] go to %j from %j with ${y}nm, and cost ${S} hours`,
-          u.requestId,
+        c.suspend = 0;
+      r = t.isAfter(h) ? !1 : r, c = await H.speedLoseAt(e, c, t, s, 0, r, u, l), b.push(c), v = v || c, c.important && d.push(c), t.isSameOrAfter(a) && (I.push(c), a.add(24, "hour"));
+      const y = R.calculateDistance(c, f, !f.gcToPrevious);
+      let F = Math.round(y / v.speed * 1e5) / 1e5;
+      if (E + F < o) {
+        if (E += F, t.add(F, "hour"), delete n[m], S == null || S.debug(
+          `[%s] go to %j from %j with ${y}nm, and cost ${F} hours`,
+          l.requestId,
           { lat: f.lat, lng: f.lng },
           { lat: v.lat, lng: v.lng, etd: v.etd }
-        ), I += y, i.filter((M) => M).length <= 1) {
-          p = f, p.eta = t.utc().format(), p.distanceFromPrevious = y, p.distanceFromStart = Math.round((o + I) * 1e4) / 1e4, h.push(p), b.push(p), delete i[m + 1];
+        ), k += y, n.filter((M) => M).length <= 1) {
+          p = f, p.eta = t.utc().format(), p.distanceFromPrevious = y, p.distanceFromStart = Math.round((i + k) * 1e4) / 1e4, d.push(p), b.push(p), delete n[m + 1];
           break;
         }
       } else {
-        S = n - F, t.add(S, "hour");
-        const M = J.roundPrecision(v.speed * S, 5);
-        p = R.calculateCoordinate(d, e.bearing, M, "nauticalmiles", !f.gcToPrevious), p.eta = t.utc().format(), i[m] = p, E == null || E.debug(
-          `[%s] go to %j from %j with ${M}nm, and cost ${S} hours`,
-          u.requestId,
+        F = o - E, t.add(F, "hour");
+        const M = J.roundPrecision(v.speed * F, 5);
+        p = R.calculateCoordinate(c, e.bearing, M, "nauticalmiles", !f.gcToPrevious), p.eta = t.utc().format(), n[m] = p, S == null || S.debug(
+          `[%s] go to %j from %j with ${M}nm, and cost ${F} hours`,
+          l.requestId,
           { lat: p.lat, lng: p.lng },
-          { lat: d.lat, lng: d.lng, etd: d.etd }
-        ), I += M, p.distanceFromPrevious = Math.round(I * 1e4) / 1e4, p.distanceFromStart = Math.round((o + I) * 1e4) / 1e4;
+          { lat: c.lat, lng: c.lng, etd: c.etd }
+        ), k += M, p.distanceFromPrevious = Math.round(k * 1e4) / 1e4, p.distanceFromStart = Math.round((i + k) * 1e4) / 1e4;
         break;
       }
     }
-    return { etd: t, from: v, to: p, next: i.filter((m) => m), wps: h, days: k, all: b };
+    return { etd: t, from: v, to: p, next: n.filter((m) => m), wps: d, days: I, all: b };
   }
   /**
    * 洋流影响因子
    * @param bearing 船舶航行方位角
    * @param current 洋流要素
    * @param role  1: 船东, 2: 租家, 0: 未知
+   * @param options
    */
-  static currentFactor(e, t, a = 0) {
-    const n = R.includedAngle(e, (t == null ? void 0 : t.degree) || 0) / 180 * Math.PI;
-    if (Math.abs(n) === Math.PI / 2)
-      return 0;
-    let o = ((t == null ? void 0 : t.kts) || 0) * Math.cos(n);
-    return a & 2 ? o = Math.ceil(o * 100) / 100 : a & 1 ? o = Math.floor(o * 100) / 100 : o = Math.round(o * 100) / 100, Math.abs(o) > 5 ? 0 : o;
+  static currentFactor(e, t, a = 0, o = {}) {
+    const i = R.includedAngle(e, (t == null ? void 0 : t.degree) || 0) / 180 * Math.PI;
+    let n;
+    return Math.abs(i) === Math.PI / 2 && (n = 0), n = ((t == null ? void 0 : t.kts) || 0) * Math.cos(i), a & 2 ? n = Math.ceil(n * 100) / 100 : a & 1 ? n = Math.floor(n * 100) / 100 : n = Math.round(n * 100) / 100, S == null || S.info("[%s] calculate current factor with %j", o.requestId, { beta: i, current: t, factor: n, role: a }), Math.abs(n) > 5 ? 0 : n;
   }
   /**
    * 风浪影响因子
    * @param props 船舶档案
    * @param wwc 气象要素
    * @param cFactor 洋流因子
+   * @param options
    */
-  static weatherFactor(e, t, a = 0) {
-    var k, b, F, I, p, v, m;
-    E == null || E.debug("calculate weather factor via: %j", { ...e, ...t });
-    const n = H.blockCoefficient(e.displacement, e.lbp, e.breadthMoulded, e.draught), o = J.roundPrecision(a * 1852 / 3600, 6), i = H.froudeNumber(e.speed - o, e.lbp), s = H.amendFactor(n, i, e.loadCondition);
-    let r = R.includedAngle(e.bearing, (k = t == null ? void 0 : t.wind) == null ? void 0 : k.degree);
-    const l = H.directionFactor(r, (b = t == null ? void 0 : t.wind) == null ? void 0 : b.scale), u = H.vesselTagFactor(e.displacement, e.loadCondition, e.tag, (F = t == null ? void 0 : t.wind) == null ? void 0 : F.kts);
-    let c = l * s * u / 100 * (e.speed - o);
-    c = Math.round(c * 1.943844 * 1e4) / 1e4 * -1, e.tag === "tugs" && Math.abs(c) > 1 && (c = c / (Math.abs(Math.round(c)) + 1)), E == null || E.debug("wind wx factor = %d", c), r = R.includedAngle(e.bearing, (p = (I = t == null ? void 0 : t.wave) == null ? void 0 : I.sig) == null ? void 0 : p.degree);
-    const h = H.waveHeightFactor(((m = (v = t == null ? void 0 : t.wave) == null ? void 0 : v.sig) == null ? void 0 : m.height) ?? 1, r, e.draught);
-    return E == null || E.debug("wave wx factor = %d", h), c = Math.abs(c) > Math.abs(h) ? c : 0.8 * c + 0.8 * h, E == null || E.debug("weather factor = %d", c), c = Math.abs(c) > 3 ? 3 * (Math.abs(c) / c) + Math.abs(c) / c * (Math.abs(c) - 2) * 0.1 : c, Math.round((c || 0) * 100) / 100;
+  static weatherFactor(e, t, a = 0, o = {}) {
+    var b, E, k, p, v, m, c;
+    S == null || S.info("[%s] calculate weather factor via: %j", o.requestId, { ...e, ...t });
+    const i = H.blockCoefficient(e.displacement, e.lbp, e.breadthMoulded, e.draught), n = J.roundPrecision(a * 1852 / 3600, 6), s = H.froudeNumber(e.speed - n, e.lbp), r = H.amendFactor(i, s, e.loadCondition);
+    let u = R.includedAngle(e.bearing, (b = t == null ? void 0 : t.wind) == null ? void 0 : b.degree);
+    const l = H.directionFactor(u, (E = t == null ? void 0 : t.wind) == null ? void 0 : E.scale), h = H.vesselTagFactor(e.displacement, e.loadCondition, e.tag, (k = t == null ? void 0 : t.wind) == null ? void 0 : k.kts);
+    let d = l * r * h / 100 * (e.speed - n);
+    d = Math.round(d * 1.943844 * 1e4) / 1e4 * -1, e.tag === "tugs" && Math.abs(d) > 1 && (d = d / (Math.abs(Math.round(d)) + 1)), S == null || S.info("[%s] calculate wind wx factor: %d", o.requestId, d), u = R.includedAngle(e.bearing, (v = (p = t == null ? void 0 : t.wave) == null ? void 0 : p.sig) == null ? void 0 : v.degree);
+    const I = H.waveHeightFactor(((c = (m = t == null ? void 0 : t.wave) == null ? void 0 : m.sig) == null ? void 0 : c.height) ?? 1, u, e.draught);
+    return S == null || S.info("[%s] calculate wave wx factor: %d", o.requestId, I), d = Math.abs(d) > Math.abs(I) ? d : 0.7 * d + 0.9 * I, S == null || S.info("[%s] calculate finial weather factor: %d (0.7 * wf) + (0.9 * hf)", o.requestId, d), Math.round((d || 0) * 100) / 100;
   }
   /**
    * 以12小时级别去掉重复的days
@@ -1102,7 +1102,7 @@ class H {
    * @param interval 12 hours
    */
   static async reduceDays(e, t = 12 * 60 * 60) {
-    return e = e == null ? void 0 : e.reduce((a, n) => (n.positionTime || (n.positionTime = w.utc(n.etd || n.eta).unix()), a.some((o) => Math.floor(o.positionTime / t) === Math.floor(n.positionTime / t)) || a.push(n), a), []), e;
+    return e = e == null ? void 0 : e.reduce((a, o) => (o.positionTime || (o.positionTime = w.utc(o.etd || o.eta).unix()), a.some((i) => Math.floor(i.positionTime / t) === Math.floor(o.positionTime / t)) || a.push(o), a), []), e;
   }
   /**
    * 以分钟级别去掉重复的wps
@@ -1110,7 +1110,7 @@ class H {
    * @param interval 1 minute
    */
   static async reduceWPS(e, t = 60) {
-    return e = e == null ? void 0 : e.reduce((a, n) => (a.some((o) => Math.floor(w(o.etd).unix() / t) === Math.floor(w(n.etd).unix() / t)) || a.push(n), a), []), e;
+    return e = e == null ? void 0 : e.reduce((a, o) => (a.some((i) => Math.floor(w(i.etd).unix() / t) === Math.floor(w(o.etd).unix() / t)) || a.push(o), a), []), e;
   }
   /**
    * 全程失速分析(走完航程)
@@ -1125,37 +1125,37 @@ class H {
    * @param useRouteParam
    * @param options
    */
-  static async analyseInstant(e, t, a, n, o, i = "", s = 0, r = !0, l = !1, u = {}) {
+  static async analyseInstant(e, t, a, o, i, n = "", s = 0, r = !0, u = !1, l = {}) {
     var U, G, X, Q, Z, $;
-    const c = w().valueOf();
+    const h = w().valueOf();
     e.lng = J.convertToStdLng(e.lng);
-    const { route: h, waypoints: k } = o.points, b = R.calculateSubRoute(e, h);
+    const { route: d, waypoints: I } = i.points, b = R.calculateSubRoute(e, d);
     if (((U = b[0]) == null ? void 0 : U.length) <= 1)
       return;
-    const { v0: F, label: I } = e.sog ? {
+    const { v0: E, label: k } = e.sog ? {
       v0: e.sog,
       label: e.label || "Other"
       /* Instruct */
     } : {
-      v0: n.speed,
+      v0: o.speed,
       label: "CP"
       /* Cp */
-    }, p = H.assembleProperties(a, n.loadCondition, F, 0), v = k.length ? R.calculateSubWaypoints(e, k) : [];
+    }, p = H.assembleProperties(a, o.loadCondition, E, 0), v = I.length ? R.calculateSubWaypoints(e, I) : [];
     v.forEach((P) => P.important = !0);
     const m = {
       from: { ...e },
       route: b,
       waypoints: v,
-      v0: F,
-      label: I
-    }, d = {
+      v0: E,
+      label: k
+    }, c = {
       hours: [],
       days: [],
       wps: [],
       all: []
     };
-    s || (R.calculateRouteDistance(b) / n.speed <= 72 ? s = 3 : s = 6);
-    let f = R.simplifyRouteToCoordinates(b, v, 0), y = 0, S = 0, M = 0, j = 0;
+    s || (R.calculateRouteDistance(b) / o.speed <= 72 ? s = 3 : s = 6);
+    let f = R.simplifyRouteToCoordinates(b, v, 0), y = 0, F = 0, M = 0, j = 0;
     t = w(t).utc();
     const N = t.clone();
     for (; f.length > 0; ) {
@@ -1166,36 +1166,36 @@ class H {
         B,
         y,
         f,
-        i,
+        n,
         r,
-        l,
-        u
+        u,
+        l
       );
-      if (d.all.push(...T.all), (G = T.from) != null && G.speed && (d.hours.push(T.from), d.wps.push(...T.wps), d.days.push(...T.days)), f = T == null ? void 0 : T.next, !f.length) {
-        const O = await H.speedLoseAt(p, T.to, w(T.to.eta), i, 0, r, l, u);
-        O.bearing = p.bearing, d.hours.push(O), d.all.push(O);
+      if (c.all.push(...T.all), (G = T.from) != null && G.speed && (c.hours.push(T.from), c.wps.push(...T.wps), c.days.push(...T.days)), f = T == null ? void 0 : T.next, !f.length) {
+        const O = await H.speedLoseAt(p, T.to, w(T.to.eta), n, 0, r, u, l);
+        O.bearing = p.bearing, c.hours.push(O), c.all.push(O);
       }
       y += Math.round((((X = T == null ? void 0 : T.to) == null ? void 0 : X.distanceFromPrevious) ?? 0) * 1e4) / 1e4;
     }
-    const D = d.hours;
+    const D = c.hours;
     for (let P = 0; P < D.length - 1; P++) {
       const B = w(D[P + 1].eta).diff(D[P].etd, "hour", !0) || 1;
-      S += (D[P].wxFactor || 0) * B, M += (D[P].cFactor || 0) * B, j += B;
+      F += (D[P].wxFactor || 0) * B, M += (D[P].cFactor || 0) * B, j += B;
     }
     const L = D.reduce((P, B) => P + (B.suspend || 0), 0);
-    (Q = d.wps) == null || Q.forEach((P, B) => {
+    (Q = c.wps) == null || Q.forEach((P, B) => {
       P.positionTime = w.utc(P.etd || P.eta).unix();
-      const T = d.wps[B - 1];
+      const T = c.wps[B - 1];
       if (T) {
         const O = P.distanceFromStart - T.distanceFromStart, q = w(P.eta || P.etd).diff(w(T.etd || T.eta), "h", !0);
         P.avgSpd = Math.round(O / q * 100) / 100;
         const at = R.calculateBearing(T, P);
         P.avgBearing = at, T.bearing = at;
       }
-    }), d.wps = await H.reduceWPS(d.wps), d.days = await H.reduceDays(d.days), d.all = (Z = d.all) == null ? void 0 : Z.reduce((P, B) => (B.positionTime = w.utc(B.etd || B.eta).unix(), P.some((T) => Math.round(T.positionTime / 60) === Math.round(B.positionTime / 60)) || P.push(B), P), []), m.sample = d;
-    const W = d.hours.at(0), C = d.hours.at(-1);
-    m.distance = Math.round(C.distanceFromStart * 1e3) / 1e3, m.etd = w(W.eta).utc().format(), m.eta = w(C.eta).utc().format(), m.wxFactor = Math.round(S / j * 1e3) / 1e3, m.cFactor = Math.round(M / j * 1e3) / 1e3, m.avgSpeed = Math.round(C.distanceFromStart / j * 1e3) / 1e3, m.totalHrs = Math.round(j * 1e3) / 1e3, m.suspend = Math.round(L * 1e3) / 1e3;
-    const Y = J.roundPrecision(n.dgo / 24 * L, 3), { distanceInECA: A, hoursInECA: V, totalDgoConsInECA: ot, eca: tt } = await this.calculateECA(m, n, u), et = J.roundPrecision(n.fo / 24 * (j - V), 3), it = J.roundPrecision(n.dgo / 24 * j + Y, 3);
+    }), c.wps = await H.reduceWPS(c.wps), c.days = await H.reduceDays(c.days), c.all = (Z = c.all) == null ? void 0 : Z.reduce((P, B) => (B.positionTime = w.utc(B.etd || B.eta).unix(), P.some((T) => Math.round(T.positionTime / 60) === Math.round(B.positionTime / 60)) || P.push(B), P), []), m.sample = c;
+    const W = c.hours.at(0), C = c.hours.at(-1);
+    m.distance = Math.round(C.distanceFromStart * 1e3) / 1e3, m.etd = w(W.eta).utc().format(), m.eta = w(C.eta).utc().format(), m.wxFactor = Math.round(F / j * 1e3) / 1e3, m.cFactor = Math.round(M / j * 1e3) / 1e3, m.avgSpeed = Math.round(C.distanceFromStart / j * 1e3) / 1e3, m.totalHrs = Math.round(j * 1e3) / 1e3, m.suspend = Math.round(L * 1e3) / 1e3;
+    const Y = J.roundPrecision(o.dgo / 24 * L, 3), { distanceInECA: A, hoursInECA: V, totalDgoConsInECA: ot, eca: tt } = await this.calculateECA(m, o, l), et = J.roundPrecision(o.fo / 24 * (j - V), 3), it = J.roundPrecision(o.dgo / 24 * j + Y, 3);
     m.extend = {
       eca: tt,
       distanceInECA: A,
@@ -1203,8 +1203,8 @@ class H {
       totalDgoConsInECA: ot,
       totalDgoConsInSuspend: Y
     }, m.totalFoCons = et < 0 ? 0 : et, m.totalDgoCons = it;
-    const st = w().valueOf() - c, ct = (($ = d == null ? void 0 : d.hours) == null ? void 0 : $.length) || 1;
-    return E == null || E.info("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", u == null ? void 0 : u.requestId, st, ct, Math.round(st / ct * 1e3) / 1e3), m;
+    const st = w().valueOf() - h, ct = (($ = c == null ? void 0 : c.hours) == null ? void 0 : $.length) || 1;
+    return S == null || S.info("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", l == null ? void 0 : l.requestId, st, ct, Math.round(st / ct * 1e3) / 1e3), m;
   }
   /**
    * 分段失速分析（最多走hours 小时）
@@ -1221,24 +1221,24 @@ class H {
    * @param useRouteParam
    * @param options
    */
-  static async analyseInstantWithThreshed(e, t, a, n, o, i, s, r = "", l = 3, u = !0, c = !1, h = {}) {
+  static async analyseInstantWithThreshed(e, t, a, o, i, n, s, r = "", u = 3, l = !0, h = !1, d = {}) {
     var X, Q, Z, $, P, B;
-    const k = w().valueOf();
+    const I = w().valueOf();
     e.lng = J.convertToStdLng(e.lng);
-    const { v0: b, label: F } = e.sog ? {
+    const { v0: b, label: E } = e.sog ? {
       v0: e.sog,
       label: e.label || "Other"
       /* Instruct */
     } : {
-      v0: o.speed,
+      v0: i.speed,
       label: "CP"
       /* Cp */
-    }, I = H.assembleProperties(n, o.loadCondition, b, 0), p = R.calculateSubRoute(e, i);
+    }, k = H.assembleProperties(o, i.loadCondition, b, 0), p = R.calculateSubRoute(e, n);
     if (((X = p[0]) == null ? void 0 : X.length) <= 1)
       return;
     const v = s.length ? R.calculateSubWaypoints(e, s) : [];
     v.forEach((T) => T.important = !0);
-    let m = R.simplifyRouteToCoordinates(p, v, 0), d = 0, f = 0, y = 0, S = 0;
+    let m = R.simplifyRouteToCoordinates(p, v, 0), c = 0, f = 0, y = 0, F = 0;
     const M = {
       hours: [],
       wps: [],
@@ -1248,11 +1248,11 @@ class H {
     t = w(t).utc();
     const j = t.clone();
     for (; m.length > 0; ) {
-      const T = l - t.hour() % l;
+      const T = u - t.hour() % u;
       let O = Math.ceil(t.clone().add(T, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4;
       O = t.clone().add(O, "h").isSameOrAfter(a) ? a.diff(t, "h", !0) * 1e4 / 1e4 : O;
-      const q = await H.speedLoseInHoursStep(I, t, j, O, d, m, r, u, c, h);
-      if (M.all.push(...q.all), (Q = q.from) != null && Q.speed && (M.hours.push(q.from), q != null && q.wps && M.wps.push(...q.wps), M.days.push(...q.days)), m = q == null ? void 0 : q.next, m.length || M.hours.push(q == null ? void 0 : q.to), d += Math.round((((Z = q == null ? void 0 : q.to) == null ? void 0 : Z.distanceFromPrevious) ?? 0) * 1e4) / 1e4, !O)
+      const q = await H.speedLoseInHoursStep(k, t, j, O, c, m, r, l, h, d);
+      if (M.all.push(...q.all), (Q = q.from) != null && Q.speed && (M.hours.push(q.from), q != null && q.wps && M.wps.push(...q.wps), M.days.push(...q.days)), m = q == null ? void 0 : q.next, m.length || M.hours.push(q == null ? void 0 : q.to), c += Math.round((((Z = q == null ? void 0 : q.to) == null ? void 0 : Z.distanceFromPrevious) ?? 0) * 1e4) / 1e4, !O)
         break;
     }
     M.wps = await H.reduceWPS(M.wps), M.days = await H.reduceDays(M.days), M.all = ($ = M.all) == null ? void 0 : $.reduce((T, O) => (O.positionTime = w.utc(O.etd || O.eta).unix(), T.some((q) => Math.round(w(q.etd).unix() / 60) === Math.round(w(O.etd).unix() / 60)) || T.push(O), T), []), (P = M.wps) == null || P.forEach((T, O) => {
@@ -1265,7 +1265,7 @@ class H {
     const N = M.hours;
     for (let T = 0; T < N.length - 1; T++) {
       const O = w(N[T + 1].eta).diff(N[T].etd, "hour", !0);
-      f += N[T].wxFactor * O, y += N[T].cFactor * O, S += O;
+      f += N[T].wxFactor * O, y += N[T].cFactor * O, F += O;
     }
     const D = N.reduce((T, O) => T + (O.suspend || 0), 0), L = M.hours.at(0), W = M.hours.at(-1), C = await R.calculateRangeRoute(L, W, p), Y = await R.calculateRangeWaypoints(L, W, p, v), A = {
       sample: M,
@@ -1273,18 +1273,18 @@ class H {
       // 注意，可能会在first节点Drift,所有采用eta做为初始出发时间
       etd: w(L.eta).utc().format(),
       eta: w(W == null ? void 0 : W.eta).utc().format(),
-      wxFactor: Math.round(f / S * 1e3) / 1e3,
-      cFactor: Math.round(y / S * 1e3) / 1e3,
-      avgSpeed: Math.round(((W == null ? void 0 : W.distanceFromStart) || 0) / S * 1e3) / 1e3,
-      totalHrs: Math.round(S * 1e3) / 1e3,
+      wxFactor: Math.round(f / F * 1e3) / 1e3,
+      cFactor: Math.round(y / F * 1e3) / 1e3,
+      avgSpeed: Math.round(((W == null ? void 0 : W.distanceFromStart) || 0) / F * 1e3) / 1e3,
+      totalHrs: Math.round(F * 1e3) / 1e3,
       suspend: Math.round(D * 1e3) / 1e3,
       from: L,
       to: W,
       route: C,
       waypoints: Y,
       v0: b,
-      label: F
-    }, V = J.roundPrecision(o.dgo / 24 * D, 3), { distanceInECA: ot, hoursInECA: tt, totalDgoConsInECA: et, eca: it } = await this.calculateECA(A, o, h), rt = J.roundPrecision(o.fo / 24 * (S - tt), 3), st = J.roundPrecision(o.dgo / 24 * S + V, 3);
+      label: E
+    }, V = J.roundPrecision(i.dgo / 24 * D, 3), { distanceInECA: ot, hoursInECA: tt, totalDgoConsInECA: et, eca: it } = await this.calculateECA(A, i, d), rt = J.roundPrecision(i.fo / 24 * (F - tt), 3), st = J.roundPrecision(i.dgo / 24 * F + V, 3);
     A.extend = {
       eca: it,
       distanceInECA: ot,
@@ -1292,8 +1292,8 @@ class H {
       totalDgoConsInECA: et,
       totalDgoConsInSuspend: V
     }, A.totalDgoCons = st, A.totalFoCons = rt < 0 ? 0 : rt;
-    const U = w().valueOf() - k, G = ((B = M == null ? void 0 : M.hours) == null ? void 0 : B.length) || 1;
-    return E == null || E.debug("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", h == null ? void 0 : h.requestId, U, G, Math.round(U / G * 1e3) / 1e3), A;
+    const U = w().valueOf() - I, G = ((B = M == null ? void 0 : M.hours) == null ? void 0 : B.length) || 1;
+    return S == null || S.debug("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", d == null ? void 0 : d.requestId, U, G, Math.round(U / G * 1e3) / 1e3), A;
   }
   /**
    * 在指定航线条件下，基于多CP，动态计算最优成本(租金+油费)方案
@@ -1310,59 +1310,59 @@ class H {
    * @param lane 基础航线（重要转向点）
    * @param options
    */
-  static async analyseCost(e, t, a, n, o = {}) {
+  static async analyseCost(e, t, a, o, i = {}) {
     var p, v;
-    const i = w().valueOf(), s = [];
+    const n = w().valueOf(), s = [];
     e.speedStep = e.speedStep || 3, e.alterStep = e.alterStep ?? 1;
-    const r = R.calculateRouteDistance(n.route);
-    let l = 0;
+    const r = R.calculateRouteDistance(o.route);
+    let u = 0;
     a.forEach((m) => {
-      const d = Math.ceil(r / m.speed / 24);
-      l = l < d ? d : l;
-    }), l = l * 1.3;
-    const u = w.utc(e.etd).add(l ?? 14, "day");
-    let c = 1;
+      const c = Math.ceil(r / m.speed / 24);
+      u = u < c ? c : u;
+    }), u = u * 1.3;
+    const l = w.utc(e.etd).add(u ?? 14, "day");
+    let h = 1;
     for (const m of a) {
-      const d = JSON.parse(JSON.stringify(n.route)), f = JSON.parse(JSON.stringify(n.waypoints)), y = await H.analyseInstantWithThreshed(
+      const c = JSON.parse(JSON.stringify(o.route)), f = JSON.parse(JSON.stringify(o.waypoints)), y = await H.analyseInstantWithThreshed(
         { lat: e.lat, lng: e.lng },
         e.etd,
-        u,
+        l,
         t,
         m,
-        d,
+        c,
         f,
         e.meteoVendor,
         e.speedStep,
         e.useMeteo,
         e.useRouteParam,
-        o
+        i
       );
-      y && (await H.calculateCost(y, m, e, o), s.push(y), E == null || E.info("[%s][L%d-%d] analyse from %s to %s cost: %j", o.requestId, 1, c, e.etd, u.format(), {
+      y && (await H.calculateCost(y, m, e, i), s.push(y), S == null || S.info("[%s][L%d-%d] analyse from %s to %s cost: %j", i.requestId, 1, h, e.etd, l.format(), {
         cost: y.cost.total,
         hire: y.cost.hire,
         bunker: y.cost.bunker,
         distance: y.distance,
         hours: y.totalHrs,
         cp: `${m.speed}/${m.fo}/${m.dgo}`
-      })), c++;
+      })), h++;
     }
-    s.sort((m, d) => m.cost.total - d.cost.total);
-    const h = s.at(0), k = s.at(1), b = [];
-    if (b.push({ combined: !1, speeds: [h], cost: (p = h.cost) == null ? void 0 : p.total }), k) {
-      const m = h.cost.cp, d = k.cost.cp, f = w(h.eta), y = w(h.etd), S = f.diff(y, "days", !0);
-      let M = Math.ceil(S / 2);
+    s.sort((m, c) => m.cost.total - c.cost.total);
+    const d = s.at(0), I = s.at(1), b = [];
+    if (b.push({ combined: !1, speeds: [d], cost: (p = d.cost) == null ? void 0 : p.total }), I) {
+      const m = d.cost.cp, c = I.cost.cp, f = w(d.eta), y = w(d.etd), F = f.diff(y, "days", !0);
+      let M = Math.ceil(F / 2);
       M = M > 7 ? 7 : M < e.alterStep ? e.alterStep : M;
-      let j = 2, N = { combined: !1, speeds: [k], cost: (v = k.cost) == null ? void 0 : v.total }, D;
+      let j = 2, N = { combined: !1, speeds: [I], cost: (v = I.cost) == null ? void 0 : v.total }, D;
       for (; M >= e.alterStep; ) {
-        const L = await H.combinedAnalyse(e, t, u, [m, d], n, M, { ...o, level: j });
+        const L = await H.combinedAnalyse(e, t, l, [m, c], o, M, { ...i, level: j });
         if (N.cost > L.cost ? D ? (D == null ? void 0 : D.cost) > L.cost && (D = L) : (D = N, N = L) : (!D || (D == null ? void 0 : D.cost) > L.cost) && (D = L), M <= e.alterStep)
           break;
         M = Math.ceil(M / 2), j += 1;
       }
       b.push(N), D && b.push(D);
     }
-    const I = w().valueOf() - i;
-    return E == null || E.info("[%s] analyse elapsed: %d ms", o == null ? void 0 : o.requestId, I), b.sort((m, d) => m.cost - d.cost);
+    const k = w().valueOf() - n;
+    return S == null || S.info("[%s] analyse elapsed: %d ms", i == null ? void 0 : i.requestId, k), b.sort((m, c) => m.cost - c.cost);
   }
   /**
    * 按步长多次减半，分别用7,4,2,1天步长及cpa,cpb交替计算各种组合下的成本
@@ -1374,24 +1374,24 @@ class H {
    * @param step 步长，7，4，2，1
    * @param options
    */
-  static async combinedAnalyse(e, t, a, n, o, i, s = {}) {
-    s.counter = 1, E == null || E.info("[%s][L%d] analyse with alternate cp in every %d days", s.requestId, s.level, i);
-    const r = await H.alternateAnalyse(e, t, a, n, 0, o, i, s), l = r.reduce((d, f) => d + f.cost.total, 0), u = r.reduce((d, f) => d + f.cost.hire, 0), c = r.reduce((d, f) => d + f.cost.bunker, 0), h = r.reduce((d, f) => d + f.distance, 0), k = r.reduce((d, f) => d + f.totalHrs, 0);
-    E == null || E.info("[%s][L%d] cost with cpa/cpb turn: %j", s.requestId, s.level, {
-      cost: l,
-      hire: u,
-      bunker: c,
-      distance: h,
-      hours: k
+  static async combinedAnalyse(e, t, a, o, i, n, s = {}) {
+    s.counter = 1, S == null || S.info("[%s][L%d] analyse with alternate cp in every %d days", s.requestId, s.level, n);
+    const r = await H.alternateAnalyse(e, t, a, o, 0, i, n, s), u = r.reduce((c, f) => c + f.cost.total, 0), l = r.reduce((c, f) => c + f.cost.hire, 0), h = r.reduce((c, f) => c + f.cost.bunker, 0), d = r.reduce((c, f) => c + f.distance, 0), I = r.reduce((c, f) => c + f.totalHrs, 0);
+    S == null || S.info("[%s][L%d] cost with cpa/cpb turn: %j", s.requestId, s.level, {
+      cost: u,
+      hire: l,
+      bunker: h,
+      distance: d,
+      hours: I
     });
-    const b = await H.alternateAnalyse(e, t, a, n, 1, o, i, s), F = b.reduce((d, f) => d + f.cost.total, 0), I = b.reduce((d, f) => d + f.cost.hire, 0), p = b.reduce((d, f) => d + f.cost.bunker, 0), v = b.reduce((d, f) => d + f.distance, 0), m = b.reduce((d, f) => d + f.totalHrs, 0);
-    return E == null || E.info("[%s][L%d] cost with cpb/cpa turn: %j", s.requestId, s.level, {
-      cost: F,
-      hire: I,
+    const b = await H.alternateAnalyse(e, t, a, o, 1, i, n, s), E = b.reduce((c, f) => c + f.cost.total, 0), k = b.reduce((c, f) => c + f.cost.hire, 0), p = b.reduce((c, f) => c + f.cost.bunker, 0), v = b.reduce((c, f) => c + f.distance, 0), m = b.reduce((c, f) => c + f.totalHrs, 0);
+    return S == null || S.info("[%s][L%d] cost with cpb/cpa turn: %j", s.requestId, s.level, {
+      cost: E,
+      hire: k,
       bunker: p,
       distance: v,
       hours: m
-    }), l < F ? { combined: !0, cost: Math.round(l * 1e3) / 1e3, speeds: r, step: i } : { combined: !0, cost: Math.round(F * 1e3) / 1e3, speeds: b, step: i };
+    }), u < E ? { combined: !0, cost: Math.round(u * 1e3) / 1e3, speeds: r, step: n } : { combined: !0, cost: Math.round(E * 1e3) / 1e3, speeds: b, step: n };
   }
   /**
    * 基于cp索引，交替计算指定步长下的成本
@@ -1404,31 +1404,31 @@ class H {
    * @param step 步长，7，4，2，1
    * @param options
    */
-  static async alternateAnalyse(e, t, a, n, o, i, s, r = {}) {
-    var h, k;
-    let l = w.utc(e.etd);
-    const u = { lat: e.lat, lng: e.lng }, c = [];
-    for (; l.isBefore(a); ) {
-      const b = l.clone().utc().add(s, "day"), F = JSON.parse(JSON.stringify(i.route)), I = JSON.parse(JSON.stringify(i.waypoints)), p = n[o], v = await H.analyseInstantWithThreshed(
-        u,
-        l.utc().format(),
+  static async alternateAnalyse(e, t, a, o, i, n, s, r = {}) {
+    var d, I;
+    let u = w.utc(e.etd);
+    const l = { lat: e.lat, lng: e.lng }, h = [];
+    for (; u.isBefore(a); ) {
+      const b = u.clone().utc().add(s, "day"), E = JSON.parse(JSON.stringify(n.route)), k = JSON.parse(JSON.stringify(n.waypoints)), p = o[i], v = await H.analyseInstantWithThreshed(
+        l,
+        u.utc().format(),
         b,
         t,
         p,
-        F,
-        I,
+        E,
+        k,
         e.meteoVendor,
         e.speedStep,
         e.useMeteo,
         e.useRouteParam,
         r
       );
-      v && (await H.calculateCost(v, p, e, r), E == null || E.info(
+      v && (await H.calculateCost(v, p, e, r), S == null || S.info(
         "[%s][L%d-%d] analyse from %s to %s cost: %j",
         r.requestId,
         r.level,
         r.counter,
-        l.utc().format(),
+        u.utc().format(),
         b.utc().format(),
         {
           cost: v.cost.total,
@@ -1439,13 +1439,13 @@ class H {
           cp: `${p.speed}/${p.fo}/${p.dgo}`
         }
       )), r.counter = r.counter + 1;
-      const m = (k = (h = v == null ? void 0 : v.sample) == null ? void 0 : h.hours) == null ? void 0 : k.at(-1);
+      const m = (I = (d = v == null ? void 0 : v.sample) == null ? void 0 : d.hours) == null ? void 0 : I.at(-1);
       if (m)
-        u.lat = m.lat, u.lng = m.lng, l = w(m.eta), c.push(v), o = o ? 0 : 1;
+        l.lat = m.lat, l.lng = m.lng, u = w(m.eta), h.push(v), i = i ? 0 : 1;
       else
         break;
     }
-    return c;
+    return h;
   }
   /**
    * 计算Speed的cost
@@ -1454,15 +1454,15 @@ class H {
    * @param props
    * @param options
    */
-  static async calculateCost(e, t, a, n = {}) {
-    var o;
+  static async calculateCost(e, t, a, o = {}) {
+    var i;
     if (e) {
-      const i = (a.addComm || 0) >= 1 ? (a.addComm || 0) / 100 : a.addComm || 0, s = Math.round((a.dailyHire || 0) * (e.suspend || 0) / 24 * 1e3) / 1e3, r = Math.round(e.totalHrs / 24 * (a.dailyHire || 0) * (1 - i) * 1e3) / 1e3 + s, l = Math.round(e.totalFoCons * (a.priceFO || 0) * 1e3) / 1e3, u = Math.round((e.totalDgoCons + (((o = e.extend) == null ? void 0 : o.totalDgoConsInECA) || 0)) * (a.priceDGO || 0) * 1e3) / 1e3;
+      const n = (a.addComm || 0) >= 1 ? (a.addComm || 0) / 100 : a.addComm || 0, s = Math.round((a.dailyHire || 0) * (e.suspend || 0) / 24 * 1e3) / 1e3, r = Math.round(e.totalHrs / 24 * (a.dailyHire || 0) * (1 - n) * 1e3) / 1e3 + s, u = Math.round(e.totalFoCons * (a.priceFO || 0) * 1e3) / 1e3, l = Math.round((e.totalDgoCons + (((i = e.extend) == null ? void 0 : i.totalDgoConsInECA) || 0)) * (a.priceDGO || 0) * 1e3) / 1e3;
       e.cost = {
-        total: Math.round((r + l + u) * 1e3) / 1e3,
+        total: Math.round((r + u + l) * 1e3) / 1e3,
         hire: Math.round(r * 1e3) / 1e3,
         suspendHire: s,
-        bunker: Math.round((l + u) * 1e3) / 1e3,
+        bunker: Math.round((u + l) * 1e3) / 1e3,
         cp: t
       };
     }
@@ -1473,22 +1473,22 @@ class H {
    *
    */
   static async calculateECA(e, t, a = {}) {
-    var r, l, u, c;
-    const n = await R.intersectInECA((e == null ? void 0 : e.route) || []);
-    let o = 0, i = 0, s = 0;
-    (l = (r = e == null ? void 0 : e.sample) == null ? void 0 : r.wps) == null || l.forEach((h) => {
-      h.positionTime = w.utc(h.etd || h.eta).unix();
+    var r, u, l, h;
+    const o = await R.intersectInECA((e == null ? void 0 : e.route) || []);
+    let i = 0, n = 0, s = 0;
+    (u = (r = e == null ? void 0 : e.sample) == null ? void 0 : r.wps) == null || u.forEach((d) => {
+      d.positionTime = w.utc(d.etd || d.eta).unix();
     });
-    for (const h of n) {
-      o += h.distance;
-      const k = await R.deadReckoningTime((u = h.waypoints) == null ? void 0 : u.at(0), e.sample.all || e.sample.wps), b = await R.deadReckoningTime((c = h.waypoints) == null ? void 0 : c.at(-1), e.sample.all || e.sample.wps);
-      h.in = k, h.out = b, h.totalHrs = J.roundPrecision((b.positionTime - k.positionTime) / 3600, 3), h.totalDgoCons = J.roundPrecision(t.fo / 24 * h.totalHrs, 3), i += h.totalHrs, s += h.totalDgoCons;
+    for (const d of o) {
+      i += d.distance;
+      const I = await R.deadReckoningTime((l = d.waypoints) == null ? void 0 : l.at(0), e.sample.all || e.sample.wps), b = await R.deadReckoningTime((h = d.waypoints) == null ? void 0 : h.at(-1), e.sample.all || e.sample.wps);
+      d.in = I, d.out = b, d.totalHrs = J.roundPrecision((b.positionTime - I.positionTime) / 3600, 3), d.totalDgoCons = J.roundPrecision(t.fo / 24 * d.totalHrs, 3), n += d.totalHrs, s += d.totalDgoCons;
     }
-    return o = J.roundPrecision(o, 3), i = J.roundPrecision(i, 3), s = J.roundPrecision(s, 3), {
-      distanceInECA: o,
-      hoursInECA: i,
+    return i = J.roundPrecision(i, 3), n = J.roundPrecision(n, 3), s = J.roundPrecision(s, 3), {
+      distanceInECA: i,
+      hoursInECA: n,
       totalDgoConsInECA: s,
-      eca: n
+      eca: o
     };
   }
   /**
@@ -1497,40 +1497,40 @@ class H {
    * @param options
    */
   static async mergeSpeeds(e, t = {}) {
-    var m, d;
+    var m, c;
     const a = {
       hours: [],
       wps: [],
       days: [],
       all: []
-    }, n = e.reduce((f, y) => f + y.distance, 0), o = e.reduce((f, y) => {
-      var S;
-      return f + (((S = y.extend) == null ? void 0 : S.distanceInECA) || 0);
-    }, 0), i = e.reduce((f, y) => f + y.totalHrs, 0), s = e.reduce((f, y) => {
-      var S;
-      return f + (((S = y.extend) == null ? void 0 : S.hoursInECA) || 0);
+    }, o = e.reduce((f, y) => f + y.distance, 0), i = e.reduce((f, y) => {
+      var F;
+      return f + (((F = y.extend) == null ? void 0 : F.distanceInECA) || 0);
+    }, 0), n = e.reduce((f, y) => f + y.totalHrs, 0), s = e.reduce((f, y) => {
+      var F;
+      return f + (((F = y.extend) == null ? void 0 : F.hoursInECA) || 0);
     }, 0), r = e.reduce((f, y) => {
-      var S;
-      return f + (((S = y.extend) == null ? void 0 : S.totalDgoConsInECA) || 0);
-    }, 0), l = e.reduce((f, y) => f + y.wxFactor * y.totalHrs / i, 0), u = e.reduce((f, y) => f + y.cFactor * y.totalHrs / i, 0), c = e.reduce((f, y) => f + y.totalFoCons, 0), h = e.reduce((f, y) => f + y.totalDgoCons, 0), k = e.reduce((f, y) => f + y.cost.total, 0), b = e.reduce((f, y) => f + y.cost.hire, 0), F = e.reduce((f, y) => f + y.cost.bunker, 0), I = [], p = [];
+      var F;
+      return f + (((F = y.extend) == null ? void 0 : F.totalDgoConsInECA) || 0);
+    }, 0), u = e.reduce((f, y) => f + y.wxFactor * y.totalHrs / n, 0), l = e.reduce((f, y) => f + y.cFactor * y.totalHrs / n, 0), h = e.reduce((f, y) => f + y.totalFoCons, 0), d = e.reduce((f, y) => f + y.totalDgoCons, 0), I = e.reduce((f, y) => f + y.cost.total, 0), b = e.reduce((f, y) => f + y.cost.hire, 0), E = e.reduce((f, y) => f + y.cost.bunker, 0), k = [], p = [];
     let v;
     for (const f of e) {
       p.push(...((m = f.extend) == null ? void 0 : m.eca) || []);
-      const y = f.sample.hours, S = f.sample.all, M = f.sample.wps, j = f.sample.days, N = y.at(0);
+      const y = f.sample.hours, F = f.sample.all, M = f.sample.wps, j = f.sample.days, N = y.at(0);
       v && (N.distanceFromPrevious = v.distanceFromPrevious, N.distanceFromStart = v.distanceFromStart, y.forEach((C, Y) => {
         Y && (C.distanceFromStart = C.distanceFromStart + v.distanceFromStart);
-      }), S.at(0).distanceFromPrevious = v.distanceFromPrevious, S.at(0).distanceFromStart = v.distanceFromStart, S.forEach((C, Y) => {
+      }), F.at(0).distanceFromPrevious = v.distanceFromPrevious, F.at(0).distanceFromStart = v.distanceFromStart, F.forEach((C, Y) => {
         Y && (C.distanceFromStart = C.distanceFromStart + v.distanceFromStart);
       }), M.at(0).distanceFromPrevious = v.distanceFromPrevious, M.at(0).distanceFromStart = v.distanceFromStart, M.forEach((C, Y) => {
         Y && (C.distanceFromStart = C.distanceFromStart + v.distanceFromStart);
       }), j.at(0).distanceFromPrevious = v.distanceFromPrevious, j.at(0).distanceFromStart = v.distanceFromStart, j.forEach((C, Y) => {
         Y && (C.distanceFromStart = C.distanceFromStart + v.distanceFromStart);
       })), N.cp = f.cost.cp;
-      const D = [f.etd, f.eta], L = I.findIndex((C) => C.id === N.cp.id);
-      L === -1 ? (N.cp.segment = [D], I.push(N.cp)) : I[L].segment.push(D), y.forEach((C) => {
+      const D = [f.etd, f.eta], L = k.findIndex((C) => C.id === N.cp.id);
+      L === -1 ? (N.cp.segment = [D], k.push(N.cp)) : k[L].segment.push(D), y.forEach((C) => {
         var A;
         ((A = a.hours) == null ? void 0 : A.findIndex((V) => V.eta === C.eta)) === -1 && a.hours.push(C);
-      }), S.forEach((C) => {
+      }), F.forEach((C) => {
         var A;
         ((A = a.all) == null ? void 0 : A.findIndex((V) => V.eta === C.eta)) === -1 && a.all.push(C);
       }), M.forEach((C) => {
@@ -1540,16 +1540,16 @@ class H {
         var A;
         ((A = a == null ? void 0 : a.days) == null ? void 0 : A.findIndex((V) => V.eta === C.eta)) === -1 && a.days.push(C);
       });
-      const W = (d = a.wps) == null ? void 0 : d.findIndex((C) => C.eta === N.eta);
+      const W = (c = a.wps) == null ? void 0 : c.findIndex((C) => C.eta === N.eta);
       W === -1 ? a.wps.push(N) : a.wps[W] = N, v = y.at(-1);
     }
     return a.wps.sort((f, y) => w(f.etd).unix() - w(y.etd).unix()), a.wps.forEach((f, y) => {
-      const S = a.wps[y - 1];
-      if (S) {
-        const M = f.distanceFromStart - (S.distanceFromStart || 0), j = w(f.eta || f.etd).diff(w(S.etd || S.eta), "hour", !0), N = Math.round(M / j * 100) / 100;
+      const F = a.wps[y - 1];
+      if (F) {
+        const M = f.distanceFromStart - (F.distanceFromStart || 0), j = w(f.eta || f.etd).diff(w(F.etd || F.eta), "hour", !0), N = Math.round(M / j * 100) / 100;
         f.avgSpd = N;
-        const D = R.calculateBearing(S, f);
-        S.bearing = D;
+        const D = R.calculateBearing(F, f);
+        F.bearing = D;
       }
     }), {
       sample: a,
@@ -1559,22 +1559,22 @@ class H {
       to: e.at(-1).to,
       v0: e.at(0).v0,
       label: "Combined",
-      distance: Math.round(n * 1e3) / 1e3,
-      totalHrs: Math.round(i * 1e3) / 1e3,
-      avgSpeed: Math.round(n / i * 1e3) / 1e3,
-      wxFactor: Math.round(l * 1e3) / 1e3,
-      cFactor: Math.round(u * 1e3) / 1e3,
-      totalFoCons: Math.round(c * 1e3) / 1e3,
-      totalDgoCons: Math.round(h * 1e3) / 1e3,
+      distance: Math.round(o * 1e3) / 1e3,
+      totalHrs: Math.round(n * 1e3) / 1e3,
+      avgSpeed: Math.round(o / n * 1e3) / 1e3,
+      wxFactor: Math.round(u * 1e3) / 1e3,
+      cFactor: Math.round(l * 1e3) / 1e3,
+      totalFoCons: Math.round(h * 1e3) / 1e3,
+      totalDgoCons: Math.round(d * 1e3) / 1e3,
       cost: {
-        total: Math.round(k * 1e3) / 1e3,
+        total: Math.round(I * 1e3) / 1e3,
         hire: Math.round(b * 1e3) / 1e3,
-        bunker: Math.round(F * 1e3) / 1e3
+        bunker: Math.round(E * 1e3) / 1e3
       },
       extend: {
-        cps: I,
+        cps: k,
         eca: p,
-        distanceInECA: Math.round(o * 1e3) / 1e3,
+        distanceInECA: Math.round(i * 1e3) / 1e3,
         hoursInECA: Math.round(s * 1e3) / 1e3,
         totalDgoConsInECA: Math.round(r * 1e3) / 1e3,
         speeds: e