deeptwins-engine-3d 0.1.64 → 0.1.65

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

@@ -1,13 +1,18 @@
-import { MeasureContext } from './index';
+import { type Cartesian2, type Cartesian3 } from 'deeptwins-cesium';
+import { MeasureContext, MeasureDrawConfig, MeasureLabelLayer, MeasureMap, MeasurePosition, ResolvedMeasureConfig } from './types';
 declare class BaseDraw {
     _measureContext: MeasureContext;
     id: string;
-    _drawer: any;
+    _drawer: MeasureContext['drawer'];
     isDestroyed: boolean;
     constructor(measureContext: MeasureContext);
     _canOperate(): boolean;
-    getMap(): any;
-    createLabelLayer(position: any, text: string, style?: any): any;
+    getMap(): MeasureMap;
+    createLabelLayer(position: MeasurePosition, text: string, style?: Record<string, any>): MeasureLabelLayer;
+    protected getMeasureConfig(config?: MeasureDrawConfig): ResolvedMeasureConfig;
+    protected toCartesian3(position: MeasurePosition): Cartesian3;
+    protected toWindowPosition(position: MeasurePosition): Cartesian2 | undefined;
+    protected destroyLabelLayer<T extends MeasureLabelLayer | null | undefined>(layer: T): null;
     destroy(): void;
 }
 export default BaseDraw;

package/dist/esm/measure/BaseDraw.js

@@ -1,4 +1,10 @@
 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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 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"); } }
@@ -9,9 +15,10 @@ 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 { v4 as uuidV4 } from 'uuid';
 import PositionProperty from "../property/PositionProperty";
-import { error } from "../tool/utils";
+import { error, lngLatAltToCartesian3 } from "../tool/utils";
 var BaseDraw = /*#__PURE__*/function () {
   function BaseDraw(measureContext) {
     _classCallCheck(this, BaseDraw);
@@ -37,7 +44,7 @@ var BaseDraw = /*#__PURE__*/function () {
   }, {
     key: "getMap",
     value: function getMap() {
-      return this._measureContext && this._measureContext.getMap();
+      return this._measureContext.getMap();
     }
 
     // 创建label图层
@@ -58,6 +65,34 @@ var BaseDraw = /*#__PURE__*/function () {
         positionProperty: new PositionProperty()
       });
     }
+  }, {
+    key: "getMeasureConfig",
+    value: function getMeasureConfig() {
+      var config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      return _objectSpread(_objectSpread({}, this._measureContext.options), config);
+    }
+  }, {
+    key: "toCartesian3",
+    value: function toCartesian3(position) {
+      var _position = _slicedToArray(position, 3),
+        lng = _position[0],
+        lat = _position[1],
+        _position$ = _position[2],
+        alt = _position$ === void 0 ? 0 : _position$;
+      return lngLatAltToCartesian3(lng, lat, alt);
+    }
+  }, {
+    key: "toWindowPosition",
+    value: function toWindowPosition(position) {
+      var _SceneTransforms$worl;
+      return (_SceneTransforms$worl = SceneTransforms.worldToWindowCoordinates(this.getMap().scene, this.toCartesian3(position))) !== null && _SceneTransforms$worl !== void 0 ? _SceneTransforms$worl : undefined;
+    }
+  }, {
+    key: "destroyLabelLayer",
+    value: function destroyLabelLayer(layer) {
+      layer === null || layer === void 0 || layer.destroy();
+      return null;
+    }
   }, {
     key: "destroy",
     value: function destroy() {

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

@@ -1,22 +1,22 @@
 import BaseDraw from './BaseDraw';
-import { MeasureContext } from './index';
-declare class Distance extends BaseDraw {
-    private readonly _type;
+import { DistanceMeasureResult, MeasureContext, MeasureDrawConfig, MeasureLayer, MeasurePosition, MeasureShapeLayer } from './types';
+declare class Distance extends BaseDraw implements MeasureLayer {
     private _config;
-    private _instance;
+    _instance: MeasureShapeLayer | null;
     private _measureCache;
     private _mouseLabelLayer;
-    constructor(measureContext: MeasureContext, config: any);
+    constructor(measureContext: MeasureContext, config?: MeasureDrawConfig);
     private _init;
-    drawing(positions: any): any;
-    pointsChange(layer: any, positions: any): any[] | undefined;
-    drawEnd(): any[] | undefined;
+    drawing(positions: MeasurePosition[]): {} | undefined;
+    pointsChange(layer: MeasureShapeLayer, positions: MeasurePosition[]): DistanceMeasureResult;
+    drawEnd(): DistanceMeasureResult;
     startEdit(): void;
-    endEdit(): any[] | undefined;
+    endEdit(): DistanceMeasureResult;
     private _createMouseMoveLabel;
     private _destroyMouseMoveLabel;
     private _calculateDistance;
     private _calculateMouseDistance;
+    private _calculateSegmentDistance;
     private _createMeasureCacheText;
     destroy(): void;
 }

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;