my-openlayer 2.5.4 → 3.0.1

package/core/line/Line.js

@@ -61,6 +61,15 @@ export default class Line {
         this.map.addLayer(layer);
         return layer;
     }
+    /** *********************统一句柄：静态线图层*********************/
+    toLayerHandle(layer) {
+        const map = this.map;
+        return {
+            layer,
+            setVisible(visible) { layer.setVisible(visible); },
+            remove() { map.removeLayer(layer); }
+        };
+    }
     /**
      * 注册流动线句柄。
      */
@@ -73,26 +82,32 @@ export default class Line {
     unregisterFlowLineHandle(layerName) {
         this.flowLineRegistry.delete(layerName);
     }
-    addLine(data, options) {
+    /** *********************创建静态线图层*********************/
+    createLineLayer(data, options) {
         ValidationUtils.validateRequired(data, 'GeoJSON data is required');
         const mergedOptions = this.mergeDefaultOptions(options);
         const features = new GeoJSON().readFeatures(data, ProjectionUtils.getGeoJSONReadOptions(mergedOptions));
         return this.createStaticLayer(new VectorSource({ features }), mergedOptions);
     }
-    addLineByUrl(url, options = {}) {
+    /** *********************添加静态线图层*********************/
+    addLine(data, options) {
+        return this.toLayerHandle(this.createLineLayer(data, options));
+    }
+    /** *********************从 URL 添加静态线图层*********************/
+    async addLineByUrl(url, options) {
         ValidationUtils.validateNonEmptyString(url, 'Line url is required');
-        const mergedOptions = this.mergeDefaultOptions(options);
-        const source = new VectorSource({
-            url,
-            format: new GeoJSON(ProjectionUtils.getGeoJSONReadOptions(mergedOptions))
-        });
-        return this.createStaticLayer(source, mergedOptions);
+        const response = await fetch(url);
+        if (!response.ok) {
+            throw new Error(`Failed to fetch line GeoJSON: ${response.status}`);
+        }
+        const json = await response.json();
+        return this.addLine(json, options);
     }
     removeLineLayer(layerName) {
         ValidationUtils.validateLayerName(layerName);
         MapTools.removeLayer(this.map, layerName);
     }
-    addFlowLine(data, options = {}) {
+    addFlowLine(data, options) {
         const mergedOptions = this.mergeFlowLineOptions(options);
         const layerName = mergedOptions.layerName;
         try {
@@ -113,7 +128,7 @@ export default class Line {
             return null;
         }
     }
-    async addFlowLineByUrl(url, options = {}) {
+    async addFlowLineByUrl(url, options) {
         const mergedOptions = this.mergeFlowLineOptions(options);
         try {
             ValidationUtils.validateNonEmptyString(url, 'Flow line url is required');
@@ -141,4 +156,17 @@ export default class Line {
         }
         MapTools.removeLayer(this.map, [layerName, `${layerName}__flow-animation`]);
     }
+    /**
+     * 销毁本实例创建的所有流动线动画。供 MyOl.destroy 调用，
+     * 确保地图销毁后所有 requestAnimationFrame / postrender 监听被回收。
+     */
+    destroyAllFlowLines() {
+        Array.from(this.flowLineRegistry.values()).forEach(handle => {
+            try {
+                handle.remove();
+            }
+            catch { /* ignore */ }
+        });
+        this.flowLineRegistry.clear();
+    }
 }

package/core/map/ConfigManager.d.ts

@@ -1,36 +1,160 @@
+import type { Positioning } from "ol/Overlay";
+/**
+ * P2-1：内部默认配置存储与 setDefaults 覆盖机制。
+ *
+ * 设计要点：
+ * - 每组默认值都通过 getter 暴露，运行时 setDefaults 可叠加 partial 覆盖
+ * - 旧 callsite 直接 spread `ConfigManager.DEFAULT_X` 不需要改一行代码
+ * - 嵌套对象（如 flowSymbol）做深合并
+ */
+interface DefaultsRegistry {
+    POINT_OPTIONS: {
+        visible: boolean;
+        zIndex: number;
+    };
+    POINT_TEXT_OPTIONS: {
+        textFont: string;
+        textFillColor: string;
+        textStrokeColor: string;
+        textStrokeWidth: number;
+        textOffsetY: number;
+    };
+    POINT_ICON_SCALE: number;
+    CLUSTER_OPTIONS: {
+        distance: number;
+        minDistance: number;
+        zIndex: number;
+    };
+    DOM_POINT_OVERLAY_OPTIONS: {
+        positioning: Positioning;
+        stopEvent: boolean;
+    };
+    LINE_OPTIONS: {
+        type: string;
+        strokeColor: string;
+        strokeWidth: number;
+        visible: boolean;
+        layerName: string;
+        zIndex: number;
+    };
+    FLOW_LINE_OPTIONS: any;
+    POLYGON_OPTIONS: {
+        zIndex: number;
+        visible: boolean;
+        textFont: string;
+        textFillColor: string;
+        textStrokeColor: string;
+        textStrokeWidth: number;
+    };
+    POLYGON_COLOR_MAP: Record<string, string>;
+    IMAGE_OPTIONS: {
+        opacity: number;
+        visible: boolean;
+        layerName: string;
+        zIndex: number;
+    };
+    MASK_OPTIONS: {
+        fillColor: string;
+        opacity: number;
+        visible: boolean;
+        layerName: string;
+        zIndex: number;
+    };
+    TEXT_OPTIONS: {
+        textFont: string;
+        textFillColor: string;
+        textStrokeColor: string;
+        textStrokeWidth: number;
+    };
+    HEATMAP_OPTIONS: {
+        blur: number;
+        radius: number;
+        zIndex: number;
+        opacity: number;
+    };
+    HEATMAP_VALUE_KEY: string;
+    TIANDITU_CONFIG: {
+        BASE_URL: string;
+        PROJECTION: string;
+        DEFAULT_ZINDEX: number;
+        ANNOTATION_ZINDEX_OFFSET: number;
+    };
+    MAP_LAYERS_OPTIONS: {
+        zIndex: number;
+        annotation: boolean;
+        mapClip: boolean;
+        mapClipData: any;
+    };
+    MYOL_OPTIONS: {
+        layers: any;
+        zoom: number;
+        center: number[];
+        extent: any;
+    };
+    VUE_TEMPLATE_POINT_OPTIONS: {
+        positioning: Positioning;
+        stopEvent: boolean;
+        visible: boolean;
+        zIndex: number;
+    };
+    RIVER_LEVEL_WIDTH_MAP: Record<number, number>;
+    RIVER_LAYERS_BY_ZOOM_OPTIONS: {
+        type: string;
+        levelCount: number;
+        zoomOffset: number;
+        strokeColor: string;
+        strokeWidth: number;
+        visible: boolean;
+        zIndex: number;
+        layerName: string;
+        removeExisting: boolean;
+    };
+    RIVER_WIDTH_BY_LEVEL_OPTIONS: {
+        type: string;
+        layerName: string;
+        strokeColor: string;
+        strokeWidth: number;
+        visible: boolean;
+        zIndex: number;
+        removeExisting: boolean;
+    };
+}
 /**
  * 配置管理类
  * 用于统一管理默认配置和验证
+ *
+ * 运行时修改默认值：调用 ConfigManager.setDefaults('LINE_OPTIONS', { strokeWidth: 4 })
+ * 之后所有新创建的 Line/FlowLine 都将以此为默认。
  */
 export default class ConfigManager {
-    /**
-     * 默认点位配置
-     */
-    static readonly DEFAULT_POINT_OPTIONS: {
+    /** 运行时覆盖默认配置。partial 会与现有 default 做深合并，未提到的键保持原值。 */
+    static setDefaults<K extends keyof DefaultsRegistry>(group: K, partial: Partial<DefaultsRegistry[K]>): void;
+    /** 取当前运行时 default（含 setDefaults 覆盖后的结果），返回深拷贝避免被外部修改。 */
+    static getDefaults<K extends keyof DefaultsRegistry>(group: K): DefaultsRegistry[K];
+    /** 把所有 setDefaults 覆盖清掉，恢复到内置默认值。 */
+    static resetDefaults(group?: keyof DefaultsRegistry): void;
+    static get DEFAULT_POINT_OPTIONS(): {
         visible: boolean;
         zIndex: number;
     };
-    static readonly DEFAULT_POINT_TEXT_OPTIONS: {
+    static get DEFAULT_POINT_TEXT_OPTIONS(): {
         textFont: string;
         textFillColor: string;
         textStrokeColor: string;
         textStrokeWidth: number;
         textOffsetY: number;
     };
-    static readonly DEFAULT_POINT_ICON_SCALE = 1;
-    static readonly DEFAULT_CLUSTER_OPTIONS: {
+    static get DEFAULT_POINT_ICON_SCALE(): number;
+    static get DEFAULT_CLUSTER_OPTIONS(): {
         distance: number;
         minDistance: number;
         zIndex: number;
     };
-    static readonly DEFAULT_DOM_POINT_OVERLAY_OPTIONS: {
-        readonly positioning: "center-center";
-        readonly stopEvent: false;
+    static get DEFAULT_DOM_POINT_OVERLAY_OPTIONS(): {
+        positioning: Positioning;
+        stopEvent: boolean;
     };
-    /**
-     * 默认线配置
-     */
-    static readonly DEFAULT_LINE_OPTIONS: {
+    static get DEFAULT_LINE_OPTIONS(): {
         type: string;
         strokeColor: string;
         strokeWidth: number;
@@ -38,34 +162,8 @@ export default class ConfigManager {
         layerName: string;
         zIndex: number;
     };
-    /**
-     * 默认流动线动画配置
-     */
-    static readonly DEFAULT_FLOW_LINE_OPTIONS: {
-        readonly duration: 4000;
-        readonly loop: true;
-        readonly autoStart: true;
-        readonly showBaseLine: true;
-        readonly animationMode: "icon";
-        readonly flowSymbol: {
-            readonly scale: 0.8;
-            readonly rotateWithView: true;
-            readonly count: 1;
-            readonly spacing: 0.15;
-        };
-        readonly trailEnabled: false;
-        readonly trailLength: 0;
-        readonly zIndex: 16;
-        readonly type: string;
-        readonly strokeColor: string;
-        readonly strokeWidth: number;
-        readonly visible: boolean;
-        readonly layerName: string;
-    };
-    /**
-     * 默认面配置
-     */
-    static readonly DEFAULT_POLYGON_OPTIONS: {
+    static get DEFAULT_FLOW_LINE_OPTIONS(): any;
+    static get DEFAULT_POLYGON_OPTIONS(): {
         zIndex: number;
         visible: boolean;
         textFont: string;
@@ -73,78 +171,59 @@ export default class ConfigManager {
         textStrokeColor: string;
         textStrokeWidth: number;
     };
-    static readonly DEFAULT_POLYGON_COLOR_MAP: {
-        '0': string;
-        '1': string;
-        '2': string;
-        '3': string;
-    };
-    /**
-     * 默认图片图层配置
-     */
-    static readonly DEFAULT_IMAGE_OPTIONS: {
+    static get DEFAULT_POLYGON_COLOR_MAP(): Record<string, string>;
+    static get DEFAULT_IMAGE_OPTIONS(): {
         opacity: number;
         visible: boolean;
         layerName: string;
         zIndex: number;
     };
-    /**
-     * 默认遮罩图层配置
-     */
-    static readonly DEFAULT_MASK_OPTIONS: {
+    static get DEFAULT_MASK_OPTIONS(): {
         fillColor: string;
         opacity: number;
         visible: boolean;
         layerName: string;
+        zIndex: number;
     };
-    /**
-     * 默认文本配置
-     */
-    static readonly DEFAULT_TEXT_OPTIONS: {
+    static get DEFAULT_TEXT_OPTIONS(): {
         textFont: string;
         textFillColor: string;
         textStrokeColor: string;
         textStrokeWidth: number;
     };
-    static readonly DEFAULT_HEATMAP_OPTIONS: {
+    static get DEFAULT_HEATMAP_OPTIONS(): {
         blur: number;
         radius: number;
         zIndex: number;
         opacity: number;
     };
-    static readonly DEFAULT_HEATMAP_VALUE_KEY = "value";
-    static readonly TIANDITU_CONFIG: {
-        readonly BASE_URL: "//t{0-7}.tianditu.gov.cn/DataServer";
-        readonly PROJECTION: "EPSG:4326";
-        readonly DEFAULT_ZINDEX: 9;
-        readonly ANNOTATION_ZINDEX_OFFSET: 10;
+    static get DEFAULT_HEATMAP_VALUE_KEY(): string;
+    static get TIANDITU_CONFIG(): {
+        BASE_URL: string;
+        PROJECTION: string;
+        DEFAULT_ZINDEX: number;
+        ANNOTATION_ZINDEX_OFFSET: number;
     };
-    static readonly DEFAULT_MAP_LAYERS_OPTIONS: {
-        zIndex: 9;
+    static get DEFAULT_MAP_LAYERS_OPTIONS(): {
+        zIndex: number;
         annotation: boolean;
         mapClip: boolean;
-        mapClipData: undefined;
+        mapClipData: any;
     };
-    static readonly DEFAULT_MYOL_OPTIONS: {
-        layers: undefined;
+    static get DEFAULT_MYOL_OPTIONS(): {
+        layers: any;
         zoom: number;
         center: number[];
-        extent: undefined;
-    };
-    static readonly DEFAULT_VUE_TEMPLATE_POINT_OPTIONS: {
-        readonly positioning: "center-center";
-        readonly stopEvent: false;
-        readonly visible: true;
-        readonly zIndex: 1;
-    };
-    static readonly DEFAULT_RIVER_LEVEL_WIDTH_MAP: {
-        1: number;
-        2: number;
-        3: number;
-        4: number;
-        5: number;
-    };
-    static readonly DEFAULT_RIVER_LAYERS_BY_ZOOM_OPTIONS: {
+        extent: any;
+    };
+    static get DEFAULT_VUE_TEMPLATE_POINT_OPTIONS(): {
+        positioning: Positioning;
+        stopEvent: boolean;
+        visible: boolean;
+        zIndex: number;
+    };
+    static get DEFAULT_RIVER_LEVEL_WIDTH_MAP(): Record<number, number>;
+    static get DEFAULT_RIVER_LAYERS_BY_ZOOM_OPTIONS(): {
         type: string;
         levelCount: number;
         zoomOffset: number;
@@ -155,7 +234,7 @@ export default class ConfigManager {
         layerName: string;
         removeExisting: boolean;
     };
-    static readonly DEFAULT_RIVER_WIDTH_BY_LEVEL_OPTIONS: {
+    static get DEFAULT_RIVER_WIDTH_BY_LEVEL_OPTIONS(): {
         type: string;
         layerName: string;
         strokeColor: string;
@@ -184,3 +263,4 @@ export default class ConfigManager {
      */
     static deepClone<T>(obj: T): T;
 }
+export {};