my-openlayer 3.0.2 → 3.1.1

package/core/line/Line.js

@@ -1,7 +1,7 @@
 import GeoJSON from "ol/format/GeoJSON";
 import VectorLayer from "ol/layer/Vector";
 import VectorSource from "ol/source/Vector";
-import { ErrorHandler } from "../../utils/ErrorHandler";
+import { ErrorHandler, ErrorType } from "../../utils/ErrorHandler";
 import ProjectionUtils from "../../utils/ProjectionUtils";
 import ValidationUtils from "../../utils/ValidationUtils";
 import { ConfigManager, MapTools } from "../map";
@@ -98,7 +98,7 @@ export default class Line {
         ValidationUtils.validateNonEmptyString(url, 'Line url is required');
         const response = await fetch(url);
         if (!response.ok) {
-            throw new Error(`Failed to fetch line GeoJSON: ${response.status}`);
+            throw ErrorHandler.getInstance().createAndHandleError(`Failed to fetch line GeoJSON: ${response.status}`, ErrorType.DATA_ERROR);
         }
         const json = await response.json();
         return this.addLine(json, options);
@@ -134,11 +134,11 @@ export default class Line {
             ValidationUtils.validateNonEmptyString(url, 'Flow line url is required');
             const response = await fetch(url);
             if (!response.ok) {
-                throw new Error(`Failed to fetch flow line data: ${response.status}`);
+                throw ErrorHandler.getInstance().createAndHandleError(`Failed to fetch flow line data: ${response.status}`, ErrorType.DATA_ERROR);
             }
             const jsonData = await response.json();
             if (!jsonData || typeof jsonData !== 'object') {
-                throw new Error('Flow line JSON data is invalid');
+                throw ErrorHandler.getInstance().createAndHandleError('Flow line JSON data is invalid', ErrorType.DATA_ERROR);
             }
             return this.addFlowLine(jsonData, mergedOptions);
         }

package/core/map/MapBaseLayers.js

@@ -93,7 +93,7 @@ export default class MapBaseLayers {
      */
     initTiandituLayers() {
         if (!this.options.token) {
-            throw new Error('Token is required for Tianditu layers');
+            throw ErrorHandler.getInstance().createAndHandleError('Token is required for Tianditu layers', ErrorType.MAP_ERROR);
         }
         const { token, zIndex = ConfigManager.TIANDITU_CONFIG.DEFAULT_ZINDEX } = this.options;
         try {
@@ -113,7 +113,7 @@ export default class MapBaseLayers {
      */
     initAnnotationLayer() {
         if (!this.options.token) {
-            throw new Error('请配置token后才能使用天地图注记');
+            throw ErrorHandler.getInstance().createAndHandleError('请配置token后才能使用天地图注记', ErrorType.MAP_ERROR);
         }
         const { token, zIndex = ConfigManager.TIANDITU_CONFIG.DEFAULT_ZINDEX } = this.options;
         this.loadDefaultAnnotationLayer(token, zIndex);
@@ -228,10 +228,10 @@ export default class MapBaseLayers {
     switchAnnotationLayer(annotationType) {
         try {
             if (!this.options.token) {
-                throw new Error('Token is required for annotation layer');
+                throw ErrorHandler.getInstance().createAndHandleError('Token is required for annotation layer', ErrorType.MAP_ERROR);
             }
             if (!this.options.annotation) {
-                throw new Error('Annotation is not enabled in options');
+                throw ErrorHandler.getInstance().createAndHandleError('Annotation is not enabled in options', ErrorType.MAP_ERROR);
             }
             const baseZIndex = this.options.zIndex ?? ConfigManager.TIANDITU_CONFIG.DEFAULT_ZINDEX;
             this.setAnnotationLayer(annotationType, this.options.token, baseZIndex);
@@ -322,7 +322,7 @@ export default class MapBaseLayers {
     addAnnotationLayer(options) {
         try {
             if (!this.options.token) {
-                throw new Error('Token is required for annotation layer');
+                throw ErrorHandler.getInstance().createAndHandleError('Token is required for annotation layer', ErrorType.MAP_ERROR);
             }
             return MapBaseLayers.addAnnotationLayer(this.map, {
                 ...options,
@@ -516,10 +516,10 @@ export default class MapBaseLayers {
     static getTiandiTuLayer(options) {
         try {
             if (!options.token) {
-                throw new Error('Token is required for Tianditu layer');
+                throw ErrorHandler.getInstance().createAndHandleError('Token is required for Tianditu layer', ErrorType.MAP_ERROR);
             }
             if (!options.type) {
-                throw new Error('Layer type is required for Tianditu layer');
+                throw ErrorHandler.getInstance().createAndHandleError('Layer type is required for Tianditu layer', ErrorType.VALIDATION_ERROR);
             }
             return new TileLayer({
                 source: new XYZ({
@@ -542,10 +542,10 @@ export default class MapBaseLayers {
     static createAnnotationLayer(options) {
         try {
             if (!options.token) {
-                throw new Error('Token is required for annotation layer');
+                throw ErrorHandler.getInstance().createAndHandleError('Token is required for annotation layer', ErrorType.MAP_ERROR);
             }
             if (!options.type) {
-                throw new Error('Annotation type is required for annotation layer');
+                throw ErrorHandler.getInstance().createAndHandleError('Annotation type is required for annotation layer', ErrorType.VALIDATION_ERROR);
             }
             return new TileLayer({
                 source: new XYZ({
@@ -569,7 +569,7 @@ export default class MapBaseLayers {
         try {
             ErrorHandler.validateMap(map);
             if (!options.token) {
-                throw new Error('Token is required for annotation layer');
+                throw ErrorHandler.getInstance().createAndHandleError('Token is required for annotation layer', ErrorType.MAP_ERROR);
             }
             const layer = MapBaseLayers.createAnnotationLayer({
                 type: options.type,
@@ -601,7 +601,7 @@ export default class MapBaseLayers {
             ValidationUtils.validatePositiveNumber(length, 'Valid length is required for tile grid');
             const projection = getProjection('EPSG:4326');
             if (!projection) {
-                throw new Error('Failed to get EPSG:4326 projection');
+                throw ErrorHandler.getInstance().createAndHandleError('Failed to get EPSG:4326 projection', ErrorType.MAP_ERROR);
             }
             const projectionExtent = projection.getExtent();
             const size = getWidth(projectionExtent) / 256;

package/core/map/MapTools.js

@@ -31,7 +31,7 @@ class MapTools {
      */
     getLayerByLayerName(layerName) {
         if (!this.map) {
-            throw new Error('Map instance is not available');
+            throw ErrorHandler.getInstance().createAndHandleError('Map instance is not available', ErrorType.MAP_ERROR);
         }
         return MapTools.getLayerByLayerName(this.map, layerName);
     }
@@ -64,7 +64,7 @@ class MapTools {
         }
         catch (error) {
             ErrorHandler.getInstance().error('Error getting layers:', error);
-            throw new Error('Failed to retrieve layers from map');
+            throw ErrorHandler.getInstance().createAndHandleError('Failed to retrieve layers from map', ErrorType.LAYER_ERROR);
         }
         return targetLayer;
     }
@@ -144,7 +144,7 @@ class MapTools {
      */
     clipMap(data) {
         if (!this.map) {
-            throw new Error('Map instance is not available');
+            throw ErrorHandler.getInstance().createAndHandleError('Map instance is not available', ErrorType.MAP_ERROR);
         }
         MapTools.clipMap(this.map, data);
     }
@@ -155,7 +155,7 @@ class MapTools {
      */
     static clipMap(map, data) {
         if (!map) {
-            throw new Error('Map instance is required');
+            throw ErrorHandler.getInstance().createAndHandleError('Map instance is required', ErrorType.MAP_ERROR);
         }
         map.getLayers().getArray().forEach(layer => {
             try {
@@ -173,7 +173,7 @@ class MapTools {
      */
     removeLayer(layerName) {
         if (!this.map) {
-            throw new Error('Map instance is not available');
+            throw ErrorHandler.getInstance().createAndHandleError('Map instance is not available', ErrorType.MAP_ERROR);
         }
         MapTools.removeLayer(this.map, layerName);
     }
@@ -185,7 +185,7 @@ class MapTools {
      */
     static removeLayer(map, layerName) {
         if (!map) {
-            throw new Error('Map instance is required');
+            throw ErrorHandler.getInstance().createAndHandleError('Map instance is required', ErrorType.MAP_ERROR);
         }
         try {
             const layers = MapTools.getLayerByLayerName(map, layerName);
@@ -195,7 +195,7 @@ class MapTools {
         }
         catch (error) {
             ErrorHandler.getInstance().error('Error removing layers:', error);
-            throw new Error('Failed to remove layers from map');
+            throw ErrorHandler.getInstance().createAndHandleError('Failed to remove layers from map', ErrorType.LAYER_ERROR);
         }
     }
     /**
@@ -206,7 +206,7 @@ class MapTools {
      */
     setLayerVisible(layerName, visible) {
         if (!this.map) {
-            throw new Error('Map instance is not available');
+            throw ErrorHandler.getInstance().createAndHandleError('Map instance is not available', ErrorType.MAP_ERROR);
         }
         MapTools.setLayerVisible(this.map, layerName, visible);
     }
@@ -221,7 +221,7 @@ class MapTools {
      */
     locationAction(lgtd, lttd, zoom = 20, duration = 3000, projection) {
         if (!this.map) {
-            throw new Error('Map instance is not available');
+            throw ErrorHandler.getInstance().createAndHandleError('Map instance is not available', ErrorType.MAP_ERROR);
         }
         const hasProjection = !!projection?.dataProjection || !!projection?.featureProjection;
         const isValidCoordinate = hasProjection
@@ -274,7 +274,7 @@ class MapTools {
      */
     static fitByData(map, jsonData, fitOptions) {
         if (!map) {
-            throw new Error('Map instance is required');
+            throw ErrorHandler.getInstance().createAndHandleError('Map instance is required', ErrorType.MAP_ERROR);
         }
         if (!jsonData) {
             return false;
@@ -303,7 +303,7 @@ class MapTools {
      */
     static fitToLayers(map, layerNameOrLayers, fitOptions) {
         if (!map) {
-            throw new Error('Map instance is required');
+            throw ErrorHandler.getInstance().createAndHandleError('Map instance is required', ErrorType.MAP_ERROR);
         }
         const layers = typeof layerNameOrLayers === "string"
             ? MapTools.getLayerByLayerName(map, layerNameOrLayers)
@@ -365,13 +365,13 @@ class MapTools {
  */
 MapTools.setLayerVisible = (map, layerName, visible) => {
     if (!map) {
-        throw new Error('Map instance is required');
+        throw ErrorHandler.getInstance().createAndHandleError('Map instance is required', ErrorType.MAP_ERROR);
     }
     if (typeof layerName !== 'string') {
-        throw new Error('Layer name must be a string');
+        throw ErrorHandler.getInstance().createAndHandleError('Layer name must be a string', ErrorType.VALIDATION_ERROR);
     }
     if (typeof visible !== 'boolean') {
-        throw new Error('Visible parameter must be a boolean');
+        throw ErrorHandler.getInstance().createAndHandleError('Visible parameter must be a boolean', ErrorType.VALIDATION_ERROR);
     }
     try {
         const layers = MapTools.getLayerByLayerName(map, layerName);
@@ -381,7 +381,7 @@ MapTools.setLayerVisible = (map, layerName, visible) => {
     }
     catch (error) {
         ErrorHandler.getInstance().error('Error setting layer visibility:', error);
-        throw new Error('Failed to set layer visibility');
+        throw ErrorHandler.getInstance().createAndHandleError('Failed to set layer visibility', ErrorType.LAYER_ERROR);
     }
 };
 export default MapTools;

package/core/map/MeasureHandler.js

@@ -7,7 +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';
+import { ErrorHandler, ErrorType } from '../../utils/ErrorHandler';
 /**
  * 测量工具处理类
  * 提供距离和面积测量功能
@@ -174,7 +174,7 @@ export default class MeasureHandler {
         }
         catch (error) {
             ErrorHandler.getInstance().error('Error starting measurement:', error);
-            throw new Error('Failed to start measurement');
+            throw ErrorHandler.getInstance().createAndHandleError('Failed to start measurement', ErrorType.MAP_ERROR);
         }
         this._draw = new Draw({
             source: this.source,

package/core/point/Point.d.ts

@@ -1,8 +1,10 @@
 import Map from "ol/Map";
+import { Style } from "ol/style";
 import VectorLayer from "ol/layer/Vector";
 import VectorSource from "ol/source/Vector";
 import Overlay from 'ol/Overlay';
 import { PointOptions, ClusterOptions, PointData, VueTemplatePointInstance, TwinkleItem, PulsePointOptions, PulsePointLayerHandle, LayerHandle, ControlHandle } from '../../types';
+import { type PointJSONInput } from '../../utils/GeoJSONProcessor';
 export default class Point {
     private map;
     /** 由本实例创建的纯图层（addPoint / addClusterPoint）。destroyAll 时统一移除。 */
@@ -36,13 +38,13 @@ export default class Point {
      */
     private createIconStyle;
     /**
-     * 创建点样式
-     * @private
+     * 创建点样式。
+     * 供内部 createPointLayer 和 addGeoJSON 的 styleByProperties 回调使用。
      * @param options 选项
-     * @param item 数据项
+     * @param item 数据项（可选，用于 textKey 文本提取）
      * @returns 样式对象
      */
-    private createPointStyle;
+    createPointStyle(options: PointOptions | ClusterOptions, item?: PointData): Style;
     /**
      * 创建集群样式
      * @private
@@ -72,11 +74,11 @@ export default class Point {
     /** *********************创建聚合点图层*********************/
     private createClusterPointLayer;
     /** *********************添加普通点*********************/
-    addPoint(pointData: PointData[], options: PointOptions & {
+    addPoint(pointData: PointJSONInput, options: PointOptions & {
         layerName: string;
     }): LayerHandle<VectorLayer<VectorSource>> | null;
     /** *********************添加聚合点*********************/
-    addClusterPoint(pointData: PointData[], options: ClusterOptions & {
+    addClusterPoint(pointData: PointJSONInput, options: ClusterOptions & {
         layerName: string;
     }): LayerHandle<VectorLayer<VectorSource>> | null;
     /** @internal 把 VectorLayer 包成 LayerHandle 的内部工具。 */
@@ -87,7 +89,7 @@ export default class Point {
      * 与 addDomPoint 不同，该方法使用 VectorLayer 批量渲染点位，并通过单个
      * requestAnimationFrame 驱动闪烁圈，适合村庄预警等大量点位场景。
      */
-    addPulsePointLayer(pointData: PointData[], options: PulsePointOptions & {
+    addPulsePointLayer(pointData: PointJSONInput, options: PulsePointOptions & {
         layerName: string;
     }): PulsePointLayerHandle | null;
     /**
@@ -129,13 +131,14 @@ export default class Point {
         getPoints: () => VueTemplatePointInstance[];
     };
     /**
-   * 地图定位
-   * @deprecated 请使用 MapTools.locationAction 方法代替
-   * @param lgtd 经度
-   * @param lttd 纬度
-   * @param zoom 缩放级别
-   * @param duration 动画时长
-   */
+     * 地图定位
+     * @deprecated 请使用 MapTools.locationAction 方法代替
+     * @param lgtd 经度
+     * @param lttd 纬度
+     * @param zoom 缩放级别
+     * @param duration 动画时长
+     * @param projection
+     */
     locationAction(lgtd: number, lttd: number, zoom?: number, duration?: number, projection?: {
         dataProjection?: string;
         featureProjection?: string;

package/core/point/Point.js

@@ -1,10 +1,12 @@
 import Feature from "ol/Feature";
 import { Point as olPoint } from "ol/geom";
-import { Text, Style, Fill, Stroke, Icon } from "ol/style";
+import { Text, Style, Fill, Stroke, Icon, Circle as CircleStyle } from "ol/style";
 import VectorLayer from "ol/layer/Vector";
 import VectorSource from "ol/source/Vector";
+import { normalizePointData } from '../../utils/GeoJSONProcessor';
 import { VueTemplatePoint } from '../vue-template-point';
 import ValidationUtils from '../../utils/ValidationUtils';
+import { ErrorHandler, ErrorType } from '../../utils/ErrorHandler';
 import ProjectionUtils from '../../utils/ProjectionUtils';
 import { ConfigManager, MapTools } from "../map";
 import PointClusterLayer from './PointClusterLayer';
@@ -93,10 +95,10 @@ export default class Point {
         return new Icon(iconOptions);
     }
     /**
-     * 创建点样式
-     * @private
+     * 创建点样式。
+     * 供内部 createPointLayer 和 addGeoJSON 的 styleByProperties 回调使用。
      * @param options 选项
-     * @param item 数据项
+     * @param item 数据项（可选，用于 textKey 文本提取）
      * @returns 样式对象
      */
     createPointStyle(options, item) {
@@ -105,8 +107,16 @@ export default class Point {
             style.text = this.createTextStyle(options, String(item[options.textKey] ?? ''));
         }
         if (options.img) {
+            // 图标样式优先
             style.image = this.createIconStyle(options);
         }
+        else if (options.circleColor || options.circleRadius) {
+            // 圆点样式：未设置 img 且提供了 circleColor 或 circleRadius 时生效
+            style.image = new CircleStyle({
+                radius: options.circleRadius ?? 6,
+                fill: new Fill({ color: options.circleColor ?? '#3399CC' }),
+            });
+        }
         return new Style(style);
     }
     /**
@@ -147,11 +157,12 @@ export default class Point {
      */
     /** *********************创建普通点图层*********************/
     createPointLayer(pointData, options) {
-        if (!ValidationUtils.validatePointData(pointData)) {
+        const normalized = normalizePointData(pointData);
+        if (!ValidationUtils.validatePointData(normalized)) {
             return null;
         }
         const pointFeatureList = [];
-        pointData.forEach((item) => {
+        normalized.forEach((item) => {
             if (!ValidationUtils.validateCoordinates(item)) {
                 return;
             }
@@ -190,10 +201,11 @@ export default class Point {
     }
     /** *********************创建聚合点图层*********************/
     createClusterPointLayer(pointData, options) {
-        if (!ValidationUtils.validatePointData(pointData)) {
+        const normalized = normalizePointData(pointData);
+        if (!ValidationUtils.validatePointData(normalized)) {
             return null;
         }
-        const layer = PointClusterLayer.create(this.map, pointData, options, this.createClusterStyle.bind(this));
+        const layer = PointClusterLayer.create(this.map, normalized, options, this.createClusterStyle.bind(this));
         if (layer) {
             this.trackLayer(layer);
         }
@@ -233,10 +245,11 @@ export default class Point {
      * requestAnimationFrame 驱动闪烁圈，适合村庄预警等大量点位场景。
      */
     addPulsePointLayer(pointData, options) {
-        if (!ValidationUtils.validatePointData(pointData)) {
+        const normalized = normalizePointData(pointData);
+        if (!ValidationUtils.validatePointData(normalized)) {
             return null;
         }
-        const handle = PointPulseLayer.create(this.map, pointData, options);
+        const handle = PointPulseLayer.create(this.map, normalized, options);
         this.trackDisposable(handle);
         return handle;
     }
@@ -250,15 +263,10 @@ export default class Point {
         ValidationUtils.validateNonEmptyString(url, 'Point url is required');
         const response = await fetch(url);
         if (!response.ok) {
-            throw new Error(`Failed to fetch point data: ${response.status}`);
+            throw ErrorHandler.getInstance().createAndHandleError(`Failed to fetch point data: ${response.status}`, ErrorType.DATA_ERROR);
         }
         const json = await response.json();
-        const pointData = Array.isArray(json) ? json : (json?.features ?? []).map((f) => ({
-            ...f.properties,
-            lgtd: f.geometry?.coordinates?.[0],
-            lttd: f.geometry?.coordinates?.[1]
-        }));
-        return this.addPoint(pointData, options);
+        return this.addPoint(json, options);
     }
     /**
      * P1-2：从 URL 加载点位数据并添加为高性能闪烁点图层。
@@ -267,15 +275,10 @@ export default class Point {
         ValidationUtils.validateNonEmptyString(url, 'Pulse point url is required');
         const response = await fetch(url);
         if (!response.ok) {
-            throw new Error(`Failed to fetch pulse point data: ${response.status}`);
+            throw ErrorHandler.getInstance().createAndHandleError(`Failed to fetch pulse point data: ${response.status}`, ErrorType.DATA_ERROR);
         }
         const json = await response.json();
-        const pointData = Array.isArray(json) ? json : (json?.features ?? []).map((f) => ({
-            ...f.properties,
-            lgtd: f.geometry?.coordinates?.[0],
-            lttd: f.geometry?.coordinates?.[1]
-        }));
-        return this.addPulsePointLayer(pointData, options);
+        return this.addPulsePointLayer(json, options);
     }
     /**
      * 添加闪烁点
@@ -297,10 +300,10 @@ export default class Point {
      */
     addVueTemplatePoint(pointDataList, template, options) {
         if (!pointDataList || !Array.isArray(pointDataList) || pointDataList.length === 0) {
-            throw new Error('Valid point info list is required');
+            throw ErrorHandler.getInstance().createAndHandleError('Valid point info list is required', ErrorType.VALIDATION_ERROR);
         }
         if (!template) {
-            throw new Error('Vue template is required');
+            throw ErrorHandler.getInstance().createAndHandleError('Vue template is required', ErrorType.VALIDATION_ERROR);
         }
         try {
             if (!this.vueTemplatePoint) {
@@ -311,17 +314,18 @@ export default class Point {
             return handle;
         }
         catch (error) {
-            throw new Error(`Failed to create Vue template points: ${error}`);
+            throw ErrorHandler.getInstance().createAndHandleError(`Failed to create Vue template points: ${error}`, ErrorType.COMPONENT_ERROR);
         }
     }
     /**
-   * 地图定位
-   * @deprecated 请使用 MapTools.locationAction 方法代替
-   * @param lgtd 经度
-   * @param lttd 纬度
-   * @param zoom 缩放级别
-   * @param duration 动画时长
-   */
+     * 地图定位
+     * @deprecated 请使用 MapTools.locationAction 方法代替
+     * @param lgtd 经度
+     * @param lttd 纬度
+     * @param zoom 缩放级别
+     * @param duration 动画时长
+     * @param projection
+     */
     locationAction(lgtd, lttd, zoom = 20, duration = 3000, projection) {
         return new MapTools(this.map).locationAction(lgtd, lttd, zoom, duration, projection);
     }

package/core/polygon/Polygon.js

@@ -2,7 +2,7 @@
 import VectorLayer from "ol/layer/Vector";
 import VectorSource from "ol/source/Vector";
 import GeoJSON from "ol/format/GeoJSON";
-import { ErrorHandler, InvalidGeoJSONError, LayerNotFoundError } from '../../utils/ErrorHandler';
+import { ErrorHandler, ErrorType, InvalidGeoJSONError, LayerNotFoundError } from '../../utils/ErrorHandler';
 import ProjectionUtils from '../../utils/ProjectionUtils';
 import ValidationUtils from '../../utils/ValidationUtils';
 import { ConfigManager, MapTools } from "../map";
@@ -25,7 +25,7 @@ export default class Polygon {
          */
         this.managedLayers = new Set();
         if (!map) {
-            throw new Error('Map instance is required');
+            throw ErrorHandler.getInstance().createAndHandleError('Map instance is required', ErrorType.MAP_ERROR);
         }
         this.map = map;
     }
@@ -161,7 +161,7 @@ export default class Polygon {
         ValidationUtils.validateNonEmptyString(url, 'Polygon url is required');
         const response = await fetch(url);
         if (!response.ok) {
-            throw new Error(`Failed to fetch polygon GeoJSON: ${response.status}`);
+            throw ErrorHandler.getInstance().createAndHandleError(`Failed to fetch polygon GeoJSON: ${response.status}`, ErrorType.DATA_ERROR);
         }
         const json = await response.json();
         return this.addPolygon(json, options);
@@ -191,7 +191,7 @@ export default class Polygon {
         }
         const layer = layers[0];
         if (!(layer instanceof VectorLayer)) {
-            throw new Error(`Layer '${layerName}' is not a vector layer`);
+            throw ErrorHandler.getInstance().createAndHandleError(`Layer '${layerName}' is not a vector layer`, ErrorType.LAYER_ERROR);
         }
         const mergedOptions = {
             textFont: '14px Calibri,sans-serif',

package/core/select/SelectHandler.js

@@ -7,7 +7,7 @@ import Collection from 'ol/Collection';
 import { getUid } from "ol/util";
 import EventManager from "../map/EventManager";
 import ValidationUtils from "../../utils/ValidationUtils";
-import { ErrorHandler, MyOpenLayersError, ErrorType } from "../../utils/ErrorHandler";
+import { ErrorHandler, ErrorType } from "../../utils/ErrorHandler";
 /**
  * 要素选择处理器类
  * 用于在地图上选择和高亮显示要素，支持单选、多选等多种选择模式
@@ -88,8 +88,7 @@ export default class SelectHandler {
             return this;
         }
         catch (error) {
-            this.errorHandler.handleError(new MyOpenLayersError(`启用要素选择失败: ${error instanceof Error ? error.message : '未知错误'}`, ErrorType.COMPONENT_ERROR, { mode, options }));
-            throw error;
+            throw this.errorHandler.createAndHandleError(`启用要素选择失败: ${error instanceof Error ? error.message : '未知错误'}`, ErrorType.COMPONENT_ERROR, { mode, options });
         }
     }
     /**
@@ -111,8 +110,7 @@ export default class SelectHandler {
             return this;
         }
         catch (error) {
-            this.errorHandler.handleError(new MyOpenLayersError(`禁用要素选择失败: ${error instanceof Error ? error.message : '未知错误'}`, ErrorType.COMPONENT_ERROR));
-            throw error;
+            throw this.errorHandler.createAndHandleError(`禁用要素选择失败: ${error instanceof Error ? error.message : '未知错误'}`, ErrorType.COMPONENT_ERROR);
         }
     }
     /**
@@ -160,8 +158,7 @@ export default class SelectHandler {
             return this;
         }
         catch (error) {
-            this.errorHandler.handleError(new MyOpenLayersError(`通过ID选择要素失败: ${error instanceof Error ? error.message : '未知错误'}`, ErrorType.COMPONENT_ERROR, { featureIds, options }));
-            throw error;
+            throw this.errorHandler.createAndHandleError(`通过ID选择要素失败: ${error instanceof Error ? error.message : '未知错误'}`, ErrorType.COMPONENT_ERROR, { featureIds, options });
         }
     }
     /**
@@ -170,7 +167,7 @@ export default class SelectHandler {
     selectByProperty(propertyName, propertyValue, options) {
         try {
             if (!propertyName)
-                throw new Error('属性名称不能为空');
+                throw ErrorHandler.getInstance().createAndHandleError('属性名称不能为空', ErrorType.VALIDATION_ERROR);
             const selectedFeatures = this.findFeaturesByProperty(propertyName, propertyValue, options?.layerName);
             if (selectedFeatures.length === 0)
                 return this;
@@ -178,8 +175,7 @@ export default class SelectHandler {
             return this;
         }
         catch (error) {
-            this.errorHandler.handleError(new MyOpenLayersError(`通过属性选择要素失败: ${error instanceof Error ? error.message : '未知错误'}`, ErrorType.COMPONENT_ERROR, { propertyName, propertyValue, options }));
-            throw error;
+            throw this.errorHandler.createAndHandleError(`通过属性选择要素失败: ${error instanceof Error ? error.message : '未知错误'}`, ErrorType.COMPONENT_ERROR, { propertyName, propertyValue, options });
         }
     }
     /**
@@ -344,7 +340,7 @@ export default class SelectHandler {
             this.errorHandler.debug('选择处理器已销毁');
         }
         catch (error) {
-            this.errorHandler.handleError(new MyOpenLayersError(`销毁选择处理器失败: ${error instanceof Error ? error.message : '未知错误'}`, ErrorType.COMPONENT_ERROR));
+            this.errorHandler.createAndHandleError(`销毁选择处理器失败: ${error instanceof Error ? error.message : '未知错误'}`, ErrorType.COMPONENT_ERROR);
         }
     }
     getSelectCondition(mode) {