my-openlayer 2.2.0 → 2.3.1

package/MyOl.js

@@ -404,12 +404,7 @@ class MyOl {
     }
 }
 // 默认配置
-MyOl.DefaultOptions = {
-    layers: undefined,
-    zoom: 10,
-    center: [119.81, 29.969],
-    extent: undefined
-};
+MyOl.DefaultOptions = ConfigManager.DEFAULT_MYOL_OPTIONS;
 // 坐标系配置
 MyOl.PROJECTIONS = {
     CGCS2000: "EPSG:4490",

package/core/ConfigManager.d.ts

@@ -7,21 +7,33 @@ export declare class ConfigManager {
      * 默认点位配置
      */
     static readonly DEFAULT_POINT_OPTIONS: {
-        strokeColor: string;
-        strokeWidth: number;
-        fillColor: string;
-        opacity: number;
         visible: boolean;
-        layerName: string;
         zIndex: number;
     };
+    static readonly 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: {
+        distance: number;
+        minDistance: number;
+        zIndex: number;
+    };
+    static readonly DEFAULT_DOM_POINT_OVERLAY_OPTIONS: {
+        readonly positioning: "center-center";
+        readonly stopEvent: false;
+    };
     /**
      * 默认线配置
      */
     static readonly DEFAULT_LINE_OPTIONS: {
+        type: string;
         strokeColor: string;
         strokeWidth: number;
-        opacity: number;
         visible: boolean;
         layerName: string;
         zIndex: number;
@@ -30,13 +42,21 @@ export declare class ConfigManager {
      * 默认面配置
      */
     static readonly DEFAULT_POLYGON_OPTIONS: {
+        zIndex: number;
+        visible: boolean;
         strokeColor: string;
         strokeWidth: number;
         fillColor: string;
-        opacity: number;
-        visible: boolean;
-        layerName: string;
-        zIndex: number;
+        textFont: string;
+        textFillColor: string;
+        textStrokeColor: string;
+        textStrokeWidth: number;
+    };
+    static readonly DEFAULT_POLYGON_COLOR_MAP: {
+        '0': string;
+        '1': string;
+        '2': string;
+        '3': string;
     };
     /**
      * 默认图片图层配置
@@ -55,7 +75,6 @@ export declare class ConfigManager {
         opacity: number;
         visible: boolean;
         layerName: string;
-        zIndex: number;
     };
     /**
      * 默认文本配置
@@ -66,6 +85,64 @@ export declare class ConfigManager {
         textStrokeColor: string;
         textStrokeWidth: number;
     };
+    static readonly 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 readonly DEFAULT_MAP_LAYERS_OPTIONS: {
+        zIndex: 9;
+        annotation: boolean;
+        mapClip: boolean;
+        mapClipData: undefined;
+    };
+    static readonly DEFAULT_MYOL_OPTIONS: {
+        layers: undefined;
+        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: {
+        type: string;
+        levelCount: number;
+        zoomOffset: number;
+        strokeColor: string;
+        strokeWidth: number;
+        visible: boolean;
+        zIndex: number;
+        layerName: string;
+        removeExisting: boolean;
+    };
+    static readonly DEFAULT_RIVER_WIDTH_BY_LEVEL_OPTIONS: {
+        type: string;
+        layerName: string;
+        strokeColor: string;
+        strokeWidth: number;
+        visible: boolean;
+        zIndex: number;
+        removeExisting: boolean;
+    };
     /**
      * 合并配置选项
      * @param defaultOptions 默认配置

package/core/ConfigManager.js

@@ -51,36 +51,56 @@ export class ConfigManager {
  * 默认点位配置
  */
 ConfigManager.DEFAULT_POINT_OPTIONS = {
-    strokeColor: '#409EFF',
-    strokeWidth: 2,
-    fillColor: 'rgba(64, 158, 255, 0.3)',
-    opacity: 1,
     visible: true,
-    layerName: 'pointLayer',
-    zIndex: 10
+    zIndex: 21
+};
+ConfigManager.DEFAULT_POINT_TEXT_OPTIONS = {
+    textFont: '12px Calibri,sans-serif',
+    textFillColor: '#FFF',
+    textStrokeColor: '#000',
+    textStrokeWidth: 3,
+    textOffsetY: 20
+};
+ConfigManager.DEFAULT_POINT_ICON_SCALE = 1;
+ConfigManager.DEFAULT_CLUSTER_OPTIONS = {
+    distance: 40,
+    minDistance: 0,
+    zIndex: 21
+};
+ConfigManager.DEFAULT_DOM_POINT_OVERLAY_OPTIONS = {
+    positioning: 'center-center',
+    stopEvent: false
 };
 /**
  * 默认线配置
  */
 ConfigManager.DEFAULT_LINE_OPTIONS = {
-    strokeColor: '#409EFF',
+    type: 'line',
+    strokeColor: 'rgba(3, 122, 255, 1)',
     strokeWidth: 2,
-    opacity: 1,
     visible: true,
     layerName: 'lineLayer',
-    zIndex: 10
+    zIndex: 15
 };
 /**
  * 默认面配置
  */
 ConfigManager.DEFAULT_POLYGON_OPTIONS = {
+    zIndex: 11,
+    visible: true,
     strokeColor: '#EBEEF5',
     strokeWidth: 2,
-    fillColor: 'rgba(255, 255, 255, 0.3)',
-    opacity: 1,
-    visible: true,
-    layerName: 'polygonLayer',
-    zIndex: 10
+    fillColor: 'rgba(255, 255, 255, 0)',
+    textFont: '14px Calibri,sans-serif',
+    textFillColor: '#FFF',
+    textStrokeColor: '#409EFF',
+    textStrokeWidth: 2
+};
+ConfigManager.DEFAULT_POLYGON_COLOR_MAP = {
+    '0': 'rgba(255, 0, 0, 0.6)',
+    '1': 'rgba(245, 154, 35, 0.6)',
+    '2': 'rgba(255, 238, 0, 0.6)',
+    '3': 'rgba(1, 111, 255, 0.6)'
 };
 /**
  * 默认图片图层配置
@@ -98,8 +118,7 @@ ConfigManager.DEFAULT_MASK_OPTIONS = {
     fillColor: 'rgba(0, 0, 0, 0.5)',
     opacity: 1,
     visible: true,
-    layerName: 'maskLayer',
-    zIndex: 12
+    layerName: 'maskLayer'
 };
 /**
  * 默认文本配置
@@ -110,3 +129,61 @@ ConfigManager.DEFAULT_TEXT_OPTIONS = {
     textStrokeColor: '#409EFF',
     textStrokeWidth: 2
 };
+ConfigManager.DEFAULT_HEATMAP_OPTIONS = {
+    blur: 15,
+    radius: 10,
+    zIndex: 11,
+    opacity: 1
+};
+ConfigManager.DEFAULT_HEATMAP_VALUE_KEY = 'value';
+ConfigManager.TIANDITU_CONFIG = {
+    BASE_URL: '//t{0-7}.tianditu.gov.cn/DataServer',
+    PROJECTION: 'EPSG:4326',
+    DEFAULT_ZINDEX: 9,
+    ANNOTATION_ZINDEX_OFFSET: 10
+};
+ConfigManager.DEFAULT_MAP_LAYERS_OPTIONS = {
+    zIndex: ConfigManager.TIANDITU_CONFIG.DEFAULT_ZINDEX,
+    annotation: false,
+    mapClip: false,
+    mapClipData: undefined
+};
+ConfigManager.DEFAULT_MYOL_OPTIONS = {
+    layers: undefined,
+    zoom: 10,
+    center: [119.81, 29.969],
+    extent: undefined
+};
+ConfigManager.DEFAULT_VUE_TEMPLATE_POINT_OPTIONS = {
+    positioning: 'center-center',
+    stopEvent: false,
+    visible: true,
+    zIndex: 1
+};
+ConfigManager.DEFAULT_RIVER_LEVEL_WIDTH_MAP = {
+    1: 2,
+    2: 1,
+    3: 0.5,
+    4: 0.5,
+    5: 0.5
+};
+ConfigManager.DEFAULT_RIVER_LAYERS_BY_ZOOM_OPTIONS = {
+    type: 'river',
+    levelCount: 5,
+    zoomOffset: 8,
+    strokeColor: 'rgb(0,113,255)',
+    strokeWidth: 3,
+    visible: true,
+    zIndex: 15,
+    layerName: 'riverLayer',
+    removeExisting: false
+};
+ConfigManager.DEFAULT_RIVER_WIDTH_BY_LEVEL_OPTIONS = {
+    type: 'river',
+    layerName: 'river',
+    strokeColor: 'rgba(3, 122, 255, 1)',
+    strokeWidth: 2,
+    visible: true,
+    zIndex: 15,
+    removeExisting: false
+};

package/core/Line.d.ts

@@ -2,28 +2,9 @@ import Map from "ol/Map";
 import VectorSource from "ol/source/Vector";
 import VectorLayer from "ol/layer/Vector";
 import { LineOptions, MapJSONData } from "../types";
-/**
- * 河流级别宽度映射配置
- */
-interface RiverLevelWidthMap {
-    [level: number]: number;
-}
-/**
- * 河流图层配置选项
- */
-interface RiverLayerOptions extends LineOptions {
-    /** 河流级别数量，默认为5 */
-    levelCount?: number;
-    /** 缩放级别偏移量，默认为8 */
-    zoomOffset?: number;
-    /** 河流级别宽度映射 */
-    levelWidthMap?: RiverLevelWidthMap;
-    /** 是否删除同名图层 */
-    removeExisting?: boolean;
-}
 /**
  * 线要素管理类
- * 用于在地图上添加和管理线要素，包括普通线要素、河流图层等
+ * 用于在地图上添加和管理线要素
  *
  * @example
  * ```typescript
@@ -38,14 +19,9 @@ interface RiverLayerOptions extends LineOptions {
 export default class Line {
     /** OpenLayers 地图实例 */
     private readonly map;
-    /** 事件管理器实例 */
-    private readonly eventManager;
-    /** 河流图层列表 */
-    private riverLayerList;
-    /** 河流图层显示状态 */
-    private riverLayerShow;
-    /** 默认河流级别宽度映射 */
-    private readonly defaultLevelWidthMap;
+    private mergeDefaultOptions;
+    private createStyleFunction;
+    private createLayer;
     /**
      * 构造函数
      * @param map OpenLayers地图实例
@@ -65,66 +41,9 @@ export default class Line {
      * @returns 创建的矢量图层
      */
     addLineByUrl(url: string, options?: LineOptions): VectorLayer<VectorSource>;
-    /**
-     * 添加分级河流图层，根据缩放级别显示不同级别的河流
-     * @param fyRiverJson 河流 GeoJSON 数据
-     * @param options 河流图层配置选项
-     * @throws {Error} 当数据格式无效时抛出错误
-     */
-    addRiverLayersByZoom(fyRiverJson: MapJSONData, options?: RiverLayerOptions): void;
-    /**
-     * 从URL添加分级河流图层，根据缩放级别显示不同级别的河流
-     * @param url 河流数据URL
-     * @param options 河流图层配置选项
-     * @throws {Error} 当数据格式无效时抛出错误
-     */
-    addRiverLayersByZoomByUrl(url: string, options?: RiverLayerOptions): void;
-    /**
-     * 显示或隐藏河流图层
-     * @param show 是否显示河流图层
-     */
-    showRiverLayer(show: boolean): void;
-    /**
-     * 根据缩放级别显示对应的河流图层
-     * 缩放级别越高，显示的河流级别越详细
-     */
-    showRiverLayerByZoom(): void;
-    /**
-     * 添加按级别显示不同宽度的河流图层
-     * @param data 河流 GeoJSON 数据
-     * @param options 河流图层配置选项
-     * @returns 创建的河流图层
-     */
-    addRiverWidthByLevel(data: MapJSONData, options?: RiverLayerOptions): VectorLayer<VectorSource>;
-    /**
-     * 从URL添加按级别显示不同宽度的河流图层
-     * @param url 河流数据URL
-     * @param options 河流图层配置选项
-     * @returns 创建的河流图层
-     */
-    addRiverWidthByLevelByUrl(url: string, options?: RiverLayerOptions): VectorLayer<VectorSource>;
     /**
      * 移除线图层
      * @param layerName 图层名称
      */
     removeLineLayer(layerName: string): void;
-    /**
-     * 清除所有河流图层
-     */
-    clearRiverLayers(): void;
-    /**
-     * 获取河流图层显示状态
-     * @returns 河流图层是否显示
-     */
-    getRiverLayerVisibility(): boolean;
-    /**
-     * 获取河流图层列表
-     * @returns 河流图层数组的副本
-     */
-    getRiverLayers(): VectorLayer<VectorSource>[];
-    /**
-     * 销毁线管理器，清理所有资源
-     */
-    destroy(): void;
 }
-export {};