Merge branch 'dev' of github.com:MapGIS/WebClient-JavaScript into dev

Author: zhaokai

src/mapboxgl/overlay/FabricLayer.js

@@ -187,7 +187,9 @@ export class FabricLayer {
         this._visiable();
     }
     removeEvent() {
-        this.mapContainer.removeChild(this.canvas);
+        try {
+            this.mapContainer.removeChild(this.canvas);
+        }catch (e) {}
     }
 
     /**

src/mapboxgl/overlay/fabric/PlotMapCoordSys.js

@@ -45,7 +45,7 @@ PlotMapCoordSys.prototype.pointToData = function pointToData(pt) {
 PlotMapCoordSys.prototype.getScale = function getScale() {
   let n=this.m_mapboxMap.getZoom()
 
-  return  256* Math.pow(2,n+1);
+  return  1024 * Math.pow(2,n+1);
 };
 
 /**

src/service/3DPlot/Draw/DrawPolyline.js

@@ -84,9 +84,6 @@ export default class DrawPolyline extends DrawObject {
           that._isAdded = true;
           that._plotLayer._isDrawing = true;
           that._plotLayer._primitiveCollection.add(that._primitive);
-          if(that._addedPlot){
-            that._addedPlot(that._primitive);
-          }
         }
 
         if(!that._handler){
@@ -122,7 +119,11 @@ export default class DrawPolyline extends DrawObject {
     handler.setInputAction((event) => {
       this.fireFinishEvent({ plotObj3D: this._primitive });
       addExtendLayersPlot(this._plotLayer._linkTool, this._primitive);
+      let _primitive = this._primitive
       this.disable();
+      if(this._addedPlot){
+        this._addedPlot(_primitive);
+      }
     }, Cesium.ScreenSpaceEventType.LEFT_DOUBLE_CLICK);
 
     this._handler = handler;

src/service/3DPlot/PlotLayer3D.js

@@ -118,6 +118,12 @@ class PlotLayer3D extends Observable {
         let plotLayer = this._getPlotLayer();
         if (plotLayer) {
             removeExtendLayersPlot(this._linkTool, plot);
+            if(plot._positionBillboards){
+                this._viewer.scene.primitives.remove(plot._positionBillboards);
+            }
+            if(plot._shapeBillboards){
+                this._viewer.scene.primitives.remove(plot._shapeBillboards);
+            }
             return plotLayer.remove(plot);
         }
     }

src/service/PlotBase/Animation/AnimationTypes/PlotExtendAnimation/PlotGrowAnimation/PlotPathAnimation.js

@@ -67,7 +67,8 @@ export default class PlotPathAnimation extends PlotCoordsAnimation {
         }
 
         if (this._cacheCoords.length === 0) {
-            throw new Error('路径动画控制点数量不能为0');
+            console.error('路径动画控制点数量不能为0');
+            return;
         }
 
         if (this._cacheCoords.length === 1) {

src/service/PlotBase/LinkTool.js

@@ -48,7 +48,8 @@ class LinkTool {
                 id = _container._container.id;
             } else {
                 type = "mapbox";
-                id = _container.mapContainer.parentElement.id;
+                id = _container.mapContainer.parentElement && _container.mapContainer.parentElement.id
+                || _container._containerId;
             }
             if (this._mapContainer._container.id !== id) {
                 switch (type) {