my-openlayer 0.1.2 → 0.1.3

package/dist/core/Point.d.ts

@@ -15,8 +15,8 @@ export default class Point {
      *   hasImg: Boolean 是否显示图标
      * }
      */
-    addPoint(pointData: PointData[], type: string, options: OptionsType): VectorLayer<VectorSource<import("ol/geom").Geometry>>;
-    addClusterPoint(pointData: any[], type: string | undefined, options: OptionsType): void;
+    addPoint(pointData: PointData[], options: OptionsType): VectorLayer<VectorSource<import("ol/geom").Geometry>>;
+    addClusterPoint(pointData: any[], options: OptionsType): void;
     /**
      * 添加点 - 闪烁
      *
@@ -26,7 +26,7 @@ export default class Point {
     /**
      * 设置闪烁点
      * @param twinkleList 闪烁点数据 - 二维数组 [[],[]]
-     * @param className 闪烁点样式
+     * @param className 闪烁点样式,需要和id保持一致
      * @param key 闪烁点索引
      * @param callback
      */

package/dist/core/Point.js

@@ -25,14 +25,14 @@ export default class Point {
      *   hasImg: Boolean 是否显示图标
      * }
      */
-    addPoint(pointData, type, options) {
+    addPoint(pointData, options) {
         const pointFeatureList = [];
         pointData.forEach((item) => {
             const pointFeature = new Feature({
                 // clickLocation: options.clickLocation,
                 // all: JSON.stringify(item),
                 rawData: item, //保存原始数据
-                type: type,
+                type: options.type,
                 geometry: new olPoint([item.lgtd, item.lttd])
             });
             const style = {};
@@ -64,7 +64,7 @@ export default class Point {
             pointFeatureList.push(pointFeature);
         });
         const PointVectorLayer = new VectorLayer({
-            layerName: type,
+            layerName: options.type,
             source: new VectorSource({
                 features: pointFeatureList
             }),
@@ -74,7 +74,7 @@ export default class Point {
         this.map.addLayer(PointVectorLayer);
         return PointVectorLayer;
     }
-    addClusterPoint(pointData, type = 'village', options) {
+    addClusterPoint(pointData, options) {
         const pointFeatureList = [];
         pointData.forEach(item => {
             const pointFeature = new Feature({
@@ -91,7 +91,7 @@ export default class Point {
             source: source,
         });
         const clusterLayer = new VectorLayer({
-            layerName: type,
+            layerName: options.type,
             source: clusterSource,
             style: function (feature) {
                 const aviValue = feature.get('features')[0].get('name');
@@ -199,7 +199,7 @@ export default class Point {
     /**
      * 设置闪烁点
      * @param twinkleList 闪烁点数据 - 二维数组 [[],[]]
-     * @param className 闪烁点样式
+     * @param className 闪烁点样式,需要和id保持一致
      * @param key 闪烁点索引
      * @param callback
      */
@@ -212,7 +212,7 @@ export default class Point {
                 arr[i].parentNode?.removeChild(arr[i]);
             }
         }
-        const el = document.getElementById('marker_warning');
+        const el = document.getElementById(className);
         for (let i = 0; i < twinkleList.length; i++) {
             const twinkleItem = twinkleList[i];
             // 定义图标Dom

package/dist/core/Polygon.d.ts

@@ -16,10 +16,9 @@ export default class Polygon {
     /**
      * 添加 地图 边框 图层
      * @param data 图层数据
-     * @param type 图层类型
      * @param options 图层配置
      */
-    addPolygonMapLayer(data: MapJSONData, type: string | undefined, options: OptionsType): void;
+    addBorderPolygonLayer(data: MapJSONData, options: OptionsType): void;
     addPolygonLayerCommon(dataJSON: MapJSONData, options?: OptionsType): VectorLayer<VectorSource<Geometry>>;
     /**
      * 根据数据数组更新某个面颜色

package/dist/core/Polygon.js

@@ -29,40 +29,12 @@ export default class Polygon {
     /**
      * 添加 地图 边框 图层
      * @param data 图层数据
-     * @param type 图层类型
      * @param options 图层配置
      */
-    addPolygonMapLayer(data, type = 'fuyangqu', options) {
-        const borderLayer = new VectorLayer({
-            name: type,
-            layerName: options.type || type,
-            source: new VectorSource({
-                features: (new GeoJSON()).readFeatures(data)
-            }),
-            style: function (feature) {
-                feature.set('type', options.type);
-                feature.set('layerName', options.type);
-                return new Style({
-                    stroke: new Stroke({
-                        color: options.strokeColor || '#EBEEF5',
-                        width: options.strokeWidth || 3
-                    }),
-                    fill: new Fill({ color: 'rgba(255, 255, 255, 0)' }),
-                    text: new Text({
-                        text: options.nameKey ? feature.values_[options.nameKey] : "",
-                        font: options.textFont ?? '14px Calibri,sans-serif',
-                        fill: new Fill({ color: options.textFillColor ?? '#FFF' }),
-                        stroke: new Stroke({
-                            color: options.textStrokeColor ?? '#409EFF',
-                            width: options.textStrokeWidth ?? 2
-                        })
-                    })
-                });
-            },
-            zIndex: options.zIndex ?? 2
-        });
-        borderLayer.setVisible(options.visible === undefined ? true : options.visible);
-        this.map.addLayer(borderLayer);
+    addBorderPolygonLayer(data, options) {
+        options.type = options.type ?? 'border';
+        options.fillColor = options.fillColor ?? 'rgba(255, 255, 255, 0)';
+        this.addPolygonLayerCommon(data, options);
         if (options.mask)
             this.setOutLayer(data);
     }

package/package.json

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