cd-mapgis 1.0.38 → 1.0.39

package/package.json

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

package/src/LayerUtil.js

@@ -207,39 +207,48 @@ export default class LayerUtil {
     }
     /**
      * 将geoJson的点集合数据包装为一个图层
-     * @param {*} p {geoJsons:[],img:{url,anchor},text:{str,font,color,offsetY}}
+     * @param {*} p {geoList:[],img:{url,anchor},text:{str,font,color,offsetY}}
      */
     static getJsonPointsLayer(p) {
         let geoJSON = new GeoJSON();
         let vectorSource = new VectorSource({ features: [] });
         let layer = new VectorLayer({
-            source: vectorSource,
-            style: StyleUtil.getPointStyle(p)
+            source: vectorSource
         });
-        for (let i = 0; i < p.geoJsons; i++) {
-            let json = p.geoJsons[i];
+        for (let i = 0; i < p.geoList; i++) {
+            let geo = p.geoList[i];
             var f = new ol.Feature({
-                geometry: geoJSON.readGeometry(json)
+                geometry: geoJSON.readGeometry(geo.json)
             });
+            if (geo.text) {
+                if (!p.text) p.text = {};
+                p.text.str = geo.text;
+            }
+            f.setStyle(StyleUtil.getPointStyle(p));
             vectorSource.addFeature(f);
         }
         return layer;
     }
     /**
      * 将geoJson的多边形集合数据包装为一个图层
-     * @param {*} p 
+     * @param {*} p {geoList:[],style:{fillColor,lineColor,lineWidth},text:{str,font,color}}
      */
     static getJsonPolygonsLayer(p) {
+        let geoJSON = new GeoJSON();
         let vectorSource = new VectorSource({ features: [] });
         let layer = new VectorLayer({
-            source: vectorSource,
-            style: StyleUtil.getPolygonStyle(p)
+            source: vectorSource
         });
-        for (let i = 0; i < p.geoJsons; i++) {
-            let json = p.geoJsons[i];
+        for (let i = 0; i < p.geoList; i++) {
+            let geo = p.geoList[i];
             var f = new ol.Feature({
-                geometry: geoJSON.readGeometry(json)
+                geometry: geoJSON.readGeometry(geo.json)
             });
+            if (geo.text) {
+                if (!p.text) p.text = {};
+                p.text.str = geo.text;
+            }
+            f.setStyle(StyleUtil.getPolygonStyle(p));
             vectorSource.addFeature(f);
         }
         return layer;

package/src/StyleUtil.js

@@ -135,17 +135,25 @@ export default class StyleUtil {
      * @returns 
      */
     static getPolygonStyle(p) {
-        let fill = p.fill ? p.fill : 'rgba(255, 255, 255, 0.2)';
-        let lineColor = p.lineColor ? p.lineColor : 'rgba(0, 0, 255, 1)';
-        let lineWidth = p.lineWidth ? p.lineWidth : 2;
-        return new Style({
-            fill: new Fill({
-                color: fill
-            }),
-            stroke: new Stroke({
-                color: lineColor,
-                width: lineWidth
-            })
+        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
         });
+        if (p.text) {
+            styleParam.text = StyleUtil.getText(p.text);
+        }
+        return new Style(styleParam);
     }
 }