deeptwins-engine-3d 0.1.64 → 0.1.66

package/dist/esm/material/entity/ImageMaterialProperty.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="deepteins-engine-3d/typings" />
 import * as Cesium from 'deeptwins-cesium';
 export default class ImageMaterialProperty extends Cesium.ImageMaterialProperty {
     constructor(options: any);

package/dist/esm/material/shader/AtmosphericShader.glsl

@@ -0,0 +1,244 @@
+precision highp float;
+uniform sampler2D colorTexture;
+uniform sampler2D depthTexture;
+uniform float u_threshold;
+uniform float u_blendFactor;
+uniform float u_lightIntensity;
+uniform float u_scatterStrength;
+uniform float u_tonemapExposure;
+uniform float u_mieExtinctionStrength;
+uniform float u_fogOpacity;
+uniform float u_fogPower;
+uniform float u_clearMixBias;
+in vec2 v_textureCoordinates;
+const float PI = 3.14159265359;
+const float TWO_PI = PI * 2.0;
+const float FOUR_PI = PI * 4.0;
+const float SCATTER_VISIBILITY_SCALE = 30000.0;
+const float MAX_EXPOSURE_RESPONSE = 1.8;
+const float MAX_LIGHT_RESPONSE = 3.0;
+
+const vec3 betaR = vec3(5.5e-6, 13.0e-6, 22.4e-6);
+
+const vec3 betaM = vec3(21e-6);
+
+const float hR = 10e3;
+const float hM = 3.8e3;
+const int num_samples = 16;
+const int num_samples_light = 4;
+#ifdef GL_ES
+          #define _in(T) const in T
+          #define _inout(T) inout T
+          #define _out(T) out T
+          #define _begin(type) type (
+          #define _end )
+          #define mul(a, b) (a) * (b)
+      #endif
+
+struct ray_t {
+    vec3 origin;
+    vec3 direction;
+};
+struct sphere_t {
+    vec3 origin;
+    float radius;
+    int material;
+};
+struct plane_t {
+    vec3 direction;
+    float distance;
+    int material;
+};
+plane_t plane;
+mat3 rotate_around_x(_in(float)  angle_degrees) {
+    float angle = radians(angle_degrees);
+    float _sin = sin(angle);
+    float _cos = cos(angle);
+    return mat3(1, 0, 0, 0, _cos, -_sin, 0, _sin, _cos);
+}
+
+bool isect_sphere(_in(ray_t)  ray, _in(sphere_t)  sphere, _inout(float)  t0, _inout(float)  t1) {
+    vec3 rc = sphere.origin - ray.origin;
+    float radius2 = sphere.radius * sphere.radius;
+    float tca = dot(rc, ray.direction);
+    float d2 = dot(rc, rc) - tca * tca;
+    if (d2 > radius2) return false;
+    float thc = sqrt(radius2 - d2);
+    t0 = tca - thc;
+    t1 = tca + thc;
+    return true;
+}
+float rayleigh_phase_func(float mu) {
+    return
+    3. * (1. + mu * mu)
+    /
+    (16. * PI);
+}
+const float g = 0.76;
+float henyey_greenstein_phase_func(float mu) {
+    return
+    (1. - g * g)
+    /
+    ((4. * PI) * pow(1. + g * g - 2. * g * mu, 1.5));
+}
+const float k = 1.55 * g - 0.55 * (g * g * g);
+float schlick_phase_func(float mu) {
+    return
+    (1. - k * k)
+    /
+    (4. * PI * (1. + k * mu) * (1. + k * mu));
+}
+const sphere_t atmosphere = _begin(sphere_t)
+vec3(0, 0, 0), 6420e3, 0
+_end;
+
+bool get_sun_light(
+_in(ray_t)  ray, _inout(float)  optical_depthR, _inout(float)  optical_depthM
+) {
+    float t0, t1;
+    isect_sphere(ray, atmosphere, t0, t1);
+    float march_pos = 0.;
+    float march_step = t1 / float(num_samples_light);
+    for (int i = 0; i < num_samples_light; i++) {
+        vec3 s = ray.origin +
+        ray.direction * (march_pos + 0.5 * march_step);
+        float height = length(s) - 6360e3;
+        if (height < 0.)
+        return false;
+        optical_depthR += exp(-height / hR) * march_step;
+        optical_depthM += exp(-height / hM) * march_step;
+        march_pos += march_step;
+    }
+    return true;
+}
+vec4 get_incident_light(_in(ray_t)  ray) {
+    vec3 dir = ray.direction;
+    vec3 start = ray.origin;
+    float a = dot(dir, dir);
+    float b = 2.0 * dot(dir, start);
+    float radius2 = atmosphere.radius * atmosphere.radius;
+    float c = dot(start, start) - radius2;
+    float d = (b * b) - 4.0 * a * c;
+    if (d < 0.0) return vec4(0.0);
+    float squaredD = sqrt(d);
+    vec2 ray_length = vec2(
+    max((-b - squaredD) / (2.0 * a), 0.0), min((-b + squaredD) / (2.0 * a), plane.distance)
+    );
+    if (ray_length.x > ray_length.y) return vec4(0.0);
+    float march_step = (ray_length.y - ray_length.x) / float(num_samples);
+    float mu = dot(ray.direction, normalize(czm_sunPositionWC));
+    float phaseR = rayleigh_phase_func(mu);
+    float phaseM =
+    #if 1
+              henyey_greenstein_phase_func(mu);
+    #else
+              schlick_phase_func(mu);
+    #endif
+
+    float optical_depthR = 0.;
+    float optical_depthM = 0.;
+    vec3 sumR = vec3(0);
+    vec3 sumM = vec3(0);
+    float march_pos = 0.;
+    for (int i = 0; i < num_samples; i++) {
+        vec3 s = ray.origin +
+        ray.direction * (march_pos + 0.5 * march_step);
+        float height = length(s) - 6360e3;
+
+        float hr = exp(-height / hR) * march_step;
+        float hm = exp(-height / hM) * march_step;
+        optical_depthR += hr;
+        optical_depthM += hm;
+
+        ray_t light_ray = _begin(ray_t)
+        s, normalize(czm_sunPositionWC)
+        _end;
+        float optical_depth_lightR = 0.;
+        float optical_depth_lightM = 0.;
+        bool overground = get_sun_light(
+            light_ray,
+            optical_depth_lightR,
+            optical_depth_lightM);
+
+        if (overground) {
+
+            vec3 tau =
+            betaR * (optical_depthR + optical_depth_lightR) +
+            betaM * u_mieExtinctionStrength * (optical_depthM + optical_depth_lightM);
+            vec3 attenuation = exp(-tau);
+            sumR += hr * attenuation;
+            sumM += hm * attenuation;
+        }
+
+        march_pos += march_step;
+    }
+    vec3 transmittance = exp(-((betaM * optical_depthM * u_mieExtinctionStrength)
+    + (betaR * optical_depthR)) * 4.);
+    float attenuation = clamp(dot(transmittance, vec3(0.3333333)), 0.0, 1.0);
+
+    return vec4(
+    u_scatterStrength *
+    (sumR * phaseR * betaR +
+    sumM * phaseM * betaM), 1.0 - attenuation);
+}
+
+void main() {
+    vec4 rawColor = texture(colorTexture, v_textureCoordinates);
+    float depth = czm_unpackDepth(texture(depthTexture, v_textureCoordinates));
+
+    vec4 positionEC = czm_windowToEyeCoordinates(gl_FragCoord.xy, depth);
+    vec4 positionWC = czm_inverseView * positionEC;
+    positionWC.xyz = positionWC.xyz / positionWC.w;
+
+    vec3 lVector = positionWC.xyz - czm_viewerPositionWC;
+    ray_t ray;
+    ray.origin = czm_viewerPositionWC;
+    ray.direction = normalize(lVector);
+    plane.distance = length(lVector);
+
+    vec4 atmosphereColor = get_incident_light(ray);
+    float lightControl = clamp(u_lightIntensity / 4.0, 0.0, 1.0);
+    float lightStrength = MAX_LIGHT_RESPONSE * (
+    1.0 - exp(-2.6 * pow(lightControl, 1.6))
+    );
+    vec3 scatterColor = atmosphereColor.rgb * lightStrength;
+    float exposureControl = clamp(u_tonemapExposure / 3.0, 0.0, 1.0);
+    float exposureStrength = pow(exposureControl, 1.25) * MAX_EXPOSURE_RESPONSE;
+    float mieVisualFactor = mix(
+        0.6,
+        1.8,
+        clamp(u_mieExtinctionStrength / 2.0, 0.0, 1.0)
+    );
+    vec3 visibleScatter = 1.0 - exp(
+        -max(scatterColor * SCATTER_VISIBILITY_SCALE, 0.0) * exposureStrength
+    );
+    visibleScatter *= mieVisualFactor;
+    float brightness = dot(visibleScatter, vec3(0.299, 0.587, 0.114));
+    float thresholdMask = u_threshold > 0.0
+    ? smoothstep(0.0, u_threshold, brightness)
+    : 1.0;
+    visibleScatter *= thresholdMask;
+    float fogSignal = clamp(atmosphereColor.a * 2.5, 0.0, 1.0);
+    float fogAlpha = clamp(
+        pow(fogSignal, u_fogPower) * u_fogOpacity * mieVisualFactor,
+        0.0,
+        1.0
+    );
+    float clearPreserve = clamp(1.0 - u_clearMixBias, 0.0, 1.0);
+    float fogMix = fogAlpha * clearPreserve * 0.85;
+    vec3 foggedBase = mix(
+        rawColor.rgb,
+        rawColor.rgb * (1.0 - fogAlpha * 0.35),
+        fogMix
+    );
+    vec3 overlayColor = visibleScatter *
+    (0.55 + fogAlpha * 1.25) *
+    mix(1.0, 0.6, u_clearMixBias);
+    vec3 finalColor = mix(
+        rawColor.rgb,
+        foggedBase + overlayColor,
+        u_blendFactor
+    );
+
+    out_FragColor = vec4(clamp(finalColor, 0.0, 1.0), rawColor.a);
+}

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

@@ -1,29 +1,29 @@
 import BaseDraw from './BaseDraw';
-import { MeasureContext } from './index';
-declare class Area extends BaseDraw {
-    private readonly _type;
+import { AreaMeasureResult, MeasureContext, MeasureDrawConfig, MeasureLayer, MeasurePosition, MeasureShapeLayer } from './types';
+declare class Area extends BaseDraw implements MeasureLayer {
     private _config;
-    private _instance;
+    private readonly _shapeType;
+    _instance: MeasureShapeLayer | null;
     private _area;
     private _areaLayer;
-    constructor(measureContext: MeasureContext, config: any);
+    constructor(measureContext: MeasureContext, config?: MeasureDrawConfig);
     private _init;
-    drawing(positions: any): {
-        area: any;
-    } | undefined;
-    pointsChange(layer: any, positions: any): {
-        area: any;
-    } | undefined;
-    drawEnd(positions: any): {
-        area: any;
-    } | undefined;
+    private _resolveShapeType;
+    private _getDrawerConfig;
+    drawing(positions: MeasurePosition[]): AreaMeasureResult | undefined;
+    pointsChange(_layer: MeasureShapeLayer, positions: MeasurePosition[]): AreaMeasureResult;
+    drawEnd(positions?: MeasurePosition[]): {
+        area: number;
+    };
     startEdit(): void;
-    endEdit(positions: any): {
-        area: any;
-    } | undefined;
+    endEdit(positions?: MeasurePosition[]): {
+        area: number;
+    };
     private _calculateArea;
     private _createAreaLabel;
     private _destroyAreaLabel;
+    private _updateArea;
+    private _toPolygonPositions;
     destroy(): void;
 }
 export default Area;

package/dist/esm/measure/Area.js

@@ -1,12 +1,16 @@
 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread 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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+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"); } }
 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; }
@@ -23,33 +27,45 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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 { centerOfMass, point, polygon } from '@turf/turf';
-import { SceneTransforms } from 'deeptwins-cesium';
-import { STATUS } from "../drawer";
-import { lngLatAltToCartesian3 } from "../tool/utils";
 import BaseDraw from "./BaseDraw";
+import { AREA_SHAPE_TYPE, STATUS } from "./types";
 import * as utils from "./utils";
 var Area = /*#__PURE__*/function (_BaseDraw) {
   _inherits(Area, _BaseDraw);
   var _super = _createSuper(Area);
-  function Area(measureContext, config) {
+  function Area(measureContext) {
     var _this;
+    var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     _classCallCheck(this, Area);
     _this = _super.call(this, measureContext);
-    _defineProperty(_assertThisInitialized(_this), "_type", 'area');
     _defineProperty(_assertThisInitialized(_this), "_config", void 0);
-    // 线图层
-    _defineProperty(_assertThisInitialized(_this), "_instance", void 0);
+    _defineProperty(_assertThisInitialized(_this), "_shapeType", void 0);
+    // 图形图层
+    _defineProperty(_assertThisInitialized(_this), "_instance", null);
     _defineProperty(_assertThisInitialized(_this), "_area", 0);
     // 鼠标移动的label
-    _defineProperty(_assertThisInitialized(_this), "_areaLayer", void 0);
+    _defineProperty(_assertThisInitialized(_this), "_areaLayer", null);
     _this._config = config;
+    _this._shapeType = _this._resolveShapeType(config.shapeType);
     _this._init();
     return _this;
   }
   _createClass(Area, [{
     key: "_init",
     value: function _init() {
-      this._instance = this._drawer.startDraw('polygon', this._config);
+      this._instance = this._drawer.startDraw(this._shapeType, this._getDrawerConfig());
+    }
+  }, {
+    key: "_resolveShapeType",
+    value: function _resolveShapeType(shapeType) {
+      return Object.values(AREA_SHAPE_TYPE).includes(shapeType) ? shapeType : AREA_SHAPE_TYPE.POLYGON;
+    }
+  }, {
+    key: "_getDrawerConfig",
+    value: function _getDrawerConfig() {
+      var drawerConfig = _objectSpread({}, this._config);
+      delete drawerConfig.shapeType;
+      return drawerConfig;
     }
 
     // 绘制
@@ -58,48 +74,30 @@ var Area = /*#__PURE__*/function (_BaseDraw) {
     value: function drawing(positions) {
       if (!this._canOperate()) return;
       this._measureContext._changeStatus(STATUS.DRAWING);
-      if (positions.length < 3) {
-        this._destroyAreaLabel();
-        return;
-      }
-      var polygonPositions = [].concat(_toConsumableArray(positions), [positions[0]]);
-      this._area = this._calculateArea(polygonPositions);
-      var center = centerOfMass(polygon([polygonPositions]));
-      this._createAreaLabel(center.geometry.coordinates, "\u9762\u79EF".concat(utils.formatArea(this._area)));
-      return {
-        area: this._area
-      };
+      return this._updateArea(positions);
     }
 
     // 点位修改
   }, {
     key: "pointsChange",
-    value: function pointsChange(layer, positions) {
-      if (!this._canOperate()) return;
-      if (positions.length < 3) {
-        this._destroyAreaLabel();
-        return {
-          area: 0
-        };
-      }
-      var polygonPositions = [].concat(_toConsumableArray(positions), [positions[0]]);
-      this._area = this._calculateArea(polygonPositions);
-      var center = centerOfMass(polygon([polygonPositions]));
-      this._createAreaLabel(center.geometry.coordinates, "\u9762\u79EF".concat(utils.formatArea(this._area)));
-      return {
-        area: this._area
+    value: function pointsChange(_layer, positions) {
+      if (!this._canOperate()) return {
+        area: 0
       };
+      return this._updateArea(positions);
     }
 
     // 结束绘制
   }, {
     key: "drawEnd",
-    value: function drawEnd(positions) {
-      if (!this._canOperate()) return;
+    value: function drawEnd() {
+      var positions = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+      if (!this._canOperate()) return {
+        area: 0
+      };
       this._measureContext._changeStatus(STATUS.END_DRAW);
       this._measureContext.setDrawerLayer(this.id, this);
-      var polygonPositions = [].concat(_toConsumableArray(positions), [positions[0]]);
-      this._area = this._calculateArea(polygonPositions);
+      this._area = this._calculateArea(this._toPolygonPositions(positions));
       this.startEdit();
       return {
         area: this._area
@@ -117,10 +115,12 @@ var Area = /*#__PURE__*/function (_BaseDraw) {
     // 结束编辑
   }, {
     key: "endEdit",
-    value: function endEdit(positions) {
-      if (!this._canOperate()) return;
-      var polygonPositions = [].concat(_toConsumableArray(positions), [positions[0]]);
-      this._area = this._calculateArea(polygonPositions);
+    value: function endEdit() {
+      var positions = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+      if (!this._canOperate()) return {
+        area: 0
+      };
+      this._area = this._calculateArea(this._toPolygonPositions(positions));
       return {
         area: this._area
       };
@@ -131,21 +131,25 @@ var Area = /*#__PURE__*/function (_BaseDraw) {
     key: "_calculateArea",
     value: function _calculateArea(positions) {
       var _this2 = this;
-      if (!this._canOperate()) return;
-      if (positions.length < 4) return;
-      var area = 0;
-      var config = _objectSpread(_objectSpread({}, this._measureContext.options), this._config);
-      var positionsC3 = positions.map(function (t) {
-        return lngLatAltToCartesian3(t[0], t[1], t[2]);
+      if (positions.length < 4) {
+        return 0;
+      }
+      var config = this.getMeasureConfig(this._config);
+      var positionsC3 = positions.map(function (item) {
+        return _this2.toCartesian3(item);
       });
       if (config.clampToGround) {
-        area = utils.calculateSurfaceArea(this.getMap(), positionsC3.map(function (item) {
-          return SceneTransforms.worldToWindowCoordinates(_this2.getMap().scene, item);
-        }));
-      } else {
-        area = utils.getArea(this.getMap(), positionsC3);
+        var windowPositions = positions.map(function (item) {
+          return _this2.toWindowPosition(item);
+        });
+        if (windowPositions.some(function (item) {
+          return !item;
+        })) {
+          return 0;
+        }
+        return utils.calculateSurfaceArea(this.getMap(), windowPositions, config.splitNum);
       }
-      return area;
+      return utils.getArea(this.getMap(), positionsC3);
     }
 
     // 绘制area label
@@ -167,8 +171,36 @@ var Area = /*#__PURE__*/function (_BaseDraw) {
   }, {
     key: "_destroyAreaLabel",
     value: function _destroyAreaLabel() {
-      this._areaLayer && this._areaLayer.destroy();
-      this._areaLayer = null;
+      this._areaLayer = this.destroyLabelLayer(this._areaLayer);
+    }
+  }, {
+    key: "_updateArea",
+    value: function _updateArea(positions) {
+      if (positions.length < 3) {
+        this._area = 0;
+        this._destroyAreaLabel();
+        return {
+          area: 0
+        };
+      }
+      var polygonPositions = this._toPolygonPositions(positions);
+      this._area = this._calculateArea(polygonPositions);
+      var center = centerOfMass(polygon([polygonPositions]));
+      var _center$geometry$coor = _slicedToArray(center.geometry.coordinates, 2),
+        lng = _center$geometry$coor[0],
+        lat = _center$geometry$coor[1];
+      this._createAreaLabel([lng, lat, 0], "\u9762\u79EF".concat(utils.formatArea(this._area)));
+      return {
+        area: this._area
+      };
+    }
+  }, {
+    key: "_toPolygonPositions",
+    value: function _toPolygonPositions(positions) {
+      if (positions.length < 3) {
+        return [];
+      }
+      return [].concat(_toConsumableArray(positions), [positions[0]]);
     }
 
     // 销毁
@@ -176,11 +208,11 @@ var Area = /*#__PURE__*/function (_BaseDraw) {
     key: "destroy",
     value: function destroy() {
       if (!this._canOperate()) return;
-      _get(_getPrototypeOf(Area.prototype), "destroy", this).call(this);
-      this._drawer.removeDrawerLayer(this._instance);
+      var layer = this._instance;
+      this._destroyAreaLabel();
       this._instance = null;
-      this._areaLayer && this._areaLayer.remove();
-      this._areaLayer = null;
+      _get(_getPrototypeOf(Area.prototype), "destroy", this).call(this);
+      layer && this._drawer.removeDrawerLayer(layer);
     }
   }]);
   return Area;

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

@@ -1,13 +1,19 @@
-import { MeasureContext } from './index';
+/// <reference path="../typings.d.ts" />
+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;
 }