Merge branch 'webclient_plot' into dev

Author: zhaokai

package.json

@@ -98,6 +98,7 @@
         "proj4": "2.3.15",
         "promise-polyfill": "^8.2.3",
         "qs": "^6.9.4",
-        "webfont-matcher": "^1.1.0"
+        "webfont-matcher": "^1.1.0",
+        "svg-pathdata": "^6.0.0"
     }
 }

src/cesiumjs/index.js

@@ -454,3 +454,13 @@ export {
     OGCWMTSInfo,
     OGCWMSInfo
 };
+
+import {
+    SymbolManager3D,
+    PlotCanvas3D
+} from "./Plot/index"
+
+export {
+    SymbolManager3D,
+    PlotCanvas3D
+}

src/mapboxgl/index.js

@@ -1,8 +1,8 @@
 import { MapExtend } from './MapExtend';
 export { MapExtend };
 
-import { Common, BaseServer, Extend, MRFS, MRGS, MRFWS, MRMS, MRCS, Info, PostGIS, CloudDisk } from '@mapgis/webclient-es6-service';
-export { Common, BaseServer, Extend, MRFS, MRGS, MRFWS, MRMS, MRCS, Info, PostGIS, CloudDisk };
+import { Common, BaseServer, Extend, MRFS, MRGS, MRFWS , MRMS, MRCS, Info, PostGIS, CloudDisk } from '@mapgis/webclient-es6-service';
+export { Common, BaseServer, Extend, MRFS, MRGS, MRFWS , MRMS, MRCS, Info, PostGIS, CloudDisk };
 
 import { mapboxgl, MapDocLayer, MapTileLayer, MapWmsLayer, MapWMTSLayer, MapVectorLayer, ArcGISLayer, TDTLayer } from './layer';
 export { mapboxgl, MapDocLayer, MapTileLayer, MapWmsLayer, MapWMTSLayer, MapVectorLayer, ArcGISLayer, TDTLayer };

src/mapboxgl/overlay/index.js

@@ -1,3 +1,10 @@
+/*
+ * @Description: 
+ * @Author: zk
+ * @Date: 2022-04-25 11:32:23
+ * @LastEditors: Do not edit
+ * @LastEditTime: 2022-04-25 20:11:41
+ */
 /**
  * @module 客户端可视化
  */

src/service/2DPlot/PlotLayer2D.js

@@ -4,7 +4,7 @@
  * @Author: zk
  * @Date: 2022-05-13 10:34:57
  * @LastEditors: zk
- * @LastEditTime: 2022-06-13 17:08:19
+ * @LastEditTime: 2022-06-22 10:01:17
  */
 
 import { DrawPlotObjectFactory2D } from './Draw/DrawPlotObjectFactory2D';
@@ -278,14 +278,15 @@ class PlotLayer2D {
         const symbolManager = SymbolManager.instance;
 
         const leaf = symbolManager.getLeafByID(id);
+        if(!leaf) return null;
 
         const element = await leaf.getElement();
+        if(!element) return null
         const plotObj = PlotObjectFactory.createInstance(element.type, {
             element,
             positions: element.positions,
             canvas: this
         });
-
         plotObj.fromGeoJSON(geoFeature);
         this.addPlot(plotObj);
     }

src/service/2DPlot/PlotLayer2DGroup.js

@@ -4,7 +4,7 @@
  * @Author: zk
  * @Date: 2022-05-13 11:01:10
  * @LastEditors: zk
- * @LastEditTime: 2022-06-15 19:53:34
+ * @LastEditTime: 2022-06-22 10:16:16
  */
 
 import { fabric } from 'fabric';
@@ -246,7 +246,11 @@ export const PlotLayer2DGroup = fabric.util.createClass(fabric.Canvas, {
     drawUtilPlotObject(id, options) {
         const symbol = SymbolManager.instance;
         const leaf = symbol.getLeafByID(id);
+
+        if(!leaf) return null;
+
         return leaf.getElement().then((element) => {
+            if(!element)return null;
             const plotObj = PlotObjectFactory.createInstance(element.type, {
                 element,
                 positions: options.positions,

src/service/2DPlot/Shapes/IrregularShapes/PlotIrregularShape.js

@@ -3,7 +3,7 @@
  * @Author: zk
  * @Date: 2021-11-18 15:08:54
  * @LastEditors: zk
- * @LastEditTime: 2022-06-13 19:14:58
+ * @LastEditTime: 2022-06-22 10:16:55
  */
 import { fabric } from 'fabric';
 import PlotPolylineObject from '../PlotPolylineObject';
@@ -17,11 +17,20 @@ const PlotIrregularShape = fabric.util.createClass(PlotPolylineObject, {
         });
         return boundingBox;
     },
+    _calcStrokeOrFillGeometry(coords) {
+        // 非规则符号使用外部设置函数进行控制点填充
+        const strokeCoords = this._elem.applyFuncToStorkeGeometry(coords);
+        // 非规则符号使用完整几何进行填充
+        const fillCoords= this._elem.applyFuncToFillGeometry(coords);
+        return { strokeCoords, fillCoords };
+    },
     _pathElementRender: function _pathElementRender(ctx, coords) {
         const style = this._elem.getContextStyle();
         const lineWidth = this.calcMapScaleLineWidth(style.lineWidth);
         style.lineWidth = lineWidth;
-        this._pointsToPath(ctx, style, coords);
+
+        const { strokeCoords, fillCoords } = this._calcStrokeOrFillGeometry(coords);
+        this._pointsToPath(ctx, style, strokeCoords, fillCoords);
     },
     _comparePathElementRender: function _comparePathElementRender(ctx, coords) {
         const style = this._elem.getContextStyle();
@@ -39,8 +48,41 @@ const PlotIrregularShape = fabric.util.createClass(PlotPolylineObject, {
             })
         );
         if (_compareStyle) {
-            this._pointsToPath(ctx, _compareStyle, coords);
+            const { strokeCoords, fillCoords } = this._calcStrokeOrFillGeometry(coords);
+            this._pointsToPath(ctx, style, strokeCoords, fillCoords);
+        }
+    },
+
+    _pointsToPath: function _pointsToPath(ctx, style, strokeCoords, fillCoords) {
+        //    stroke
+        ctx.save();
+        const strokeCoordsPnts = strokeCoords.filter((s) => s.length !== 0);
+        for (let j = 0; j < strokeCoordsPnts.length; j += 1) {
+            const tempPnts = strokeCoordsPnts[j];
+            const tempPntsLen = tempPnts.length;
+            ctx.beginPath();
+            ctx.moveTo(tempPnts[0].x + this.m_offsetX, tempPnts[0].y + this.m_offsetY);
+            for (let m = 1; m < tempPntsLen; m += 1) {
+                ctx.lineTo(tempPnts[m].x + this.m_offsetX, tempPnts[m].y + this.m_offsetY);
+            }
+            this._drawPath(ctx, Object.assign({},style, { fillStyle: 'none' }));
+        }
+        ctx.restore();
+
+        // fill
+        ctx.save();
+        const fillPnts = fillCoords.filter((s) => s.length !== 0);
+        for (let j = 0; j < fillPnts.length; j += 1) {
+            const tempPnts = fillPnts[j];
+            const tempPntsLen = tempPnts.length;
+            ctx.beginPath();
+            ctx.moveTo(tempPnts[0].x + this.m_offsetX, tempPnts[0].y + this.m_offsetY);
+            for (let m = 1; m < tempPntsLen; m += 1) {
+                ctx.lineTo(tempPnts[m].x + this.m_offsetX, tempPnts[m].y + this.m_offsetY);
+            }
+            this._drawPath(ctx, Object.assign({},style, { strokeStyle: 'none' }));
         }
+        ctx.restore();
     },
     _render(ctx) {
         const coords = this._elem.cacheCoords || this._elem.getCoords();

src/service/2DPlot/Shapes/PlotPolylineObject.js

@@ -158,7 +158,7 @@ const PlotPolylineObject = fabric.util.createClass(PlotObject, {
             for (let m = 1; m < tempPntsLen; m += 1) {
                 ctx.lineTo(tempPnts[m].x + this.m_offsetX, tempPnts[m].y + this.m_offsetY);
             }
-            if (GeomUtil.PointEqualFuzzy(startPnt.x, startPnt.y, endPnt.x, endPnt.y)) {
+            if (GeomUtil.PointEqualFuzzy(startPnt.x, startPnt.y, endPnt.x, endPnt.y,1e-18)) {
                 ctx.closePath();
             }
 

src/service/3DPlot/PlotLayer3D.js

@@ -132,7 +132,7 @@ class PlotLayer3D extends Observable {
         if (!plotLayer) {
             return undefined;
         }
-
+        
         let index = this._getPlotIndexById(id, plotLayer);
         const {_primitives} = plotLayer;
         if (index !== undefined) {
@@ -253,8 +253,10 @@ class PlotLayer3D extends Observable {
         const symbolManager = SymbolManager.instance;
 
         const leaf = symbolManager.getLeafByID(id);
+        if(!leaf) return null;
 
         leaf.getElement().then(function (element) {
+            if(!element) return null;
             const primitive = PrimitiveFactory.createInstance(element.type, {
                 positions: element.positions,
                 element,

src/service/3DPlot/PlotLayer3DGroup.js

@@ -216,7 +216,9 @@ class PlotLayer3DGroup {
     drawUtilPlotObject(id, options) {
         const symbol = SymbolManager.instance;
         const leaf = symbol.getLeafByID(id);
+        if(!leaf)return null;
         return leaf.getElement().then((element) => {
+            if(!element) return null;
             // 待修改问题：positions传参无效
             //   const primitive = PrimitiveFactory.createInstance(element.type, {
             //     positions:options.positions,
@@ -233,7 +235,9 @@ class PlotLayer3DGroup {
         });
     }
     removeDrawUtilPlotObject(primitive) {
-        this._utilPlotCanvas.removePlot(primitive);
+        if(primitive){
+            this._utilPlotCanvas.removePlot(primitive);
+        }
     }
     /**
      * @function: Module:3DPlot.PlotLayer3DGroup.getPlotObjectById