cd-mapgis 1.0.74 → 1.0.76

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cd-mapgis",
-  "version": "1.0.74",
+  "version": "1.0.76",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",
   "type": "module",

package/src/LayerUtil.js

@@ -202,7 +202,7 @@ export default class LayerUtil {
         let geometry = geoJSON.readGeometry(p.data);
         let feature = new Feature({ geometry: geometry });
         let vectorSource = new VectorSource({ features: [feature] });
-        p.style = p.style ? StyleUtil.getPointStyle(p.style) : StyleUtil.getViewOnTemplayerStyle();
+        p.style = p.style ? StyleUtil.getCommStyle(p.style) : StyleUtil.getViewOnTemplayerStyle();
         let layer = new VectorLayer({
             source: vectorSource,
             style: p.style

package/src/StyleUtil.js

@@ -21,6 +21,15 @@ export default class StyleUtil {
             }),
             fill: new Fill({
                 color: 'rgba(0, 0, 0, 0)'  // 透明填充
+            }),
+            image: new Circle({
+                radius: 5,
+                stroke: new Stroke({
+                    color: 'rgba(0, 0, 0, 0.7)'
+                }),
+                fill: new Fill({
+                    color: 'rgba(255, 255, 255, 0.2)'
+                })
             })
         });
     }
@@ -86,8 +95,8 @@ export default class StyleUtil {
             anchorXUnits: 'fraction',
             anchorYUnits: 'pixels',
             offsetOrigin: 'top-right',
-            scale:p.scale ?? 0.5,
-            offset:p.offset ?? [0,10],
+            scale: p.scale ?? 0.5,
+            offset: p.offset ?? [0, 10],
             // offset:[0,10],
             //图标缩放比例
             //scale:0.5,
@@ -156,7 +165,46 @@ export default class StyleUtil {
         });
         if (p.text) {
             styleParam.text = StyleUtil.getText(p.text);
-        }      
+        }
+        return new Style(styleParam);
+    }
+    /**
+     * 通用样式配置
+     * @param {*} p 
+     * @returns 
+     */
+    static getCommStyle(p) {
+        let styleParam = {};
+        let fill = 'rgba(255, 255, 255, 0.2)';
+        let lineColor = 'rgba(0, 0, 255, 1)';
+        let lineWidth = 2;
+        if (p.style) {
+            if (p.style.fillColor) fill = p.style.fillColor;
+            if (p.style.lineColor) lineColor = p.style.lineColor;
+            if (p.style.lineWidth) lineWidth = p.style.lineWidth;
+        }
+        styleParam.fill = new Fill({
+            color: fill
+        });
+        styleParam.stroke = new Stroke({
+            color: lineColor,
+            width: lineWidth
+        });
+        styleParam.image = new Circle({
+            radius: 5,
+            stroke: new Stroke({
+                color: 'rgba(0, 0, 0, 0.7)'
+            }),
+            fill: new Fill({
+                color: 'rgba(255, 255, 255, 0.2)'
+            })
+        });
+        if (p.img) {
+            styleParam.image = StyleUtil.getIcon(p.img);
+        }
+        if (p.text) {
+            styleParam.text = StyleUtil.getText(p.text);
+        }
         return new Style(styleParam);
     }
 }