hn-map 1.1.16 → 1.1.17

package/src/map.ts

@@ -24,7 +24,6 @@ export default (hnMap: any) => {
     sj_route_net: true,
     // Cesium配置
     cesium_accessToken: "",
-    cesium_baseUrl: "",
     cesium_terrainProvider: null,
     cesium_imageryProvider: null,
     cesium_options: {},
@@ -473,14 +472,33 @@ export default (hnMap: any) => {
     event: any = {};
     level: any = null;
     // 数据源集合
-    dataSources: any = new Cesium.CustomDataSource("hnMap_dataSources");
+    // dataSources: any = new Cesium.CustomDataSource("hnMap_dataSources");
+    //  // 数据源集合 - 改为初始化为数组
+    // dataSources: any[] = [];
+
     private constructor(id: any, option: any) {
       this.layerList = [];
-      this.level = 10;
+      this.level = 6;
       deepMerge(this.option, option);
       this.config = this.formatConfig(this.option);
+
+      // 创建Viewer前确保Cesium已加载
+      if (typeof Cesium === "undefined") {
+        throw new Error("Cesium未加载，请检查资源加载顺序");
+      }
+
       this.map = new Cesium.Viewer(id, this.config);
 
+      // 确保 dataSources 存在且是正确的类型
+      if (!this.map.dataSources) {
+        this.map.dataSources = new Cesium.DataSourceCollection();
+      }
+
+      // 隐藏版权信息
+      if (this.map._cesiumWidget && this.map._cesiumWidget._creditContainer) {
+        this.map._cesiumWidget._creditContainer.style.display = "none";
+      }
+
       // 监听相机移动事件
       this.map.camera.moveEnd.addEventListener(() => {
         const camera = this.map.camera;
@@ -493,8 +511,6 @@ export default (hnMap: any) => {
           this.event.cameraMoveEnd();
         }
       });
-      // 添加自定义数据源
-      this.map.dataSources.add(this.dataSources);
 
       // 设置初始视图
       const { lat, lng, level, heading, pitch, roll } = this.option;
@@ -516,10 +532,10 @@ export default (hnMap: any) => {
     static async create(id: string, option: any) {
       const instance = new cesium_map(id, option);
 
-      // 返回一个 Promise，等待地图的 'ready' 事件
-      await new Promise<void>((resolve) => {
-        resolve();
-      });
+      // 等待场景初始化完成
+      if (instance.map.scene.initializePromise) {
+        await instance.map.scene.initializePromise;
+      }
 
       return instance;
     }
@@ -527,103 +543,32 @@ export default (hnMap: any) => {
     formatConfig(option: any) {
       const config: any = {
         ...option.cesium_options,
-        // 设置不显示商标
-        imageryProvider: new Cesium.ArcGisMapServerImageryProvider({
-          url: "https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer",
-          enablePickFeatures: false,
-        }),
+        animation: false, // 关闭动画控件
+        timeline: false, // 关闭时间轴
+        navigationHelpButton: false, // 关闭导航帮助按钮
+
+        selectionIndicator: false, // 关闭选择指示器
+        homeButton: false, // 关闭主页按钮
+
+        shouldAnimate: true, // 允许动画
       };
 
       // 设置地形 - 兼容性处理
       if (option.cesium_terrainProvider) {
         config.terrainProvider = option.cesium_terrainProvider;
-      } else {
-        config.terrainProvider = this.createTerrainProvider();
       }
-
       // 设置影像 - 兼容性处理
       if (option.cesium_imageryProvider) {
         config.imageryProvider = option.cesium_imageryProvider;
-      } else {
-        config.imageryProvider = this.createImageryProvider();
       }
 
       return config;
     }
 
-    // 创建地形提供者（兼容各版本）
-    createTerrainProvider() {
-      // 检查是否支持createWorldTerrain
-      if (typeof Cesium.createWorldTerrain === "function") {
-        // 1.107及以上版本
-        return Cesium.createWorldTerrain({
-          requestWaterMask: true,
-          requestVertexNormals: true,
-        });
-      } else if (Cesium.CesiumTerrainProvider) {
-        // 1.106及以下版本
-        const terrainUrl = this.getTerrainUrl();
-        return new Cesium.CesiumTerrainProvider({
-          url: terrainUrl,
-          requestWaterMask: true,
-          requestVertexNormals: true,
-        });
-      } else {
-        // 没有地形
-        console.warn("Cesium地形不可用，使用无地形模式");
-        return new Cesium.EllipsoidTerrainProvider();
-      }
-    }
-
-    // 获取地形URL（兼容处理）
-    getTerrainUrl() {
-      // 根据不同版本的API获取地形URL
-      if (Cesium.IonResource && Cesium.IonResource.fromAssetId) {
-        return Cesium.IonResource.fromAssetId(1);
-      } else if (Cesium.Ion && Cesium.Ion.defaultServer) {
-        return `${Cesium.Ion.defaultServer.url}/assets/1/quantized-mesh`;
-      } else {
-        // 使用Cesium官方的地形服务
-        return "https://assets.cesium.com/1/";
-      }
-    }
-
-    // 创建影像提供者（兼容各版本）
-    createImageryProvider() {
-      // 默认使用Bing地图或ArcGIS
-      try {
-        // 尝试创建Bing地图
-        if (Cesium.BingMapsImageryProvider) {
-          return new Cesium.BingMapsImageryProvider({
-            url: "https://dev.virtualearth.net",
-            key: this.option.cesium_bing_key || "", // 需要Bing Maps Key
-            mapStyle: Cesium.BingMapsStyle.AERIAL,
-          });
-        }
-      } catch (e) {
-        console.warn("Bing地图不可用，尝试其他影像源", e);
-      }
-
-      // 使用ArcGIS作为备选
-      if (Cesium.ArcGisMapServerImageryProvider) {
-        return new Cesium.ArcGisMapServerImageryProvider({
-          url: "https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer",
-        });
-      }
-
-      // 使用OpenStreetMap作为最后备选
-      if (Cesium.OpenStreetMapImageryProvider) {
-        return new Cesium.OpenStreetMapImageryProvider({
-          url: "https://a.tile.openstreetmap.org/",
-        });
-      }
-
-      // 没有可用影像提供者
-      console.warn("没有可用的影像提供者");
-      return undefined;
-    }
+    // 添加图层
     // 添加图层
     addLayer(layer: any) {
+      console.log("Adding layer:", layer);
       if (this.layerList.find((v: any) => v.id === layer.id)) {
         console.error("已存在同名图层" + layer.id);
         return null;
@@ -631,33 +576,98 @@ export default (hnMap: any) => {
 
       this.layerList.push(layer);
 
-      // 如果是数据源图层，添加到数据源集合
-      if (layer.layerEntity && layer.layerEntity.entities) {
-        this.map.dataSources.add(layer.layerEntity);
-      }
-
-      // 如果是Primitive图层，添加到Primitive集合
-      if (
-        layer.layerEntity &&
-        layer.layerEntity instanceof Cesium.PrimitiveCollection
-      ) {
-        this.map.scene.primitives.add(layer.layerEntity);
+      const entity = layer.layerEntity;
+      console.log("Layer entity:", entity);
+      if (entity && this.map) {
+        try {
+          // 根据实体类型进行添加
+          if (entity instanceof Cesium.Entity) {
+            console.log("Adding Entity to entities");
+            this.map.entities.add(entity);
+          } else if (
+            entity instanceof Cesium.Primitive ||
+            entity instanceof Cesium.PrimitiveCollection
+          ) {
+            console.log("Adding Primitive to scene");
+            this.map.scene.primitives.add(entity);
+          } else if (entity instanceof Cesium.DataSource) {
+            // 确保 dataSources 是正确的类型后再调用 add 方法
+            console.log("Adding DataSource");
+            if (
+              this.map.dataSources &&
+              typeof this.map.dataSources.add === "function"
+            ) {
+              this.map.dataSources.add(entity);
+            } else {
+              console.warn(
+                "dataSources 不可用，尝试创建新的 DataSourceCollection"
+              );
+              if (!this.map.dataSources) {
+                this.map.dataSources = new Cesium.DataSourceCollection();
+              }
+              this.map.dataSources.add(entity);
+            }
+          } else if (Array.isArray(entity)) {
+            // 如果是实体数组
+            console.log("Adding array of entities");
+            entity.forEach((item) => {
+              if (item instanceof Cesium.Entity) {
+                this.map.entities.add(item);
+              }
+            });
+          } else {
+            // 默认尝试添加到 entities
+            console.log("Adding to entities (default)");
+            this.map.entities.add(entity);
+          }
+        } catch (error: any) {
+          console.error("添加图层失败:", error);
+          console.error("错误详情:", {
+            entity: entity,
+            entityType: typeof entity,
+            entityConstructor: entity?.constructor?.name,
+          });
+        }
       }
 
       return layer;
     }
-
     // 获取图层
     getLayer(layerId: any) {
       return this.layerList.find((v: any) => v.id === layerId);
     }
 
+    // 删除图层
     // 删除图层
     removeLayer(layerId: any) {
       const layer = this.getLayer(layerId);
       if (layer) {
+        const entity = layer.layerEntity;
+        if (entity && this.map) {
+          if (entity instanceof Cesium.DataSource) {
+            if (
+              this.map.dataSources &&
+              typeof this.map.dataSources.remove === "function"
+            ) {
+              this.map.dataSources.remove(entity);
+            }
+          } else if (
+            entity instanceof Cesium.PrimitiveCollection ||
+            entity instanceof Cesium.Primitive
+          ) {
+            this.map.scene.primitives.remove(entity);
+          } else if (entity instanceof Cesium.Entity) {
+            this.map.entities.remove(entity);
+          } else if (Array.isArray(entity)) {
+            entity.forEach((item) => {
+              if (item instanceof Cesium.Entity) {
+                this.map.entities.remove(item);
+              }
+            });
+          }
+        }
         this.layerList = this.layerList.filter((v: any) => v.id !== layerId);
-        layer.destroy();
+        layer.destroy?.();
       }
     }