cd-mapgis 1.1.5 → 1.1.7

package/package.json

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

package/src/LineLayer.js

@@ -15,7 +15,6 @@ export default class LineLayer {
         this.vectorLayer = new VectorLayer({
             source: this.vectorSource
         });
-        this.features = [];
         this.mapView = p.mapView ? p.mapView : MapView.Instance;
         this.map = this.mapView.map;
         this.map.addLayer(this.vectorLayer);
@@ -49,7 +48,6 @@ export default class LineLayer {
             })
         }));
         feature.set('attr', p.attr);
-        this.features.push(feature);
         return feature;
     }
     /**
@@ -84,21 +82,10 @@ export default class LineLayer {
      * 缩放到本图层显示范围
      */
     fitToLayer(){
-        const map = this.map;      
-        let minX = Infinity, minY = Infinity, maxX = -Infinity, maxY = -Infinity;
-        this.features.forEach(f => {
-            const coord = f.getGeometry().getCoordinates();
-            minX = Math.min(minX, coord[0]);
-            minY = Math.min(minY, coord[1]);
-            maxX = Math.max(maxX, coord[0]);
-            maxY = Math.max(maxY, coord[1]);
-        });
-        const manualExtent = [minX, minY, maxX, maxY];
-        console.log('手动计算 extent:', manualExtent);
-        map.getView().fit(manualExtent, {
+        const map = this.map;
+        map.getView().fit(this.vectorSource.getExtent(), {
             size: map.getSize(),
-            maxZoom: 16,
-            duration: 1000
+            maxZoom: 18
         })
     }
 }

package/src/PointLayer.js

@@ -15,7 +15,6 @@ export default class PointLayer {
         this.vectorLayer = new VectorLayer({
             source: this.vectorSource
         });
-        this.features = [];
         this.mapView = p.mapView ? p.mapView : MapView.Instance;
         this.map = this.mapView.map;
         this.map.addLayer(this.vectorLayer);
@@ -42,18 +41,34 @@ export default class PointLayer {
         let feature = new Feature({
             geometry: new Point(p.point)
         });
-        feature.setStyle(new Style({
-            image: new Icon({
+        let p = {};
+        if (p.img) {
+            p.image = new Icon({
                 src: p.img, // 外部图标路径
                 scale: 1, // 缩放比例
                 anchor: [0.5, 0.5], // 锚点为中心
                 anchorOrigin: 'center',
                 anchorXUnits: 'fraction',
                 anchorYUnits: 'fraction'
-            })
-        }));
+            });
+        }
+        if (p.text) {
+            let font = p.font ? p.font : 'bold 20px 宋体';
+            let corlor = p.corlor ? p.corlor : '#0619e9';
+            let offsetY = p.offsetY ? p.offsetY : -10;
+            p.text = new Text({
+                text: p.text,  // 从要素属性获取文字
+                font: font,
+                overflow: true,  // 关键设置：允许文字溢出
+                fill: new Fill({
+                    color: corlor
+                }),
+                offsetX: 0,
+                offsetY: offsetY  // 文字显示在图标上方
+            });
+        }
+        feature.setStyle(new Style(p));
         feature.set('attr', p.attr);
-        this.features.push(feature);
         return feature;
     }
     /**
@@ -88,22 +103,10 @@ export default class PointLayer {
      * 缩放到本图层显示范围
      */
     fitToLayer() {
-        const map = this.map;        
-        let minX = Infinity, minY = Infinity, maxX = -Infinity, maxY = -Infinity;
-        this.features.forEach(f => {
-            const coord = f.getGeometry().getCoordinates();
-            minX = Math.min(minX, coord[0]);
-            minY = Math.min(minY, coord[1]);
-            maxX = Math.max(maxX, coord[0]);
-            maxY = Math.max(maxY, coord[1]);
-        });
-        const manualExtent = [minX, minY, maxX, maxY];
-        console.log('features:', this.features);
-        console.log('手动计算 extent:', manualExtent);
-        map.getView().fit(manualExtent, {
+        const map = this.map;
+        map.getView().fit(this.vectorSource.getExtent(), {
             size: map.getSize(),
-            maxZoom: 16,
-            duration: 1000
+            maxZoom: 18
         })
     }
 }