deeptwins-engine-3d 0.1.64 → 0.1.65

package/dist/esm/drawer/utils.js

@@ -1,5 +1,39 @@
-// 获取对应类型的数据处理方法
+var _excluded = ["type", "featureTypeField", "featureConfigField", "config"];
+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 _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); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+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 _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; }
 import { flattenEach } from '@turf/turf';
+import * as Cesium from 'deeptwins-cesium';
+import * as utils from "../tool/utils";
+var DEFAULT_FEATURE_TYPE_FIELD = 'shapeType';
+var DEFAULT_FEATURE_CONFIG_FIELD = 'shapeConfig';
+var DRAWER_GEOMETRY_SHAPE_MAP = {
+  Point: 'point',
+  MultiPoint: 'point',
+  LineString: 'polyline',
+  MultiLineString: 'polyline',
+  Polygon: 'polygon',
+  MultiPolygon: 'polygon'
+};
+var DRAWER_POLYGON_BASED_SHAPES = new Set(['polygon', 'circle', 'regularPolygon', 'assemble', 'attackArrow', 'elliptic', 'pincerArrow', 'rightAngleArrow', 'sector', 'straightArrow', 'swallowtailArrow']);
+var DRAWER_POLYLINE_BASED_SHAPES = new Set(['polyline', 'bow', 'curve', 'formation']);
+
+// 获取对应类型的数据处理方法
 export var HANDLE_FEATURE_DATA_TYPE_FUN = {
   Point: handleFeaturePoint,
   MultiPoint: handleFeatureMultiPoint,
@@ -9,6 +43,290 @@ export var HANDLE_FEATURE_DATA_TYPE_FUN = {
   MultiPolygon: handleFeatureMultiPolygon
 };
 
+// 去掉 GeoJSON Polygon 首尾重复的闭合点，避免编辑时生成重复控制点。
+export function normalizePolygonPositions() {
+  var positions = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  if (!Array.isArray(positions)) {
+    return [];
+  }
+  var normalizedPositions = positions.filter(function (position) {
+    return Array.isArray(position) && position.length >= 2;
+  }).map(function (position) {
+    var _position = _slicedToArray(position, 3),
+      lng = _position[0],
+      lat = _position[1],
+      _position$ = _position[2],
+      alt = _position$ === void 0 ? 0 : _position$;
+    return [lng, lat, alt];
+  });
+  if (normalizedPositions.length < 2) {
+    return normalizedPositions;
+  }
+  var first = normalizedPositions[0];
+  var last = normalizedPositions[normalizedPositions.length - 1];
+  var isClosedRing = first[0] === last[0] && first[1] === last[1] && first[2] === last[2];
+  return isClosedRing ? normalizedPositions.slice(0, normalizedPositions.length - 1) : normalizedPositions;
+}
+
+// 根据 polygon 顶点估算中心点，供 circle / regularPolygon 恢复双控制点模型。
+export function getPolygonRestoreCenterPosition(positions) {
+  var normalizedPositions = normalizePolygonPositions(positions);
+  if (!normalizedPositions.length) {
+    return null;
+  }
+  var cartesianPositions = normalizedPositions.map(function (position) {
+    var _position2 = _slicedToArray(position, 3),
+      lng = _position2[0],
+      lat = _position2[1],
+      _position2$ = _position2[2],
+      alt = _position2$ === void 0 ? 0 : _position2$;
+    if (!Number.isFinite(lng) || !Number.isFinite(lat) || !Number.isFinite(alt)) {
+      return null;
+    }
+    return utils.lngLatAltToCartesian3(lng, lat, alt);
+  }).filter(function (position) {
+    return Boolean(position);
+  });
+  if (!cartesianPositions.length) {
+    return null;
+  }
+  var boundingSphere = Cesium.BoundingSphere.fromPoints(cartesianPositions);
+  var _utils$cartesian3ToLn = utils.cartesian3ToLngLatAlt(boundingSphere.center),
+    lng = _utils$cartesian3ToLn.lng,
+    lat = _utils$cartesian3ToLn.lat,
+    alt = _utils$cartesian3ToLn.alt;
+  return [lng, lat, alt];
+}
+
+// polygon 型特殊 shape 统一使用首个顶点作为半径/朝向控制点。
+export function getPolygonRestoreHandlePosition(positions) {
+  var _normalizePolygonPosi = normalizePolygonPositions(positions),
+    _normalizePolygonPosi2 = _slicedToArray(_normalizePolygonPosi, 1),
+    firstPosition = _normalizePolygonPosi2[0];
+  if (!firstPosition) {
+    return null;
+  }
+  return _toConsumableArray(firstPosition);
+}
+
+// 检测恢复项
+function isValidRestorePositionTuple(position) {
+  return Array.isArray(position) && position.length >= 3 && Number.isFinite(position[0]) && Number.isFinite(position[1]) && Number.isFinite(position[2]);
+}
+
+// 转换恢复项
+function toCartesianRestorePositions(positions) {
+  var cartesianPositions = positions.map(function (position) {
+    var _position3 = _slicedToArray(position, 3),
+      lng = _position3[0],
+      lat = _position3[1],
+      _position3$ = _position3[2],
+      alt = _position3$ === void 0 ? 0 : _position3$;
+    if (!Number.isFinite(lng) || !Number.isFinite(lat) || !Number.isFinite(alt)) {
+      return null;
+    }
+    return utils.lngLatAltToCartesian3(lng, lat, alt);
+  }).filter(function (position) {
+    return Boolean(position);
+  });
+  return cartesianPositions.length === positions.length ? cartesianPositions : [];
+}
+
+// 获取中位值
+function getMedianValue(values) {
+  var sortedValues = _toConsumableArray(values).sort(function (prev, next) {
+    return prev - next;
+  });
+  var middleIndex = Math.floor(sortedValues.length / 2);
+  if (sortedValues.length % 2 === 1) {
+    return sortedValues[middleIndex];
+  }
+  return (sortedValues[middleIndex - 1] + sortedValues[middleIndex]) / 2;
+}
+
+// 扇形的圆心到所有圆弧点距离基本一致，据此识别圆心顶点。
+function getSectorRestoreCenterIndex(cartesianPositions) {
+  var bestIndex = -1;
+  var bestConsistency = -1;
+  var bestSpread = Number.POSITIVE_INFINITY;
+  var _loop = function _loop(index) {
+      var distances = cartesianPositions.map(function (position, currentIndex) {
+        if (currentIndex === index) {
+          return null;
+        }
+        var distance = Cesium.Cartesian3.distance(cartesianPositions[index], position);
+        return Number.isFinite(distance) && distance > 0 ? distance : null;
+      }).filter(function (distance) {
+        return Number.isFinite(distance);
+      });
+      if (distances.length < 2) {
+        return 0; // continue
+      }
+      var medianDistance = getMedianValue(distances);
+      if (!Number.isFinite(medianDistance) || medianDistance <= 0) {
+        return 0; // continue
+      }
+      var tolerance = Math.max(medianDistance * 0.02, 0.5);
+      var consistentDistances = distances.filter(function (distance) {
+        return Math.abs(distance - medianDistance) <= tolerance;
+      });
+      if (consistentDistances.length < 2) {
+        return 0; // continue
+      }
+      var consistency = consistentDistances.length / distances.length;
+      var spread = consistentDistances.length > 1 ? (Math.max.apply(Math, _toConsumableArray(consistentDistances)) - Math.min.apply(Math, _toConsumableArray(consistentDistances))) / medianDistance : 0;
+      if (consistency > bestConsistency || consistency === bestConsistency && spread < bestSpread) {
+        bestIndex = index;
+        bestConsistency = consistency;
+        bestSpread = spread;
+      }
+    },
+    _ret;
+  for (var index = 0; index < cartesianPositions.length; index += 1) {
+    _ret = _loop(index);
+    if (_ret === 0) continue;
+  }
+  return bestConsistency >= 0.8 ? bestIndex : -1;
+}
+
+// 扇形恢复时先识别圆心，再取圆心前后两个相邻顶点作为两个转角。
+export function getSectorRestoreAnchors(positions) {
+  var normalizedPositions = normalizePolygonPositions(positions);
+  if (normalizedPositions.length < 3) {
+    return null;
+  }
+  var cartesianPositions = toCartesianRestorePositions(normalizedPositions);
+  if (cartesianPositions.length !== normalizedPositions.length) {
+    return null;
+  }
+  var centerIndex = getSectorRestoreCenterIndex(cartesianPositions);
+  if (centerIndex < 0) {
+    return null;
+  }
+  var previousIndex = (centerIndex - 1 + normalizedPositions.length) % normalizedPositions.length;
+  var nextIndex = (centerIndex + 1) % normalizedPositions.length;
+  var centerPosition = normalizedPositions[centerIndex];
+  var radiusPosition = normalizedPositions[nextIndex];
+  var anglePosition = normalizedPositions[previousIndex];
+  if (!isValidRestorePositionTuple(centerPosition) || !isValidRestorePositionTuple(radiusPosition) || !isValidRestorePositionTuple(anglePosition)) {
+    return null;
+  }
+  var radiusDistance = Cesium.Cartesian3.distance(cartesianPositions[centerIndex], cartesianPositions[nextIndex]);
+  var angleDistance = Cesium.Cartesian3.distance(cartesianPositions[centerIndex], cartesianPositions[previousIndex]);
+  var meanDistance = (radiusDistance + angleDistance) / 2;
+  if (!Number.isFinite(radiusDistance) || !Number.isFinite(angleDistance) || meanDistance <= 0 || Math.abs(radiusDistance - angleDistance) > Math.max(meanDistance * 0.05, 1)) {
+    return null;
+  }
+  return [_toConsumableArray(centerPosition), _toConsumableArray(radiusPosition), _toConsumableArray(anglePosition)];
+}
+
+// 规范化数据转换绘制选项
+export function normalizeDataTransformDrawOptions() {
+  var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var type = options.type,
+    featureTypeField = options.featureTypeField,
+    featureConfigField = options.featureConfigField,
+    config = options.config,
+    shapeOptions = _objectWithoutProperties(options, _excluded);
+  return {
+    type: type,
+    shapeOptions: _objectSpread(_objectSpread({}, config && _typeof(config) === 'object' ? config : {}), shapeOptions),
+    featureTypeField: featureTypeField || DEFAULT_FEATURE_TYPE_FIELD,
+    featureConfigField: featureConfigField || DEFAULT_FEATURE_CONFIG_FIELD
+  };
+}
+
+// 获取默认绘制形状类型
+export function getDefaultDrawerShapeType(geometryType) {
+  return DRAWER_GEOMETRY_SHAPE_MAP[geometryType];
+}
+
+// 绘制形状类型是否与几何类型兼容
+export function isShapeTypeCompatible(shapeType, geometryType) {
+  if (!shapeType || !geometryType) {
+    return false;
+  }
+  var defaultShapeType = getDefaultDrawerShapeType(geometryType);
+  if (!defaultShapeType) {
+    return false;
+  }
+  if (DRAWER_POLYGON_BASED_SHAPES.has(shapeType)) {
+    return geometryType === 'Polygon' || geometryType === 'MultiPolygon';
+  }
+  if (DRAWER_POLYLINE_BASED_SHAPES.has(shapeType)) {
+    return geometryType === 'LineString' || geometryType === 'MultiLineString';
+  }
+  return shapeType === defaultShapeType;
+}
+
+// 获取绘制形状类型
+function getDrawerFeatureShapeType(feature, geometryType, options) {
+  var _feature$properties;
+  var featureShapeType = feature === null || feature === void 0 || (_feature$properties = feature.properties) === null || _feature$properties === void 0 ? void 0 : _feature$properties[options.featureTypeField];
+  var shapeType = typeof options.type === 'string' ? options.type : featureShapeType;
+  if (typeof shapeType === 'string' && isShapeTypeCompatible(shapeType, geometryType)) {
+    return shapeType;
+  }
+  return getDefaultDrawerShapeType(geometryType);
+}
+
+// 获取绘制配置
+function getDrawerFeatureConfig(feature, options) {
+  var _feature$properties2;
+  var featureConfig = feature === null || feature === void 0 || (_feature$properties2 = feature.properties) === null || _feature$properties2 === void 0 ? void 0 : _feature$properties2[options.featureConfigField];
+  if (!featureConfig || _typeof(featureConfig) !== 'object') {
+    return _objectSpread({}, options.shapeOptions);
+  }
+  return _objectSpread(_objectSpread({}, featureConfig), options.shapeOptions);
+}
+
+// 解析特征
+function explodeFeature(feature) {
+  var _feature$geometry;
+  var geometryType = feature === null || feature === void 0 || (_feature$geometry = feature.geometry) === null || _feature$geometry === void 0 ? void 0 : _feature$geometry.type;
+  if (!geometryType) {
+    return [];
+  }
+  if (!geometryType.startsWith('Multi')) {
+    return [feature];
+  }
+  var features = [];
+  flattenEach(feature, function (currentFeature) {
+    features.push(_objectSpread(_objectSpread({}, currentFeature), {}, {
+      properties: _objectSpread(_objectSpread({}, (feature === null || feature === void 0 ? void 0 : feature.properties) || {}), (currentFeature === null || currentFeature === void 0 ? void 0 : currentFeature.properties) || {})
+    }));
+  });
+  return features;
+}
+
+// 获取恢复项
+export function getDrawerRestoreItems(feature) {
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var normalizedOptions = normalizeDataTransformDrawOptions(options);
+  return explodeFeature(feature).reduce(function (items, currentFeature) {
+    var _currentFeature$geome;
+    var geometryType = currentFeature === null || currentFeature === void 0 || (_currentFeature$geome = currentFeature.geometry) === null || _currentFeature$geome === void 0 ? void 0 : _currentFeature$geome.type;
+    if (!geometryType) {
+      return items;
+    }
+    var handle = HANDLE_FEATURE_DATA_TYPE_FUN[geometryType];
+    if (!handle) {
+      return items;
+    }
+    var handleFeature = handle(currentFeature);
+    if (!(handleFeature !== null && handleFeature !== void 0 && handleFeature.positions)) {
+      return items;
+    }
+    items.push({
+      shapeType: getDrawerFeatureShapeType(currentFeature, geometryType, normalizedOptions),
+      positions: handleFeature.positions,
+      config: getDrawerFeatureConfig(currentFeature, normalizedOptions),
+      geometryType: geometryType
+    });
+    return items;
+  }, []);
+}
+
 // 处理点
 function handleFeaturePoint(feature) {
   return {
@@ -45,7 +363,7 @@ function handleFeatureMultiLineString(feature) {
 function handleFeaturePolygon(feature) {
   return {
     type: 'single',
-    positions: feature.geometry.coordinates[0]
+    positions: normalizePolygonPositions(feature.geometry.coordinates[0])
   };
 }
 

package/dist/esm/index.js

@@ -64,11 +64,11 @@ DEEP_TWINS_BASE_URL && (window.CESIUM_BASE_URL = DEEP_TWINS_BASE_URL);
 // 全局加载css
 loadCss(Cesium.buildModuleUrl('Widgets/widgets.css'));
 // 打印版本信息
-console.log('DeepTwinsEngine3D Version:', "0.1.64");
+console.log('DeepTwinsEngine3D Version:', "0.1.65");
 export var DeepTwinsEngine3D = /*#__PURE__*/_createClass(function DeepTwinsEngine3D() {
   _classCallCheck(this, DeepTwinsEngine3D);
 });
-_defineProperty(DeepTwinsEngine3D, "Version", "0.1.64");
+_defineProperty(DeepTwinsEngine3D, "Version", "0.1.65");
 _defineProperty(DeepTwinsEngine3D, "Map", Map);
 _defineProperty(DeepTwinsEngine3D, "GroundSkyBox", GroundSkyBox);
 _defineProperty(DeepTwinsEngine3D, "RasterLayer", RasterLayer);

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;