my-openlayer 0.1.8 → 0.1.9

package/dist/MyOl.d.ts

@@ -5,7 +5,7 @@ import Point from "./core/Point";
 import Line from "./core/Line";
 import MapBaseLayers from "./core/MapBaseLayers";
 import MapTools from "./core/MapTools";
-import { MapInitType } from './types';
+import { MapInitType, EventType } from './types';
 export default class MyOl {
     map: Map;
     private baseLayers;
@@ -63,5 +63,5 @@ export default class MyOl {
      * @param clickType 点击类型
      * @param callback 回调函数
      */
-    mapOnEvent(eventType: string | undefined, callback: (feature?: any, e?: any) => void, clickType?: 'point' | 'line' | 'polygon' | undefined): void;
+    mapOnEvent(eventType: EventType, callback: (feature?: any, e?: any) => void, clickType?: 'point' | 'line' | 'polygon' | undefined): void;
 }

package/dist/MyOl.js

@@ -150,7 +150,7 @@ class MyOl {
      * @param clickType 点击类型
      * @param callback 回调函数
      */
-    mapOnEvent(eventType = "def", callback, clickType) {
+    mapOnEvent(eventType, callback, clickType) {
         MapTools.mapOnEvent(this.map, eventType, callback, clickType);
     }
 }

package/dist/core/MapTools.d.ts

@@ -1,5 +1,5 @@
 import Map from "ol/Map";
-import { MapJSONData } from "../types";
+import { EventType, MapJSONData } from "../types";
 import VectorLayer from "ol/layer/Vector";
 import VectorSource from "ol/source/Vector";
 import BaseLayer from "ol/layer/Base";
@@ -12,8 +12,8 @@ export default class MapTools {
      * 根据名称获取图层
      * @param layerName 图层名称
      */
-    getLayerByLayerName(layerName: string): (BaseLayer | VectorLayer<VectorSource<import("ol/geom").Geometry>> | ImageLayer<ImageSource>)[];
-    static getLayerByLayerName(map: Map, layerName: string): (BaseLayer | VectorLayer<VectorSource<import("ol/geom").Geometry>> | ImageLayer<ImageSource>)[];
+    getLayerByLayerName(layerName: string | string[]): (BaseLayer | VectorLayer<VectorSource<import("ol/geom").Geometry>> | ImageLayer<ImageSource>)[];
+    static getLayerByLayerName(map: Map, layerName: string | string[]): (BaseLayer | VectorLayer<VectorSource<import("ol/geom").Geometry>> | ImageLayer<ImageSource>)[];
     /**
      * 设置地图裁剪
      */
@@ -22,13 +22,13 @@ export default class MapTools {
      * 移除图层
      * @param layerName 图层名称
      */
-    removeLayer(layerName: string): void;
+    removeLayer(layerName: string | string[]): void;
     /**
      * 移除图层
      * @param map 地图对象
      * @param layerName 图层名称
      */
-    static removeLayer(map: Map, layerName: string): void;
+    static removeLayer(map: Map, layerName: string | string[]): void;
     setLayerVisible(layerName: string, visible: boolean): void;
     /**
      * 设置图层可见性
@@ -37,7 +37,7 @@ export default class MapTools {
      * @param visible 是否可见
      */
     static setLayerVisible: (map: Map, layerName: string, visible: boolean) => void;
-    mapOnEvent(eventType: string, callback: (feature?: any, e?: any) => void, clickType?: 'point' | 'line' | 'polygon' | undefined): void;
+    mapOnEvent(eventType: EventType, callback: (feature?: any, e?: any) => void, clickType?: 'point' | 'line' | 'polygon' | undefined): void;
     /**
      * 地图监听事件
      * @param map
@@ -45,5 +45,5 @@ export default class MapTools {
      * @param clickType 点击类型
      * @param callback 回调函数
      */
-    static mapOnEvent(map: Map, eventType: string | undefined, callback: (feature?: any, e?: any) => void, clickType?: 'point' | 'line' | 'polygon' | undefined): void;
+    static mapOnEvent(map: Map, eventType: EventType, callback: (feature?: any, e?: any) => void, clickType?: 'point' | 'line' | 'polygon'): void;
 }

package/dist/core/MapTools.js

@@ -21,9 +21,16 @@ class MapTools {
         const targetLayer = [];
         const layers = map.getLayers().getArray();
         Object.keys(layers).forEach(function (key) {
-            const _layerName = layers[key]['values_'].layerName;
-            if (_layerName && _layerName === layerName) {
-                targetLayer.push(layers[key]);
+            const _layerName = layers[key].get('layerName');
+            if (typeof layerName === "string") {
+                if (_layerName && _layerName === layerName) {
+                    targetLayer.push(layers[key]);
+                }
+            }
+            else {
+                if (_layerName && layerName.includes(_layerName)) {
+                    targetLayer.push(layers[key]);
+                }
             }
         });
         return targetLayer;
@@ -99,7 +106,7 @@ class MapTools {
      * @param clickType 点击类型
      * @param callback 回调函数
      */
-    static mapOnEvent(map, eventType = "def", callback, clickType) {
+    static mapOnEvent(map, eventType, callback, clickType) {
         const clickTypeObj = {
             point: ['point'],
             line: ['line'],

package/dist/types.d.ts

@@ -91,3 +91,4 @@ export interface PointData {
     [propName: string]: any;
 }
 export type MeasureHandlerType = 'Polygon' | 'LineString';
+export type EventType = 'click' | 'moveend' | 'hover';

package/package.json

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