my-openlayer 2.1.2 → 2.1.3

package/MyOl.js

@@ -34,6 +34,9 @@ class MyOl {
             this.configManager = new ConfigManager();
             // 合并配置（处理 undefined 情况）
             this.options = ConfigManager.mergeOptions(MyOl.DefaultOptions, options || {});
+            // 初始化日志配置（默认关闭，级别为 error）
+            this.errorHandler.setEnabled(this.options.enableLog ?? false);
+            this.errorHandler.setLogLevel(this.options.logLevel ?? 'error');
             // 参数验证
             this.validateConstructorParams(id, this.options);
             // 初始化坐标系
@@ -116,7 +119,7 @@ class MyOl {
         const eventManager = this.getEventManager();
         // 地图加载完成事件
         eventManager.on('rendercomplete', (eventData) => {
-            console.debug('地图初始化完成', { map: this.map });
+            this.errorHandler.debug('地图初始化完成', { map: this.map });
         }, { once: true });
         // 地图错误事件
         eventManager.on('error', (eventData) => {
@@ -155,7 +158,7 @@ class MyOl {
      * @deprecated 请使用 createView 方法
      */
     static getView(options = MyOl.DefaultOptions) {
-        console.warn('getView 方法已废弃，请使用 createView 方法');
+        ErrorHandler.getInstance().warn('getView 方法已废弃，请使用 createView 方法');
         return MyOl.createView(options);
     }
     // ==========================================
@@ -169,7 +172,7 @@ class MyOl {
         try {
             if (!this._polygon) {
                 this._polygon = new Polygon(this.map);
-                console.debug('面要素模块已加载');
+                this.errorHandler.debug('面要素模块已加载');
             }
             return this._polygon;
         }
@@ -187,7 +190,7 @@ class MyOl {
             if (!this._baseLayers) {
                 // 检查是否设置了自定义底图
                 if (Array.isArray(this.options.layers)) {
-                    console.warn('已设置默认底图，MapBaseLayers 中的 switchBaseLayer 方法将失效');
+                    this.errorHandler.warn('已设置默认底图，MapBaseLayers 中的 switchBaseLayer 方法将失效');
                 }
                 const layerOptions = {
                     layers: this.options.layers,
@@ -198,7 +201,7 @@ class MyOl {
                     token: this.options.token || ''
                 };
                 this._baseLayers = new MapBaseLayers(this.map, layerOptions);
-                console.debug('基础图层模块已加载');
+                this.errorHandler.debug('基础图层模块已加载');
             }
             return this._baseLayers;
         }
@@ -215,7 +218,7 @@ class MyOl {
         try {
             if (!this._point) {
                 this._point = new Point(this.map);
-                console.debug('点要素模块已加载');
+                this.errorHandler.debug('点要素模块已加载');
             }
             return this._point;
         }
@@ -232,7 +235,7 @@ class MyOl {
         try {
             if (!this._line) {
                 this._line = new Line(this.map);
-                console.debug('线要素模块已加载');
+                this.errorHandler.debug('线要素模块已加载');
             }
             return this._line;
         }
@@ -249,7 +252,7 @@ class MyOl {
         try {
             if (!this._selectHandler) {
                 this._selectHandler = new SelectHandler(this.map);
-                console.debug('要素选择模块已加载');
+                this.errorHandler.debug('要素选择模块已加载');
             }
             return this._selectHandler;
         }
@@ -266,7 +269,7 @@ class MyOl {
         try {
             if (!this._mapTools) {
                 this._mapTools = new MapTools(this.map);
-                console.debug('工具模块已加载');
+                this.errorHandler.debug('工具模块已加载');
             }
             return this._mapTools;
         }
@@ -315,7 +318,7 @@ class MyOl {
             }
             this.getPoint().locationAction(longitude, latitude, zoom, duration);
             // 记录定位操作
-            console.debug('地图定位完成', {
+            this.errorHandler.debug('地图定位完成', {
                 longitude,
                 latitude,
                 zoom,
@@ -379,7 +382,7 @@ class MyOl {
             this._selectHandler = undefined;
             // 销毁地图
             this.map.setTarget(undefined);
-            console.debug('地图实例已销毁', { map: this.map });
+            this.errorHandler.debug('地图实例已销毁', { map: this.map });
         }
         catch (error) {
             this.errorHandler.handleError(new MyOpenLayersError(`销毁地图失败: ${error instanceof Error ? error.message : '未知错误'}`, ErrorType.MAP_ERROR));

package/core/Line.js

@@ -6,6 +6,7 @@ import { Feature } from "ol";
 import MapTools from "./MapTools";
 import { ValidationUtils } from "../utils/ValidationUtils";
 import { EventManager } from "./EventManager";
+import { ErrorHandler } from "src/utils/ErrorHandler";
 /**
  * 线要素管理类
  * 用于在地图上添加和管理线要素，包括普通线要素、河流图层等
@@ -183,7 +184,7 @@ export default class Line {
                                 }
                             }
                             catch (error) {
-                                console.warn(`Failed to load river feature at level ${level}:`, error);
+                                ErrorHandler.getInstance().warn(`Failed to load river feature at level ${level}:`, error);
                             }
                         }
                     });
@@ -278,14 +279,14 @@ export default class Line {
                                     }
                                 }
                                 catch (error) {
-                                    console.warn(`Failed to load river feature at level ${level}:`, error);
+                                    ErrorHandler.getInstance().warn(`Failed to load river feature at level ${level}:`, error);
                                 }
                             }
                         });
                         success?.(vectorSource.getFeatures());
                     })
                         .catch(error => {
-                        console.error('Error loading river data:', error);
+                        ErrorHandler.getInstance().error('Error loading river data:', error);
                         failure?.();
                     });
                 }

package/core/MapTools.js

@@ -62,7 +62,7 @@ class MapTools {
             });
         }
         catch (error) {
-            console.error('Error getting layers:', error);
+            ErrorHandler.getInstance().error('Error getting layers:', error);
             throw new Error('Failed to retrieve layers from map');
         }
         return targetLayer;
@@ -117,7 +117,7 @@ class MapTools {
             });
         }
         catch (error) {
-            console.error('Error removing layers:', error);
+            ErrorHandler.getInstance().error('Error removing layers:', error);
             throw new Error('Failed to remove layers from map');
         }
     }
@@ -138,7 +138,7 @@ class MapTools {
             });
         }
         catch (error) {
-            console.error('Error removing layers:', error);
+            ErrorHandler.getInstance().error('Error removing layers:', error);
             throw new Error('Failed to remove layers from map');
         }
     }
@@ -159,7 +159,7 @@ class MapTools {
             });
         }
         catch (error) {
-            console.error('Error setting layer visibility:', error);
+            ErrorHandler.getInstance().error('Error setting layer visibility:', error);
             throw new Error('Failed to set layer visibility');
         }
     }
@@ -195,7 +195,7 @@ MapTools.setLayerVisible = (map, layerName, visible) => {
         });
     }
     catch (error) {
-        console.error('Error setting layer visibility:', error);
+        ErrorHandler.getInstance().error('Error setting layer visibility:', error);
         throw new Error('Failed to set layer visibility');
     }
 };

package/core/MeasureHandler.js

@@ -7,6 +7,7 @@ import { Vector as VectorLayer } from 'ol/layer.js';
 import { getArea, getLength } from 'ol/sphere.js';
 import { unByKey } from 'ol/Observable.js';
 import { ValidationUtils } from '../utils/ValidationUtils';
+import { ErrorHandler } from '../utils/ErrorHandler';
 /**
  * 测量工具处理类
  * 提供距离和面积测量功能
@@ -171,7 +172,7 @@ export default class MeasureHandler {
             }
         }
         catch (error) {
-            console.error('Error starting measurement:', error);
+            ErrorHandler.getInstance().error('Error starting measurement:', error);
             throw new Error('Failed to start measurement');
         }
         this._draw = new Draw({

package/core/Point.js

@@ -11,6 +11,7 @@ import GeoJSON from "ol/format/GeoJSON";
 import VueTemplatePoint from './VueTemplatePoint';
 import MapTools from "./MapTools";
 import { ValidationUtils } from '../utils/ValidationUtils';
+import { ErrorHandler } from '../utils/ErrorHandler';
 export default class Point {
     constructor(map) {
         this.map = map;
@@ -286,7 +287,7 @@ export default class Point {
             return true;
         }
         catch (error) {
-            console.error('[地图定位]', '定位失败:', error);
+            ErrorHandler.getInstance().error('[地图定位]', '定位失败:', error);
             return false;
         }
     }
@@ -295,7 +296,7 @@ export default class Point {
      */
     addDomPoint(id, lgtd, lttd) {
         if (!id) {
-            console.error('Element ID is required');
+            ErrorHandler.getInstance().error('Element ID is required');
             return false;
         }
         if (!ValidationUtils.validateLngLat(lgtd, lttd)) {
@@ -303,7 +304,7 @@ export default class Point {
         }
         const el = document.getElementById(id);
         if (!el) {
-            console.error(`Element with id '${id}' not found`);
+            ErrorHandler.getInstance().error(`Element with id '${id}' not found`);
             return false;
         }
         try {
@@ -318,7 +319,7 @@ export default class Point {
             return true;
         }
         catch (error) {
-            console.error('Failed to set DOM point:', error);
+            ErrorHandler.getInstance().error('Failed to set DOM point:', error);
             return false;
         }
     }

package/core/Polygon.js

@@ -9,6 +9,7 @@ import { fromExtent } from "ol/geom/Polygon";
 import Feature from "ol/Feature";
 import ImageStatic from "ol/source/ImageStatic";
 import MapTools from "./MapTools";
+import { ErrorHandler } from '../utils/ErrorHandler';
 import { ValidationUtils } from '../utils/ValidationUtils';
 /**
  * Polygon 类用于处理地图上的面要素操作
@@ -276,7 +277,7 @@ export default class Polygon {
         };
         const features = layer.getSource()?.getFeatures();
         if (!features) {
-            console.warn(`No features found in layer '${layerName}'`);
+            ErrorHandler.getInstance().warn(`No features found in layer '${layerName}'`);
             return;
         }
         features.forEach((feature) => {
@@ -345,7 +346,7 @@ export default class Polygon {
                 });
             }
             else {
-                console.log('暂时不支持的类型');
+                ErrorHandler.getInstance().warn('暂时不支持的类型');
             }
             return group;
         }
@@ -578,7 +579,7 @@ export default class Polygon {
             throw new Error(`Invalid GeoJSON data: ${error}`);
         }
         if (!features || features.length === 0) {
-            console.warn('No features found in mask data');
+            ErrorHandler.getInstance().warn('No features found in mask data');
         }
         const maskLayer = new VectorLayer({
             source: new VectorSource({ features }),

package/core/SelectHandler.js

@@ -94,7 +94,7 @@ export default class SelectHandler {
             // 添加到地图
             this.map.addInteraction(this.selectInteraction);
             this.isEnabled = true;
-            console.debug('要素选择已启用', { mode, options: mergedOptions });
+            this.errorHandler.debug('要素选择已启用', { mode, options: mergedOptions });
             return this;
         }
         catch (error) {
@@ -114,7 +114,7 @@ export default class SelectHandler {
             }
             this.isEnabled = false;
             this.currentMode = undefined;
-            console.debug('要素选择已禁用');
+            this.errorHandler.debug('要素选择已禁用');
             return this;
         }
         catch (error) {
@@ -152,11 +152,11 @@ export default class SelectHandler {
     selectByIds(featureIds, options) {
         try {
             if (!this.selectInteraction) {
-                console.warn('选择交互未启用，无法选择要素');
+                this.errorHandler.warn('选择交互未启用，无法选择要素');
                 return this;
             }
             if (!featureIds || featureIds.length === 0) {
-                console.warn('要素ID列表为空');
+                this.errorHandler.warn('要素ID列表为空');
                 return this;
             }
             // 清除当前选择
@@ -216,7 +216,7 @@ export default class SelectHandler {
     selectByProperty(propertyName, propertyValue, options) {
         try {
             if (!this.selectInteraction) {
-                console.warn('选择交互未启用，无法选择要素');
+                this.errorHandler.warn('选择交互未启用，无法选择要素');
                 return this;
             }
             if (!propertyName) {
@@ -323,7 +323,7 @@ export default class SelectHandler {
             }
         }
         catch (error) {
-            console.error('定位至要素失败:', error);
+            this.errorHandler.error('定位至要素失败:', error);
         }
     }
     /**
@@ -332,7 +332,7 @@ export default class SelectHandler {
     destroy() {
         try {
             this.disableSelect();
-            console.debug('选择处理器已销毁');
+            this.errorHandler.debug('选择处理器已销毁');
         }
         catch (error) {
             this.errorHandler.handleError(new MyOpenLayersError(`销毁选择处理器失败: ${error instanceof Error ? error.message : '未知错误'}`, ErrorType.COMPONENT_ERROR));
@@ -442,7 +442,7 @@ export default class SelectHandler {
      */
     updateSelectStyle(selectStyle) {
         if (!this.selectInteraction) {
-            console.warn('选择交互未启用，无法更新样式');
+            this.errorHandler.warn('选择交互未启用，无法更新样式');
             return this;
         }
         try {
@@ -484,7 +484,7 @@ export default class SelectHandler {
                     options.onSelect(callbackEvent);
                 }
                 catch (error) {
-                    console.error('选择回调执行失败:', error);
+                    this.errorHandler.error('选择回调执行失败:', error);
                 }
             }
             // 触发取消选择回调
@@ -493,7 +493,7 @@ export default class SelectHandler {
                     options.onDeselect(callbackEvent);
                 }
                 catch (error) {
-                    console.error('取消选择回调执行失败:', error);
+                    this.errorHandler.error('取消选择回调执行失败:', error);
                 }
             }
         });

package/core/VueTemplatePoint.js

@@ -20,7 +20,7 @@ async function detectAndImportVue() {
         }
     }
     catch (e) {
-        console.warn('Vue not found. Please ensure Vue is installed in your project.');
+        ErrorHandler.getInstance().warn('Vue not found. Please ensure Vue is installed in your project.');
         Vue = null;
     }
 }
@@ -42,13 +42,13 @@ function detectVueSync() {
                 isVue3 = !!(Vue.version?.startsWith('3') || Vue.createApp);
             }
             catch (e) {
-                console.warn('Vue not found. Please ensure Vue is installed in your project.');
+                ErrorHandler.getInstance().warn('Vue not found. Please ensure Vue is installed in your project.');
                 Vue = null;
             }
         }
     }
     catch (e) {
-        console.warn('Failed to detect Vue:', e);
+        ErrorHandler.getInstance().warn('Failed to detect Vue:', e);
     }
 }
 // 初始化Vue导入
@@ -457,7 +457,7 @@ class VueTemplatePointInstanceImpl {
      */
     remove() {
         if (this.state === VueTemplatePointState.DESTROYED) {
-            console.warn('DOM point already destroyed');
+            this.errorHandler.warn('DOM point already destroyed');
             return;
         }
         try {

package/package.json

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

package/types.d.ts

@@ -32,6 +32,8 @@ export interface MapInitType {
     mapClipData?: MapJSONData;
     token?: string;
     annotation?: boolean;
+    enableLog?: boolean;
+    logLevel?: 'debug' | 'info' | 'warn' | 'error';
 }
 export type AnnotationType = 'cva_c' | 'cia_c' | 'cta_c';
 export type TiandituType = 'vec_c' | 'img_c' | 'ter_c';

package/utils/ErrorHandler.d.ts

@@ -25,6 +25,7 @@ export declare class ErrorHandler {
     private static instance;
     private errorCallbacks;
     private logLevel;
+    private enabled;
     private constructor();
     /**
      * 获取单例实例
@@ -35,6 +36,19 @@ export declare class ErrorHandler {
      * @param level 日志级别
      */
     setLogLevel(level: 'debug' | 'info' | 'warn' | 'error'): void;
+    /**
+     * 设置日志开关
+     * @param enabled 是否启用日志输出
+     */
+    setEnabled(enabled: boolean): void;
+    /**
+     * 日志门槛判断
+     */
+    private shouldLog;
+    debug(...args: any[]): void;
+    info(...args: any[]): void;
+    warn(...args: any[]): void;
+    error(...args: any[]): void;
     /**
      * 添加错误回调
      * @param callback 错误回调函数

package/utils/ErrorHandler.js

@@ -37,6 +37,7 @@ export class ErrorHandler {
     constructor() {
         this.errorCallbacks = [];
         this.logLevel = 'error';
+        this.enabled = false;
     }
     /**
      * 获取单例实例
@@ -54,6 +55,45 @@ export class ErrorHandler {
     setLogLevel(level) {
         this.logLevel = level;
     }
+    /**
+     * 设置日志开关
+     * @param enabled 是否启用日志输出
+     */
+    setEnabled(enabled) {
+        this.enabled = enabled;
+    }
+    /**
+     * 日志门槛判断
+     */
+    shouldLog(target) {
+        const levelOrder = {
+            debug: 0,
+            info: 1,
+            warn: 2,
+            error: 3
+        };
+        return this.enabled && levelOrder[target] >= levelOrder[this.logLevel];
+    }
+    debug(...args) {
+        if (this.shouldLog('debug')) {
+            console.debug(...args);
+        }
+    }
+    info(...args) {
+        if (this.shouldLog('info')) {
+            console.info(...args);
+        }
+    }
+    warn(...args) {
+        if (this.shouldLog('warn')) {
+            console.warn(...args);
+        }
+    }
+    error(...args) {
+        if (this.shouldLog('error')) {
+            console.error(...args);
+        }
+    }
     /**
      * 添加错误回调
      * @param callback 错误回调函数
@@ -112,21 +152,7 @@ export class ErrorHandler {
             context: error.context,
             stack: error.stack
         };
-        switch (this.logLevel) {
-            case 'debug':
-                console.debug(logMessage, logData);
-                break;
-            case 'info':
-                console.info(logMessage, logData);
-                break;
-            case 'warn':
-                console.warn(logMessage, logData);
-                break;
-            case 'error':
-            default:
-                console.error(logMessage, logData);
-                break;
-        }
+        this.error(logMessage, logData);
     }
     /**
      * 验证参数

package/utils/ValidationUtils.d.ts

@@ -1,7 +1,3 @@
-/**
- * 验证工具类
- * 统一管理所有验证方法
- */
 export declare class ValidationUtils {
     /**
      * 验证坐标是否有效

package/utils/ValidationUtils.js

@@ -2,6 +2,7 @@
  * 验证工具类
  * 统一管理所有验证方法
  */
+import { ErrorHandler } from './ErrorHandler';
 export class ValidationUtils {
     /**
      * 验证坐标是否有效
@@ -27,7 +28,7 @@ export class ValidationUtils {
      */
     static validateLngLat(lgtd, lttd) {
         if (!lgtd || !lttd || isNaN(lgtd) || isNaN(lttd)) {
-            console.error('Invalid longitude or latitude coordinates');
+            ErrorHandler.getInstance().error('Invalid longitude or latitude coordinates');
             return false;
         }
         return true;
@@ -39,7 +40,7 @@ export class ValidationUtils {
      */
     static validatePointData(pointData) {
         if (!pointData || pointData.length === 0) {
-            console.warn('Point data is empty or undefined');
+            ErrorHandler.getInstance().warn('Point data is empty or undefined');
             return false;
         }
         return true;
@@ -51,7 +52,7 @@ export class ValidationUtils {
      */
     static validateCoordinates(item) {
         if (!item.lgtd || !item.lttd) {
-            console.warn('Invalid coordinates for point:', item);
+            ErrorHandler.getInstance().warn('Invalid coordinates for point:', item);
             return false;
         }
         return true;
@@ -99,11 +100,11 @@ export class ValidationUtils {
      */
     static validateGeoJSONData(data) {
         if (!data) {
-            console.warn('GeoJSON data is required');
+            ErrorHandler.getInstance().warn('GeoJSON data is required');
             return false;
         }
         if (!data.features || !Array.isArray(data.features)) {
-            console.warn('Invalid GeoJSON data: features array is required');
+            ErrorHandler.getInstance().warn('Invalid GeoJSON data: features array is required');
             return false;
         }
         return true;
@@ -115,7 +116,7 @@ export class ValidationUtils {
      */
     static validateOptions(options) {
         if (!options || typeof options !== 'object') {
-            console.warn('Options are required and must be an object');
+            ErrorHandler.getInstance().warn('Options are required and must be an object');
             return false;
         }
         return true;
@@ -140,7 +141,7 @@ export class ValidationUtils {
      */
     static validateElementId(id) {
         if (!id) {
-            console.error('Element ID is required');
+            ErrorHandler.getInstance().error('Element ID is required');
             return false;
         }
         return true;
@@ -154,15 +155,15 @@ export class ValidationUtils {
      */
     static validateVueParams(pointInfoList, template, Vue) {
         if (!pointInfoList || !Array.isArray(pointInfoList) || pointInfoList.length === 0) {
-            console.error('Valid point info list is required');
+            ErrorHandler.getInstance().error('Valid point info list is required');
             return false;
         }
         if (!template) {
-            console.error('Vue template is required');
+            ErrorHandler.getInstance().error('Vue template is required');
             return false;
         }
         if (!Vue) {
-            console.error('Vue instance is required');
+            ErrorHandler.getInstance().error('Vue instance is required');
             return false;
         }
         return true;