MapGIS
diff --git a/‎src/mapboxgl/overlay/FabricLayer.js‎
Lines changed: 3 additions & 1 deletion b/‎src/mapboxgl/overlay/FabricLayer.js‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎src/mapboxgl/overlay/fabric/PlotMapCoordSys.js‎
Lines changed: 1 addition & 1 deletion b/‎src/mapboxgl/overlay/fabric/PlotMapCoordSys.js‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/service/3DPlot/Draw/DrawPolyline.js‎
Lines changed: 4 additions & 3 deletions b/‎src/service/3DPlot/Draw/DrawPolyline.js‎
Lines changed: 4 additions & 3 deletions
diff --git a/‎src/service/3DPlot/PlotLayer3D.js‎
Lines changed: 6 additions & 0 deletions b/‎src/service/3DPlot/PlotLayer3D.js‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎src/service/PlotBase/Animation/AnimationTypes/PlotExtendAnimation/PlotGrowAnimation/PlotPathAnimation.js‎
Lines changed: 2 additions & 1 deletion b/‎src/service/PlotBase/Animation/AnimationTypes/PlotExtendAnimation/PlotGrowAnimation/PlotPathAnimation.js‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎src/service/PlotBase/LinkTool.js‎
Lines changed: 2 additions & 1 deletion b/‎src/service/PlotBase/LinkTool.js‎
Lines changed: 2 additions & 1 deletion
@@ -187,7 +187,9 @@ export class FabricLayer {
         this._visiable();
     }
     removeEvent() {
-        this.mapContainer.removeChild(this.canvas);
+        try {
+            this.mapContainer.removeChild(this.canvas);
+        }catch (e) {}
     }
 
     /**
 
@@ -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);
 };
 
 /**
 
@@ -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;
 
@@ -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);
         }
     }
 
@@ -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) {
 
@@ -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) {
Original file line number	Diff line number	Diff line change
@@ -187,7 +187,9 @@ export class FabricLayer {
187	187	this._visiable();
188	188	}
189	189	removeEvent() {
190		- this.mapContainer.removeChild(this.canvas);
	190	+ try {
	191	+ this.mapContainer.removeChild(this.canvas);
	192	+ }catch (e) {}
191	193	}
192	194
193	195	/**
Original file line number	Diff line number	Diff line change
@@ -118,6 +118,12 @@ class PlotLayer3D extends Observable {
118	118	let plotLayer = this._getPlotLayer();
119	119	if (plotLayer) {
120	120	removeExtendLayersPlot(this._linkTool, plot);
	121	+ if(plot._positionBillboards){
	122	+ this._viewer.scene.primitives.remove(plot._positionBillboards);
	123	+ }
	124	+ if(plot._shapeBillboards){
	125	+ this._viewer.scene.primitives.remove(plot._shapeBillboards);
	126	+ }
121	127	return plotLayer.remove(plot);
122	128	}
123	129	}
Original file line number	Diff line number	Diff line change
@@ -67,7 +67,8 @@ export default class PlotPathAnimation extends PlotCoordsAnimation {
67	67	}
68	68
69	69	if (this._cacheCoords.length === 0) {
70		- throw new Error('路径动画控制点数量不能为0');
	70	+ console.error('路径动画控制点数量不能为0');
	71	+ return;
71	72	}
72	73
73	74	if (this._cacheCoords.length === 1) {