deeptwins-engine-3d 0.1.64 → 0.1.66

package/dist/esm/measure/Distance.js

@@ -1,6 +1,4 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -18,26 +16,24 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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 { point } from '@turf/turf';
 import * as Cesium from 'deeptwins-cesium';
-import { SceneTransforms } from 'deeptwins-cesium';
-import { STATUS } from "../drawer";
-import { lngLatAltToCartesian3 } from "../tool/utils";
 import BaseDraw from "./BaseDraw";
+import { STATUS } from "./types";
 import * as utils from "./utils";
 var Distance = /*#__PURE__*/function (_BaseDraw) {
   _inherits(Distance, _BaseDraw);
   var _super = _createSuper(Distance);
-  function Distance(measureContext, config) {
+  function Distance(measureContext) {
     var _this;
+    var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     _classCallCheck(this, Distance);
     _this = _super.call(this, measureContext);
-    _defineProperty(_assertThisInitialized(_this), "_type", 'distance');
     _defineProperty(_assertThisInitialized(_this), "_config", void 0);
     // 线图层
-    _defineProperty(_assertThisInitialized(_this), "_instance", void 0);
+    _defineProperty(_assertThisInitialized(_this), "_instance", null);
     // 测量缓存数据
     _defineProperty(_assertThisInitialized(_this), "_measureCache", []);
     // 鼠标移动的label
-    _defineProperty(_assertThisInitialized(_this), "_mouseLabelLayer", void 0);
+    _defineProperty(_assertThisInitialized(_this), "_mouseLabelLayer", null);
     _this._config = config;
     _this._init();
     return _this;
@@ -54,9 +50,12 @@ var Distance = /*#__PURE__*/function (_BaseDraw) {
     value: function drawing(positions) {
       if (!this._canOperate()) return;
       this._measureContext._changeStatus(STATUS.DRAWING);
-      if (positions.length < 2) return {};
+      if (positions.length < 2) {
+        this._destroyMouseMoveLabel();
+        return {};
+      }
       var mouseDistance = this._calculateMouseDistance(positions);
-      this._createMouseMoveLabel(positions.slice(-1)[0], "\u603B\u8BA1".concat(utils.formatLength(mouseDistance.allDistance), "\n(+").concat(utils.formatLength(mouseDistance.distance), ")"));
+      this._createMouseMoveLabel(positions[positions.length - 1], "\u603B\u8BA1".concat(utils.formatLength(mouseDistance.allDistance), "\n(+").concat(utils.formatLength(mouseDistance.distance), ")"));
       return mouseDistance;
     }
 
@@ -64,26 +63,19 @@ var Distance = /*#__PURE__*/function (_BaseDraw) {
   }, {
     key: "pointsChange",
     value: function pointsChange(layer, positions) {
-      if (!this._canOperate()) return;
-      // 未返回点位 销毁随鼠标移动的label
-      if (!positions.length) {
-        this._destroyMouseMoveLabel();
-        return [];
-      }
-      // 小于两个点时清除测量缓存数据
+      if (!this._canOperate()) return [];
       if (positions.length < 2) {
+        var _layer$dragPoints$;
         this._measureCache = [];
-      } else {
-        this._calculateDistance(positions);
-      }
-      if (!this._measureCache.length) {
-        layer.dragPoints[0].labelLayer.setStyle({
+        this._destroyMouseMoveLabel();
+        (_layer$dragPoints$ = layer.dragPoints[0]) === null || _layer$dragPoints$ === void 0 || _layer$dragPoints$.labelLayer.setStyle({
           show: true,
           text: '起点'
         });
-      } else {
-        this._createMeasureCacheText(layer.dragPoints);
+        return this._measureCache;
       }
+      this._calculateDistance(positions);
+      this._createMeasureCacheText(layer.dragPoints);
       return this._measureCache;
     }
 
@@ -91,7 +83,7 @@ var Distance = /*#__PURE__*/function (_BaseDraw) {
   }, {
     key: "drawEnd",
     value: function drawEnd() {
-      if (!this._canOperate()) return;
+      if (!this._canOperate()) return [];
       this._measureContext._changeStatus(STATUS.END_DRAW);
       this._measureContext.setDrawerLayer(this.id, this);
       this._destroyMouseMoveLabel();
@@ -111,7 +103,7 @@ var Distance = /*#__PURE__*/function (_BaseDraw) {
   }, {
     key: "endEdit",
     value: function endEdit() {
-      if (!this._canOperate()) return;
+      if (!this._canOperate()) return [];
       return this._measureCache;
     }
 
@@ -139,40 +131,30 @@ var Distance = /*#__PURE__*/function (_BaseDraw) {
   }, {
     key: "_destroyMouseMoveLabel",
     value: function _destroyMouseMoveLabel() {
-      this._mouseLabelLayer && this._mouseLabelLayer.destroy();
-      this._mouseLabelLayer = null;
+      this._mouseLabelLayer = this.destroyLabelLayer(this._mouseLabelLayer);
     }
 
     // 计算距离
   }, {
     key: "_calculateDistance",
     value: function _calculateDistance(positions) {
-      if (!this._canOperate()) return;
-      if (positions.length < 2) return;
-      var distanceList = [];
+      if (positions.length < 2) {
+        this._measureCache = [];
+        return;
+      }
+      var config = this.getMeasureConfig(this._config);
+      var allDistance = 0;
       this._measureCache = [];
-      var config = _objectSpread(_objectSpread({}, this._measureContext.options), this._config);
       for (var i = 0; i < positions.length - 1; i++) {
         var start = positions[i];
         var end = positions[i + 1];
-        var startC3 = lngLatAltToCartesian3(start[0], start[1], start[2]);
-        var endC3 = lngLatAltToCartesian3(end[0], end[1], end[2]);
-        var distance = 0;
-        if (config.clampToGround) {
-          var startC2 = SceneTransforms.worldToWindowCoordinates(this.getMap().scene, startC3);
-          var endC2 = SceneTransforms.worldToWindowCoordinates(this.getMap().scene, endC3);
-          distance = utils.calculateSurfaceDistance(this.getMap(), startC2, endC2, config.splitNum);
-        } else {
-          distance = utils.getDistance(startC3, endC3);
-        }
-        distanceList.push(distance);
+        var distance = this._calculateSegmentDistance(start, end, config);
+        allDistance += distance;
         this._measureCache.push({
           start: start,
           end: end,
           distance: distance,
-          allDistance: distanceList.reduce(function (sum, distance) {
-            return sum + distance;
-          }, 0)
+          allDistance: allDistance
         });
       }
     }
@@ -181,21 +163,10 @@ var Distance = /*#__PURE__*/function (_BaseDraw) {
   }, {
     key: "_calculateMouseDistance",
     value: function _calculateMouseDistance(positions) {
-      if (!this._canOperate()) return;
-      if (positions.length < 2) return;
-      var start = positions.slice(-2, -1)[0];
-      var end = positions.slice(-1)[0];
-      var startC3 = lngLatAltToCartesian3(start[0], start[1], start[2]);
-      var endC3 = lngLatAltToCartesian3(end[0], end[1], end[2]);
-      var distance = 0;
-      var config = _objectSpread(_objectSpread({}, this._measureContext.options), this._config);
-      if (config.clampToGround) {
-        var startC2 = SceneTransforms.worldToWindowCoordinates(this.getMap().scene, startC3);
-        var endC2 = SceneTransforms.worldToWindowCoordinates(this.getMap().scene, endC3);
-        distance = utils.calculateSurfaceDistance(this.getMap(), startC2, endC2, config.splitNum);
-      } else {
-        distance = utils.getDistance(startC3, endC3);
-      }
+      var start = positions[positions.length - 2];
+      var end = positions[positions.length - 1];
+      var config = this.getMeasureConfig(this._config);
+      var distance = this._calculateSegmentDistance(start, end, config);
       return {
         distance: distance,
         allDistance: this._measureCache.reduce(function (sum, item) {
@@ -203,6 +174,19 @@ var Distance = /*#__PURE__*/function (_BaseDraw) {
         }, distance)
       };
     }
+  }, {
+    key: "_calculateSegmentDistance",
+    value: function _calculateSegmentDistance(start, end, config) {
+      if (!config.clampToGround) {
+        return utils.getDistance(this.toCartesian3(start), this.toCartesian3(end));
+      }
+      var startC2 = this.toWindowPosition(start);
+      var endC2 = this.toWindowPosition(end);
+      if (!startC2 || !endC2) {
+        return 0;
+      }
+      return utils.calculateSurfaceDistance(this.getMap(), startC2, endC2, config.splitNum);
+    }
 
     // 根据缓存数据创建文字
   }, {
@@ -210,10 +194,11 @@ var Distance = /*#__PURE__*/function (_BaseDraw) {
     value: function _createMeasureCacheText(dragPoints) {
       if (!this._canOperate()) return;
       for (var i = 0; i < this._measureCache.length; i++) {
+        var _dragPoints;
         var _this$_measureCache$i = this._measureCache[i],
           distance = _this$_measureCache$i.distance,
           allDistance = _this$_measureCache$i.allDistance;
-        dragPoints[i + 1].labelLayer.setStyle({
+        (_dragPoints = dragPoints[i + 1]) === null || _dragPoints === void 0 || _dragPoints.labelLayer.setStyle({
           show: true,
           text: "".concat(utils.formatLength(allDistance), "\n(+").concat(utils.formatLength(distance), ")")
         });
@@ -225,13 +210,12 @@ var Distance = /*#__PURE__*/function (_BaseDraw) {
     key: "destroy",
     value: function destroy() {
       if (!this._canOperate()) return;
-      _get(_getPrototypeOf(Distance.prototype), "destroy", this).call(this);
-      this._drawer.removeDrawerLayer(this._instance);
-      this._instance = null;
-      this._mouseLabelLayer && this._mouseLabelLayer.remove();
-      this._mouseLabelLayer = null;
+      var layer = this._instance;
       this._measureCache = [];
       this._destroyMouseMoveLabel();
+      this._instance = null;
+      _get(_getPrototypeOf(Distance.prototype), "destroy", this).call(this);
+      layer && this._drawer.removeDrawerLayer(layer);
     }
   }]);
   return Distance;

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,95 @@
+/// <reference path="../typings.d.ts" />
+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;
+}