my-openlayer 1.0.12 → 1.0.13

package/core/MapBaseLayers.d.ts

@@ -8,7 +8,7 @@ import { Tile as TileLayer } from "ol/layer";
 import { TileWMS } from "ol/source";
 import WMTSTileGrid from "ol/tilegrid/WMTS";
 import XYZ from "ol/source/XYZ";
-import { MapLayersOptions, TiandituType, AnnotationLayerOptions } from "../types";
+import { MapLayersOptions, TiandituType, AnnotationLayerOptions, AnnotationType } from "../types";
 /**
  * GeoServer图层选项接口
  */
@@ -31,7 +31,7 @@ interface GeoServerLayerOptions {
  */
 interface TiandituLayerOptions {
     /** 图层类型 */
-    type: TiandituType;
+    type: TiandituType | string;
     /** 天地图token */
     token: string;
     /** 图层层级 */
@@ -91,7 +91,7 @@ export default class MapBaseLayers {
      * 切换注记类别
      * @param annotationType 注记类型 ('cva_c' | 'cia_c' | 'cta_c')
      */
-    switchAnnotationLayer(annotationType: 'cva_c' | 'cia_c' | 'cta_c'): void;
+    switchAnnotationLayer(annotationType: AnnotationType): void;
     /**
      * 设置注记图层（私有方法，用于消除代码重复）
      * @param annotationType 注记类型
@@ -119,7 +119,7 @@ export default class MapBaseLayers {
      * 切换底图图层
      * @param type 图层类型
      */
-    switchBaseLayer(type: TiandituType): void;
+    switchBaseLayer(type: TiandituType | string): void;
     /**
      * 获取当前底图类型
      * @returns 当前底图类型

package/core/MapBaseLayers.js

@@ -21,6 +21,7 @@ const TIANDITU_CONFIG = {
     DEFAULT_ZINDEX: 9,
     ANNOTATION_ZINDEX_OFFSET: 10
 };
+const TIANDITU_TYPES = ['vec_c', 'img_c', 'ter_c'];
 /**
  * 地图底图图层管理类
  */
@@ -42,7 +43,14 @@ export default class MapBaseLayers {
             this.map = map;
             this.options = this.mergeDefaultOptions(options);
             // 初始化图层
-            this.initializeLayers();
+            if (this.options?.token) {
+                this.initializeLayers();
+            }
+            if (this.layers && Object.keys(this.layers).length > 0) {
+                this.addMapLayer();
+                const firstLayerType = Object.keys(this.layers)[0];
+                this.switchBaseLayer(firstLayerType);
+            }
         }
         catch (error) {
             this.errorHandler.createAndHandleError(`Failed to initialize MapBaseLayers: ${error}`, ErrorType.MAP_ERROR, { map, options, error });
@@ -86,11 +94,6 @@ export default class MapBaseLayers {
                 throw new Error('请配置token后才能使用天地图底图');
             }
             this.initTiandituLayers();
-            if (this.layers && Object.keys(this.layers).length > 0) {
-                this.addMapLayer();
-                const firstLayerType = Object.keys(this.layers)[0];
-                this.switchBaseLayer(firstLayerType);
-            }
         }
         // 添加注记图层
         if (this.options.annotation) {
@@ -208,6 +211,10 @@ export default class MapBaseLayers {
                 this.errorHandler.createAndHandleError('需要按照键值对的方式配置底图才可使用切换底图功能', ErrorType.LAYER_ERROR, { layersType: 'array', requestedType: type });
                 return;
             }
+            if (TIANDITU_TYPES.includes(type) && !this.options.token) {
+                this.errorHandler.createAndHandleError('请配置token后才能使用天地图底图', ErrorType.LAYER_ERROR, { requestedType: type });
+                return;
+            }
             if (!this.layers[type]) {
                 this.errorHandler.createAndHandleError(`图层类型 '${type}' 不存在`, ErrorType.LAYER_ERROR, { availableTypes: Object.keys(this.layers), requestedType: type });
                 return;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "my-openlayer",
   "private": false,
-  "version": "1.0.12",
+  "version": "1.0.13",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",

package/types.d.ts

@@ -32,7 +32,7 @@ export interface MapInitType {
     annotation?: boolean;
 }
 export type AnnotationType = 'cva_c' | 'cia_c' | 'cta_c';
-export type TiandituType = 'vec_c' | 'img_c' | 'ter_c' | string;
+export type TiandituType = 'vec_c' | 'img_c' | 'ter_c';
 export interface MapLayers {
     vec_c?: BaseLayer[];
     img_c?: BaseLayer[];