Merge remote-tracking branch 'origin/devzpx' into devzpx

# Conflicts:
#	src/assets/js/cesium-map/measureDistance.js

src/assets/js/cesium-map/measureDistance.js

@@ -1,5 +1,6 @@
 import * as Cesium from 'cesium'
 import {Cartesian3} from 'cesium'
+import {geojson2kml} from "@/assets/js/DataUtils.js";
 
 export default class MeasureDistance {
     constructor(viewer) {
@@ -798,7 +799,7 @@ export default class MeasureDistance {
             aPolygon.polygon.hierarchy = new Cesium.PolygonHierarchy(drawPolygonPts);
             this.graphics.push(aPolygon)
             this._stopDraw()
-            geojson2kml(this.entity2Geojson(aPolygon))
+            // geojson2kml(this.entity2Geojson(aPolygon))
         }, Cesium.ScreenSpaceEventType.RIGHT_CLICK)
     }
     _drawRec(){