gis-common 5.1.12 → 5.1.14

package/dist/gis-common.es.js

@@ -285,7 +285,7 @@ const Util = {
    * @returns 解码后的字符串
    */
   decodeDict(...args) {
-    let res = "";
+    let res = null;
     if (args.length > 1) {
       const items = args.slice(1, args.length % 2 === 0 ? args.length - 1 : args.length);
       for (let i = 0; i < items.length; i = i + 2) {
@@ -1223,18 +1223,6 @@ class GeoUtil {
     const y = earthRad / 2 * Math.log((1 + Math.sin(a)) / (1 - Math.sin(a)));
     return { x, y };
   }
-  /**
-   * 根据百分比获取坐标
-   *
-   * @param start 起点坐标
-   * @param end 终点坐标
-   * @param percent 百分比，取值范围0-1
-   * @returns 返回插值后的坐标
-   */
-  static interpolate({ x: x1, y: y1, z: z1 = 0 }, { x: x2, y: y2, z: z2 = 0 }, percent) {
-    const dx = x2 - x1, dy = y2 - y1, dz = z2 - z1;
-    return { x: x1 + dx * percent, y: y1 + dy * percent, z: z1 + dz * percent };
-  }
   /**
    * 计算三角形面积
    *
@@ -1281,25 +1269,22 @@ class GeoUtil {
     };
   }
   /**
-   * 在两点之间的线段上进行插值计算
+   * 根据百分比获取坐标
    *
    * @param pA 线段起点，可以是Coordinate类型（包含x,y属性）或LngLat类型（包含lng,lat属性）
    * @param pB 线段终点，可以是Coordinate类型（包含x,y属性）或LngLat类型（包含lng,lat属性）
    * @param ratio 插值比例，0表示在起点pA，1表示在终点pB，0-1之间表示两点间的插值点
    * @returns 返回插值点坐标，类型与输入参数保持一致
    */
-  static interpolateOnSegment(pA, pB, ratio) {
-    ratio = MathUtil.clamp(ratio, 0, 1);
+  static interpolate(pA, pB, ratio) {
     if ("x" in pA && "y" in pA && "x" in pB && "y" in pB) {
-      return {
-        x: pA.x * (1 - ratio) + ratio * pB.x,
-        y: pA.y * (1 - ratio) + ratio * pB.y
-      };
+      const dx = pB.x - pA.x;
+      const dy = pB.y - pA.y;
+      return { x: pA.x + dx * ratio, y: pA.y + dy * ratio };
     } else if ("lng" in pA && "lat" in pA && "lng" in pB && "lat" in pB) {
-      return {
-        lng: pA.lng * (1 - ratio) + ratio * pB.lng,
-        lat: pA.lat * (1 - ratio) + ratio * pB.lat
-      };
+      const dx = pB.lng - pA.lng;
+      const dy = pB.lat - pA.lat;
+      return { x: pA.lng + dx * ratio, y: pA.lat + dy * ratio };
     }
   }
 }
@@ -1469,7 +1454,7 @@ class Color {
     this._r = r;
     this._g = g;
     this._b = b;
-    this._alpha = MathUtil.clamp(a || 1, 0, 1);
+    this._alpha = MathUtil.clamp(a ?? 1, 0, 1);
   }
   _validateColorChannel(channel) {
     if (channel < 0 || channel > 255) {
@@ -1492,7 +1477,7 @@ class Color {
     return Color.rgb2hex(this._r, this._g, this._b, this._alpha);
   }
   setAlpha(a) {
-    this._alpha = MathUtil.clamp(a, 0, 1);
+    this._alpha = MathUtil.clamp(a ?? 1, 0, 1);
     return this;
   }
   // 设置颜色的RGB值