@idm-plugin/geo 1.4.4 → 1.4.6

package/dist/index.js

@@ -1,11 +1,11 @@
 import * as g from "@turf/turf";
-import R from "moment";
+import y from "moment";
 import "moment-timezone";
 import A from "tz-lookup";
 function E(C) {
   return C && C.__esModule && Object.prototype.hasOwnProperty.call(C, "default") ? C.default : C;
 }
-class y {
+class R {
   log() {
   }
   isLevelEnabled() {
@@ -19,18 +19,18 @@ class y {
   }
 }
 ["Trace", "Debug", "Info", "Warn", "Error", "Fatal", "Mark"].forEach((C) => {
-  y.prototype[C.toLowerCase()] = () => {
-  }, y.prototype[`is${C}Enabled`] = () => !1;
+  R.prototype[C.toLowerCase()] = () => {
+  }, R.prototype[`is${C}Enabled`] = () => !1;
 });
-const F = () => {
+const k = () => {
   try {
     return require("log4js");
   } catch {
     return null;
   }
-}, x = F(), k = x ? x.getLogger : () => new y();
+}, x = k(), F = x ? x.getLogger : () => new R();
 var B = {
-  getLogger: k
+  getLogger: F
 };
 const O = /* @__PURE__ */ E(B);
 class l {
@@ -40,7 +40,7 @@ class l {
    * @param lat
    */
   static guessTimeZoneOffset(t, e) {
-    const n = A(e, t), s = R().tz(n).utcOffset();
+    const i = A(e, t), s = y().tz(i).utcOffset();
     return this.roundPrecision(s / 60, 1);
   }
   /**
@@ -49,21 +49,21 @@ class l {
    * @return timezone => +08:30
    */
   static prettyTimeZoneOffset(t) {
-    let e = Math.floor(Math.abs(t)), n = Math.round((Math.abs(t) - e) * 60);
-    return n = n > 9 ? n : `0${n}`, e = e > 9 ? e : `0${e}`, t > 0 ? `+${e}:${n}` : `-${e}:${n}`;
+    let e = Math.floor(Math.abs(t)), i = Math.round((Math.abs(t) - e) * 60);
+    return i = i > 9 ? i : `0${i}`, e = e > 9 ? e : `0${e}`, t > 0 ? `+${e}:${i}` : `-${e}:${i}`;
   }
-  static lng2pretty(t, e = 6, n = "H°M′") {
+  static lng2pretty(t, e = 6, i = "H°M′") {
     t = l.convertToStdLng(t, e);
     let s = "E";
-    t < 0 && (s = "W"), t = Math.abs(t), n = n.toUpperCase();
-    let o = t * 3600, i, r, c, a, d, u;
-    i = o % 3600 % 60, n.indexOf("S") !== -1 && (o = o - i, r = l.padNumber(i, 2, 2)), c = o / 60 % 60, n.indexOf("M") !== -1 && (n.indexOf("S") !== -1 ? a = l.roundPrecision(c, e).toString().padStart(2, "0") : a = l.padNumber(c, 2, 2), o = o - c * 60), d = o / 3600, n.indexOf("M") !== -1 ? u = l.roundPrecision(d, e).toString().padStart(3, "0") : u = l.padNumber(d, 3, 2);
-    const f = `${n.replace(/S+/gi, r).replace(/M+/gi, a).replace(/H+/gi, u)}${s}`;
+    t < 0 && (s = "W"), t = Math.abs(t), i = i.toUpperCase();
+    let o = t * 3600, n, r, c, a, d, u;
+    n = o % 3600 % 60, i.indexOf("S") !== -1 && (o = o - n, r = l.padNumber(n, 2, 2)), c = o / 60 % 60, i.indexOf("M") !== -1 && (i.indexOf("S") !== -1 ? a = l.roundPrecision(c, e).toString().padStart(2, "0") : a = l.padNumber(c, 2, 2), o = o - c * 60), d = o / 3600, i.indexOf("M") !== -1 ? u = l.roundPrecision(d, e).toString().padStart(3, "0") : u = l.padNumber(d, 3, 2);
+    const f = `${i.replace(/S+/gi, r).replace(/M+/gi, a).replace(/H+/gi, u)}${s}`;
     return {
       direction: s,
       degree: l.roundPrecision(d, e),
       minute: l.roundPrecision(c, e),
-      second: l.roundPrecision(i, e),
+      second: l.roundPrecision(n, e),
       pretty: f
     };
   }
@@ -73,57 +73,57 @@ class l {
    * @param precision 精确度
    * @param format 格式化
    */
-  static lat2pretty(t, e = 6, n = "H°M′") {
+  static lat2pretty(t, e = 6, i = "H°M′") {
     t = t % 180;
     let s = "N";
-    t < 0 && (s = "S"), t = Math.abs(t), n = n.toUpperCase();
-    let o = t * 3600, i, r, c, a, d, u;
-    i = o % 3600 % 60, n.indexOf("S") !== -1 && (o = o - i, r = l.padNumber(i, 2, 2)), c = o / 60 % 60, n.indexOf("M") !== -1 && (n.indexOf("S") !== -1 ? a = l.roundPrecision(c, e).toString().padStart(2, "0") : a = l.padNumber(c, 2, 2), o = o - c * 60), d = o / 3600, n.indexOf("M") !== -1 ? u = l.roundPrecision(d, e).toString().padStart(2, "0") : u = l.padNumber(d, 2, 2);
-    const f = `${n.replace(/S+/gi, r).replace(/M+/gi, a).replace(/H+/gi, u)}${s}`;
+    t < 0 && (s = "S"), t = Math.abs(t), i = i.toUpperCase();
+    let o = t * 3600, n, r, c, a, d, u;
+    n = o % 3600 % 60, i.indexOf("S") !== -1 && (o = o - n, r = l.padNumber(n, 2, 2)), c = o / 60 % 60, i.indexOf("M") !== -1 && (i.indexOf("S") !== -1 ? a = l.roundPrecision(c, e).toString().padStart(2, "0") : a = l.padNumber(c, 2, 2), o = o - c * 60), d = o / 3600, i.indexOf("M") !== -1 ? u = l.roundPrecision(d, e).toString().padStart(2, "0") : u = l.padNumber(d, 2, 2);
+    const f = `${i.replace(/S+/gi, r).replace(/M+/gi, a).replace(/H+/gi, u)}${s}`;
     return {
       direction: s,
       degree: l.roundPrecision(d, e),
       minute: l.roundPrecision(c, e),
-      second: l.roundPrecision(i, e),
+      second: l.roundPrecision(n, e),
       pretty: f
     };
   }
   static str2Lng(t, e = 6) {
-    let n;
+    let i;
     if (isNaN(t)) {
       t = l.strReplace(t, "LNG");
       const s = t[t.length - 1].toUpperCase();
       t = t.substring(0, t.length - 1).trim();
       const o = t.split(" ").filter((c) => c !== "").map((c) => Number(c));
-      let [i, r] = o;
-      if (r = r > 60 ? r / Math.pow(10, String(r).length - 2) : r, i > 360 && !r) {
-        const c = this.roundPrecision(i / 100, 0);
-        r = i - c * 100, i = c;
+      let [n, r] = o;
+      if (r = r > 60 ? r / Math.pow(10, String(r).length - 2) : r, n > 360 && !r) {
+        const c = this.roundPrecision(n / 100, 0);
+        r = n - c * 100, n = c;
       }
-      n = i + (r ?? 0) / 60, s === "W" && (n = n * -1);
+      i = n + (r ?? 0) / 60, s === "W" && (i = i * -1);
     } else
-      n = Number(t);
-    return l.convertToStdLng(n, e);
+      i = Number(t);
+    return l.convertToStdLng(i, e);
   }
   static str2Lat(t, e = 6) {
-    let n;
+    let i;
     if (isNaN(t)) {
       t = l.strReplace(t, "LAT");
       const s = t[t.length - 1].toUpperCase();
       t = t.substring(0, t.length - 1).trim();
       const o = t.split(" ").filter((c) => c !== "").map((c) => Number(c));
-      let [i, r] = o;
-      if (r = r > 60 ? r / Math.pow(10, String(r).length - 2) : r, i > 90 && !r) {
-        const c = this.roundPrecision(i / 100, 0);
-        r = i - c * 100, i = c;
+      let [n, r] = o;
+      if (r = r > 60 ? r / Math.pow(10, String(r).length - 2) : r, n > 90 && !r) {
+        const c = this.roundPrecision(n / 100, 0);
+        r = n - c * 100, n = c;
       }
-      n = i + (r ?? 0) / 60, s === "S" && (n = n * -1);
+      i = n + (r ?? 0) / 60, s === "S" && (i = i * -1);
     } else
-      n = Number(t);
-    return l.roundPrecision(n, e);
+      i = Number(t);
+    return l.roundPrecision(i, e);
   }
-  static str2LngOrLat(t, e = 6, n = "LAT") {
-    t = l.strReplace(t, n);
+  static str2LngOrLat(t, e = 6, i = "LAT") {
+    t = l.strReplace(t, i);
     const s = t[t.length - 1].toUpperCase();
     return ["N", "S"].includes(s) ? {
       lat: l.str2Lat(t, e)
@@ -136,8 +136,8 @@ class l {
   }
   static roundPrecision(t, e = 4) {
     if (typeof t == "number") {
-      const n = Number("1".padEnd(e + 1, "0"));
-      return Math.round(t * n) / n;
+      const i = Number("1".padEnd(e + 1, "0"));
+      return Math.round(t * i) / i;
     }
     return t;
   }
@@ -161,8 +161,8 @@ class l {
   }
   static strReplace(t, e = "LAT") {
     t = t.replace(/([0-9]+)\.([0-9]+\.[0-9]+)/g, "$1 $2").replace(/-/g, " ").replace(/°/, " ").replace(/'/g, " ").replace(/′/g, " ").replace(/"/g, " ").replace(/∼/g, " ").replace(/°/g, " ").replace(/,/g, ".").replace(/^ /g, "").replace(/ $/g, "").trim();
-    const n = t[t.length - 1].toUpperCase();
-    if (!["N", "S", "E", "W"].includes(n)) {
+    const i = t[t.length - 1].toUpperCase();
+    if (!["N", "S", "E", "W"].includes(i)) {
       const s = t, o = Number(s.split(" ")[0]);
       if (isNaN(o))
         throw new Error(`invalid Lat/Lng: ${t}`);
@@ -177,8 +177,8 @@ class l {
    * @param intPrecision 整数位数
    * @param dcmPrecision 小数位数
    */
-  static padNumber(t, e = 2, n = 2) {
-    const s = Math.trunc(t).toString().padStart(e, "0"), o = Math.trunc(l.roundPrecision(t - Math.trunc(t), n) * Math.pow(10, n)).toString().padStart(n, "0");
+  static padNumber(t, e = 2, i = 2) {
+    const s = Math.trunc(t).toString().padStart(e, "0"), o = Math.trunc(l.roundPrecision(t - Math.trunc(t), i) * Math.pow(10, i)).toString().padStart(i, "0");
     return `${s}.${o}`;
   }
 }
@@ -191,13 +191,13 @@ class b {
    * @param precision
    * @returns {number} 单位度
    */
-  static calculateBearing(t, e, n = !0, s = 4) {
+  static calculateBearing(t, e, i = !0, s = 4) {
     const o = g.points([
       [t.lng, t.lat],
       [e.lng, e.lat]
     ]);
-    let i;
-    return n ? i = g.rhumbBearing(o.features[0], o.features[1]) : i = g.bearing(o.features[0], o.features[1]), i < 0 && (i += 360), l.roundPrecision(i, s);
+    let n;
+    return i ? n = g.rhumbBearing(o.features[0], o.features[1]) : n = g.bearing(o.features[0], o.features[1]), n < 0 && (n += 360), l.roundPrecision(n, s);
   }
   /**
    * 计算两点间距离
@@ -208,14 +208,14 @@ class b {
    * @param units 单位，默认 nm(海里)
    * @returns {number}
    */
-  static calculateDistance(t, e, n = !0, s = 4, o = "nauticalmiles") {
+  static calculateDistance(t, e, i = !0, s = 4, o = "nauticalmiles") {
     t = { ...t }, e = { ...e }, t.lng = l.convertToStdLng(t.lng, s), e.lng = l.convertToStdLng(e.lng, s);
-    const i = g.points([
+    const n = g.points([
       [t.lng, t.lat],
       [e.lng, e.lat]
     ]);
     let r;
-    return n ? r = g.rhumbDistance(i.features[0], i.features[1], { units: o }) : r = g.distance(i.features[0], i.features[1], { units: o }), l.roundPrecision(r, s);
+    return i ? r = g.rhumbDistance(n.features[0], n.features[1], { units: o }) : r = g.distance(n.features[0], n.features[1], { units: o }), l.roundPrecision(r, s);
   }
   /**
    * 计算航线距离
@@ -223,14 +223,14 @@ class b {
    * @param precision
    * @param units
    */
-  static calculateRouteDistance(t, e = 4, n = "nauticalmiles") {
+  static calculateRouteDistance(t, e = 4, i = "nauticalmiles") {
     let s = 0, o;
-    for (const i of t)
-      for (let r = 0; r < i.length - 1; r++) {
-        const c = { lng: i[r][0], lat: i[r][1] };
-        r === 0 && o && (s += this.calculateDistance(o, c, !0, e, n));
-        const a = { lng: i[r + 1][0], lat: i[r + 1][1] };
-        s += this.calculateDistance(c, a, !0, e, n), o = a;
+    for (const n of t)
+      for (let r = 0; r < n.length - 1; r++) {
+        const c = { lng: n[r][0], lat: n[r][1] };
+        r === 0 && o && (s += this.calculateDistance(o, c, !0, e, i));
+        const a = { lng: n[r + 1][0], lat: n[r + 1][1] };
+        s += this.calculateDistance(c, a, !0, e, i), o = a;
       }
     return l.roundPrecision(s, e);
   }
@@ -242,10 +242,10 @@ class b {
    * @param units 单位，默认 nm(海里)
    * @param rhumb
    */
-  static calculateCoordinate(t, e, n, s = "nauticalmiles", o = !0) {
-    const i = g.point([t.lng, t.lat]);
+  static calculateCoordinate(t, e, i, s = "nauticalmiles", o = !0) {
+    const n = g.point([t.lng, t.lat]);
     let r;
-    o ? r = g.rhumbDestination(i, n, e, { units: s }) : r = g.destination(i, n, e, { units: s });
+    o ? r = g.rhumbDestination(n, i, e, { units: s }) : r = g.destination(n, i, e, { units: s });
     const c = r.geometry.coordinates;
     return { lng: l.convertToStdLng(c[0], 8), lat: l.roundPrecision(c[1], 8) };
   }
@@ -258,12 +258,12 @@ class b {
    * @param includeTail true 包含终点 to
    * @param units 单位，默认 nm(海里)
    */
-  static interpolateCoordinates(t, e, n, s = !0, o = !0, i = "nauticalmiles") {
-    const r = [], c = this.calculateBearing(t, e, !1), a = this.calculateDistance(t, e, !1, 8, i);
+  static interpolateCoordinates(t, e, i, s = !0, o = !0, n = "nauticalmiles") {
+    const r = [], c = this.calculateBearing(t, e, !1), a = this.calculateDistance(t, e, !1, 8, n);
     s && r.push({ lng: t.lng, lat: t.lat });
     let d = 0;
     for (; d < a; )
-      d += n, d < a && r.push(this.calculateCoordinate(t, c, d, i, !1));
+      d += i, d < a && r.push(this.calculateCoordinate(t, c, d, n, !1));
     return o && r.push({ lng: e.lng, lat: e.lat }), r;
   }
   /**
@@ -281,16 +281,16 @@ class b {
     if ((t == null ? void 0 : t.length) < 2)
       return [];
     t = this.deduplicateCoordinates(t);
-    let n = [];
+    let i = [];
     const s = [];
-    let o, i;
+    let o, n;
     for (let r = 0; r < t.length - 1; r++) {
-      o = l.convertToStdLng(t[r].lng, 8), i = l.convertToStdLng(t[r + 1].lng, 8), t[r].lat = l.roundPrecision(t[r].lat, 8), t[r + 1].lat = l.roundPrecision(t[r + 1].lat, 8), n.push([o, t[r].lat]);
-      const c = o - i;
+      o = l.convertToStdLng(t[r].lng, 8), n = l.convertToStdLng(t[r + 1].lng, 8), t[r].lat = l.roundPrecision(t[r].lat, 8), t[r + 1].lat = l.roundPrecision(t[r + 1].lat, 8), i.push([o, t[r].lat]);
+      const c = o - n;
       if (Math.abs(c) > 180) {
         const a = l.convertToMonotonicLng2([
           [o, t[r].lat],
-          [i, t[r + 1].lat]
+          [n, t[r + 1].lat]
         ]);
         let d, u;
         e ? (d = g.lineString(a), u = g.lineString([
@@ -300,15 +300,15 @@ class b {
         const f = g.lineIntersect(d, u);
         let h;
         if (f.features.length) {
-          const P = g.getCoord(f.features[0]);
-          h = l.roundPrecision(P[1], 8);
+          const T = g.getCoord(f.features[0]);
+          h = l.roundPrecision(T[1], 8);
         } else
           h = t[r].lat;
-        c > 0 ? (n.push([180 - 1e-6, h]), s.push([...n]), n = [], n.push([-(180 - 1e-6), h])) : (n.push([-(180 - 1e-6), h]), s.push([...n]), n = [], n.push([180 - 1e-6, h]));
+        c > 0 ? (i.push([180 - 1e-6, h]), s.push([...i]), i = [], i.push([-(180 - 1e-6), h])) : (i.push([-(180 - 1e-6), h]), s.push([...i]), i = [], i.push([180 - 1e-6, h]));
       }
-      r === t.length - 2 && n.push([i, t[r + 1].lat]);
+      r === t.length - 2 && i.push([n, t[r + 1].lat]);
     }
-    return s.push(n), s;
+    return s.push(i), s;
   }
   /**
    * 去除重复坐标
@@ -316,8 +316,8 @@ class b {
    */
   static deduplicateRoute(t) {
     const e = [];
-    for (const n of t) {
-      const s = n.reduce((o, i) => (o.findIndex((r) => r[0] === i[0] && r[1] === i[1]) === -1 && o.push(i), o), []);
+    for (const i of t) {
+      const s = i.reduce((o, n) => (o.findIndex((r) => r[0] === n[0] && r[1] === n[1]) === -1 && o.push(n), o), []);
       e.push(s);
     }
     return e;
@@ -327,7 +327,7 @@ class b {
    * @param coordinates
    */
   static deduplicateCoordinates(t) {
-    return t.reduce((e, n) => (e.findIndex((s) => s.lat === n.lat && s.lng === n.lng) === -1 && e.push(n), e), []);
+    return t.reduce((e, i) => (e.findIndex((s) => s.lat === i.lat && s.lng === i.lng) === -1 && e.push(i), e), []);
   }
   /**
    * 移出坐标
@@ -336,9 +336,9 @@ class b {
    */
   static removeCoordinateFromRoute(t, e) {
     t.lng = l.convertToStdLng(t.lng, 8);
-    for (const n of e)
-      for (let s = n.length - 1; s >= 0; s--)
-        l.roundPrecision(n[s][0], 8) === t.lng && l.roundPrecision(n[s][1], 8) === l.roundPrecision(t.lat, 8) && n.splice(s, 1);
+    for (const i of e)
+      for (let s = i.length - 1; s >= 0; s--)
+        l.roundPrecision(i[s][0], 8) === t.lng && l.roundPrecision(i[s][1], 8) === l.roundPrecision(t.lat, 8) && i.splice(s, 1);
     return e;
   }
   /**
@@ -348,8 +348,8 @@ class b {
    */
   static removeCoordinateFromWaypoints(t, e) {
     t.lng = l.convertToStdLng(t.lng, 8);
-    for (let n = e.length - 1; n >= 0; n--)
-      l.roundPrecision(e[n].lng, 8) === t.lng && l.roundPrecision(e[n].lat, 8) === l.roundPrecision(t.lat, 8) && e.splice(n, 1);
+    for (let i = e.length - 1; i >= 0; i--)
+      l.roundPrecision(e[i].lng, 8) === t.lng && l.roundPrecision(e[i].lat, 8) === l.roundPrecision(t.lat, 8) && e.splice(i, 1);
     return e;
   }
   /**
@@ -365,13 +365,13 @@ class b {
    */
   static mergeCoordinateToRoute(t, e) {
     t.lng = l.convertToStdLng(t.lng, 8);
-    let n = Number.MAX_VALUE, s = 0, o = 0, i, r;
+    let i = Number.MAX_VALUE, s = 0, o = 0, n, r;
     return e.forEach((c, a) => {
       for (let d = 0; d < c.length - 1; d++) {
         const u = { lng: c[d][0], lat: c[d][1] }, f = { lng: c[d + 1][0], lat: c[d + 1][1] }, h = this.calculatePointToLineDistance(t, u, f);
-        n > h && (n = h, o = d, s = a, i = this.calculateDistance(u, t), r = this.calculateDistance(f, t));
+        i > h && (i = h, o = d, s = a, n = this.calculateDistance(u, t), r = this.calculateDistance(f, t));
       }
-    }), i !== 0 && r !== 0 ? e[s].splice(o + 1, 0, [t.lng, t.lat]) : i === 0 ? e[s].splice(o, 1, [t.lng, t.lat]) : r === 0 && e[s].splice(o + 1, 1, [t.lng, t.lat]), e;
+    }), n !== 0 && r !== 0 ? e[s].splice(o + 1, 0, [t.lng, t.lat]) : n === 0 ? e[s].splice(o, 1, [t.lng, t.lat]) : r === 0 && e[s].splice(o + 1, 1, [t.lng, t.lat]), e;
   }
   /**
    * 向Route尾加1个坐标
@@ -380,8 +380,8 @@ class b {
    */
   static appendCoordinateToRoute(t, e) {
     t.lng = l.convertToStdLng(t.lng, 8);
-    const n = b.convertRouteToCoordinates(e);
-    return n.push(t), b.divideAccordingToLng(n);
+    const i = b.convertRouteToCoordinates(e);
+    return i.push(t), b.divideAccordingToLng(i);
   }
   /**
    * 向route头加1个坐标
@@ -389,8 +389,8 @@ class b {
    * @param route
    */
   static unshiftCoordinateToRoute(t, e) {
-    const n = b.convertRouteToCoordinates(e);
-    return n.unshift(t), b.divideAccordingToLng(n);
+    const i = b.convertRouteToCoordinates(e);
+    return i.unshift(t), b.divideAccordingToLng(i);
   }
   /**
    * 合并多个waypoints进航线
@@ -398,8 +398,8 @@ class b {
    * @param route 航线 [[[lng, lat],[lng, lat]]]
    */
   static mergeWaypointsToRoute(t, e) {
-    for (const n of t)
-      e = this.mergeCoordinateToRoute(n, e);
+    for (const i of t)
+      e = this.mergeCoordinateToRoute(i, e);
     return e;
   }
   /**
@@ -409,15 +409,15 @@ class b {
    * @param route [[[lng, lat]]]
    * @return [[[lng, lat]]]
    */
-  static calculateRangeRoute(t, e, n) {
-    n = this.mergeWaypointsToRoute([t, e], n);
+  static calculateRangeRoute(t, e, i) {
+    i = this.mergeWaypointsToRoute([t, e], i);
     const s = [];
     let o = 0;
-    return n.forEach((i) => {
+    return i.forEach((n) => {
       if (o === 2)
         return;
       const r = [];
-      for (const c of i) {
+      for (const c of n) {
         if (l.roundPrecision(e.lng, 8) === l.roundPrecision(c[0], 8) && l.roundPrecision(e.lat, 8) === l.roundPrecision(c[1], 8)) {
           r.push(c), o === 0 && r.push([t.lng, t.lat]), o = 2;
           break;
@@ -435,13 +435,13 @@ class b {
    * @param waypoints
    * @return [{lng, lat}]
    */
-  static calculateRangeWaypoints(t, e, n, s = []) {
-    const o = this.convertRouteToCoordinates(n, 0), i = this.mergeCoordinatesToWaypoints([t, e, ...s], o), r = i.findIndex(
+  static calculateRangeWaypoints(t, e, i, s = []) {
+    const o = this.convertRouteToCoordinates(i, 0), n = this.mergeCoordinatesToWaypoints([t, e, ...s], o), r = n.findIndex(
       (d) => l.roundPrecision(t.lng, 8) === l.roundPrecision(d.lng, 8) && l.roundPrecision(t.lat, 8) === l.roundPrecision(d.lat, 8)
-    ), c = i.findIndex(
+    ), c = n.findIndex(
       (d) => l.roundPrecision(e.lng, 8) === l.roundPrecision(d.lng, 8) && l.roundPrecision(e.lat, 8) === l.roundPrecision(d.lat, 8)
     );
-    return i.filter((d, u) => u >= r && u <= c);
+    return n.filter((d, u) => u >= r && u <= c);
   }
   /**
    * 计算坐标到航路上的最短距离
@@ -449,13 +449,13 @@ class b {
    * @param route
    */
   static calculateMinDistanceToRoute(t, e) {
-    let n = Number.MAX_VALUE, s = 0, o = 0;
-    return e.forEach((i, r) => {
-      for (let c = 0; c < i.length - 1; c++) {
-        const a = { lng: i[c][0], lat: i[c][1] }, d = { lng: i[c + 1][0], lat: i[c + 1][1] }, u = this.calculatePointToLineDistance(t, a, d);
-        n > u && (n = u, s = c, o = r);
+    let i = Number.MAX_VALUE, s = 0, o = 0;
+    return e.forEach((n, r) => {
+      for (let c = 0; c < n.length - 1; c++) {
+        const a = { lng: n[c][0], lat: n[c][1] }, d = { lng: n[c + 1][0], lat: n[c + 1][1] }, u = this.calculatePointToLineDistance(t, a, d);
+        i > u && (i = u, s = c, o = r);
       }
-    }), { minDist: n, segIndex: o, minIndex: s };
+    }), { minDist: i, segIndex: o, minIndex: s };
   }
   /**
    * 计算子航线
@@ -464,11 +464,11 @@ class b {
    * @return [[[lng, lat]]]
    */
   static calculateSubRoute(t, e) {
-    const n = b.convertRouteToCoordinates(e);
-    b.mergeCoordinateToWaypoints(t, n, !0), e = b.divideAccordingToLng(n);
+    const i = b.convertRouteToCoordinates(e);
+    b.mergeCoordinateToWaypoints(t, i, !0), e = b.divideAccordingToLng(i);
     const { segIndex: s, minIndex: o } = this.calculateMinDistanceToRoute({ ...t }, e);
     t.lng = l.convertToStdLng(t.lng);
-    const i = [];
+    const n = [];
     let r = !0;
     for (let c = s; c < e.length; c++)
       if (r) {
@@ -476,10 +476,10 @@ class b {
         a.push([t.lng, t.lat]);
         for (let d = o + 1; d < e[c].length; d++)
           t.lng === e[c][d][0] && t.lat === e[c][d][1] || a.push(e[c][d]);
-        i.push(a), r = !1;
+        n.push(a), r = !1;
       } else
-        i.push([...e[c]]);
-    return i;
+        n.push([...e[c]]);
+    return n;
   }
   /**
    * 计算子途经点
@@ -488,20 +488,20 @@ class b {
    * @return [{lng, lat}]
    */
   static calculateSubWaypoints(t, e) {
-    let n = Number.MAX_VALUE, s = 0;
-    for (let i = 0; i < e.length - 1; i++) {
-      const r = e[i], c = e[i + 1];
+    let i = Number.MAX_VALUE, s = 0;
+    for (let n = 0; n < e.length - 1; n++) {
+      const r = e[n], c = e[n + 1];
       if (this.calculateDistance(t, r) === 0)
         return e;
       if (this.calculateDistance(t, c) === 0)
         return e.filter((d, u) => u > 0);
       const a = this.calculatePointToLineDistance(t, r, c);
-      n > a && (n = a, s = i);
+      i > a && (i = a, s = n);
     }
     t.lng = l.convertToStdLng(t.lng);
     const o = [t];
-    for (let i = s + 1; i < e.length; i++)
-      o.push(e[i]);
+    for (let n = s + 1; n < e.length; n++)
+      o.push(e[n]);
     return o;
   }
   /**
@@ -511,14 +511,14 @@ class b {
    * @param to { lng, lat }
    * @param options
    */
-  static calculatePointToLineDistance(t, e, n, s = { units: "nauticalmiles", method: "geodesic" }) {
-    t.lng = l.convertToStdLng(t.lng, 8), e = { ...e }, n = { ...n }, e.lng = l.convertToStdLng(e.lng, 8), n.lng = l.convertToStdLng(n.lng, 8);
-    const o = l.convertToMonotonicLng([e, n]);
-    e = o[0], n = o[1];
-    const i = g.lineString([
+  static calculatePointToLineDistance(t, e, i, s = { units: "nauticalmiles", method: "geodesic" }) {
+    t.lng = l.convertToStdLng(t.lng, 8), e = { ...e }, i = { ...i }, e.lng = l.convertToStdLng(e.lng, 8), i.lng = l.convertToStdLng(i.lng, 8);
+    const o = l.convertToMonotonicLng([e, i]);
+    e = o[0], i = o[1];
+    const n = g.lineString([
       [e.lng, e.lat],
-      [n.lng, n.lat]
-    ]), r = g.pointToLineDistance(g.point([t.lng, t.lat]), i, s), c = g.pointToLineDistance(g.point([t.lng > 0 ? t.lng - 360 : t.lng + 360, t.lat]), i, s);
+      [i.lng, i.lat]
+    ]), r = g.pointToLineDistance(g.point([t.lng, t.lat]), n, s), c = g.pointToLineDistance(g.point([t.lng > 0 ? t.lng - 360 : t.lng + 360, t.lat]), n, s);
     return l.roundPrecision(Math.min(r, c), 6);
   }
   /**
@@ -528,9 +528,9 @@ class b {
    */
   static calculateWaypointsPropInRoute(t, e) {
     e = this.mergeWaypointsToRoute(t, e);
-    for (let n = 0; n < t.length - 1; n++) {
-      const s = t[n], o = t[n + 1], i = this.calculateRangeRoute(s, o, e);
-      n === 0 && (s.distanceFromPrevious = 0, s.distanceFromStart = 0), o.distanceFromPrevious = this.calculateRouteDistance(i), o.distanceFromStart = l.roundPrecision((s.distanceFromStart || 0) + o.distanceFromPrevious);
+    for (let i = 0; i < t.length - 1; i++) {
+      const s = t[i], o = t[i + 1], n = this.calculateRangeRoute(s, o, e);
+      i === 0 && (s.distanceFromPrevious = 0, s.distanceFromStart = 0), o.distanceFromPrevious = this.calculateRouteDistance(n), o.distanceFromStart = l.roundPrecision((s.distanceFromStart || 0) + o.distanceFromPrevious);
     }
     return t;
   }
@@ -539,9 +539,9 @@ class b {
    * @param waypoints [{lng, lat}]
    * @param replace true replace the same waypoint with coordinate
    */
-  static mergeCoordinatesToWaypoints(t, e, n = !0) {
+  static mergeCoordinatesToWaypoints(t, e, i = !0) {
     for (const s of t)
-      this.mergeCoordinateToWaypoints(s, e, n);
+      this.mergeCoordinateToWaypoints(s, e, i);
     return e;
   }
   /**
@@ -556,14 +556,14 @@ class b {
    * @return
    * [{ lng: 160, lat: 30}, { lng: 170, lat: 40}, {lng: 179, lat: 50}, {lng: -170, lat: 40}, {lng: -160, lat: 30}]
    */
-  static mergeCoordinateToWaypoints(t, e, n = !0) {
+  static mergeCoordinateToWaypoints(t, e, i = !0) {
     t.lng = l.convertToStdLng(t.lng, 8);
-    let s = Number.MAX_VALUE, o = 0, i = 0, r = 0;
+    let s = Number.MAX_VALUE, o = 0, n = 0, r = 0;
     for (let c = 0; c < e.length - 1; c++) {
       const a = { lng: e[c].lng, lat: e[c].lat }, d = { lng: e[c + 1].lng, lat: e[c + 1].lat }, u = this.calculatePointToLineDistance(t, a, d);
-      s >= u && (s = u, o = c, i = this.calculateDistance(a, t, !1, 6), r = this.calculateDistance(d, t, !1, 6));
+      s >= u && (s = u, o = c, n = this.calculateDistance(a, t, !1, 6), r = this.calculateDistance(d, t, !1, 6));
     }
-    return i !== 0 && r !== 0 ? i < s || i === s && o === 0 ? e.unshift(t) : r < s || r === s && o === e.length - 2 ? e.push(t) : e.splice(o + 1, 0, t) : i === 0 ? n && e.splice(o, 1, t) : r === 0 && n && e.splice(o + 1, 1, t), e.map((c) => (c.lng = l.convertToStdLng(c.lng), c));
+    return n !== 0 && r !== 0 ? n < s || n === s && o === 0 ? e.unshift(t) : r < s || r === s && o === e.length - 2 ? e.push(t) : e.splice(o + 1, 0, t) : n === 0 ? i && e.splice(o, 1, t) : r === 0 && i && e.splice(o + 1, 1, t), e.map((c) => (c.lng = l.convertToStdLng(c.lng), c));
   }
   /**
    * 生成航线（基于途经点生成大圆/横向航线，并根据是否跨180度分组）
@@ -572,11 +572,11 @@ class b {
    */
   static generateRouteAccordingToWaypoints(t) {
     const e = [];
-    for (let n = 1; n < t.length; n++) {
-      const s = t[n - 1], o = t[n];
-      if (n === 1 && e.push(s), o.gcToPrevious) {
-        const i = this.interpolateCoordinates(s, o, 200, !1, !0, "nauticalmiles");
-        e.push(...i);
+    for (let i = 1; i < t.length; i++) {
+      const s = t[i - 1], o = t[i];
+      if (i === 1 && e.push(s), o.gcToPrevious) {
+        const n = this.interpolateCoordinates(s, o, 200, !1, !0, "nauticalmiles");
+        e.push(...n);
       } else
         e.push(o);
     }
@@ -588,7 +588,7 @@ class b {
    * @param route [[[lng, lat]]]
    */
   static nearestCoordinateInRoute(t, e) {
-    const n = g.point([t.lng, t.lat]), o = this.convertRouteToCoordinates(e).map((a) => [a.lng, a.lat]), i = g.lineString(o), r = g.nearestPointOnLine(i, n), c = g.getCoord(r);
+    const i = g.point([t.lng, t.lat]), o = this.convertRouteToCoordinates(e).map((a) => [a.lng, a.lat]), n = g.lineString(o), r = g.nearestPointOnLine(n, i), c = g.getCoord(r);
     return { lng: l.roundPrecision(c[0], 8), lat: l.roundPrecision(c[1], 8) };
   }
   /**
@@ -597,20 +597,20 @@ class b {
    * @param waypoints
    */
   static calculatePrevWaypoint(t, e) {
-    let n = 0;
+    let i = 0;
     this.mergeCoordinateToWaypoints(t, e);
     for (let s = 0; s < e.length - 1; s++) {
-      const o = e[s], i = e[s + 1];
+      const o = e[s], n = e[s + 1];
       if (this.calculateDistance(t, o) === 0) {
-        n = s;
+        i = s;
         break;
       }
-      if (this.calculateDistance(t, i) === 0) {
-        n = s + 1;
+      if (this.calculateDistance(t, n) === 0) {
+        i = s + 1;
         break;
       }
     }
-    return e[n === 0 ? 0 : n - 1];
+    return e[i === 0 ? 0 : i - 1];
   }
   /**
    * 计算下一个距离单位的坐标及其子航线
@@ -620,11 +620,11 @@ class b {
    * @param units
    * @return { coordinate: {lng, lat}, route: [[[lng, lat]]]}
    */
-  static calculateNextCoordinateAlongRoute(t, e, n, s = "nauticalmiles") {
+  static calculateNextCoordinateAlongRoute(t, e, i, s = "nauticalmiles") {
     var f;
-    const o = t.speed || 12, i = [];
+    const o = t.speed || 12, n = [];
     let r = [], c = !1, a = 0, d = 0, u;
-    if (e && n.length ? (i.push(t), n.forEach((h, P) => {
+    if (e && i.length ? (n.push(t), i.forEach((h, T) => {
       if (c)
         r.push(h);
       else {
@@ -637,7 +637,7 @@ class b {
             S = { lng: h[M][0], lat: h[M][1] };
             const D = this.calculateDistance(t, S, !0, 8, s);
             if (a += D, a < e)
-              d += D, i.push(S), t = S;
+              d += D, n.push(S), t = S;
             else {
               if (d = e, a === e)
                 u = S, m.push([u.lng, u.lat]);
@@ -648,15 +648,15 @@ class b {
               c = !0;
             }
           }
-        m.length && r.push(m), P === n.length - 1 && !u && (u = S);
+        m.length && r.push(m), T === i.length - 1 && !u && (u = S);
       }
-    })) : (r = n, u = { ...t }), u)
-      if (i.push(u), u.distanceFromPrevious = d, u.hourFromPrevious = Math.round(d / o * 1e4) / 1e4, ((f = r[0]) == null ? void 0 : f.length) > 1) {
+    })) : (r = i, u = { ...t }), u)
+      if (n.push(u), u.distanceFromPrevious = d, u.hourFromPrevious = Math.round(d / o * 1e4) / 1e4, ((f = r[0]) == null ? void 0 : f.length) > 1) {
         const h = { lng: r[0][1][0], lat: r[0][1][1] };
         u.bearing = this.calculateBearing(u, h);
       } else
         u.bearing = 0;
-    return { coordinate: u, nextRoute: r, prevRoute: i };
+    return { coordinate: u, nextRoute: r, prevRoute: n };
   }
   /**
    * 返回最近点及其是否为垂足(最近点不是起点或终点)
@@ -664,12 +664,12 @@ class b {
    * @param from {lng, lat}
    * @param to {lng, lat}
    */
-  static nearestCoordinateInLine(t, e, n) {
-    const s = l.convertToStdLng(t.lng, 6), o = g.point([s, t.lat]), i = l.convertToStdLng(e.lng, 6), r = l.convertToStdLng(n.lng, 6), c = g.lineString([
-      [i, e.lat],
-      [r, n.lat]
+  static nearestCoordinateInLine(t, e, i) {
+    const s = l.convertToStdLng(t.lng, 6), o = g.point([s, t.lat]), n = l.convertToStdLng(e.lng, 6), r = l.convertToStdLng(i.lng, 6), c = g.lineString([
+      [n, e.lat],
+      [r, i.lat]
     ]), a = g.nearestPointOnLine(c, o), d = g.getCoord(a), u = l.roundPrecision(d[0], 6), f = l.roundPrecision(d[1], 6);
-    return { lng: u, lat: f, inline: !(u === i && f === e.lat) && !(u === r && f === n.lat) };
+    return { lng: u, lat: f, inline: !(u === n && f === e.lat) && !(u === r && f === i.lat) };
   }
   /**
    * 将route转coordinate
@@ -677,22 +677,22 @@ class b {
    * @param distance 临近点过虑
    */
   static convertRouteToCoordinates(t, e = 0) {
-    const n = [];
+    const i = [];
     let s, o;
-    return t.forEach((i) => {
-      i.forEach((r) => {
+    return t.forEach((n) => {
+      n.forEach((r) => {
         const c = { lng: l.roundPrecision(r[0], 8), lat: l.roundPrecision(r[1], 8) };
         if (!o)
-          n.push(c), o = c;
+          i.push(c), o = c;
         else if (o.bearing === void 0)
           o.bearing = this.calculateBearing(o, c, !0);
         else {
           const a = this.calculateDistance(s, c, !0);
-          a && a >= e && (s.bearing = this.calculateBearing(s, c, !0), n.push(s), o = s);
+          a && a >= e && (s.bearing = this.calculateBearing(s, c, !0), i.push(s), o = s);
         }
         s = c;
       });
-    }), s && n.push(s), n;
+    }), s && i.push(s), i;
   }
   /**
    * 抽稀（基于转向点）
@@ -700,8 +700,8 @@ class b {
    * @param waypoints [{ lng, lat, gcToPrevious }]
    * @param distance
    */
-  static simplifyRouteToCoordinates(t, e, n = 1) {
-    let s = this.convertRouteToCoordinates(t, n);
+  static simplifyRouteToCoordinates(t, e, i = 1) {
+    let s = this.convertRouteToCoordinates(t, i);
     return s = this.simplifyGCCoordinates(s, e), s;
   }
   /**
@@ -714,17 +714,17 @@ class b {
       this.mergeCoordinateToWaypoints(s, t, !0);
     });
     for (let s = 1; s < e.length; s++) {
-      const o = e[s - 1], i = e[s];
-      if (i.gcToPrevious) {
-        const r = t.findIndex((a) => a.lng === o.lng && a.lat === o.lat), c = t.findIndex((a) => a.lng === i.lng && a.lat === i.lat);
+      const o = e[s - 1], n = e[s];
+      if (n.gcToPrevious) {
+        const r = t.findIndex((a) => a.lng === o.lng && a.lat === o.lat), c = t.findIndex((a) => a.lng === n.lng && a.lat === n.lat);
         for (let a = c - 1; a > r; a--)
           t.splice(a, 1);
       }
     }
-    let n = 0;
+    let i = 0;
     for (let s = 1; s < t.length; s++) {
-      const o = t[s - 1], i = t[s];
-      i.gcToPrevious ? (o.bearing = this.calculateBearing(o, i, !1), i.distanceFromPrevious = this.calculateDistance(o, i, !1)) : (o.bearing = this.calculateBearing(o, i, !0), i.distanceFromPrevious = this.calculateDistance(o, i, !0)), n = l.roundPrecision(n + i.distanceFromPrevious), i.distanceFromStart = n;
+      const o = t[s - 1], n = t[s];
+      n.gcToPrevious ? (o.bearing = this.calculateBearing(o, n, !1), n.distanceFromPrevious = this.calculateDistance(o, n, !1)) : (o.bearing = this.calculateBearing(o, n, !0), n.distanceFromPrevious = this.calculateDistance(o, n, !0)), i = l.roundPrecision(i + n.distanceFromPrevious), n.distanceFromStart = i;
     }
     return t.map((s) => (s.lng = l.convertToStdLng(s.lng), s));
   }
@@ -737,11 +737,11 @@ class b {
     for (const r of t)
       for (const c of r)
         e.push(c);
-    const n = g.featureCollection([]), s = l.convertToMonotonicLng2(e);
+    const i = g.featureCollection([]), s = l.convertToMonotonicLng2(e);
     for (const r of s)
-      n.features.push(g.point(r));
-    const i = g.center(n).geometry.coordinates;
-    return { lng: l.convertToStdLng(i[0], 8), lat: l.roundPrecision(i[1], 8) };
+      i.features.push(g.point(r));
+    const n = g.center(i).geometry.coordinates;
+    return { lng: l.convertToStdLng(n[0], 8), lat: l.roundPrecision(n[1], 8) };
   }
   /**
    * 计算中心点
@@ -758,9 +758,9 @@ class b {
   static calculateBBox(t) {
     const e = [];
     for (const o of t)
-      for (const i of o)
-        e.push(i);
-    const n = l.convertToMonotonicLng2(e), s = g.lineString(n);
+      for (const n of o)
+        e.push(n);
+    const i = l.convertToMonotonicLng2(e), s = g.lineString(i);
     return g.bbox(s);
   }
   /**
@@ -777,14 +777,14 @@ class b {
    * @param distance 三点最小距离， 小于此距离时，B点将被忽略(三点太近)
    * @param angle 三点夹角， 大于此角度时，B点将被忽略(近似走RL)
    */
-  static simplifyCoordinates(t, e = 10, n = 160) {
+  static simplifyCoordinates(t, e = 10, i = 160) {
     const s = [];
     for (let o = 1; o < t.length; o++) {
-      const i = t[o - 1], r = t[o], c = t[o + 1];
+      const n = t[o - 1], r = t[o], c = t[o + 1];
       let a = !1, d = !1;
-      if ((i.velocity || i.suspend || i.important || i.pilot || o === 1) && (a = !0, s.push(i)), r.gcToPrevious && (a || (a = !0, s.push(i)), d = !0, s.push(r), o++), c) {
-        const u = b.calculateDistance(i, r, !0), f = b.calculateDistance(r, c, !0), h = b.calculateDistance(i, c, !0), P = (Math.pow(u, 2) + Math.pow(f, 2) - Math.pow(h, 2)) / (2 * u * f);
-        Math.round(Math.acos(P) * 180 / Math.PI) < n && h > e && !d && (s.push(r), o++);
+      if ((n.velocity || n.suspend || n.important || n.pilot || o === 1) && (a = !0, s.push(n)), r.gcToPrevious && (a || (a = !0, s.push(n)), d = !0, s.push(r), o++), c) {
+        const u = b.calculateDistance(n, r, !0), f = b.calculateDistance(r, c, !0), h = b.calculateDistance(n, c, !0), T = (Math.pow(u, 2) + Math.pow(f, 2) - Math.pow(h, 2)) / (2 * u * f);
+        Math.round(Math.acos(T) * 180 / Math.PI) < i && h > e && !d && (s.push(r), o++);
       }
       if (o >= t.length - 1) {
         const u = t.at(-1);
@@ -793,10 +793,22 @@ class b {
     }
     return s;
   }
+  /**
+   * 在时间轨迹上寻找ts最近的点
+   * @param ts ts最近的点(向后取), 单位秒
+   * @param step 时间步长, 前后n小时
+   * @param waypoints 带时间的轨迹, 单位秒
+   */
+  static nearestTSPointInWaypoints(t, e, i) {
+    const s = y.unix(t), o = i.filter(
+      (n) => s.clone().subtract(e, "hour").unix() <= (n.positionTime || 0) && s.clone().add(e, "h").unix() >= (n.positionTime || 0)
+    );
+    return o.sort((n, r) => (n.positionTime || 0) - (r.positionTime || 0)), o.at(-1);
+  }
 }
-let T;
+let P;
 try {
-  T = O.getLogger("vessel");
+  P = O.getLogger("vessel");
 } catch {
 } finally {
 }
@@ -806,16 +818,17 @@ class q {
    * @param raw
    */
   static convert2Geojson(t) {
-    var n;
+    var i;
     const e = g.featureCollection([]);
     for (const s of t) {
       if (s.forecasts) {
-        const o = (n = s.history) == null ? void 0 : n[0];
-        for (const i of s.forecasts) {
-          const r = [], c = R(i.date).utc(), a = `${s.name}-${i.model}`;
+        const o = (i = s.history) == null ? void 0 : i[0];
+        o && o.wind && (o.wind.spd = o.spd, o.wind.kts = o.kts);
+        for (const n of s.forecasts) {
+          const r = [], c = y(n.date).utc(), a = `${s.name}-${n.model}`;
           if (o) {
-            const d = R(o.updated).utc(), u = g.point([o.lng, o.lat], {
-              model: i.model,
+            const d = y(o.updated).utc(), u = g.point([o.lng, o.lat], {
+              model: n.model,
               name: s.name,
               date: d.format(),
               hour: 0,
@@ -827,11 +840,11 @@ class q {
             });
             e.features.push(u), r.push(u.geometry.coordinates);
           }
-          for (const d in i == null ? void 0 : i.hours) {
-            const u = i.hours[d];
+          for (const d in n == null ? void 0 : n.hours) {
+            const u = n.hours[d];
             u.wind.spd = u.wind.spd || u.wind.speed;
             const f = c.clone().add(Number(d), "hour"), h = g.point([u.lng, u.lat], {
-              model: i.model,
+              model: n.model,
               name: s.name,
               date: f.format(),
               hour: Number(d),
@@ -847,9 +860,9 @@ class q {
           }
           if ((r == null ? void 0 : r.length) > 1) {
             const d = g.lineString(l.convertToMonotonicLng2(r), {
-              date: i.date,
+              date: n.date,
               id: s.id || s.name,
-              model: i.model,
+              model: n.model,
               name: s.name,
               category: a,
               type: "forecast"
@@ -861,7 +874,7 @@ class q {
       if (s.history) {
         const o = [];
         for (const r of s.history) {
-          const c = R(r.updated).utc(), a = g.point([r.lng, r.lat], {
+          const c = y(r.updated).utc(), a = g.point([r.lng, r.lat], {
             name: s.name,
             date: c.format(),
             format: c.format("MMM-DD/HHmm[Z]"),
@@ -876,17 +889,17 @@ class q {
           });
           e.features.push(a), o.push(a.geometry.coordinates);
         }
-        const i = s.history[0];
+        const n = s.history[0];
         if (o.length === 1 && o.push(o[0]), o.length > 1) {
           const r = g.lineString(l.convertToMonotonicLng2(o), {
             name: s.name,
             type: "history",
-            updated: i == null ? void 0 : i.updated,
-            pressure: (i == null ? void 0 : i.pressure) > 1e4 ? l.roundPrecision((i == null ? void 0 : i.pressure) / 100, 0) : l.roundPrecision(i == null ? void 0 : i.pressure, 0),
-            spd: (i == null ? void 0 : i.speed) || (i == null ? void 0 : i.spd),
-            kts: i == null ? void 0 : i.kts,
-            source: i == null ? void 0 : i.source,
-            level: i == null ? void 0 : i.type
+            updated: n == null ? void 0 : n.updated,
+            pressure: (n == null ? void 0 : n.pressure) > 1e4 ? l.roundPrecision((n == null ? void 0 : n.pressure) / 100, 0) : l.roundPrecision(n == null ? void 0 : n.pressure, 0),
+            spd: (n == null ? void 0 : n.speed) || (n == null ? void 0 : n.spd),
+            kts: n == null ? void 0 : n.kts,
+            source: n == null ? void 0 : n.source,
+            level: n == null ? void 0 : n.type
           });
           e.features.push(r);
         }
@@ -900,15 +913,15 @@ class q {
    * @param step
    */
   static interpolate(t, e = 3) {
-    var o, i, r, c;
-    const n = (o = t == null ? void 0 : t.data) == null ? void 0 : o.features.filter((a) => a.geometry.type === "LineString" && a.properties.type === "forecast"), s = [];
-    for (const a of n) {
-      const d = a.properties.name, u = a.properties.model, f = a.properties.showCircle, h = a.properties.disabled, P = R(a.properties.date).utc();
-      let m = e * 60 - (P.get("hour") * 60 + P.get("minute")) % (e * 60);
-      const S = (i = t == null ? void 0 : t.data) == null ? void 0 : i.features.filter(
+    var o, n, r, c;
+    const i = (o = t == null ? void 0 : t.data) == null ? void 0 : o.features.filter((a) => a.geometry.type === "LineString" && a.properties.type === "forecast"), s = [];
+    for (const a of i) {
+      const d = a.properties.name, u = a.properties.model, f = a.properties.showCircle, h = a.properties.disabled, T = y(a.properties.date).utc();
+      let m = e * 60 - (T.get("hour") * 60 + T.get("minute")) % (e * 60);
+      const S = (n = t == null ? void 0 : t.data) == null ? void 0 : n.features.filter(
         (v) => v.geometry.type === "Point" && v.properties.type === "forecast" && v.properties.category === `${d}-${u}`
       );
-      let M, D = P.clone().add(m, "minute").set({ minute: 0, second: 0, millisecond: 0 });
+      let M, D = T.clone().add(m, "minute").set({ minute: 0, second: 0, millisecond: 0 });
       for (; M = this.pickIndex(S, D), M <= S.length - 1; ) {
         if (M > 0) {
           const v = S[M], p = M === 0 ? void 0 : S[M - 1], N = (m / 60 - ((r = p == null ? void 0 : p.properties) == null ? void 0 : r.hour)) / (v.properties.hour - ((c = p == null ? void 0 : p.properties) == null ? void 0 : c.hour)), I = this.computeNumber(p == null ? void 0 : p.geometry.coordinates[0], v.geometry.coordinates[0], N), $ = this.computeNumber(p == null ? void 0 : p.geometry.coordinates[1], v.geometry.coordinates[1], N), W = g.point([I, $], {
@@ -928,7 +941,7 @@ class q {
           });
           s.push(W);
         }
-        m += e * 60, D = P.clone().add(m, "minute").set({ minute: 0, second: 0, millisecond: 0 });
+        m += e * 60, D = T.clone().add(m, "minute").set({ minute: 0, second: 0, millisecond: 0 });
       }
     }
     return s;
@@ -940,8 +953,8 @@ class q {
    * @param options
    */
   static accelPassageAt(t, e) {
-    const { t1: n, t2: s, hr: o, hours: i } = this.tropicalCenterTwin(t, 24, e);
-    return { t1: n, t2: s, hr: o, hours: i };
+    const { t1: i, t2: s, hr: o, hours: n } = this.tropicalCenterTwin(t, 24, e);
+    return { t1: i, t2: s, hr: o, hours: n };
   }
   /**
    * 计算最佳绕航点
@@ -954,32 +967,32 @@ class q {
    * @param speed 前进速度
    * @param options
    */
-  static diversionPassageAt(t, e, n, s = {}) {
-    const { t1: o, t2: i, hr: r, hours: c } = this.tropicalCenterTwin(e, 24, s);
-    if (o && i) {
+  static diversionPassageAt(t, e, i, s = {}) {
+    const { t1: o, t2: n, hr: r, hours: c } = this.tropicalCenterTwin(e, 24, s);
+    if (o && n) {
       if (!s.debug) {
-        const P = b.calculateDistance(t, o), m = b.calculateDistance(t, i);
-        if (P > 2 * n && m > 2 * n)
-          return T == null || T.info("[%s] the distance between from and t1(%d) and t2(%d) is enough, no need diversion: %j", s.requestId, P, m, {
+        const T = b.calculateDistance(t, o), m = b.calculateDistance(t, n);
+        if (T > 2 * i && m > 2 * i)
+          return P == null || P.info("[%s] the distance between from and t1(%d) and t2(%d) is enough, no need diversion: %j", s.requestId, T, m, {
             from: t,
             t1: o,
-            t2: i,
+            t2: n,
             hr: r
           }), {};
       }
-      const a = b.calculateBearing(t, o), d = b.calculateBearing(o, i), u = Math.abs(a - d);
+      const a = b.calculateBearing(t, o), d = b.calculateBearing(o, n), u = Math.abs(a - d);
       let f = 0;
       u < 180 ? f = u + 90 : u >= 180 && (f = u - 90);
-      const h = b.calculateCoordinate(o, f, n);
-      return T == null || T.info("[%s] the right tangent position: %j", s.requestId, {
+      const h = b.calculateCoordinate(o, f, i);
+      return P == null || P.info("[%s] the right tangent position: %j", s.requestId, {
         from: t,
         t1: o,
-        t2: i,
-        radius: n,
+        t2: n,
+        radius: i,
         bearing1: a,
         bearing2: d,
         right: h
-      }), { at: h, t1: o, t2: i, hr: Number(r), hours: c };
+      }), { at: h, t1: o, t2: n, hr: Number(r), hours: c };
     }
     return {};
   }
@@ -993,23 +1006,23 @@ class q {
    * @param radius 与台风中心的距离
    * @param options
    */
-  static driftPassageAt(t, e, n, s = {}) {
-    const { t1: o, t2: i, hr: r, hours: c } = this.tropicalCenterTwin(e, 24, s);
-    if (o && i) {
+  static driftPassageAt(t, e, i, s = {}) {
+    const { t1: o, t2: n, hr: r, hours: c } = this.tropicalCenterTwin(e, 24, s);
+    if (o && n) {
       if (!s.debug) {
-        const h = b.calculateDistance(t, o), P = b.calculateDistance(t, i);
-        if (h > 2 * n && P > 2 * n)
-          return T == null || T.info("[%s] the distance between from and t1(%d) and t2(%d) is enough, no need drifting: %j", s.requestId, h, P, {
+        const h = b.calculateDistance(t, o), T = b.calculateDistance(t, n);
+        if (h > 2 * i && T > 2 * i)
+          return P == null || P.info("[%s] the distance between from and t1(%d) and t2(%d) is enough, no need drifting: %j", s.requestId, h, T, {
             from: t,
             t1: o,
-            t2: i,
+            t2: n,
             hr: r
           }), {};
       }
-      const a = b.calculateBearing(t, o), d = b.calculateBearing(o, i), u = b.calculateDistance(t, o);
-      return { at: b.calculateCoordinate(o, a - d + 180, n < u ? n : u), t1: o, t2: i, hr: Number(r), hours: c };
+      const a = b.calculateBearing(t, o), d = b.calculateBearing(o, n), u = b.calculateDistance(t, o);
+      return { at: b.calculateCoordinate(o, a - d + 180, i < u ? i : u), t1: o, t2: n, hr: Number(r), hours: c };
     } else
-      return T == null || T.info("[%s] no need drift: %j", s.requestId, { from: t, t1: o, t2: i, hr: r }), {};
+      return P == null || P.info("[%s] no need drift: %j", s.requestId, { from: t, t1: o, t2: n, hr: r }), {};
   }
   /**
    * 获取台风中心点对
@@ -1019,42 +1032,42 @@ class q {
    * @returns { t1: 当前台风中心点, t2: 未来hr小时台风中心点, hr: 未来台风中心点与当前台风中心点之间的时间差, hours: 未来24小时内所有台风中心点 }
    * @private
    */
-  static tropicalCenterTwin(t, e = 24, n = {}) {
-    var d, u, f, h, P;
+  static tropicalCenterTwin(t, e = 24, i = {}) {
+    var d, u, f, h, T;
     let s = {};
     (d = t.forecasts) == null || d.forEach((m) => {
       s = { ...m.hours, ...s };
     });
     const o = ((u = t == null ? void 0 : t.history) == null ? void 0 : u[0]) || (s == null ? void 0 : s[(f = Object.keys(s)) == null ? void 0 : f[0]]);
-    T == null || T.info("[%s] the first tropical center: %j", n.requestId, o);
-    let i = (h = Object.keys(s || {}).filter((m) => Number(m) <= (e < 0 ? 24 : e))) == null ? void 0 : h.at(-1);
-    i || (i = (P = Object.keys(s || {}).filter((m) => Number(m) <= (e < 0 ? 24 : 2 * e))) == null ? void 0 : P.at(-1));
-    const r = s == null ? void 0 : s[i || -1];
-    T == null || T.info("[%s] the second tropical center: %j in %d hrs", n.requestId, r, i);
-    const c = Object.keys(s || {}).filter((m) => Number(m) <= Number(i)), a = { 0: o };
+    P == null || P.info("[%s] the first tropical center: %j", i.requestId, o);
+    let n = (h = Object.keys(s || {}).filter((m) => Number(m) <= (e < 0 ? 24 : e))) == null ? void 0 : h.at(-1);
+    n || (n = (T = Object.keys(s || {}).filter((m) => Number(m) <= (e < 0 ? 24 : 2 * e))) == null ? void 0 : T.at(-1));
+    const r = s == null ? void 0 : s[n || -1];
+    P == null || P.info("[%s] the second tropical center: %j in %d hrs", i.requestId, r, n);
+    const c = Object.keys(s || {}).filter((m) => Number(m) <= Number(n)), a = { 0: o };
     for (const m of c)
       a[m] = s[m];
-    return { t1: o, t2: r, hr: Number(i), hours: a };
+    return { t1: o, t2: r, hr: Number(n), hours: a };
   }
   static pickIndex(t, e) {
-    let n = 0;
+    let i = 0;
     for (const s of t) {
-      if (R(s.properties.date).isAfter(e))
-        return n === 0 ? -1 : n;
-      n++;
+      if (y(s.properties.date).isAfter(e))
+        return i === 0 ? -1 : i;
+      i++;
     }
-    return n;
+    return i;
   }
-  static computeNumber(t, e, n) {
+  static computeNumber(t, e, i) {
     if (t)
       if (e) {
         if (isNaN(t) && isNaN(e) && typeof t != "string" && typeof e != "string") {
           const s = {};
           for (const o in t)
-            s[o] = this.computeNumber(t[o], e[o], n);
+            s[o] = this.computeNumber(t[o], e[o], i);
           return s;
         }
-        return Math.round((t + (e - t) * n) * 100) / 100;
+        return Math.round((t + (e - t) * i) * 100) / 100;
       } else
         return t;
     else