deeptwins-engine-3d 0.1.63 → 0.1.65

package/dist/esm/measure/index.d.ts

@@ -1,44 +1,34 @@
 import Drawer from '../drawer';
-export interface MeasureContext {
-    options: any;
-    getMap: any;
-    drawer: any;
-    setDrawerLayer: any;
-    _changeStatus: any;
-}
-export declare const STATUS: {
-    readonly INIT: "INIT";
-    readonly START_DRAW: "START_DRAW";
-    readonly DRAWING: "DRAWING";
-    readonly END_DRAW: "END_DRAW";
-    readonly EDITING: "EDITING";
-    readonly END_EDIT: "END_EDIT";
-};
-export type Status = (typeof STATUS)[keyof typeof STATUS];
+import { MapContext } from '../map/Map';
+import { MeasureContext, MeasureDrawConfig, MeasureLayer, MeasureMap, MeasureOptions, MeasureType, Status } from './types';
 declare class Measure implements MeasureContext {
     private readonly _mapContext;
     private readonly _measureContext;
-    options: any;
+    options: MeasureOptions;
     isDestroyed: boolean;
     private _status;
     drawer: Drawer;
     private _instance;
     private _measureDrawLayers;
-    constructor(map: any, options?: any);
+    constructor(map: {
+        _mapContext: MapContext;
+    }, options?: MeasureDrawConfig);
     private _canOperate;
-    getMap(): any;
-    _changeStatus(status: any): void;
-    startDraw(type: any, config?: any): any;
+    getMap(): MeasureMap;
+    _changeStatus(status: Status): void;
+    startDraw(type: MeasureType, config?: MeasureDrawConfig): MeasureLayer | undefined;
     private _stopDraw;
     endDraw(): void;
-    startEdit(id: any): void;
+    startEdit(id: string | MeasureLayer): void;
     endEdit(): void;
-    getDrawerLayer(id: any): any;
-    setDrawerLayer(id: any, value: any): void;
-    removeDrawerLayer(id: any): void;
-    getAllDrawerLayers(): unknown[] | undefined;
+    getDrawerLayer(id: string | MeasureLayer): MeasureLayer | undefined;
+    setDrawerLayer(id: string, value: MeasureLayer): void;
+    removeDrawerLayer(id: string | MeasureLayer): void;
+    getAllDrawerLayers(): MeasureLayer[] | undefined;
     clearAllDrawerLayers(): void;
     clear(): void;
     destroy(): void;
+    private _emitCallback;
 }
+export { AREA_SHAPE_TYPE, MEASURE_TYPE, STATUS, type AreaMeasureResult, type AreaShapeType, type DistanceMeasureCacheItem, type DistanceMeasureResult, type DistancePreviewResult, type MeasureCallbackPayload, type MeasureContext, type MeasureDrawConfig, type MeasureLayer, type MeasureOptions, type MeasurePosition, type MeasureResult, type Status, } from './types';
 export default Measure;

package/dist/esm/measure/index.js

@@ -5,28 +5,14 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { isString, merge } from 'lodash';
+import { merge } from 'lodash';
 import { DEFAULT_MEASURE_STYLE } from "../constant";
 import Drawer from "../drawer";
 import { error } from "../tool/utils";
 import Area from "./Area";
 import Distance from "./Distance";
-var MEASURE_TYPE = {
-  DISTANCE: 'distance',
-  AREA: 'area'
-};
-
-// 状态表定义
-export var STATUS = {
-  INIT: 'INIT',
-  START_DRAW: 'START_DRAW',
-  DRAWING: 'DRAWING',
-  END_DRAW: 'END_DRAW',
-  EDITING: 'EDITING',
-  END_EDIT: 'END_EDIT'
-};
-
-// 从状态表推导类型
+import { MEASURE_TYPE, STATUS } from "./types";
+var MEASURE_CLASS_MAP = _defineProperty(_defineProperty({}, MEASURE_TYPE.DISTANCE, Distance), MEASURE_TYPE.AREA, Area);
 var Measure = /*#__PURE__*/function () {
   function Measure(map) {
     var _this = this;
@@ -39,7 +25,7 @@ var Measure = /*#__PURE__*/function () {
     _defineProperty(this, "_status", STATUS.INIT);
     _defineProperty(this, "drawer", void 0);
     // 绘制的实例
-    _defineProperty(this, "_instance", void 0);
+    _defineProperty(this, "_instance", null);
     // 绘制完成的图层
     _defineProperty(this, "_measureDrawLayers", new Map());
     this._mapContext = map._mapContext;
@@ -52,33 +38,16 @@ var Measure = /*#__PURE__*/function () {
       },
       onPointsChange: function onPointsChange(e) {
         if (_this._instance) {
-          var data = _this._instance.pointsChange(e.layer, e.positions);
-          _this.options.onPointsChange && _this.options.onPointsChange({
-            layer: _this._instance,
-            positions: e.positions,
-            measure: data
-          });
+          var positions = e.positions;
+          var data = _this._instance.pointsChange(e.layer, positions);
+          _this._emitCallback('onPointsChange', positions, data);
         }
       },
       onComplete: function onComplete(e) {
         if (_this._instance) {
-          var data = {};
-          if (_this._status === 'END_DRAW' || _this._status === 'DRAWING') {
-            data = _this._instance.drawEnd(e.positions);
-            _this.options.onComplete && _this.options.onComplete({
-              layer: _this._instance,
-              positions: e.positions,
-              measure: data
-            });
-          }
-          if (_this._status === 'END_EDIT') {
-            data = _this._instance.endEdit(e.positions);
-            _this.options.onComplete && _this.options.onComplete({
-              layer: _this._instance,
-              positions: e.positions,
-              measure: data
-            });
-          }
+          var positions = e.positions;
+          var data = _this._status === STATUS.END_EDIT ? _this._instance.endEdit(positions) : _this._instance.drawEnd(positions);
+          _this._emitCallback('onComplete', positions, data);
         }
       }
     });
@@ -104,7 +73,7 @@ var Measure = /*#__PURE__*/function () {
   }, {
     key: "getMap",
     value: function getMap() {
-      return this._mapContext && this._mapContext.getMap();
+      return this._mapContext.getMap();
     }
 
     // 修改状态
@@ -120,17 +89,13 @@ var Measure = /*#__PURE__*/function () {
     value: function startDraw(type) {
       var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       if (!this._canOperate()) return;
-      if (!Object.values(MEASURE_TYPE).includes(type)) return;
+      var MeasureClass = MEASURE_CLASS_MAP[type];
+      if (!MeasureClass) return;
       if (this._instance) {
         this._stopDraw();
       }
       this._changeStatus(STATUS.START_DRAW);
-      if (type === MEASURE_TYPE.DISTANCE) {
-        this._instance = new Distance(this._measureContext, config);
-      }
-      if (type === MEASURE_TYPE.AREA) {
-        this._instance = new Area(this._measureContext, config);
-      }
+      this._instance = new MeasureClass(this._measureContext, config);
       return this._instance;
     }
 
@@ -140,24 +105,13 @@ var Measure = /*#__PURE__*/function () {
     value: function _stopDraw() {
       if (!this._canOperate()) return;
       if (!this._instance) return;
-      if (this._status === STATUS.INIT || this._status === STATUS.START_DRAW || this._status === STATUS.END_EDIT) {
-        var layer = this.getDrawerLayer(this._instance);
-        // layer未存入
-        if (!layer) {
-          this._instance.destroy();
-        }
-        this._instance = null;
-        return;
-      }
-      if (this._status === STATUS.DRAWING) {
-        this.removeDrawerLayer(this._instance);
-        this._instance = null;
-        return;
-      }
       if (this._status === STATUS.END_DRAW || this._status === STATUS.EDITING) {
         this.endEdit();
         return;
       }
+      this._instance.destroy();
+      this._instance = null;
+      this._changeStatus(STATUS.INIT);
     }
 
     // 结束绘制
@@ -174,15 +128,17 @@ var Measure = /*#__PURE__*/function () {
       if (!this._canOperate()) return;
       if (!id) return;
       if (this._instance) {
-        this.drawer.endEdit();
-        this.setDrawerLayer(this._instance.id, this._instance);
-        this._instance = null;
+        if (this._status === STATUS.EDITING || this._status === STATUS.END_DRAW) {
+          this.endEdit();
+        } else {
+          this._stopDraw();
+        }
       }
+      var layer = this.getDrawerLayer(id);
+      if (!(layer !== null && layer !== void 0 && layer._instance)) return;
+      this._instance = layer;
       this._changeStatus(STATUS.EDITING);
-      this._instance = this.getDrawerLayer(id);
-      if (!this._instance) return;
-      this._changeStatus(STATUS.EDITING);
-      this.drawer.startEdit(this._instance._instance);
+      this.drawer.startEdit(layer._instance);
     }
 
     // 结束编辑
@@ -191,26 +147,35 @@ var Measure = /*#__PURE__*/function () {
     value: function endEdit() {
       if (!this._canOperate()) return;
       this._changeStatus(STATUS.END_EDIT);
-      if (!this._instance) return;
+      if (!this._instance) {
+        this._changeStatus(STATUS.INIT);
+        return;
+      }
       this.drawer.endEdit();
       this.setDrawerLayer(this._instance.id, this._instance);
       this._instance = null;
+      this._changeStatus(STATUS.INIT);
     }
 
     // 获取绘制的图层
   }, {
     key: "getDrawerLayer",
     value: function getDrawerLayer(id) {
-      if (!this._canOperate) return;
+      var _this$_measureDrawLay;
+      if (!this._canOperate()) return;
       if (!id) return;
-      return isString(id) ? this._measureDrawLayers.get(id) : id;
+      if (typeof id === 'string') {
+        return this._measureDrawLayers.get(id);
+      }
+      return (_this$_measureDrawLay = this._measureDrawLayers.get(id.id)) !== null && _this$_measureDrawLay !== void 0 ? _this$_measureDrawLay : id;
     }
 
     // 添加完成绘制的图层
   }, {
     key: "setDrawerLayer",
     value: function setDrawerLayer(id, value) {
-      if (!this._instance) return;
+      if (!this._canOperate()) return;
+      if (!id || !value) return;
       this._measureDrawLayers.set(id, value);
     }
 
@@ -218,7 +183,7 @@ var Measure = /*#__PURE__*/function () {
   }, {
     key: "removeDrawerLayer",
     value: function removeDrawerLayer(id) {
-      if (!this._canOperate) return;
+      if (!this._canOperate()) return;
       var layer = this.getDrawerLayer(id);
       if (layer) {
         var _this$_instance;
@@ -228,7 +193,6 @@ var Measure = /*#__PURE__*/function () {
         }
         this._measureDrawLayers.delete(layer.id);
         layer.destroy();
-        layer = null;
       }
     }
 
@@ -236,7 +200,7 @@ var Measure = /*#__PURE__*/function () {
   }, {
     key: "getAllDrawerLayers",
     value: function getAllDrawerLayers() {
-      if (!this._canOperate) return;
+      if (!this._canOperate()) return;
       return Array.from(this._measureDrawLayers.values());
     }
 
@@ -244,21 +208,33 @@ var Measure = /*#__PURE__*/function () {
   }, {
     key: "clearAllDrawerLayers",
     value: function clearAllDrawerLayers() {
-      if (!this._canOperate) return;
-      this._measureDrawLayers.forEach(function (t) {
-        return t.destroy();
-      });
+      var _this2 = this;
+      if (!this._canOperate()) return;
+      var layers = Array.from(new Set(this._measureDrawLayers.values()));
       this._measureDrawLayers.clear();
+      layers.forEach(function (layer) {
+        return layer.destroy();
+      });
+      if (this._instance && layers.some(function (layer) {
+        var _this2$_instance;
+        return layer.id === ((_this2$_instance = _this2._instance) === null || _this2$_instance === void 0 ? void 0 : _this2$_instance.id);
+      })) {
+        this._instance = null;
+        this._changeStatus(STATUS.INIT);
+      }
     }
 
     // 清除
   }, {
     key: "clear",
     value: function clear() {
-      if (!this._canOperate) return;
+      if (!this._canOperate()) return;
       this.getMap().canvas.style.cursor = 'default';
       this._changeStatus(STATUS.INIT);
-      this._instance && this._instance.destroy();
+      if (this._instance) {
+        this._measureDrawLayers.delete(this._instance.id);
+        this._instance.destroy();
+      }
       this._instance = null;
       this.clearAllDrawerLayers();
     }
@@ -267,12 +243,24 @@ var Measure = /*#__PURE__*/function () {
   }, {
     key: "destroy",
     value: function destroy() {
-      if (!this._canOperate) return;
+      if (!this._canOperate()) return;
       this.clear();
       this.drawer.destroy();
       this.isDestroyed = true;
     }
+  }, {
+    key: "_emitCallback",
+    value: function _emitCallback(callbackName, positions, measure) {
+      if (!this._instance) return;
+      var callback = this.options[callbackName];
+      callback === null || callback === void 0 || callback({
+        layer: this._instance,
+        positions: positions,
+        measure: measure
+      });
+    }
   }]);
   return Measure;
 }();
+export { AREA_SHAPE_TYPE, MEASURE_TYPE, STATUS } from "./types";
 export default Measure;

package/dist/esm/measure/types.d.ts

@@ -0,0 +1,94 @@
+import type { Viewer } from 'deeptwins-cesium';
+import type Drawer from '../drawer';
+export declare const MEASURE_TYPE: {
+    readonly DISTANCE: "distance";
+    readonly AREA: "area";
+};
+export type MeasureType = (typeof MEASURE_TYPE)[keyof typeof MEASURE_TYPE];
+export declare const AREA_SHAPE_TYPE: {
+    readonly POLYGON: "polygon";
+    readonly CIRCLE: "circle";
+    readonly REGULAR_POLYGON: "regularPolygon";
+};
+export type AreaShapeType = (typeof AREA_SHAPE_TYPE)[keyof typeof AREA_SHAPE_TYPE];
+export declare const STATUS: {
+    readonly INIT: "INIT";
+    readonly START_DRAW: "START_DRAW";
+    readonly DRAWING: "DRAWING";
+    readonly END_DRAW: "END_DRAW";
+    readonly EDITING: "EDITING";
+    readonly END_EDIT: "END_EDIT";
+};
+export type Status = (typeof STATUS)[keyof typeof STATUS];
+export type MeasurePosition = [number, number, number];
+export interface DistanceMeasureCacheItem {
+    start: MeasurePosition;
+    end: MeasurePosition;
+    distance: number;
+    allDistance: number;
+}
+export interface DistancePreviewResult {
+    distance: number;
+    allDistance: number;
+}
+export interface AreaMeasureResult {
+    area: number;
+}
+export type DistanceMeasureResult = DistanceMeasureCacheItem[];
+export type MeasureResult = DistanceMeasureResult | AreaMeasureResult;
+export interface MeasureCallbackPayload {
+    layer: MeasureLayer;
+    positions: MeasurePosition[];
+    measure: MeasureResult;
+}
+export interface MeasureOptions extends Record<string, any> {
+    clampToGround: boolean;
+    splitNum: number;
+    onPointsChange?: (payload: MeasureCallbackPayload) => void;
+    onComplete?: (payload: MeasureCallbackPayload) => void;
+}
+export interface MeasureDrawConfig extends Partial<MeasureOptions> {
+    shapeType?: AreaShapeType;
+    segments?: number;
+    sides?: number;
+    [key: string]: any;
+}
+export interface ResolvedMeasureConfig extends MeasureDrawConfig {
+    clampToGround: boolean;
+    splitNum: number;
+}
+export interface MeasureLabelLayer {
+    setData(data: any): void;
+    setStyle(style: any): void;
+    destroy(): void;
+}
+export interface MeasureDragPoint {
+    labelLayer: {
+        setStyle(style: any): void;
+    };
+}
+export interface MeasureShapeLayer {
+    id: string;
+    dragPoints: MeasureDragPoint[];
+    destroy(): void;
+}
+export interface MeasureMap extends Viewer {
+    addGraphicLayer(data: any, options: any): MeasureLabelLayer;
+}
+export interface MeasureContext {
+    options: MeasureOptions;
+    getMap: () => MeasureMap;
+    drawer: Drawer;
+    setDrawerLayer: (id: string, value: MeasureLayer) => void;
+    _changeStatus: (status: Status) => void;
+}
+export interface MeasureLayer {
+    id: string;
+    _instance: MeasureShapeLayer | null;
+    drawing(positions: MeasurePosition[]): MeasureResult | DistancePreviewResult | Record<string, never> | void;
+    pointsChange(layer: MeasureShapeLayer, positions: MeasurePosition[]): MeasureResult;
+    drawEnd(positions?: MeasurePosition[]): MeasureResult;
+    startEdit(): void;
+    endEdit(positions?: MeasurePosition[]): MeasureResult;
+    destroy(): void;
+}

package/dist/esm/measure/types.js

@@ -0,0 +1,17 @@
+export var MEASURE_TYPE = {
+  DISTANCE: 'distance',
+  AREA: 'area'
+};
+export var AREA_SHAPE_TYPE = {
+  POLYGON: 'polygon',
+  CIRCLE: 'circle',
+  REGULAR_POLYGON: 'regularPolygon'
+};
+export var STATUS = {
+  INIT: 'INIT',
+  START_DRAW: 'START_DRAW',
+  DRAWING: 'DRAWING',
+  END_DRAW: 'END_DRAW',
+  EDITING: 'EDITING',
+  END_EDIT: 'END_EDIT'
+};

package/dist/esm/measure/utils.d.ts

@@ -1,4 +1,4 @@
-import { Polygon } from '@turf/helpers';
+import { MultiPolygon, Polygon } from '@turf/helpers';
 import { Cartesian2, Cartesian3, type Viewer } from 'deeptwins-cesium';
 /**
  * 从地图中拾取指定屏幕坐标对应的三维笛卡尔坐标
@@ -10,7 +10,7 @@ export declare function pickCartesian3(map: Viewer, position: Cartesian2): Carte
 /**
  * 计算给定点集合的边界范围
  * @param points - 二维笛卡尔坐标点数组
- * @returns 返回边界范围数组，格式为[left, top, right, bottom]
+ * @returns 返回边界范围数组，格式为[minX, minY, maxX, maxY]
  */
 export declare function getBounds(points: Cartesian2[]): number[];
 /**
@@ -88,16 +88,16 @@ export declare function Cartesian2turfPolygon(positions: Cartesian2[]): Polygon;
  * 计算两个多边形的交集区域
  * @param poly1 - 第一个多边形
  * @param poly2 - 第二个多边形
- * @returns 交集区域的顶点坐标数组，如果没有交集则返回空数组
+ * @returns 交集区域的顶点坐标数组集合，如果没有交集则返回空数组
  */
-export declare function getIntersect(poly1: Polygon, poly2: Polygon): Cartesian2[];
+export declare function getIntersect(poly1: Polygon, poly2: Polygon): Cartesian2[][];
 /**
  * 将Turf.js的Polygon对象转换为Cesium的Cartesian2数组
  *
- * @param polygon - Turf.js的Polygon对象，包含经纬度坐标信息
- * @returns 返回一个Cartesian2数组，每个元素对应polygon外环坐标点的二维笛卡尔坐标
+ * @param polygonGeometry - Turf.js的Polygon或MultiPolygon对象，包含经纬度坐标信息
+ * @returns 返回Cartesian2数组集合，每个元素对应一个外环坐标点集合
  */
-export declare function turfPolygon2CartesianArr(polygon: Polygon): Cartesian2[];
+export declare function turfPolygon2CartesianArr(polygonGeometry: Polygon | MultiPolygon): Cartesian2[][];
 /**
  * 计算地图上指定位置围成区域的表面积
  * @param map - 地图查看器实例

package/dist/esm/measure/utils.js

@@ -26,22 +26,22 @@ export function pickCartesian3(map, position) {
 /**
  * 计算给定点集合的边界范围
  * @param points - 二维笛卡尔坐标点数组
- * @returns 返回边界范围数组，格式为[left, top, right, bottom]
+ * @returns 返回边界范围数组，格式为[minX, minY, maxX, maxY]
  */
 export function getBounds(points) {
-  var left = Math.min.apply(Math, _toConsumableArray(points.map(function (item) {
+  var minX = Math.min.apply(Math, _toConsumableArray(points.map(function (item) {
     return item.x;
   })));
-  var right = Math.max.apply(Math, _toConsumableArray(points.map(function (item) {
+  var maxX = Math.max.apply(Math, _toConsumableArray(points.map(function (item) {
     return item.x;
   })));
-  var top = Math.max.apply(Math, _toConsumableArray(points.map(function (item) {
+  var minY = Math.min.apply(Math, _toConsumableArray(points.map(function (item) {
     return item.y;
   })));
-  var bottom = Math.min.apply(Math, _toConsumableArray(points.map(function (item) {
+  var maxY = Math.max.apply(Math, _toConsumableArray(points.map(function (item) {
     return item.y;
   })));
-  return [left, top, right, bottom];
+  return [minX, minY, maxX, maxY];
 }
 
 /**
@@ -88,8 +88,8 @@ export function calculateSurfaceDistance(map, startPoint, endPoint) {
   var splitNum = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 20;
   var resultDistance = 0;
   var sampleWindowPoints = [startPoint];
-  var interval = Math.sqrt(Math.pow(endPoint.x - startPoint.x, 2) + (endPoint.y - startPoint.y, 2)) / splitNum;
-  for (var ii = 1; ii <= splitNum; ii += 1) {
+  var interval = Math.sqrt(Math.pow(endPoint.x - startPoint.x, 2) + Math.pow(endPoint.y - startPoint.y, 2)) / splitNum;
+  for (var ii = 1; ii < splitNum; ii += 1) {
     var tempPositon = findWindowPositionByPixelInterval(startPoint, endPoint, ii * interval);
     sampleWindowPoints.push(tempPositon);
   }
@@ -181,6 +181,9 @@ export function calculateDetailSurfaceLength(map, startPoint, endPoint) {
  */
 export function calculateSurfaceArea(map, positions) {
   var splitNum = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 20;
+  if (positions.length < 3) {
+    return 0;
+  }
   var result = 0;
   // 获取边界范围
   var bounds = getBounds(positions);
@@ -194,10 +197,15 @@ export function calculateSurfaceArea(map, positions) {
   var voronoiPolygons = voronoi(points, {
     bbox: [bounds[0], bounds[1], bounds[2], bounds[3]]
   });
+  if (!voronoiPolygons) {
+    return 0;
+  }
   // 遍历Voronoi多边形计算相交区域的表面积
   voronoiPolygons.features.forEach(function (element) {
-    var intersectPoints = getIntersect(mainPoly, element.geometry);
-    result += calculateDetailSurfaceArea(map, intersectPoints);
+    var intersectPolygons = getIntersect(mainPoly, element.geometry);
+    intersectPolygons.forEach(function (intersectPoints) {
+      result += calculateDetailSurfaceArea(map, intersectPoints);
+    });
   });
   return result;
 }
@@ -221,26 +229,32 @@ export function Cartesian2turfPolygon(positions) {
  * 计算两个多边形的交集区域
  * @param poly1 - 第一个多边形
  * @param poly2 - 第二个多边形
- * @returns 交集区域的顶点坐标数组，如果没有交集则返回空数组
+ * @returns 交集区域的顶点坐标数组集合，如果没有交集则返回空数组
  */
 export function getIntersect(poly1, poly2) {
   var intersection = intersect(poly1, poly2);
-  if ((intersection === null || intersection === void 0 ? void 0 : intersection.geometry) !== undefined) {
-    return turfPolygon2CartesianArr(intersection === null || intersection === void 0 ? void 0 : intersection.geometry);
-  } else {
+  if (!(intersection !== null && intersection !== void 0 && intersection.geometry)) {
     return [];
   }
+  return turfPolygon2CartesianArr(intersection.geometry);
 }
 
 /**
  * 将Turf.js的Polygon对象转换为Cesium的Cartesian2数组
  *
- * @param polygon - Turf.js的Polygon对象，包含经纬度坐标信息
- * @returns 返回一个Cartesian2数组，每个元素对应polygon外环坐标点的二维笛卡尔坐标
+ * @param polygonGeometry - Turf.js的Polygon或MultiPolygon对象，包含经纬度坐标信息
+ * @returns 返回Cartesian2数组集合，每个元素对应一个外环坐标点集合
  */
-export function turfPolygon2CartesianArr(polygon) {
-  return polygon.coordinates[0].map(function (item) {
-    return new Cartesian2(item[0], item[1]);
+export function turfPolygon2CartesianArr(polygonGeometry) {
+  if (polygonGeometry.type === 'Polygon') {
+    return [polygonGeometry.coordinates[0].map(function (item) {
+      return new Cartesian2(item[0], item[1]);
+    })];
+  }
+  return polygonGeometry.coordinates.map(function (coordinates) {
+    return coordinates[0].map(function (item) {
+      return new Cartesian2(item[0], item[1]);
+    });
   });
 }
 
@@ -251,6 +265,9 @@ export function turfPolygon2CartesianArr(polygon) {
  * @returns 返回世界坐标系中围成区域的表面积
  */
 export function calculateDetailSurfaceArea(map, positions) {
+  if (positions.length < 3) {
+    return 0;
+  }
   var worldPositions = [];
   positions.forEach(function (element) {
     var pickResult = pickCartesian3(map, element);
@@ -269,10 +286,12 @@ export function calculateDetailSurfaceArea(map, positions) {
  * @returns 返回由输入点围成区域的近似面积（单位：平方米）。
  */
 export function getWorldPositionsArea(positions) {
+  if (positions.length < 3) {
+    return 0;
+  }
   var x = [0];
   var y = [0];
   var geodesic = new EllipsoidGeodesic();
-  var radiansPerDegree = Math.PI / 180.0; //角度转化为弧度(rad)
   //数组x,y分别按顺序存储各点的横、纵坐标值
   for (var i = 0; i < positions.length - 1; i += 1) {
     var p1 = positions[i];
@@ -281,10 +300,10 @@ export function getWorldPositionsArea(positions) {
     var point2cartographic = Cartographic.fromCartesian(p2);
     geodesic.setEndPoints(point1cartographic, point2cartographic);
     var s = Math.sqrt(Math.pow(geodesic.surfaceDistance, 2) + Math.pow(point2cartographic.height - point1cartographic.height, 2));
-    var lat1 = point2cartographic.latitude * radiansPerDegree;
-    var lon1 = point2cartographic.longitude * radiansPerDegree;
-    var lat2 = point1cartographic.latitude * radiansPerDegree;
-    var lon2 = point1cartographic.longitude * radiansPerDegree;
+    var lat1 = point2cartographic.latitude;
+    var lon1 = point2cartographic.longitude;
+    var lat2 = point1cartographic.latitude;
+    var lon2 = point1cartographic.longitude;
     var angle = -Math.atan2(Math.sin(lon1 - lon2) * Math.cos(lat2), Math.cos(lat1) * Math.sin(lat2) - Math.sin(lat1) * Math.cos(lat2) * Math.cos(lon1 - lon2));
     if (angle < 0) {
       angle += Math.PI * 2.0;