hn-map 1.1.16 → 1.1.17

package/src/layer/geoJson.ts

@@ -1,174 +1,174 @@
-import {deepMerge, wgs84ToGcj02Format} from '../util'
-
-let baseGeoData: any = {
-    type: 'FeatureCollection',
-    name: '',
-    crs: {},
-    features: [
-        {
-            type: 'Feature',
-            properties: {},
-            geometry: {
-                type: 'MultiPolygon',
-                coordinates: [[[]]]
-            }
-        }
-    ]
-}
-export default (hnMap: any) => {
-
-    const defaultOption = {
-        id: "",
-        data: baseGeoData,
-        opacity: 1,
-        line: {
-            show: true,
-            color: "#ff00ff",
-            opacity: 1,
-            width: 2,
-        },
-        area: {
-            show: false,
-            color: "#ffff00",
-            opacity: 1,
-        }
-    }
-
-    class mars3d_class {
-        type: any = 'geoJson'
-        id: any = null
-        option: any = JSON.parse(JSON.stringify(defaultOption))
-        config: any = null
-        layerEntity: any = null
-
-        constructor(option: any) {
-            this.id = option.id
-            deepMerge(this.option, option)
-            this.config = this.formatConfig(this.option)
-            this.layerEntity = new mars3d.layer.GeoJsonLayer(this.config)
-        }
-
-        formatConfig(option: any) {
-            return {
-                name: option.id,
-                id: option.id,
-                allowDrillPick: true,
-                data: option.data,
-                symbol: {
-                    styleOptions: {
-                        clampToGround: true,
-                        fill: option.area.show,
-                        randomColor: !!(option.area.show && option.area.color), // 随机色
-                        outline: option.line.show,
-                        opacity: option.opacity,
-                        outlineStyle: {
-                            color: option.line.color,
-                            width: option.line.width,
-                            opacity: option.line.opacity,
-                        },
-                    }
-                },
-                // flyTo: true,
-                // attr: option.data
-            }
-        }
-
-        set(option: any) {
-            deepMerge(this.option, option)
-            this.config = this.formatConfig(this.option)
-            this.layerEntity.setOptions(this.config)
-        }
-
-        customStyle(callback: any) {
-            this.layerEntity.options.symbol.callback = (attr: any) => {
-                return callback(attr)
-            }
-        }
-
-        destroy() {
-            this.layerEntity.remove(true)
-            hnMap.map.layerList = hnMap.map.layerList.filter((v: any) => v.id !== this.id)
-        }
-
-        setData(data: any) {
-            this.layerEntity.loadGeoJSON(data, {clear: true})
-        }
-
-        clear() {
-            this.layerEntity.clear()
-        }
-
-        flyTo() {
-            this.layerEntity.flyTo()
-        }
-
-        // 添加属性弹窗
-        addPopupByAttr() {
-            this.layerEntity.bindPopup((event: any) => {
-                if (event.graphic.attr) {
-                    const data = event.graphic.attr
-                    return mars3d.Util.getTemplateHtml({title: "详情", template: "all", attr: data})
-                }
-            })
-        }
-
-        // 添加自定义dom弹窗
-        addCustomPopup(getCustomDom: any) {
-            this.layerEntity.bindPopup(async (event: any) => {
-                if (event.graphic.attr) {
-                    const data = event.graphic.attr || {};
-                    return await getCustomDom(data);
-                }
-            }, {offsetY: -20});
-        }
-
-    }
-
-    class gaode_class {
-
-        id: any = null
-        option: any = JSON.parse(JSON.stringify(defaultOption))
-        config: any = null
-        layerEntity: any = null
-
-        constructor(option: any) {
-            this.id = option.id
-            deepMerge(this.option, option)
-            this.config = this.formatConfig(this.option)
-            this.layerEntity = new AMap.HeatMap(hnMap.map.map, this.config)
-        }
-
-        formatConfig(option: any) {
-            const data = option.position.map((v: any) => {
-                return {lng: v.lng, lat: v.lat, count: v.value}
-            })
-            const amapData = wgs84ToGcj02Format(data)
-
-            return {}
-        }
-
-        set(option: any) {
-            deepMerge(this.option, option)
-            this.config = this.formatConfig(this.option)
-            this.layerEntity.setOptions(this.config)
-        }
-
-        destroy() {
-            this.layerEntity.setMap(null)
-            hnMap.map.layerList = hnMap.map.layerList.filter((v: any) => v.id !== this.id)
-        }
-
-
-        flyTo() {
-
-        }
-
-    }
-
-    const fn: any = {
-        mars3d: mars3d_class,
-        gaode: gaode_class
-    }
-
-    return fn[hnMap.mapType]
-}
+import {deepMerge, wgs84ToGcj02Format} from '../util'
+
+let baseGeoData: any = {
+    type: 'FeatureCollection',
+    name: '',
+    crs: {},
+    features: [
+        {
+            type: 'Feature',
+            properties: {},
+            geometry: {
+                type: 'MultiPolygon',
+                coordinates: [[[]]]
+            }
+        }
+    ]
+}
+export default (hnMap: any) => {
+
+    const defaultOption = {
+        id: "",
+        data: baseGeoData,
+        opacity: 1,
+        line: {
+            show: true,
+            color: "#ff00ff",
+            opacity: 1,
+            width: 2,
+        },
+        area: {
+            show: false,
+            color: "#ffff00",
+            opacity: 1,
+        }
+    }
+
+    class mars3d_class {
+        type: any = 'geoJson'
+        id: any = null
+        option: any = JSON.parse(JSON.stringify(defaultOption))
+        config: any = null
+        layerEntity: any = null
+
+        constructor(option: any) {
+            this.id = option.id
+            deepMerge(this.option, option)
+            this.config = this.formatConfig(this.option)
+            this.layerEntity = new mars3d.layer.GeoJsonLayer(this.config)
+        }
+
+        formatConfig(option: any) {
+            return {
+                name: option.id,
+                id: option.id,
+                allowDrillPick: true,
+                data: option.data,
+                symbol: {
+                    styleOptions: {
+                        clampToGround: true,
+                        fill: option.area.show,
+                        randomColor: !!(option.area.show && option.area.color), // 随机色
+                        outline: option.line.show,
+                        opacity: option.opacity,
+                        outlineStyle: {
+                            color: option.line.color,
+                            width: option.line.width,
+                            opacity: option.line.opacity,
+                        },
+                    }
+                },
+                // flyTo: true,
+                // attr: option.data
+            }
+        }
+
+        set(option: any) {
+            deepMerge(this.option, option)
+            this.config = this.formatConfig(this.option)
+            this.layerEntity.setOptions(this.config)
+        }
+
+        customStyle(callback: any) {
+            this.layerEntity.options.symbol.callback = (attr: any) => {
+                return callback(attr)
+            }
+        }
+
+        destroy() {
+            this.layerEntity.remove(true)
+            hnMap.map.layerList = hnMap.map.layerList.filter((v: any) => v.id !== this.id)
+        }
+
+        setData(data: any) {
+            this.layerEntity.loadGeoJSON(data, {clear: true})
+        }
+
+        clear() {
+            this.layerEntity.clear()
+        }
+
+        flyTo() {
+            this.layerEntity.flyTo()
+        }
+
+        // 添加属性弹窗
+        addPopupByAttr() {
+            this.layerEntity.bindPopup((event: any) => {
+                if (event.graphic.attr) {
+                    const data = event.graphic.attr
+                    return mars3d.Util.getTemplateHtml({title: "详情", template: "all", attr: data})
+                }
+            })
+        }
+
+        // 添加自定义dom弹窗
+        addCustomPopup(getCustomDom: any) {
+            this.layerEntity.bindPopup(async (event: any) => {
+                if (event.graphic.attr) {
+                    const data = event.graphic.attr || {};
+                    return await getCustomDom(data);
+                }
+            }, {offsetY: -20});
+        }
+
+    }
+
+    class gaode_class {
+
+        id: any = null
+        option: any = JSON.parse(JSON.stringify(defaultOption))
+        config: any = null
+        layerEntity: any = null
+
+        constructor(option: any) {
+            this.id = option.id
+            deepMerge(this.option, option)
+            this.config = this.formatConfig(this.option)
+            this.layerEntity = new AMap.HeatMap(hnMap.map.map, this.config)
+        }
+
+        formatConfig(option: any) {
+            const data = option.position.map((v: any) => {
+                return {lng: v.lng, lat: v.lat, count: v.value}
+            })
+            const amapData = wgs84ToGcj02Format(data)
+
+            return {}
+        }
+
+        set(option: any) {
+            deepMerge(this.option, option)
+            this.config = this.formatConfig(this.option)
+            this.layerEntity.setOptions(this.config)
+        }
+
+        destroy() {
+            this.layerEntity.setMap(null)
+            hnMap.map.layerList = hnMap.map.layerList.filter((v: any) => v.id !== this.id)
+        }
+
+
+        flyTo() {
+
+        }
+
+    }
+
+    const fn: any = {
+        mars3d: mars3d_class,
+        gaode: gaode_class
+    }
+
+    return fn[hnMap.mapType]
+}

package/src/layer/layer.ts

@@ -552,13 +552,25 @@ export default (hnMap: any) => {
       this.layerEntity.show = this.show;
 
       // 添加到地图
-      hnMap.map.dataSources.add(this.layerEntity);
+      // 注意：这里需要确保 hnMap.map.dataSources 存在且可用
+      if (hnMap.map && hnMap.map.dataSources) {
+        if (typeof hnMap.map.dataSources.add === "function") {
+          hnMap.map.dataSources.add(this.layerEntity);
+        } else {
+          console.warn("无法添加数据源到地图");
+        }
+      } else {
+        console.warn("地图数据源不可用");
+      }
     }
     formatConfig(option: any) {
       return option;
     }
     // 添加图形
+    // 添加图形
     addEntity(entity: any) {
+      console.log("添加图形到Cesium图层", entity);
+
       if (this.children.find((v: any) => v.id === entity.id)) {
         console.error(`已存在同名图形: ${entity.id}`);
         return;
@@ -577,13 +589,34 @@ export default (hnMap: any) => {
         } else if (entity.type === "heatMap") {
           // 热力图特殊处理
           this.handleHeatMap(entity);
+        } else if (entity.type === "line") {
+          // 线要素 - 确保添加到地图
+          this.handleLineEntity(entity);
         } else {
           // 普通实体
+          console.log("添加普通实体到Cesium:", entity.graphic);
           this.layerEntity.entities.add(entity.graphic);
         }
       }
     }
 
+    // 处理线实体
+    handleLineEntity(entity: any) {
+      console.log("处理线实体:", entity);
+
+      if (entity.entity) {
+        // 如果是Cesium实体，直接添加到数据源
+        console.log("添加线实体到数据源:", entity.entity);
+        this.layerEntity.entities.add(entity.entity);
+      } else if (entity.graphic && entity.graphic instanceof Cesium.Entity) {
+        // 如果graphic是Cesium实体
+        console.log("添加graphic作为Cesium实体");
+        this.layerEntity.entities.add(entity.graphic);
+      } else {
+        console.warn("线实体格式不支持:", entity);
+      }
+    }
+
     // 处理集群
     handleCluster(entity: any) {
       // 集群有自己的管理逻辑
@@ -653,7 +686,14 @@ export default (hnMap: any) => {
     // 销毁图层
     destroy() {
       this.clearEntity();
-      hnMap.map.dataSources.remove(this.layerEntity);
+      // 从地图移除数据源
+      if (
+        hnMap.map &&
+        hnMap.map.dataSources &&
+        typeof hnMap.map.dataSources.remove === "function"
+      ) {
+        hnMap.map.dataSources.remove(this.layerEntity);
+      }
 
       // 从图层列表中移除
       const index = hnMap.map.layerList.findIndex((v: any) => v.id === this.id);