hn-map 1.1.14 → 1.1.16

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

@@ -38,6 +38,17 @@ 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);
+              entity.flyTo();
+            }, 100);
+          }
         } else {
           this.layerEntity.addGraphic(entity.graphic); // 添加图形
         }
@@ -51,9 +62,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);
       }
@@ -180,7 +189,6 @@ export default (hnMap: any) => {
       if (this.children.find((v: any) => v.id === entity.id)) {
         console.error("已存在同名图形" + entity.id);
       } else {
-        alert(entity.id);
         this.children.push(entity);
         this.layerEntity.addOverlay(entity.graphic); // 添加图形
 
@@ -399,6 +407,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);
       }
@@ -507,10 +533,186 @@ export default (hnMap: any) => {
     }
   }
 
+  class cesium_class {
+    type: any = "layer";
+    id: any = null;
+    option: any = JSON.parse(JSON.stringify(defaultOption));
+    config: any = null;
+    children: any = null;
+    layerEntity: any = null;
+    show: boolean = true;
+    constructor(option: any) {
+      this.id = option.id;
+      this.children = [];
+      deepMerge(this.option, option);
+      this.config = this.formatConfig(this.option);
+
+      // 创建数据源
+      this.layerEntity = new Cesium.CustomDataSource(this.id);
+      this.layerEntity.show = this.show;
+
+      // 添加到地图
+      hnMap.map.dataSources.add(this.layerEntity);
+    }
+    formatConfig(option: any) {
+      return option;
+    }
+    // 添加图形
+    addEntity(entity: any) {
+      if (this.children.find((v: any) => v.id === entity.id)) {
+        console.error(`已存在同名图形: ${entity.id}`);
+        return;
+      }
+
+      this.children.push(entity);
+
+      // 根据图形类型处理
+      if (entity.graphic) {
+        if (entity.type === "cluster") {
+          // 集群特殊处理
+          this.handleCluster(entity);
+        } else if (entity.type === "pointCloud") {
+          // 点云特殊处理
+          this.handlePointCloud(entity);
+        } else if (entity.type === "heatMap") {
+          // 热力图特殊处理
+          this.handleHeatMap(entity);
+        } else {
+          // 普通实体
+          this.layerEntity.entities.add(entity.graphic);
+        }
+      }
+    }
+
+    // 处理集群
+    handleCluster(entity: any) {
+      // 集群有自己的管理逻辑
+      entity.layer = this;
+      // 集群会自己管理添加到地图
+    }
+
+    // 处理点云
+    handlePointCloud(entity: any) {
+      // 点云有自己的图层管理
+      if (entity.layerEntity) {
+        hnMap.map.scene.primitives.add(entity.layerEntity);
+      }
+    }
+
+    // 处理热力图
+    handleHeatMap(entity: any) {
+      // 热力图有自己的图层管理
+      if (entity.layerEntity) {
+        hnMap.map.scene.primitives.add(entity.layerEntity);
+      }
+    }
+
+    // 移除图形
+    removeEntity(entityParam: string) {
+      const entity = this.getEntity(entityParam);
+      if (entity) {
+        this.children = this.children.filter((v: any) => v.id !== entity.id);
+
+        if (entity.graphic) {
+          if (entity.type === "cluster") {
+            entity.destroy();
+          } else if (
+            entity.type === "pointCloud" ||
+            entity.type === "heatMap"
+          ) {
+            if (entity.layerEntity) {
+              hnMap.map.scene.primitives.remove(entity.layerEntity);
+            }
+          } else {
+            this.layerEntity.entities.remove(entity.graphic);
+          }
+        }
+
+        if (entity.destroy) {
+          entity.destroy();
+        }
+      }
+    }
+
+    // 获取图形
+    getEntity(entityId: string) {
+      return this.children.find((v: any) => v.id === entityId);
+    }
+
+    // 清除所有图形
+    clearEntity() {
+      this.children.forEach((entity: any) => {
+        if (entity.destroy) entity.destroy();
+        if (entity.graphic) {
+          this.layerEntity.entities.remove(entity.graphic);
+        }
+      });
+      this.children = [];
+    }
+
+    // 销毁图层
+    destroy() {
+      this.clearEntity();
+      hnMap.map.dataSources.remove(this.layerEntity);
+
+      // 从图层列表中移除
+      const index = hnMap.map.layerList.findIndex((v: any) => v.id === this.id);
+      if (index > -1) {
+        hnMap.map.layerList.splice(index, 1);
+      }
+    }
+
+    // 飞向图层
+    flyTo() {
+      if (this.children.length > 0) {
+        // 计算所有实体的边界
+        const positions: any[] = [];
+        this.children.forEach((entity: any) => {
+          if (entity.option.position) {
+            positions.push(entity.option.position);
+          } else if (entity.option.positions) {
+            positions.push(...entity.option.positions);
+          }
+        });
+
+        if (positions.length > 0) {
+          // 飞向边界
+          const cartesians = positions.map((pos) =>
+            Cesium.Cartesian3.fromDegrees(pos[0], pos[1], pos[2] || 0)
+          );
+          const boundingSphere = Cesium.BoundingSphere.fromPoints(cartesians);
+
+          hnMap.map.flyToBoundingSphere(boundingSphere, {
+            duration: 2,
+            offset: new Cesium.HeadingPitchRange(0, -Cesium.Math.PI / 4, 0),
+          });
+        }
+      }
+    }
+
+    // 添加属性弹窗
+    addPopupByAttr() {
+      this.children.forEach((entity: any) => {
+        if (entity.addPopupByAttr) {
+          entity.addPopupByAttr();
+        }
+      });
+    }
+
+    // 添加自定义弹窗
+    addCustomPopup(getCustomDom: Function) {
+      this.children.forEach((entity: any) => {
+        if (entity.addCustomPopup) {
+          entity.addCustomPopup(getCustomDom);
+        }
+      });
+    }
+  }
   const fn: any = {
     mars3d: mars3d_class,
     gaode: gaode_class,
     siji: siji_class,
+    cesium: cesium_class,
   };
 
   return fn[hnMap.mapType];

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);