deeptwins-engine-3d 0.1.8 → 0.1.11

package/dist/esm/cameraControl/RotateInPlace.d.ts

@@ -1,10 +1,12 @@
+import { MapContext } from '../map/Map';
 export default class RotateInPlace {
+    _mapContext: MapContext | undefined;
     _timer: any;
-    private _map;
     private _eventComplete;
     private _eventCancel;
     private _restAngle;
     constructor(map: any, options?: any);
+    getMap(): any;
     start(options: any): void;
     stop(): void;
     destroy(): void;

package/dist/esm/cameraControl/RotateInPlace.js

@@ -6,13 +6,12 @@ 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 * as Cesium from 'deeptwins-cesium';
-
 // 镜头原地旋转
 var RotateInPlace = /*#__PURE__*/function () {
   function RotateInPlace(map, options) {
     _classCallCheck(this, RotateInPlace);
+    _defineProperty(this, "_mapContext", void 0);
     _defineProperty(this, "_timer", void 0);
-    _defineProperty(this, "_map", void 0);
     _defineProperty(this, "_eventComplete", void 0);
     _defineProperty(this, "_eventCancel", void 0);
     _defineProperty(this, "_restAngle", void 0);
@@ -21,9 +20,14 @@ var RotateInPlace = /*#__PURE__*/function () {
       cancel = _ref.cancel;
     complete && (this._eventComplete = complete);
     cancel && (this._eventCancel = cancel);
-    this._map = map;
+    this._mapContext = map._mapContext;
   }
   _createClass(RotateInPlace, [{
+    key: "getMap",
+    value: function getMap() {
+      return this._mapContext && this._mapContext.getMap();
+    }
+  }, {
     key: "start",
     value: function start(options) {
       var _this = this;
@@ -35,48 +39,48 @@ var RotateInPlace = /*#__PURE__*/function () {
       // 每秒飞行的角度
       var angleOneSecond = 360 / (360 / angle * duration);
       // 倾斜角
-      var pitch = this._map.camera.pitch;
+      var pitch = this.getMap().camera.pitch;
 
       // 开始时间
       var startTime = Cesium.JulianDate.fromDate(new Date());
       // 结束时间
       var stopTime = Cesium.JulianDate.addSeconds(startTime, duration, new Cesium.JulianDate());
-      this._map.clock.startTime = startTime.clone(); // 开始时间
-      this._map.clock.stopTime = stopTime.clone(); // 结速时间
-      this._map.clock.currentTime = startTime.clone(); // 当前时间
-      this._map.clock.clockRange = Cesium.ClockRange.CLAMPED; // 行为方式
-      this._map.clock.clockStep = Cesium.ClockStep.SYSTEM_CLOCK; // 时钟设置为当前系统时间; 忽略所有其他设置。
+      this.getMap().clock.startTime = startTime.clone(); // 开始时间
+      this.getMap().clock.stopTime = stopTime.clone(); // 结速时间
+      this.getMap().clock.currentTime = startTime.clone(); // 当前时间
+      this.getMap().clock.clockRange = Cesium.ClockRange.CLAMPED; // 行为方式
+      this.getMap().clock.clockStep = Cesium.ClockStep.SYSTEM_CLOCK; // 时钟设置为当前系统时间; 忽略所有其他设置。
       // 相机的当前heading
-      var initialHeading = this._map.camera.heading;
+      var initialHeading = this.getMap().camera.heading;
       this._timer = function () {
         // 当前已经过去的时间，单位s
-        var delTime = Cesium.JulianDate.secondsDifference(_this._map.clock.currentTime, _this._map.clock.startTime);
+        var delTime = Cesium.JulianDate.secondsDifference(_this.getMap().clock.currentTime, _this.getMap().clock.startTime);
         // 修改heading
         var heading = Cesium.Math.toRadians(delTime * angleOneSecond) + initialHeading;
         _this._restAngle = angle - Cesium.Math.toDegrees(Cesium.Math.toRadians(delTime * angleOneSecond));
-        _this._map.scene.camera.setView({
+        _this.getMap().scene.camera.setView({
           orientation: {
             heading: heading,
             pitch: pitch
           }
         });
-        if (Cesium.JulianDate.compare(_this._map.clock.currentTime, _this._map.clock.stopTime) >= 0) {
-          _this._map.clock.onTick.removeEventListener(_this._timer);
+        if (Cesium.JulianDate.compare(_this.getMap().clock.currentTime, _this.getMap().clock.stopTime) >= 0) {
+          _this.getMap().clock.onTick.removeEventListener(_this._timer);
           _this._timer = null;
           if (_this._eventComplete) {
             _this._eventComplete();
           }
         }
       };
-      this._map.clock.onTick.addEventListener(this._timer);
+      this.getMap().clock.onTick.addEventListener(this._timer);
     }
   }, {
     key: "stop",
     value: function stop() {
-      this._timer && this._map.clock.onTick.removeEventListener(this._timer);
+      this._timer && this.getMap().clock.onTick.removeEventListener(this._timer);
       this._timer = null;
       if (this._eventCancel) {
-        var time = Cesium.JulianDate.compare(this._map.clock.currentTime, this._map.clock.stopTime);
+        var time = Cesium.JulianDate.compare(this.getMap().clock.currentTime, this.getMap().clock.stopTime);
         this._eventCancel({
           restTime: time >= 0 ? 0 : time * -1,
           restAngle: this._restAngle <= 0 ? 0 : this._restAngle
@@ -86,9 +90,8 @@ var RotateInPlace = /*#__PURE__*/function () {
   }, {
     key: "destroy",
     value: function destroy() {
-      this._timer && this._map.clock.onTick.removeEventListener(this._timer);
+      this._timer && this.getMap().clock.onTick.removeEventListener(this._timer);
       this._timer = null;
-      this._map = null;
     }
   }]);
   return RotateInPlace;

package/dist/esm/constant.d.ts

@@ -161,6 +161,18 @@ export declare const LAYER_EVENT_TYPE: {
     MIDDLE_CLICK: Cesium.ScreenSpaceEventType;
     MOUSE_MOVE: Cesium.ScreenSpaceEventType;
 };
+export declare const DEFAULT_PRIMITIVE_OPTIONS: () => {
+    modelMatrix: Cesium.Matrix4;
+    vertexCacheOptimize: boolean;
+    interleave: boolean;
+    compressVertices: boolean;
+    releaseGeometryInstances: boolean;
+    allowPicking: boolean;
+    cull: boolean;
+    asynchronous: boolean;
+    debugShowBoundingVolume: boolean;
+    shadows: Cesium.ShadowMode;
+};
 export declare const DEFAULT_POINT_OPTIONS: () => {
     show: boolean;
     pixelSize: number;

package/dist/esm/constant.js

@@ -480,6 +480,22 @@ export var LAYER_EVENT_TYPE = {
   MOUSE_MOVE: Cesium.ScreenSpaceEventType.MOUSE_MOVE
 };
 
+// primitive默认配置
+export var DEFAULT_PRIMITIVE_OPTIONS = function DEFAULT_PRIMITIVE_OPTIONS() {
+  return {
+    modelMatrix: Cesium.Matrix4.IDENTITY,
+    vertexCacheOptimize: false,
+    interleave: false,
+    compressVertices: true,
+    releaseGeometryInstances: true,
+    allowPicking: true,
+    cull: true,
+    asynchronous: true,
+    debugShowBoundingVolume: false,
+    shadows: Cesium.ShadowMode.DISABLED
+  };
+};
+
 // 点的默认配置
 export var DEFAULT_POINT_OPTIONS = function DEFAULT_POINT_OPTIONS() {
   return {

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

@@ -2,7 +2,6 @@ export default class BaseEntity {
     id: any;
     source: any;
     style: any;
-    graphic: any;
     entity: any;
     positionProperty: any;
     type: string;

package/dist/esm/graphicLayer/BaseEntity.js

@@ -15,7 +15,6 @@ var BaseEntity = /*#__PURE__*/function () {
     _defineProperty(this, "id", void 0);
     _defineProperty(this, "source", void 0);
     _defineProperty(this, "style", void 0);
-    _defineProperty(this, "graphic", void 0);
     _defineProperty(this, "entity", void 0);
     _defineProperty(this, "positionProperty", void 0);
     _defineProperty(this, "type", void 0);

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

@@ -1,4 +1,5 @@
 export default class BaseLayer {
+    private readonly _mapContext;
     id: any;
     type: any;
     options: any;
@@ -10,8 +11,8 @@ export default class BaseLayer {
     isPrimitive: boolean;
     private _isCompleteInfo;
     private readonly _renderClass;
-    private _graphicLayerCollection;
-    constructor({ id, source, options, entity, graphicLayerCollection }: any);
+    constructor({ id, source, options, entity, mapContext }: any);
+    getMap(): any;
     private _createPrimitiveCollection;
     private _createEntity;
     private _createPrimitive;

package/dist/esm/graphicLayer/BaseLayer.js

@@ -13,7 +13,6 @@ import { v4 as uuidv4 } from 'uuid';
 import * as constant from "../constant";
 import BaseSource from "../graphicLayer/BaseSource";
 import * as utils from "../tool/utils";
-import { cameraFlyToPositions } from "../tool/utils";
 import BoxPrimitive from "./BoxPrimitive";
 import EllipsePrimitive from "./EllipsePrimitive";
 import EllipsoidPrimitive from "./EllipsoidPrimitive";
@@ -23,14 +22,17 @@ import PolylinePrimitive from "./PolylinePrimitive";
 import PolylineVolumePrimitive from "./PolylineVolumePrimitive";
 import WallPrimitive from "./WallPrimitive";
 var BaseLayer = /*#__PURE__*/function () {
+  // 处理类的函数
+
   function BaseLayer(_ref) {
     var _this = this;
     var id = _ref.id,
       source = _ref.source,
       options = _ref.options,
       entity = _ref.entity,
-      graphicLayerCollection = _ref.graphicLayerCollection;
+      mapContext = _ref.mapContext;
     _classCallCheck(this, BaseLayer);
+    _defineProperty(this, "_mapContext", void 0);
     _defineProperty(this, "id", void 0);
     _defineProperty(this, "type", void 0);
     _defineProperty(this, "options", void 0);
@@ -44,16 +46,15 @@ var BaseLayer = /*#__PURE__*/function () {
     // 是否是完整的信息
     _defineProperty(this, "_isCompleteInfo", true);
     _defineProperty(this, "_renderClass", void 0);
-    // 处理类的函数
-    _defineProperty(this, "_graphicLayerCollection", void 0);
     if (!(options !== null && options !== void 0 && options.type)) {
-      throw new Error('错误的layer类型');
+      utils.error('请传入type参数');
+      return;
     }
+    this._mapContext = mapContext;
     this.id = id;
     this.type = options.type;
     this.options = options;
     this.sourceId = source === null || source === void 0 ? void 0 : source.id;
-    this._graphicLayerCollection = graphicLayerCollection;
     this._renderClass = constant.GRAPHIC_LAYER_TYPE_TO_CLASS[options.type];
     if (entity) {
       // 添加的是entity对象
@@ -68,12 +69,14 @@ var BaseLayer = /*#__PURE__*/function () {
       this.isPrimitive = true;
       // 创建集合
       this._createPrimitiveCollection(options.type);
+      // 实例的集合
+      var primitiveInstance = [];
       source.source.forEach(function (t) {
-        _this._createPrimitive(t, options);
+        _this._createPrimitive(t, options, primitiveInstance);
       });
       if (!['pointP', 'billboardP', 'labelP'].includes(options.type)) {
         // 集合创建Primitive
-        this.primitiveCollection.createPrimitive(options);
+        this.primitiveCollection.createPrimitive(options, primitiveInstance);
       }
     } else {
       // entity类型
@@ -83,9 +86,14 @@ var BaseLayer = /*#__PURE__*/function () {
       });
     }
   }
-
-  // 根据类型创建不同的集合
   _createClass(BaseLayer, [{
+    key: "getMap",
+    value: function getMap() {
+      return this._mapContext && this._mapContext.getMap();
+    }
+
+    // 根据类型创建不同的集合
+  }, {
     key: "_createPrimitiveCollection",
     value: function _createPrimitiveCollection(type) {
       var _this2 = this,
@@ -95,34 +103,34 @@ var BaseLayer = /*#__PURE__*/function () {
           _this2.primitiveCollection = new Cesium.PointPrimitiveCollection();
         },
         polylineP: function polylineP() {
-          _this2.primitiveCollection = new PolylinePrimitive(_this2._graphicLayerCollection._map);
+          _this2.primitiveCollection = new PolylinePrimitive(_this2._mapContext);
         },
         polygonP: function polygonP() {
-          _this2.primitiveCollection = new PolygonPrimitive(_this2._graphicLayerCollection._map);
+          _this2.primitiveCollection = new PolygonPrimitive(_this2._mapContext);
         },
         boxP: function boxP() {
-          _this2.primitiveCollection = new BoxPrimitive(_this2._graphicLayerCollection._map);
+          _this2.primitiveCollection = new BoxPrimitive(_this2._mapContext);
         },
         billboardP: function billboardP() {
           _this2.primitiveCollection = new Cesium.BillboardCollection();
         },
         modelP: function modelP() {
-          _this2.primitiveCollection = new ModelPrimitive(_this2._graphicLayerCollection._map);
+          _this2.primitiveCollection = new ModelPrimitive(_this2._mapContext);
         },
         labelP: function labelP() {
           _this2.primitiveCollection = new Cesium.LabelCollection();
         },
         wallP: function wallP() {
-          _this2.primitiveCollection = new WallPrimitive(_this2._graphicLayerCollection._map);
+          _this2.primitiveCollection = new WallPrimitive(_this2._mapContext);
         },
         polylineVolumeP: function polylineVolumeP() {
-          _this2.primitiveCollection = new PolylineVolumePrimitive(_this2._graphicLayerCollection._map);
+          _this2.primitiveCollection = new PolylineVolumePrimitive(_this2._mapContext);
         },
         ellipseP: function ellipseP() {
-          _this2.primitiveCollection = new EllipsePrimitive(_this2._graphicLayerCollection._map);
+          _this2.primitiveCollection = new EllipsePrimitive(_this2._mapContext);
         },
         ellipsoidP: function ellipsoidP() {
-          _this2.primitiveCollection = new EllipsoidPrimitive(_this2._graphicLayerCollection._map);
+          _this2.primitiveCollection = new EllipsoidPrimitive(_this2._mapContext);
         }
       };
       (_createType$type = createType[type]) === null || _createType$type === void 0 || _createType$type.call(createType);
@@ -133,7 +141,7 @@ var BaseLayer = /*#__PURE__*/function () {
     key: "_createEntity",
     value: function _createEntity(data, options) {
       var layer = new this._renderClass(_objectSpread(_objectSpread(_objectSpread({
-        map: this._graphicLayerCollection._map
+        map: this.getMap()
       }, data), options), {}, {
         html: utils.isFunction(options.html) ? options.html(data.properties) : options.html,
         source: data,
@@ -146,14 +154,16 @@ var BaseLayer = /*#__PURE__*/function () {
     // 创建相应的primitive
   }, {
     key: "_createPrimitive",
-    value: function _createPrimitive(data, options) {
+    value: function _createPrimitive(data, options, primitiveInstance) {
       var layer = new this._renderClass(_objectSpread(_objectSpread(_objectSpread({}, data), options), {}, {
         source: data,
         style: utils.styleFun(cloneDeep(options.style || {}), data.properties),
-        primitiveCollection: this.primitiveCollection
+        primitiveInstance: primitiveInstance,
+        primitiveCollection: this.primitiveCollection,
+        layerId: this.id,
+        mapContext: this._mapContext
       }));
       this.layers.push(layer);
-      return layer;
     }
 
     // 是否能进行操作
@@ -161,15 +171,19 @@ var BaseLayer = /*#__PURE__*/function () {
     key: "_canOperate",
     value: function _canOperate() {
       if (this.isDestroyed) {
-        throw new Error('BaseLayer实例已销毁');
+        utils.error('BaseLayer实例已销毁');
+        return false;
       }
+      return true;
     }
 
     // 显示隐藏
   }, {
     key: "show",
     value: function show(isShow) {
-      this._canOperate();
+      if (!this._canOperate()) {
+        return;
+      }
       if (this.isEntity) {
         if (this.type === 'html') {
           this.layers.forEach(function (t) {
@@ -199,7 +213,9 @@ var BaseLayer = /*#__PURE__*/function () {
     key: "setStyle",
     value: function setStyle(style) {
       var _this3 = this;
-      this._canOperate();
+      if (!this._canOperate()) {
+        return;
+      }
       this.layers.forEach(function (t) {
         var originStyle = utils.styleFun(style, t.source.properties);
         var handleStyle = _this3._renderClass.handleOptions(originStyle);
@@ -211,7 +227,9 @@ var BaseLayer = /*#__PURE__*/function () {
   }, {
     key: "setStyleOne",
     value: function setStyleOne(layer, style) {
-      this._canOperate();
+      if (!this._canOperate()) {
+        return;
+      }
       var currLayer = this._getOne(layer);
       if (currLayer) {
         var originStyle = utils.styleFun(style, currLayer.source.properties);
@@ -224,32 +242,41 @@ var BaseLayer = /*#__PURE__*/function () {
   }, {
     key: "setData",
     value: function setData(data) {
-      this._canOperate();
+      if (!this._canOperate()) {
+        return;
+      }
+      // 获取数据源
       var source = null;
       var sourceType = BaseSource.analysisSourceType(data);
       if (sourceType === 'sourceInstance') {
         source = data;
       } else if (sourceType === 'sourceId') {
-        source = this._graphicLayerCollection.graphicSources.get(data);
+        source = this.getMap().graphicLayerCollection.graphicSources.get(data);
       } else {
-        source = this._graphicLayerCollection.addSource(uuidv4(), data);
+        source = this.getMap().graphicLayerCollection.addSource(uuidv4(), data);
       }
       this.sourceId = source.id;
+      // 移除多余的
       if (source.source.length < this.layers.length) {
-        for (var i = source.source.length; i < this.layers.length; i++) {
+        var startIndex = this.layers.length - 1;
+        for (var i = startIndex; i >= source.source.length; i--) {
           this.removeOne(this.layers[i]);
         }
       }
+      // 实例的集合
+      var primitiveInstance = [];
       for (var _i = 0; _i < source.source.length; _i++) {
         var sourceData = source.source[_i];
         if (this.layers[_i]) {
+          // 更新数据
           this.layers[_i].updateData(sourceData);
         } else {
+          // 创建数据
           if (this.isEntity) {
             var layer = this._createEntity(sourceData, this.options);
-            layer.entity && this._graphicLayerCollection._map.entities.add(layer.entity);
+            layer.entity && this.getMap().entities.add(layer.entity);
           } else {
-            this._createPrimitive(sourceData, this.options);
+            this._createPrimitive(sourceData, this.options, primitiveInstance);
           }
         }
       }
@@ -260,7 +287,9 @@ var BaseLayer = /*#__PURE__*/function () {
     key: "remove",
     value: function remove() {
       var _this4 = this;
-      this._canOperate();
+      if (!this._canOperate()) {
+        return;
+      }
       this.isDestroyed = true;
       if (this.isEntity) {
         if (this.type === 'html') {
@@ -269,30 +298,32 @@ var BaseLayer = /*#__PURE__*/function () {
           });
         } else {
           this.layers.forEach(function (t) {
-            _this4._graphicLayerCollection._map.entities.remove(t.entity);
+            _this4.getMap().entities.remove(t.entity);
           });
         }
       } else {
         this.primitiveCollection.removeAll();
-        this._graphicLayerCollection._map.scene.primitives.remove(this.primitiveCollection);
+        this.getMap().scene.primitives.remove(this.primitiveCollection);
       }
       this.layers = [];
       // 移除相应的graphicLayers上的数据
-      this._graphicLayerCollection._removeGraphicMapLayer(this.id);
+      this.getMap().graphicLayerCollection._removeGraphicMapLayer(this.id);
     }
 
     // 清除图层中某个
   }, {
     key: "removeOne",
     value: function removeOne(layer) {
-      this._canOperate();
+      if (!this._canOperate()) {
+        return;
+      }
       var currLayer = this._getOne(layer);
       if (currLayer) {
         if (this.isEntity) {
           if (this.type === 'html') {
             currLayer.remove();
           } else {
-            this._graphicLayerCollection._map.entities.remove(currLayer.entity);
+            this.getMap().entities.remove(currLayer.entity);
           }
         } else {
           this.primitiveCollection.remove(currLayer.primitive);
@@ -312,18 +343,18 @@ var BaseLayer = /*#__PURE__*/function () {
         return;
       }
       // 计算包围球
-      var camera = this._graphicLayerCollection._map.camera;
+      var camera = this.getMap().camera;
       var positions = flattenDeep(this.layers.map(function (t) {
         return t.source.positions;
       }));
-      cameraFlyToPositions(camera, positions, options);
+      utils.cameraFlyToPositions(camera, positions, options);
     }
 
     // 监听
   }, {
     key: "on",
     value: function on(type, event) {
-      return this._graphicLayerCollection._map._event.listenToLayer(type, event, this);
+      return this.getMap()._event.listenToLayer(type, event, this);
     }
 
     // 改成销毁状态
@@ -333,6 +364,7 @@ var BaseLayer = /*#__PURE__*/function () {
       this.isDestroyed = true;
       this.layers = [];
       this.primitiveCollection && this.primitiveCollection.removeAll();
+      this.primitiveCollection = null;
     }
   }]);
   return BaseLayer;

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

@@ -1,10 +1,12 @@
+import { MapContext } from '../map/Map';
 export default class BasePointPrimitive {
+    readonly _mapContext: MapContext;
+    _layerId: null;
     id: any;
     source: any;
     style: any;
-    primitive: any;
     type: string;
     isPrimitive: boolean;
     constructor(options: any);
-    updateStyle(originStyle: any, style: any): void;
+    getPrimitiveCollection(): any;
 }

package/dist/esm/graphicLayer/BasePointPrimitive.js

@@ -5,35 +5,39 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { merge } from 'lodash';
 import { v4 as uuidv4 } from 'uuid';
-
 // 基础Primitive图层
 var BasePointPrimitive = /*#__PURE__*/function () {
   function BasePointPrimitive(options) {
     _classCallCheck(this, BasePointPrimitive);
+    _defineProperty(this, "_mapContext", void 0);
+    _defineProperty(this, "_layerId", null);
     _defineProperty(this, "id", void 0);
     _defineProperty(this, "source", void 0);
     _defineProperty(this, "style", void 0);
-    _defineProperty(this, "primitive", void 0);
     _defineProperty(this, "type", void 0);
     _defineProperty(this, "isPrimitive", true);
     this.id = uuidv4();
     var style = options.style,
-      source = options.source;
+      source = options.source,
+      layerId = options.layerId,
+      mapContext = options.mapContext;
+    this._layerId = layerId;
+    this._mapContext = mapContext;
     this.type = options.type;
     this.source = source;
     this.style = style || {};
   }
 
-  // 更新样式
+  // 获取primitive集合
   _createClass(BasePointPrimitive, [{
-    key: "updateStyle",
-    value: function updateStyle(originStyle, style) {
-      this.style = merge(this.style, originStyle);
-      for (var key in style) {
-        this.primitive[key] = style[key];
+    key: "getPrimitiveCollection",
+    value: function getPrimitiveCollection() {
+      if (!this._mapContext || !this._layerId) {
+        return null;
       }
+      var layer = this._mapContext.getMap().graphicLayerCollection.graphicLayers.get(this._layerId);
+      return layer === null || layer === void 0 ? void 0 : layer.primitiveCollection;
     }
   }]);
   return BasePointPrimitive;

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

@@ -1,12 +1,10 @@
+import { MapContext } from '../map/Map';
 export default class BasePrimitive {
-    primitiveInstance: any[];
+    private readonly _mapContext;
     primitive: any;
     id: any;
-    map: any;
-    constructor(map: any);
+    constructor(mapContext: MapContext);
     get show(): any;
     set show(v: any);
-    add(instance: any): void;
-    remove(): void;
     removeAll(): void;
 }

package/dist/esm/graphicLayer/BasePrimitive.js

@@ -7,14 +7,13 @@ 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 { v4 as uuidv4 } from 'uuid';
 var BasePrimitive = /*#__PURE__*/function () {
-  function BasePrimitive(map) {
+  function BasePrimitive(mapContext) {
     _classCallCheck(this, BasePrimitive);
-    _defineProperty(this, "primitiveInstance", []);
+    _defineProperty(this, "_mapContext", void 0);
     _defineProperty(this, "primitive", void 0);
     _defineProperty(this, "id", void 0);
-    _defineProperty(this, "map", void 0);
     this.id = uuidv4();
-    this.map = map;
+    this._mapContext = mapContext;
   }
   _createClass(BasePrimitive, [{
     key: "show",
@@ -25,24 +24,11 @@ var BasePrimitive = /*#__PURE__*/function () {
     set: function set(v) {
       this.primitive && (this.primitive.show = v);
     }
-  }, {
-    key: "add",
-    value: function add(instance) {
-      this.primitiveInstance.push(instance);
-    }
-  }, {
-    key: "remove",
-    value: function remove() {
-      if (this.primitive) {
-        console.warn('primitive类型不支持删除单个对象');
-      }
-    }
   }, {
     key: "removeAll",
     value: function removeAll() {
-      this.primitive && this.map.scene.primitives.remove(this.primitive);
+      this.primitive && this._mapContext.getMap().scene.primitives.remove(this.primitive);
       this.primitive = null;
-      this.primitiveInstance = [];
     }
   }]);
   return BasePrimitive;

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

@@ -2,9 +2,8 @@ export default class BasePrimitiveInstance {
     id: any;
     source: any;
     style: any;
-    instance: any;
     type: string;
-    isPrimitive: boolean;
+    readonly isPrimitive: boolean;
     constructor(options: any);
     updateStyle(): void;
 }

package/dist/esm/graphicLayer/BasePrimitiveInstance.js

@@ -14,7 +14,6 @@ var BasePrimitiveInstance = /*#__PURE__*/function () {
     _defineProperty(this, "id", void 0);
     _defineProperty(this, "source", void 0);
     _defineProperty(this, "style", void 0);
-    _defineProperty(this, "instance", void 0);
     _defineProperty(this, "type", void 0);
     _defineProperty(this, "isPrimitive", true);
     this.id = uuidv4();