deeptwins-engine-3d 0.1.8 → 0.1.11

package/dist/esm/graphicLayer/BaseSource.d.ts

@@ -1,18 +1,19 @@
 export default class BaseSource {
+    private readonly _mapContext;
     id: any;
     geoJson: any;
     source: any;
     isDestroyed: boolean;
     private _isCompleteInfo;
-    private _graphicLayerCollection;
     static HANDLE_FEATURE_TYPE_FUN: any;
     static HANDLE_FEATURE_CLAMP_TYPE_FUN: any;
-    constructor({ id, source, customSource, graphicLayerCollection }: any);
+    constructor({ id, source, customSource, mapContext }: any);
+    getMap(): any;
     private _canOperate;
     private _handleGeoJson;
     translateSource(source: any): void;
     remove(): void;
-    setData(data: any): this;
+    setData(data: any): this | undefined;
     _toDestroy(): void;
     static analysisSourceType(data: any): "other" | "wkt" | "sourceId" | "sourceInstance" | "geoJson";
     static wktToGeoJon(wkt: string): any;

package/dist/esm/graphicLayer/BaseSource.js

@@ -31,17 +31,17 @@ var BaseSource = /*#__PURE__*/function () {
     var id = _ref.id,
       source = _ref.source,
       customSource = _ref.customSource,
-      graphicLayerCollection = _ref.graphicLayerCollection;
+      mapContext = _ref.mapContext;
     _classCallCheck(this, BaseSource);
+    _defineProperty(this, "_mapContext", void 0);
     _defineProperty(this, "id", void 0);
     _defineProperty(this, "geoJson", void 0);
     _defineProperty(this, "source", []);
     _defineProperty(this, "isDestroyed", false);
     // 是否是完整的信息
     _defineProperty(this, "_isCompleteInfo", true);
-    _defineProperty(this, "_graphicLayerCollection", void 0);
     this.id = id;
-    this._graphicLayerCollection = graphicLayerCollection;
+    this._mapContext = mapContext;
     // 直接添加实体数据
     if (customSource) {
       this._isCompleteInfo = false;
@@ -50,20 +50,30 @@ var BaseSource = /*#__PURE__*/function () {
       this.translateSource(source);
     }
   }
-
-  // 是否能进行操作
   _createClass(BaseSource, [{
+    key: "getMap",
+    value: function getMap() {
+      return this._mapContext.getMap();
+    }
+
+    // 是否能进行操作
+  }, {
     key: "_canOperate",
     value: function _canOperate() {
       if (this.isDestroyed) {
-        throw new Error('BaseSource实例已销毁');
+        utils.error('BaseSource实例已销毁');
+        return false;
       }
+      return true;
     }
 
     // 处理geoJson
   }, {
     key: "_handleGeoJson",
     value: function _handleGeoJson(geoJson) {
+      if (!this._canOperate()) {
+        return;
+      }
       this.geoJson = geoJson;
       this.source = BaseSource.geoJsonToGeoCartesian3Array(geoJson);
     }
@@ -72,6 +82,9 @@ var BaseSource = /*#__PURE__*/function () {
   }, {
     key: "translateSource",
     value: function translateSource(source) {
+      if (!this._canOperate()) {
+        return;
+      }
       var sourceType = BaseSource.analysisSourceType(source);
       if (sourceType === 'geoJson') {
         this._handleGeoJson(source);
@@ -86,20 +99,24 @@ var BaseSource = /*#__PURE__*/function () {
   }, {
     key: "remove",
     value: function remove() {
-      this._canOperate();
+      if (!this._canOperate()) {
+        return;
+      }
       this.isDestroyed = true;
       // 移除相应的new map上的数据
-      this._graphicLayerCollection._removeGraphicMapSource(this.id);
+      this.getMap().graphicLayerCollection._removeGraphicMapSource(this.id);
     }
 
     // 更新数据
   }, {
     key: "setData",
     value: function setData(data) {
-      this._canOperate();
+      if (!this._canOperate()) {
+        return;
+      }
       this.translateSource(data);
-      this._graphicLayerCollection.graphicSources.set(this.id, this);
-      this._graphicLayerCollection.setLayerData('_allLayer', this);
+      this.getMap().graphicLayerCollection.graphicSources.set(this.id, this);
+      this.getMap().graphicLayerCollection.setLayerData('_allLayer', this);
       return this;
     }
 

package/dist/esm/graphicLayer/BillboardEntity.js

@@ -1,5 +1,5 @@
 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); }
-var _excluded = ["style", "source", "entity"],
+var _excluded = ["style", "entity"],
   _excluded2 = ["color", "pixelOffset", "eyeOffset", "alignedAxis", "rotation"];
 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; }
@@ -18,8 +18,8 @@ function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) ===
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-import { cloneDeep, merge } from 'lodash';
 import * as Cesium from 'deeptwins-cesium';
+import { cloneDeep, merge } from 'lodash';
 import { DEFAULT_BILLBOARD_OPTIONS } from "../constant";
 import PositionProperty from "../property/PositionProperty";
 import * as utils from "../tool/utils";
@@ -33,9 +33,7 @@ var BillboardEntity = /*#__PURE__*/function (_BaseEntity) {
     var _this;
     _classCallCheck(this, BillboardEntity);
     _this = _super.call(this, options);
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     var style = options.style,
-      source = options.source,
       entity = options.entity,
       currOptions = _objectWithoutProperties(options, _excluded);
     if (entity) {
@@ -58,11 +56,10 @@ var BillboardEntity = /*#__PURE__*/function (_BaseEntity) {
     function _init(options) {
       var style = options.style;
       var positions = PositionProperty.changeToPropertyData.call(this);
-      this.graphic = new Cesium.BillboardGraphics(style);
       this.entity = new Cesium.Entity({
         position: positions,
         id: this.id,
-        billboard: this.graphic
+        billboard: new Cesium.BillboardGraphics(style)
       });
     }
 

package/dist/esm/graphicLayer/BillboardPrimitive.d.ts

@@ -3,5 +3,7 @@ export default class BillboardPrimitive extends BasePointPrimitive {
     constructor(options: any);
     static handleOptions(style: any): any;
     private _init;
+    getPrimitive(): any;
     updateData(data: any): void;
+    updateStyle(originStyle: any, style: any): void;
 }

package/dist/esm/graphicLayer/BillboardPrimitive.js

@@ -1,5 +1,5 @@
 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); }
-var _excluded = ["style", "source"],
+var _excluded = ["style"],
   _excluded2 = ["color", "pixelOffset", "eyeOffset", "alignedAxis", "rotation"];
 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; }
@@ -29,9 +29,7 @@ var BillboardPrimitive = /*#__PURE__*/function (_BasePointPrimitive) {
     var _this;
     _classCallCheck(this, BillboardPrimitive);
     _this = _super.call(this, options);
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     var style = options.style,
-      source = options.source,
       currOptions = _objectWithoutProperties(options, _excluded);
     var mergeStyle = merge(DEFAULT_BILLBOARD_PRIMITIVE_OPTIONS(), cloneDeep(style || {}));
     var currStyle = BillboardPrimitive.handleOptions(mergeStyle);
@@ -48,19 +46,45 @@ var BillboardPrimitive = /*#__PURE__*/function (_BasePointPrimitive) {
       var style = options.style,
         positions = options.positions,
         primitiveCollection = options.primitiveCollection;
-      this.primitive = primitiveCollection.add(_objectSpread({
+      primitiveCollection.add(_objectSpread({
         id: this.id,
         position: positions
       }, style));
     }
 
+    // 获取primitive
+  }, {
+    key: "getPrimitive",
+    value: function getPrimitive() {
+      var _primitiveCollection$,
+        _this2 = this;
+      var primitiveCollection = this.getPrimitiveCollection();
+      return primitiveCollection === null || primitiveCollection === void 0 || (_primitiveCollection$ = primitiveCollection._billboards) === null || _primitiveCollection$ === void 0 ? void 0 : _primitiveCollection$.find(function (t) {
+        return t.id === _this2.id;
+      });
+    }
+
     // 更新geoJson数据
   }, {
     key: "updateData",
     value: function updateData(data) {
       var positions = data.positions;
       this.source = data;
-      this.primitive.position = positions;
+      var primitive = this.getPrimitive();
+      if (!primitive) return;
+      primitive.position = positions;
+    }
+
+    // 更新样式
+  }, {
+    key: "updateStyle",
+    value: function updateStyle(originStyle, style) {
+      this.style = merge(this.style, originStyle);
+      var primitive = this.getPrimitive();
+      if (!primitive) return;
+      for (var key in style) {
+        primitive[key] = style[key];
+      }
     }
   }], [{
     key: "handleOptions",

package/dist/esm/graphicLayer/BoxEntity.js

@@ -1,5 +1,5 @@
 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); }
-var _excluded = ["style", "source", "entity"],
+var _excluded = ["style", "entity"],
   _excluded2 = ["material", "outlineColor", "dimensions"];
 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; }
@@ -33,9 +33,7 @@ var BoxEntity = /*#__PURE__*/function (_BaseEntity) {
     var _this;
     _classCallCheck(this, BoxEntity);
     _this = _super.call(this, options);
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     var style = options.style,
-      source = options.source,
       entity = options.entity,
       currOptions = _objectWithoutProperties(options, _excluded);
     // 添加的是entity对象
@@ -59,11 +57,10 @@ var BoxEntity = /*#__PURE__*/function (_BaseEntity) {
     function _init(options) {
       var style = options.style;
       var positions = PositionProperty.changeToPropertyData.call(this);
-      this.graphic = new Cesium.BoxGraphics(style);
       this.entity = new Cesium.Entity({
         id: this.id,
         position: positions,
-        box: this.graphic
+        box: new Cesium.BoxGraphics(style)
       });
     }
 

package/dist/esm/graphicLayer/BoxPrimitive.d.ts

@@ -1,5 +1,5 @@
 import BasePrimitive from './BasePrimitive';
 export default class BoxPrimitive extends BasePrimitive {
-    constructor(map: any);
-    createPrimitive(options?: any): void;
+    constructor(mapContext: any);
+    createPrimitive(options: any, primitiveInstance: any[]): void;
 }

package/dist/esm/graphicLayer/BoxPrimitive.js

@@ -1,4 +1,7 @@
 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 _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; }
@@ -13,28 +16,30 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 import * as Cesium from 'deeptwins-cesium';
 import { cloneDeep, merge } from 'lodash';
-import { DEFAULT_BOX_PRIMITIVE_OPTIONS } from "../constant";
+import { DEFAULT_BOX_PRIMITIVE_OPTIONS, DEFAULT_PRIMITIVE_OPTIONS } from "../constant";
 import BasePrimitive from "./BasePrimitive";
 var BoxPrimitive = /*#__PURE__*/function (_BasePrimitive) {
   _inherits(BoxPrimitive, _BasePrimitive);
   var _super = _createSuper(BoxPrimitive);
-  function BoxPrimitive(map) {
+  function BoxPrimitive(mapContext) {
     _classCallCheck(this, BoxPrimitive);
-    return _super.call(this, map);
+    return _super.call(this, mapContext);
   }
   _createClass(BoxPrimitive, [{
     key: "createPrimitive",
     value: function createPrimitive() {
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      var primitiveInstance = arguments.length > 1 ? arguments[1] : undefined;
       var style = merge(DEFAULT_BOX_PRIMITIVE_OPTIONS(), cloneDeep(options.style || {}));
+      var primitiveOptions = merge(DEFAULT_PRIMITIVE_OPTIONS(), cloneDeep(options.primitive || {}));
       var appearance = new Cesium.PerInstanceColorAppearance({
         translucent: !!(style !== null && style !== void 0 && style.translucent),
         closed: true
       });
-      this.primitive = new Cesium.Primitive({
-        geometryInstances: this.primitiveInstance,
+      this.primitive = new Cesium.Primitive(_objectSpread({
+        geometryInstances: primitiveInstance,
         appearance: appearance
-      });
+      }, primitiveOptions));
       this.show = !!(style !== null && style !== void 0 && style.show);
     }
   }]);

package/dist/esm/graphicLayer/BoxPrimitiveInstance.js

@@ -1,5 +1,5 @@
 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); }
-var _excluded = ["style", "source"],
+var _excluded = ["style"],
   _excluded2 = ["color", "dimensions"];
 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; }
@@ -32,9 +32,7 @@ var BoxPrimitiveInstance = /*#__PURE__*/function (_BasePrimitiveInstanc) {
     var _this;
     _classCallCheck(this, BoxPrimitiveInstance);
     _this = _super.call(this, options);
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     var style = options.style,
-      source = options.source,
       currOptions = _objectWithoutProperties(options, _excluded);
     var mergeStyle = merge(DEFAULT_BOX_PRIMITIVE_OPTIONS(), cloneDeep(style || {}));
     var currStyle = BoxPrimitiveInstance.handleOptions(mergeStyle);
@@ -55,8 +53,8 @@ var BoxPrimitiveInstance = /*#__PURE__*/function (_BasePrimitiveInstanc) {
         dimensions = _options$style.dimensions,
         scale = _options$style.scale,
         positions = options.positions,
-        primitiveCollection = options.primitiveCollection;
-      this.instance = new Cesium.GeometryInstance({
+        primitiveInstance = options.primitiveInstance;
+      var instance = new Cesium.GeometryInstance({
         id: this.id,
         geometry: Cesium.BoxGeometry.fromDimensions({
           vertexFormat: Cesium.PerInstanceColorAppearance.VERTEX_FORMAT,
@@ -67,7 +65,7 @@ var BoxPrimitiveInstance = /*#__PURE__*/function (_BasePrimitiveInstanc) {
           color: color
         }
       });
-      primitiveCollection.add(this.instance);
+      primitiveInstance.push(instance);
     }
 
     // 更新geoJson数据

package/dist/esm/graphicLayer/EllipseEntity.js

@@ -1,5 +1,5 @@
 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); }
-var _excluded = ["style", "source", "entity"],
+var _excluded = ["style", "entity"],
   _excluded2 = ["material", "outlineColor", "rotation", "stRotation"];
 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; }
@@ -33,9 +33,7 @@ var EllipseEntity = /*#__PURE__*/function (_BaseEntity) {
     var _this;
     _classCallCheck(this, EllipseEntity);
     _this = _super.call(this, options);
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     var style = options.style,
-      source = options.source,
       entity = options.entity,
       currOptions = _objectWithoutProperties(options, _excluded);
     if (entity) {
@@ -60,11 +58,10 @@ var EllipseEntity = /*#__PURE__*/function (_BaseEntity) {
       var alt = options.geometry.coordinates[2];
       alt && !style.height && (style.height = alt);
       var positions = PositionProperty.changeToPropertyData.call(this);
-      this.graphic = new Cesium.EllipseGraphics(style);
       this.entity = new Cesium.Entity({
         position: positions,
         id: this.id,
-        ellipse: this.graphic
+        ellipse: new Cesium.EllipseGraphics(style)
       });
     }
 

package/dist/esm/graphicLayer/EllipsePrimitive.d.ts

@@ -1,5 +1,5 @@
 import BasePrimitive from './BasePrimitive';
 export default class EllipsePrimitive extends BasePrimitive {
     constructor(map: any);
-    createPrimitive(options?: any): void;
+    createPrimitive(options: any, primitiveInstance: any[]): void;
 }

package/dist/esm/graphicLayer/EllipsePrimitive.js

@@ -1,4 +1,7 @@
 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 _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; }
@@ -13,7 +16,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 import * as Cesium from 'deeptwins-cesium';
 import { cloneDeep, merge } from 'lodash';
-import { DEFAULT_ELLIPSE_PRIMITIVE_OPTIONS } from "../constant";
+import { DEFAULT_ELLIPSE_PRIMITIVE_OPTIONS, DEFAULT_PRIMITIVE_OPTIONS } from "../constant";
 import BasePrimitive from "./BasePrimitive";
 var EllipsePrimitive = /*#__PURE__*/function (_BasePrimitive) {
   _inherits(EllipsePrimitive, _BasePrimitive);
@@ -26,14 +29,16 @@ var EllipsePrimitive = /*#__PURE__*/function (_BasePrimitive) {
     key: "createPrimitive",
     value: function createPrimitive() {
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      var primitiveInstance = arguments.length > 1 ? arguments[1] : undefined;
       var style = merge(DEFAULT_ELLIPSE_PRIMITIVE_OPTIONS(), cloneDeep(options.style || {}));
+      var primitiveOptions = merge(DEFAULT_PRIMITIVE_OPTIONS(), cloneDeep(options.primitive || {}));
       var appearance = new Cesium.PerInstanceColorAppearance({
         translucent: !!(style !== null && style !== void 0 && style.translucent)
       });
-      this.primitive = new Cesium.Primitive({
-        geometryInstances: this.primitiveInstance,
+      this.primitive = new Cesium.Primitive(_objectSpread({
+        geometryInstances: primitiveInstance,
         appearance: appearance
-      });
+      }, primitiveOptions));
       this.show = !!(style !== null && style !== void 0 && style.show);
     }
   }]);

package/dist/esm/graphicLayer/EllipsePrimitiveInstance.js

@@ -1,5 +1,5 @@
 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); }
-var _excluded = ["style", "source", "entity"],
+var _excluded = ["style"],
   _excluded2 = ["color"],
   _excluded3 = ["color", "rotation", "stRotation"];
 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; }
@@ -33,10 +33,7 @@ var EllipsePrimitiveInstance = /*#__PURE__*/function (_BasePrimitiveInstanc) {
     var _this;
     _classCallCheck(this, EllipsePrimitiveInstance);
     _this = _super.call(this, options);
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     var style = options.style,
-      source = options.source,
-      entity = options.entity,
       currOptions = _objectWithoutProperties(options, _excluded);
     var mergeStyle = merge(DEFAULT_ELLIPSE_PRIMITIVE_OPTIONS(), cloneDeep(style || {}));
     var currStyle = EllipsePrimitiveInstance.handleOptions(mergeStyle);
@@ -56,12 +53,12 @@ var EllipsePrimitiveInstance = /*#__PURE__*/function (_BasePrimitiveInstanc) {
         color = _options$style.color,
         style = _objectWithoutProperties(_options$style, _excluded2),
         positions = options.positions,
-        primitiveCollection = options.primitiveCollection;
+        primitiveInstance = options.primitiveInstance;
       if (isNil(style.height)) {
         var _utils$cartesian3ToLn;
         style.height = ((_utils$cartesian3ToLn = utils.cartesian3ToLngLatAlt(positions)) === null || _utils$cartesian3ToLn === void 0 ? void 0 : _utils$cartesian3ToLn.alt) || 0;
       }
-      this.instance = new Cesium.GeometryInstance({
+      var instance = new Cesium.GeometryInstance({
         id: this.id,
         geometry: new Cesium.EllipseGeometry(_objectSpread({
           center: positions,
@@ -71,7 +68,7 @@ var EllipsePrimitiveInstance = /*#__PURE__*/function (_BasePrimitiveInstanc) {
           color: color
         }
       });
-      primitiveCollection.add(this.instance);
+      primitiveInstance.push(instance);
     }
 
     // 更新geoJson数据

package/dist/esm/graphicLayer/EllipsoidEntity.js

@@ -1,5 +1,5 @@
 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); }
-var _excluded = ["style", "source", "entity"],
+var _excluded = ["style", "entity"],
   _excluded2 = ["radii", "innerRadii", "minimumClock", "maximumClock", "minimumCone", "maximumCone", "material", "outlineColor"];
 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; }
@@ -33,9 +33,7 @@ var EllipsoidEntity = /*#__PURE__*/function (_BaseEntity) {
     var _this;
     _classCallCheck(this, EllipsoidEntity);
     _this = _super.call(this, options);
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     var style = options.style,
-      source = options.source,
       entity = options.entity,
       currOptions = _objectWithoutProperties(options, _excluded);
     if (entity) {
@@ -58,11 +56,10 @@ var EllipsoidEntity = /*#__PURE__*/function (_BaseEntity) {
     function _init(options) {
       var style = options.style;
       var positions = PositionProperty.changeToPropertyData.call(this);
-      this.graphic = new Cesium.EllipsoidGraphics(style);
       this.entity = new Cesium.Entity({
         position: positions,
         id: this.id,
-        ellipsoid: this.graphic
+        ellipsoid: new Cesium.EllipsoidGraphics(style)
       });
     }
 

package/dist/esm/graphicLayer/EllipsoidPrimitive.d.ts

@@ -1,5 +1,5 @@
 import BasePrimitive from './BasePrimitive';
 export default class EllipsoidPrimitive extends BasePrimitive {
     constructor(map: any);
-    createPrimitive(options?: any): void;
+    createPrimitive(options: any, primitiveInstance: any[]): void;
 }

package/dist/esm/graphicLayer/EllipsoidPrimitive.js

@@ -1,4 +1,7 @@
 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 _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; }
@@ -13,7 +16,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 import * as Cesium from 'deeptwins-cesium';
 import { cloneDeep, merge } from 'lodash';
-import { DEFAULT_ELLIPSOID_PRIMITIVE_OPTIONS } from "../constant";
+import { DEFAULT_ELLIPSOID_PRIMITIVE_OPTIONS, DEFAULT_PRIMITIVE_OPTIONS } from "../constant";
 import BasePrimitive from "./BasePrimitive";
 var EllipsoidPrimitive = /*#__PURE__*/function (_BasePrimitive) {
   _inherits(EllipsoidPrimitive, _BasePrimitive);
@@ -26,15 +29,17 @@ var EllipsoidPrimitive = /*#__PURE__*/function (_BasePrimitive) {
     key: "createPrimitive",
     value: function createPrimitive() {
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      var primitiveInstance = arguments.length > 1 ? arguments[1] : undefined;
       var style = merge(DEFAULT_ELLIPSOID_PRIMITIVE_OPTIONS(), cloneDeep(options.style || {}));
+      var primitiveOptions = merge(DEFAULT_PRIMITIVE_OPTIONS(), cloneDeep(options.primitive || {}));
       var appearance = new Cesium.PerInstanceColorAppearance({
         translucent: !!(style !== null && style !== void 0 && style.translucent),
         closed: true
       });
-      this.primitive = new Cesium.Primitive({
-        geometryInstances: this.primitiveInstance,
+      this.primitive = new Cesium.Primitive(_objectSpread({
+        geometryInstances: primitiveInstance,
         appearance: appearance
-      });
+      }, primitiveOptions));
       this.show = !!(style !== null && style !== void 0 && style.show);
     }
   }]);

package/dist/esm/graphicLayer/EllipsoidPrimitiveInstance.js

@@ -56,8 +56,8 @@ var EllipsePrimitiveInstance = /*#__PURE__*/function (_BasePrimitiveInstanc) {
         color = _options$style.color,
         style = _objectWithoutProperties(_options$style, _excluded2),
         positions = options.positions,
-        primitiveCollection = options.primitiveCollection;
-      this.instance = new Cesium.GeometryInstance({
+        primitiveInstance = options.primitiveInstance;
+      var instance = new Cesium.GeometryInstance({
         id: this.id,
         modelMatrix: Cesium.Transforms.eastNorthUpToFixedFrame(positions),
         geometry: new Cesium.EllipsoidGeometry(_objectSpread({
@@ -67,7 +67,7 @@ var EllipsePrimitiveInstance = /*#__PURE__*/function (_BasePrimitiveInstanc) {
           color: color
         }
       });
-      primitiveCollection.add(this.instance);
+      primitiveInstance.push(instance);
     }
 
     // 更新geoJson数据

package/dist/esm/graphicLayer/GraphicLayerCollection.d.ts

@@ -1,16 +1,18 @@
+import { MapContext } from '../map/Map';
 import BaseLayer from './BaseLayer';
 import BaseSource from './BaseSource';
 export default class GraphicLayerCollection {
-    private _map;
-    isDestroy: boolean;
+    private readonly _mapContext;
+    isDestroyed: boolean;
     graphicLayers: Map<any, any>;
     graphicSources: Map<any, any>;
-    constructor(map: any);
+    constructor(mapContext: MapContext);
     private _canOperate;
-    addSource(id: string, geoJson: any): BaseSource;
-    addCustomSource(id: string, positions: any): BaseSource;
-    addLayer(data: any, options: any): BaseLayer;
-    addCustomSourceToLayer(positions: any, options: any): BaseLayer;
+    getMap(): any;
+    addSource(id: string, geoJson: any): BaseSource | undefined;
+    addCustomSource(id: string, positions: any): BaseSource | undefined;
+    addLayer(data: any, options: any): BaseLayer | undefined;
+    addCustomSourceToLayer(positions: any, options: any): BaseLayer | undefined;
     private _addLayerToMap;
     private _removeGraphicMapLayer;
     private _removeGraphicMapSource;