@idm-plugin/geo 1.8.5 → 1.8.7

package/dist/index.js

@@ -1173,8 +1173,13 @@ class X {
     let z = Math.floor(Math.abs(M)), b = Math.round((Math.abs(M) - z) * 60);
     return b = b > 9 ? b : `0${b}`, z = z > 9 ? z : `0${z}`, M > 0 ? `+${z}:${b}` : `-${z}:${b}`;
   }
+  /**
+   * @param lng
+   * @param precision 3位小数在百米级，4位小数在十米级, 5位小数在米级
+   * @param format
+   */
   static lng2pretty(M, z = 6, b = "H°M′") {
-    z = z < 6 ? 6 : z, M = X.convertToStdLng(M, z);
+    M = X.convertToStdLng(M, z);
     let O = "E";
     M < 0 && (O = "W"), M = Math.abs(M), b = b.toUpperCase();
     let c = M * 3600, p, A, o, q, Y, d;
@@ -1195,7 +1200,7 @@ class X {
    * @param format 格式化
    */
   static lat2pretty(M, z = 6, b = "H°M′") {
-    z = z < 6 ? 6 : z, M = M % 180;
+    M = M % 180;
     let O = "N";
     M < 0 && (O = "S"), M = Math.abs(M), b = b.toUpperCase();
     let c = M * 3600, p, A, o, q, Y, d;
@@ -1215,13 +1220,13 @@ class X {
       M = X.strReplace(M, "LNG");
       const O = M[M.length - 1].toUpperCase();
       M = M.substring(0, M.length - 1).trim();
-      const c = M.split(" ").filter((o) => o !== "").map((o) => Math.abs(Number(o)));
-      let [p, A] = c;
-      if (A = A > 60 ? A / Math.pow(10, String(A).length - 2) : A, p > 360 && !A) {
-        const o = this.roundPrecision(p / 100, 0);
-        A = p - o * 100, p = o;
+      const c = M.split(" ").filter((q) => q !== "").map((q) => Math.abs(Number(q)));
+      let [p, A, o] = c;
+      if (A = A || 0, A = A > 60 ? A / Math.pow(10, String(A).length - 2) : A, o = o || 0, o = o > 60 ? o / Math.pow(10, String(o).length - 2) : o, p > 360 && !A) {
+        const q = this.roundPrecision(p / 100, 0);
+        A = p - q * 100, p = q;
       }
-      b = p + (A ?? 0) / 60, O === "W" && (b = b * -1);
+      b = p + A / 60 + o / 3600, O === "W" && (b = b * -1);
     } else
       b = Number(M);
     return X.convertToStdLng(b, z);
@@ -1232,13 +1237,13 @@ class X {
       M = X.strReplace(M, "LAT");
       const O = M[M.length - 1].toUpperCase();
       M = M.substring(0, M.length - 1).trim();
-      const c = M.split(" ").filter((o) => o !== "").map((o) => Math.abs(Number(o)));
-      let [p, A] = c;
-      if (A = A > 60 ? A / Math.pow(10, String(A).length - 2) : A, p > 90 && !A) {
-        const o = this.roundPrecision(p / 100, 0);
-        A = p - o * 100, p = o;
+      const c = M.split(" ").filter((q) => q !== "").map((q) => Math.abs(Number(q)));
+      let [p, A, o] = c;
+      if (o = o || 0, A = A || 0, A = A > 60 ? A / Math.pow(10, String(A).length - 2) : A, o = o > 60 ? o / Math.pow(10, String(o).length - 2) : o, p > 90 && !A) {
+        const q = this.roundPrecision(p / 100, 0);
+        A = p - q * 100, p = q;
       }
-      if (b = p + (A ?? 0) / 60, b > 90)
+      if (b = p + A / 60 + o / 3600, b > 90)
         throw new Error(`latitude out of range: ${M}${O}`);
       O === "S" && (b = b * -1);
     } else
@@ -1257,7 +1262,7 @@ class X {
   static convertToStdLng(M, z = 6) {
     return M > 180 ? (M = M % 360, M = M > 180 ? M - 360 : M) : M < -180 && (M = M % 360, M = M < -180 ? M + 360 : M), X.roundPrecision(M, z);
   }
-  static roundPrecision(M, z = 4) {
+  static roundPrecision(M, z = 6) {
     if (typeof M == "number") {
       const b = Number("1".padEnd(z + 1, "0"));
       return Math.round(M * b) / b;
@@ -1283,7 +1288,7 @@ class X {
     return M;
   }
   static strReplace(M, z = "LAT") {
-    M = M.replace(/([0-9]+)\.([0-9]+\.[0-9]+)/g, "$1 $2").replace(/([0-9]+)-([0-9]+\.[0-9]+)/g, "$1 $2").replace(/°/, " ").replace(/'/g, " ").replace(/′/g, " ").replace(/"/g, " ").replace(/∼/g, " ").replace(/°/g, " ").replace(/,/g, ".").replace(/^ /g, "").replace(/ $/g, "").trim();
+    M = M.replace(/([0-9]+)\.([0-9]+\.[0-9]+)/g, "$1 $2").replace(/([0-9]+)-([0-9]+\.[0-9]+)/g, "$1 $2").replace(/°/, " ").replace(/(\d+)-(\d?)/g, "$1 $2").replace(/'/g, " ").replace(/′/g, " ").replace(/"/g, " ").replace(/∼/g, " ").replace(/°/g, " ").replace(/,/g, ".").replace(/^ /g, "").replace(/ $/g, "").trim();
     const b = M[M.length - 1].toUpperCase();
     if (!["N", "S", "E", "W"].includes(b)) {
       const O = M, c = Number(O.split(" ")[0]);
@@ -1302,7 +1307,7 @@ class X {
    */
   static padNumber(M, z = 2, b = 2) {
     const O = X.roundPrecision(M - Math.trunc(M), b), c = O >= 1 ? Math.trunc(M + 1).toString().padStart(z, "0") : Math.trunc(M).toString().padStart(z, "0");
-    return O >= 1 ? c : `${c}.${Math.trunc(O * Math.pow(10, b)).toString().padStart(b, "0")}`;
+    return O >= 1 ? c : b > 0 ? `${c}.${Math.trunc(O * Math.pow(10, b)).toString().padStart(b, "0")}` : c;
   }
 }
 let r0;
@@ -2071,7 +2076,7 @@ class t0 {
           }
           if (z.features.push(...d), (Y == null ? void 0 : Y.length) > 1) {
             const e = N.lineString(X.convertToMonotonicLng2(Y), {
-              date: A.updated,
+              date: (A == null ? void 0 : A.updated) || (L == null ? void 0 : L.format()),
               id: p.id || p.name,
               model: o.model,
               name: p.name,
@@ -2128,7 +2133,7 @@ class t0 {
     const b = (c = M == null ? void 0 : M.data) == null ? void 0 : c.features.filter((q) => q.geometry.type === "LineString" && q.properties.type === "forecast"), O = [];
     for (const q of b) {
       const Y = q.properties.name, d = q.properties.model, L = q.properties.showCircle, T = q.properties.disabled, S = I(q.properties.date).utc();
-      let e = z * 60 - (S.get("hour") * 60 + S.get("minute")) % (z * 60);
+      let e = z * 60;
       const r = (p = M == null ? void 0 : M.data) == null ? void 0 : p.features.filter(
         (P) => P.geometry.type === "Point" && P.properties.type === "forecast" && P.properties.category === `${Y}-${d}`
       );