hn-map 1.1.14 → 1.1.15

package/src/layer/heatMap.ts

@@ -180,9 +180,6 @@ export default (hnMap: any) => {
               type: "Point",
               coordinates: [v.lng, v.lat],
             },
-            properties: {
-              value: v.value,
-            },
           })),
         },
       });

package/src/layer/layer.ts

@@ -28,6 +28,8 @@ export default (hnMap: any) => {
     }
 
     addEntity(entity: any) {
+
+
       if (this.children.find((v: any) => v.id === entity.id)) {
         console.error("已存在同名图形" + entity.id);
       } else {
@@ -38,6 +40,16 @@ export default (hnMap: any) => {
           entity.start();
         } else if (entity.type == "pointCloud" || entity.type == "heatMap") {
           hnMap.map.map.addLayer(entity.layerEntity);
+        } else if (entity.type == "cluster") {
+          // 添加聚合图层到地图
+          hnMap.map.map.addLayer(entity.layerEntity);
+
+          // 如果已有位置数据，立即设置
+          if (entity.option.position && entity.option.position.length > 0) {
+            setTimeout(() => {
+              entity.setPosition(entity.option.position);
+            }, 100);
+          }
         } else {
           this.layerEntity.addGraphic(entity.graphic); // 添加图形
         }
@@ -51,9 +63,7 @@ export default (hnMap: any) => {
           return v.id !== entity.id;
         });
         if (entity.type === "pointCloud" || entity.type === "heatMap") {
-          alert(entity.id);
           hnMap.map.map.removeLayer(entity.id);
-          // entity.id.destroy();
         }
         this.layerEntity.removeGraphic(entity.graphic);
       }
@@ -399,6 +409,24 @@ export default (hnMap: any) => {
           duration: 2000,
           essential: true,
         });
+      } else if (entity.type == "cluster") {
+        hnMap.map.map.addLayer(entity.config_layer);
+        hnMap.map.map.addLayer(entity.config_label);
+        hnMap.map.map.loadImage(
+          entity.option.image,
+          function (error: any, image: any) {
+            entity.config_Image.layout["icon-size"] =
+              entity.option.width / image.width;
+
+            hnMap.map.map.addImage(entity.id + "_poiImage", image);
+            hnMap.map.map.addLayer(entity.config_Image);
+          }
+        );
+        hnMap.map.map.flyTo({
+          center: entity.option.position[0].position,
+          duration: 2000,
+          essential: true,
+        });
       } else {
         hnMap.map.map.addLayer(entity.config);
       }

package/src/layer/pointCloud.ts

@@ -104,6 +104,7 @@ export default (hnMap: any) => {
       ]);
       var modelAltitude = option.position.alt;
       var modelRotate = this.calculateRotationFromDegrees(option.rotation);
+
       var modelScale = option.scale * (1e-6);
 
       var modelTransform = {
@@ -145,10 +146,10 @@ export default (hnMap: any) => {
           this.scene.add(directionalLight2);
 
           // var loader = new THREE.GLTFLoader();
-          var loader = new THREE.ObjectLoader();
+           var loader = new THREE.ObjectLoader();
           let that = this;
-          loader.load(option.url,
-          // 'https://map.sgcc.com.cn/products/js-sdk/v3/assets/model/ZH-SZC3-42.gltf',
+          loader.load(
+          'https://map.sgcc.com.cn/products/js-sdk/v3/assets/model/ZH-SZC3-42.gltf',
             // function (gltf: any) {
             function (object:any) {
               that.scene.add(object);

package/src/map.ts

@@ -21,7 +21,7 @@ export default (hnMap: any) => {
     sj_app_key: "",
     sj_app_secret: "",
     sj_style: "aegis://styles/aegis/Streets-Raster512",
-    sj_route_net:true,
+    sj_route_net: true,
   };
 
   class mars3d_map {
@@ -43,7 +43,6 @@ export default (hnMap: any) => {
       deepMerge(this.option, option);
       this.config = this.formatConfig(this.option);
       this.map = new mars3d.Map(id, this.config);
-
       this.map.on("cameraMoveEnd", (e: any) => {
         const height = this.map.getCameraView().alt;
         this.level = getHeightToLevel(height);
@@ -287,24 +286,21 @@ export default (hnMap: any) => {
       await new Promise((resolve) => {
         instance.map.on("load", (e: any) => {
           // 路况展示
-          if(option.sj_route_net){
+          if (option.sj_route_net) {
             let roadNetLayer = new SGMap.RoadNetLayer({ map: instance.map });
             roadNetLayer.render();
           }
 
           //添加天空图层
           instance.map.addLayer({
-            "id": "sky",
-            "type": "sky",
-            "paint": {
+            id: "sky",
+            type: "sky",
+            paint: {
               "sky-type": "atmosphere",
-              "sky-atmosphere-sun": [
-                0,
-                0
-              ],
-              "sky-atmosphere-sun-intensity": 15
-            }
-          })
+              "sky-atmosphere-sun": [0, 0],
+              "sky-atmosphere-sun-intensity": 15,
+            },
+          });
 
           // 加载地形（需要v3.1.0，且需要新的key和secret）
           // !instance.map.getSource('terrain') && instance.map.addSource('terrain',{
@@ -386,11 +382,14 @@ export default (hnMap: any) => {
       switch (eventType) {
         case "click":
           this.event[eventType] = (event: any) => {
-            callback({
-              lng: event.lngLat.lng,
-              lat: event.lngLat.lat,
-              alt: event.lngLat.alt || 0,
-            });
+            callback(
+              {
+                lng: event.lngLat.lng,
+                lat: event.lngLat.lat,
+                alt: event.lngLat.alt || 0,
+              },
+              event
+            );
           };
           break;
         case "dblclick":

package/src/util.ts

@@ -15,36 +15,36 @@
 
 // 对象深度合并
 export function deepMerge(target: any, source: any): any {
-  for (let key of Object.keys(source)) {
-    if (source[key] instanceof Object && !Array.isArray(source[key])) {
-      if (!target[key]) Object.assign(target, { [key]: {} });
-      deepMerge(target[key], source[key]);
-    } else {
-      Object.assign(target, { [key]: source[key] });
+    for (let key of Object.keys(source)) {
+        if (source[key] instanceof Object && !Array.isArray(source[key])) {
+            if (!target[key]) Object.assign(target, {[key]: {}});
+            deepMerge(target[key], source[key]);
+        } else {
+            Object.assign(target, {[key]: source[key]});
+        }
     }
-  }
-  return target;
+    return target;
 }
 
 // 递归格式化高德坐标系
 export function wgs84ToGcj02Format(position: any): any {
-  // 判断是否是数组
-  if (position.every((item: any) => Array.isArray(item))) {
-    return position.map((item: any) => {
-      return wgs84ToGcj02Format(item);
-    });
-  } else if (position.every((item: any) => typeof item === "object")) {
-    return position.map((item: any) => {
-      let data = wgs84ToGcj02Format([item.lng, item.lat]);
-      return {
-        ...item,
-        lng: data[0],
-        lat: data[1],
-      };
-    });
-  } else {
-    return wgs84ToGcj02(position[0], position[1]);
-  }
+    // 判断是否是数组
+    if (position.every((item: any) => Array.isArray(item))) {
+        return position.map((item: any) => {
+            return wgs84ToGcj02Format(item);
+        });
+    } else if (position.every((item: any) => typeof item === "object")) {
+        return position.map((item: any) => {
+            let data = wgs84ToGcj02Format([item.lng, item.lat]);
+            return {
+                ...item,
+                lng: data[0],
+                lat: data[1],
+            };
+        });
+    } else {
+        return wgs84ToGcj02(position[0], position[1]);
+    }
 }
 
 /**
@@ -54,66 +54,66 @@ export function wgs84ToGcj02Format(position: any): any {
  * @returns {[number, number]} GCJ-02经纬度数组
  */
 export function wgs84ToGcj02(wgsLng: any, wgsLat: any): any {
-  if (!isCorrectPosition(wgsLng, wgsLat)) {
-    return [wgsLng, wgsLat];
-  }
+    if (!isCorrectPosition(wgsLng, wgsLat)) {
+        return [wgsLng, wgsLat];
+    }
 
-  const a = 6378245.0; // 长半轴
-  const ee = 0.00669342162296594323; // 扁率
+    const a = 6378245.0; // 长半轴
+    const ee = 0.00669342162296594323; // 扁率
 
-  function transformLat(x: any, y: any): any {
-    let ret =
-      -100.0 +
-      2.0 * x +
-      3.0 * y +
-      0.2 * y * y +
-      0.1 * x * y +
-      0.2 * Math.sqrt(Math.abs(x));
-    ret +=
-      ((20.0 * Math.sin(6.0 * x * Math.PI) +
-        20.0 * Math.sin(2.0 * x * Math.PI)) *
-        2.0) /
-      3.0;
-    ret +=
-      ((160.0 * Math.sin((y * Math.PI) / 3.0) +
-        320 * Math.sin((y * Math.PI) / 30.0)) *
-        2.0) /
-      3.0;
-    return ret;
-  }
+    function transformLat(x: any, y: any): any {
+        let ret =
+            -100.0 +
+            2.0 * x +
+            3.0 * y +
+            0.2 * y * y +
+            0.1 * x * y +
+            0.2 * Math.sqrt(Math.abs(x));
+        ret +=
+            ((20.0 * Math.sin(6.0 * x * Math.PI) +
+                    20.0 * Math.sin(2.0 * x * Math.PI)) *
+                2.0) /
+            3.0;
+        ret +=
+            ((160.0 * Math.sin((y * Math.PI) / 3.0) +
+                    320 * Math.sin((y * Math.PI) / 30.0)) *
+                2.0) /
+            3.0;
+        return ret;
+    }
 
-  function transformLng(x: any, y: any): any {
-    let ret =
-      300.0 +
-      x +
-      2.0 * y +
-      0.1 * x * x +
-      0.1 * x * y +
-      0.1 * Math.sqrt(Math.abs(x));
-    ret +=
-      ((20.0 * Math.sin(6.0 * x * Math.PI) + 20.0 * Math.sin(x * Math.PI)) *
-        2.0) /
-      3.0;
-    ret +=
-      ((150.0 * Math.sin((x * Math.PI) / 3.0) +
-        300.0 * Math.sin((x * Math.PI) / 15.0)) *
-        2.0) /
-      3.0;
-    return ret;
-  }
+    function transformLng(x: any, y: any): any {
+        let ret =
+            300.0 +
+            x +
+            2.0 * y +
+            0.1 * x * x +
+            0.1 * x * y +
+            0.1 * Math.sqrt(Math.abs(x));
+        ret +=
+            ((20.0 * Math.sin(6.0 * x * Math.PI) + 20.0 * Math.sin(x * Math.PI)) *
+                2.0) /
+            3.0;
+        ret +=
+            ((150.0 * Math.sin((x * Math.PI) / 3.0) +
+                    300.0 * Math.sin((x * Math.PI) / 15.0)) *
+                2.0) /
+            3.0;
+        return ret;
+    }
 
-  let dLat = transformLat(wgsLng - 105.0, wgsLat - 35.0);
-  let dLng = transformLng(wgsLng - 105.0, wgsLat - 35.0);
-  const radLat = (wgsLat / 180.0) * Math.PI;
-  let magic = Math.sin(radLat);
-  magic = 1 - ee * magic * magic;
-  const sqrtMagic = Math.sqrt(magic);
-  dLat = (dLat * 180.0) / (((a * (1 - ee)) / (magic * sqrtMagic)) * Math.PI);
-  dLng = (dLng * 180.0) / ((a / sqrtMagic) * Math.cos(radLat) * Math.PI);
-  const gcjLat = wgsLat + dLat;
-  const gcjLng = wgsLng + dLng;
+    let dLat = transformLat(wgsLng - 105.0, wgsLat - 35.0);
+    let dLng = transformLng(wgsLng - 105.0, wgsLat - 35.0);
+    const radLat = (wgsLat / 180.0) * Math.PI;
+    let magic = Math.sin(radLat);
+    magic = 1 - ee * magic * magic;
+    const sqrtMagic = Math.sqrt(magic);
+    dLat = (dLat * 180.0) / (((a * (1 - ee)) / (magic * sqrtMagic)) * Math.PI);
+    dLng = (dLng * 180.0) / ((a / sqrtMagic) * Math.cos(radLat) * Math.PI);
+    const gcjLat = wgsLat + dLat;
+    const gcjLng = wgsLng + dLng;
 
-  return [gcjLng, gcjLat];
+    return [gcjLng, gcjLat];
 }
 
 /**
@@ -123,46 +123,46 @@ export function wgs84ToGcj02(wgsLng: any, wgsLat: any): any {
  * @returns {boolean}
  */
 export function isCorrectPosition(lng: any, lat: any): boolean {
-  return lng <= 180 && lng >= -180 && lat <= 90 && lat >= -90;
+    return lng <= 180 && lng >= -180 && lat <= 90 && lat >= -90;
 }
 
 // 根据矩形左上角和右上角坐标计算矩形坐标对
 export function createRectangleCoordinates(leftTop: any, rightBottom: any) {
-  const [leftTopLng, leftTopLat] = leftTop;
-  const [rightBottomLng, rightBottomLat] = rightBottom;
+    const [leftTopLng, leftTopLat] = leftTop;
+    const [rightBottomLng, rightBottomLat] = rightBottom;
 
-  // 计算四个角点
-  const leftTopPoint = [Number(leftTopLng), Number(leftTopLat)];
-  const rightTopPoint = [Number(rightBottomLng), Number(leftTopLat)];
-  const rightBottomPoint = [Number(rightBottomLng), Number(rightBottomLat)];
-  const leftBottomPoint = [Number(leftTopLng), Number(rightBottomLat)];
+    // 计算四个角点
+    const leftTopPoint = [Number(leftTopLng), Number(leftTopLat)];
+    const rightTopPoint = [Number(rightBottomLng), Number(leftTopLat)];
+    const rightBottomPoint = [Number(rightBottomLng), Number(rightBottomLat)];
+    const leftBottomPoint = [Number(leftTopLng), Number(rightBottomLat)];
 
-  // 返回五个点的坐标对（首尾相同）
-  return [
-    leftTopPoint,
-    rightTopPoint,
-    rightBottomPoint,
-    leftBottomPoint,
-    leftTopPoint, // 闭合矩形
-  ];
+    // 返回五个点的坐标对（首尾相同）
+    return [
+        leftTopPoint,
+        rightTopPoint,
+        rightBottomPoint,
+        leftBottomPoint,
+        leftTopPoint, // 闭合矩形
+    ];
 }
 
 export function getMapRangeHeightByLevel(level: number) {
-  // 输入校验：限制在 1~18
-  level = Math.max(1, Math.min(18, Math.floor(level)));
+    // 输入校验：限制在 1~18
+    level = Math.max(1, Math.min(18, Math.floor(level)));
 
-  // 计算指定 level 对应的高度（level >= 2 时使用指数衰减）
-  function getHeight(lvl: number) {
-    if (lvl === 1) {
-      return Infinity; // level=1 表示“最大高度”，逻辑上为无穷大
-    } else {
-      return 32000000 / Math.pow(2, lvl - 2);
+    // 计算指定 level 对应的高度（level >= 2 时使用指数衰减）
+    function getHeight(lvl: number) {
+        if (lvl === 1) {
+            return Infinity; // level=1 表示“最大高度”，逻辑上为无穷大
+        } else {
+            return 32000000 / Math.pow(2, lvl - 2);
+        }
     }
-  }
 
-  const endHeight = getHeight(level); // 当前 level 的“粗略”高度
-  const startHeight = level < 18 ? getHeight(level + 1) : 0; // 下一级更细
-  return { startHeight, endHeight };
+    const endHeight = getHeight(level); // 当前 level 的“粗略”高度
+    const startHeight = level < 18 ? getHeight(level + 1) : 0; // 下一级更细
+    return {startHeight, endHeight};
 }
 
 /**
@@ -172,15 +172,18 @@ export function getMapRangeHeightByLevel(level: number) {
  * @returns {number} 中间高度（米）
  */
 export function getLevelMiddleHeight(level: number): number {
-  const { startHeight, endHeight } = getMapRangeHeightByLevel(level);
-  // 如果 startHeight 为 0（如 level=18），几何平均会为 0，不合理
-  // 所以 level=18 特殊处理：返回 (0 + end)/2 或直接返回 end * 0.7 左右
-  if (startHeight === 0) {
-    return endHeight * 0.7; // 经验值，贴近“中间感知”
-  }
-
-  // 几何平均：√(start × end)
-  return Math.sqrt(startHeight * endHeight);
+    // const { startHeight, endHeight } = getMapRangeHeightByLevel(level);
+    // // 如果 startHeight 为 0（如 level=18），几何平均会为 0，不合理
+    // // 所以 level=18 特殊处理：返回 (0 + end)/2 或直接返回 end * 0.7 左右
+    // if (startHeight === 0) {
+    //   return endHeight * 0.7; // 经验值，贴近“中间感知”
+    // }
+    //
+    // // 几何平均：√(start × end)
+    // return Math.sqrt(startHeight * endHeight);
+    const EARTH_RADIUS = 6378137; // 赤道半径
+    const height = (2 * Math.PI * EARTH_RADIUS) / (256 * Math.pow(2, level))
+    return height;
 }
 
 /**
@@ -193,8 +196,8 @@ export function getLevelMiddleHeight(level: number): number {
  * @returns {[number, number]} [开始高度, 结束高度]（单位：米）
  */
 export function getLevelHeightRange(level: number): [number, number] {
-  const { startHeight, endHeight } = getMapRangeHeightByLevel(level);
-  return [startHeight, endHeight];
+    const {startHeight, endHeight} = getMapRangeHeightByLevel(level);
+    return [startHeight, endHeight];
 }
 
 /**
@@ -203,96 +206,97 @@ export function getLevelHeightRange(level: number): [number, number] {
  * @returns {number} level
  */
 export function getHeightToLevel(height: number): number {
-  if (height > 32000000) return 1;
-  if (height <= 0) return 18;
+    if (height > 32000000) return 1;
+    if (height <= 0) return 18;
 
-  // 解公式：height = 32e6 / 2^(level-2)
-  let level = 2 + Math.log(32000000 / height) / Math.log(2);
-  level = Math.floor(level);
+    // 解公式：height = 32e6 / 2^(level-2)
+    let level = 2 + Math.log(32000000 / height) / Math.log(2);
+    level = Math.floor(level);
 
-  // 限制在 1~18
-  return Math.max(1, Math.min(18, level));
+    // 限制在 1~18
+    return Math.max(1, Math.min(18, level));
 }
+
 // 將坐标数组中的元素字符串类型统一处理为number类型
 export function convertPosition(
-  position: string[] | string[][] | string[][][]
+    position: string[] | string[][] | string[][][]
 ): number[] | number[][] | number[][][] {
-  return position.map((item) => {
-    if (Array.isArray(item)) {
-      return item.map((innerItem) => {
-        if (Array.isArray(innerItem)) {
-          // 第三层，将每个字符串转数字
-          return innerItem.map((str) => Number(str));
+    return position.map((item) => {
+        if (Array.isArray(item)) {
+            return item.map((innerItem) => {
+                if (Array.isArray(innerItem)) {
+                    // 第三层，将每个字符串转数字
+                    return innerItem.map((str) => Number(str));
+                } else {
+                    return Number(innerItem);
+                }
+            });
         } else {
-          return Number(innerItem);
+            return Number(item);
         }
-      });
-    } else {
-      return Number(item);
-    }
-  }) as number[] | number[][] | number[][][];
+    }) as number[] | number[][] | number[][][];
 }
 
 // mars3d 地图重写瓦片加载失败的回调，使控制台过滤掉瓦片加载失败的报错
 export function mars3dTileErrorHandler() {
-  // 确保 Cesium 已加载
-  if (typeof Cesium !== 'undefined' && Cesium.TileProviderError) {
-    const originalReportError = Cesium.TileProviderError.reportError;
+    // 确保 Cesium 已加载
+    if (typeof Cesium !== 'undefined' && Cesium.TileProviderError) {
+        const originalReportError = Cesium.TileProviderError.reportError;
 
-    Cesium.TileProviderError.reportError = function (
-        existingError:any,
-        provider:any,
-        errorEvent:any,
-        message:any,
-        x:any,
-        y:any,
-        level:any,
-        error:any
-    ) {
-      // 可选：判断是否为“瓦片不存在”类错误（如 404、fetch 失败等）
-      const shouldIgnore =
-          message?.includes('Failed to obtain image') ||
-          message?.includes('无法获得图块') ||
-          message?.includes('404') ||
-          (error && error.status === 404) ||
-          message?.includes('NetworkError') ||
-          message?.includes('not found');
+        Cesium.TileProviderError.reportError = function (
+            existingError: any,
+            provider: any,
+            errorEvent: any,
+            message: any,
+            x: any,
+            y: any,
+            level: any,
+            error: any
+        ) {
+            // 可选：判断是否为“瓦片不存在”类错误（如 404、fetch 失败等）
+            const shouldIgnore =
+                message?.includes('Failed to obtain image') ||
+                message?.includes('无法获得图块') ||
+                message?.includes('404') ||
+                (error && error.status === 404) ||
+                message?.includes('NetworkError') ||
+                message?.includes('not found');
 
-      if (shouldIgnore) {
-        // 静默处理：不打印日志，但仍可触发 errorEvent（供自定义监听）
-        // 注意：仍需调用 raiseEvent（如果有人监听），但跳过 console.log
-        if (Cesium.defined(errorEvent) && errorEvent.numberOfListeners > 0) {
-          let tileError = existingError;
-          if (Cesium.defined(existingError)) {
-            tileError.provider = provider;
-            tileError.message = message;
-            tileError.x = x;
-            tileError.y = y;
-            tileError.level = level;
-            tileError.retry = false;
-            tileError.error = error;
-            tileError.timesRetried = Cesium.defaultValue(tileError.timesRetried, 0) + 1;
-          } else {
-            tileError = new Cesium.TileProviderError(
-                provider,
-                message,
-                x,
-                y,
-                level,
-                0,
-                error
-            );
-          }
-          errorEvent.raiseEvent(tileError);
-          return tileError;
-        } else {
-          // 没人监听，且我们不想打印 → 直接返回一个空错误对象（或 null）
-          return existingError || new Cesium.TileProviderError(provider, message, x, y, level, 0, error);
-        }
-      }
+            if (shouldIgnore) {
+                // 静默处理：不打印日志，但仍可触发 errorEvent（供自定义监听）
+                // 注意：仍需调用 raiseEvent（如果有人监听），但跳过 console.log
+                if (Cesium.defined(errorEvent) && errorEvent.numberOfListeners > 0) {
+                    let tileError = existingError;
+                    if (Cesium.defined(existingError)) {
+                        tileError.provider = provider;
+                        tileError.message = message;
+                        tileError.x = x;
+                        tileError.y = y;
+                        tileError.level = level;
+                        tileError.retry = false;
+                        tileError.error = error;
+                        tileError.timesRetried = Cesium.defaultValue(tileError.timesRetried, 0) + 1;
+                    } else {
+                        tileError = new Cesium.TileProviderError(
+                            provider,
+                            message,
+                            x,
+                            y,
+                            level,
+                            0,
+                            error
+                        );
+                    }
+                    errorEvent.raiseEvent(tileError);
+                    return tileError;
+                } else {
+                    // 没人监听，且我们不想打印 → 直接返回一个空错误对象（或 null）
+                    return existingError || new Cesium.TileProviderError(provider, message, x, y, level, 0, error);
+                }
+            }
 
-      // 非忽略错误：走原始逻辑
-      return originalReportError.apply(this, arguments);
-    };
-  }
+            // 非忽略错误：走原始逻辑
+            return originalReportError.apply(this, arguments);
+        };
+    }
 }