deeptwins-engine-3d 0.1.45 → 0.1.47

package/dist/esm/constant.d.ts

@@ -168,6 +168,21 @@ export declare const DEFAULT_FLIGHT_PLANNING_OPTIONS: () => {
         TASKEND: string;
     };
 };
+export declare const DEFAULT_FLIGHT_RISK_EVALUATION_OPTIONS: () => {
+    isDraw: boolean;
+    TYPE_LABEL_MAP: {
+        START: string;
+        END: string;
+    };
+    TYPE_COLOR_MAP: {
+        START: string;
+        END: string;
+    };
+    segmentGradeColor: {
+        num: number;
+        color: string;
+    }[];
+};
 export declare const DEFAULT_SUBMERGENCE_ANALYSIS_OPTIONS: () => {
     startHeight: number;
     targetHeight: number;

package/dist/esm/constant.js

@@ -281,6 +281,35 @@ export var DEFAULT_FLIGHT_PLANNING_OPTIONS = function DEFAULT_FLIGHT_PLANNING_OP
   };
 };
 
+// 默认航线风险评估配置选项
+export var DEFAULT_FLIGHT_RISK_EVALUATION_OPTIONS = function DEFAULT_FLIGHT_RISK_EVALUATION_OPTIONS() {
+  return {
+    isDraw: true,
+    // 是否绘制
+    // 点位名称
+    TYPE_LABEL_MAP: {
+      START: '起点',
+      END: '终点'
+    },
+    // 点位颜色
+    TYPE_COLOR_MAP: {
+      START: '#00ff00',
+      END: '#ff0000'
+    },
+    // 航段颜色等级
+    segmentGradeColor: [{
+      num: -Number.NEGATIVE_INFINITY,
+      color: 'rgba(239,68,68,0.95)'
+    }, {
+      num: 0,
+      color: 'rgba(245,158,11,0.95)'
+    }, {
+      num: 0.5,
+      color: 'rgba(16,185,129,0.95)'
+    }]
+  };
+};
+
 // 默认淹没分析配置选项 SubmergenceAnalysis
 export var DEFAULT_SUBMERGENCE_ANALYSIS_OPTIONS = function DEFAULT_SUBMERGENCE_ANALYSIS_OPTIONS() {
   return {

package/dist/esm/index.js

@@ -58,11 +58,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.45");
+console.log('DeepTwinsEngine3D Version:', "0.1.47");
 export var DeepTwinsEngine3D = /*#__PURE__*/_createClass(function DeepTwinsEngine3D() {
   _classCallCheck(this, DeepTwinsEngine3D);
 });
-_defineProperty(DeepTwinsEngine3D, "Version", "0.1.45");
+_defineProperty(DeepTwinsEngine3D, "Version", "0.1.47");
 _defineProperty(DeepTwinsEngine3D, "Map", Map);
 _defineProperty(DeepTwinsEngine3D, "GroundSkyBox", GroundSkyBox);
 _defineProperty(DeepTwinsEngine3D, "RasterLayer", RasterLayer);

package/dist/esm/lowAltitude/BaseGridMvtLayer.js

@@ -60,7 +60,7 @@ var BaseGridMvtLayer = /*#__PURE__*/function () {
     key: "_canOperate",
     value: function _canOperate() {
       if (this.isDestroyed) {
-        utils.error('SubmergenceAnalysis实例已销毁');
+        utils.error('BaseGridMvtLayer实例已销毁');
         return false;
       }
       return true;

package/dist/esm/lowAltitude/FlightPlanning.d.ts

@@ -10,7 +10,7 @@ declare class FlightPlanning {
     constructor(map: any, options: any);
     private _canOperate;
     getMap(): any;
-    createPlan(value: any): Promise<any>;
+    create(value: any): Promise<any>;
     private _buildPayload;
     private _normalizeRouteData;
     private _createRoute;

package/dist/esm/lowAltitude/FlightPlanning.js

@@ -42,7 +42,7 @@ var FlightPlanning = /*#__PURE__*/function () {
     key: "_canOperate",
     value: function _canOperate() {
       if (this.isDestroyed) {
-        utils.error('SubmergenceAnalysis实例已销毁');
+        utils.error('FlightPlanning实例已销毁');
         return false;
       }
       return true;
@@ -55,9 +55,9 @@ var FlightPlanning = /*#__PURE__*/function () {
 
     // 生成计划
   }, {
-    key: "createPlan",
+    key: "create",
     value: function () {
-      var _createPlan = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(value) {
+      var _create = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(value) {
         var payload, _yield$fetch$post, result, normalized, hasPoints;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -102,10 +102,10 @@ var FlightPlanning = /*#__PURE__*/function () {
           }
         }, _callee, this);
       }));
-      function createPlan(_x) {
-        return _createPlan.apply(this, arguments);
+      function create(_x) {
+        return _create.apply(this, arguments);
       }
-      return createPlan;
+      return create;
     }()
   }, {
     key: "_buildPayload",

package/dist/esm/lowAltitude/FlightRiskEvaluation.d.ts

@@ -10,10 +10,18 @@ declare class FlightRiskEvaluation {
     riskPointsLayer: any;
     riskPointsLabelLayer: any;
     gridsLayer: any;
+    private _onClickSegmentEvent;
+    private _onClickRiskPointEvent;
+    private _onClickRiskPointLabelEvent;
     constructor(map: any, options?: any);
     private _canOperate;
     getMap(): any;
-    start(geoJson?: any): Promise<void>;
+    start(geoJson: any): Promise<{
+        pointEvaluationData: any;
+        segmentEvaluationData: any;
+        routeEvaluationData: any;
+        gridData: any;
+    } | undefined>;
     private _createRoute;
     private _clearRoute;
     private _getSegmentColorFromEvaluation;
@@ -21,6 +29,7 @@ declare class FlightRiskEvaluation {
     private _createRiskPoints;
     private _clearRiskPoints;
     private _createGrids;
+    clear(): void;
     destroy(): void;
 }
 export default FlightRiskEvaluation;

package/dist/esm/lowAltitude/FlightRiskEvaluation.js

@@ -26,27 +26,11 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { flatten, getCoords } from '@turf/turf';
 import * as Cesium from 'deeptwins-cesium';
 import { merge } from 'lodash';
-import { DEFAULT_GRID_VT_OPTIONS, LAYER_EVENT_TYPE } from "../constant";
+import { DEFAULT_FLIGHT_RISK_EVALUATION_OPTIONS, LAYER_EVENT_TYPE } from "../constant";
 import BaseSource from "../graphicLayer/BaseSource";
 import { ShapeSection, translateSource } from "../tool/common";
 import fetch from "../tool/fetch";
 import * as utils from "../tool/utils";
-var API_HOST = 'https://els-yunjing.amap.com';
-var API_KEY = 'd1dc38f19b7bfc453e870a80be359cd5';
-// 接口定义 - 明确各接口职责
-var POINT_EVALUATION_URL = "".concat(API_HOST, "/data/risk/evaluation/point?key=").concat(API_KEY); // 风险点评估接口 - 用于创建风险点标记
-var SEGMENT_EVALUATION_URL = "".concat(API_HOST, "/data/risk/evaluation/segment?key=").concat(API_KEY); // 航段评估接口 - 用于管道颜色和绘制
-var ROUTE_EVALUATION_URL = "".concat(API_HOST, "/data/risk/evaluation/route?key=").concat(API_KEY); // 航线评估接口 - 用于右侧面板数据
-var GRID_RENDER_URL = "".concat(API_HOST, "/data/grid/render?key=").concat(API_KEY); // 网格渲染接口 - 用于航迹点网格
-
-var TYPE_COLOR_MAP = {
-  START: '#00ff00',
-  END: '#ff0000'
-}; // 点位颜色
-var TYPE_LABEL_MAP = {
-  START: '起点',
-  END: '终点'
-}; // 点位名称
 
 // 航线风险评估
 var FlightRiskEvaluation = /*#__PURE__*/function () {
@@ -72,8 +56,14 @@ var FlightRiskEvaluation = /*#__PURE__*/function () {
     _defineProperty(this, "riskPointsLabelLayer", null);
     // 网格
     _defineProperty(this, "gridsLayer", null);
+    // 点击航线段事件
+    _defineProperty(this, "_onClickSegmentEvent", null);
+    // 点击风险点事件
+    _defineProperty(this, "_onClickRiskPointEvent", null);
+    // 点击风险点文字事件
+    _defineProperty(this, "_onClickRiskPointLabelEvent", null);
     this._mapContext = map._mapContext;
-    this.options = merge(DEFAULT_GRID_VT_OPTIONS(), options);
+    this.options = merge(DEFAULT_FLIGHT_RISK_EVALUATION_OPTIONS(), options);
   }
 
   // 是否能进行操作
@@ -81,7 +71,7 @@ var FlightRiskEvaluation = /*#__PURE__*/function () {
     key: "_canOperate",
     value: function _canOperate() {
       if (this.isDestroyed) {
-        utils.error('SubmergenceAnalysis实例已销毁');
+        utils.error('FlightRiskEvaluation实例已销毁');
         return false;
       }
       return true;
@@ -96,33 +86,17 @@ var FlightRiskEvaluation = /*#__PURE__*/function () {
   }, {
     key: "start",
     value: function () {
-      var _start = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        var geoJson,
-          translatedSource,
-          points,
-          _yield$Promise$all,
-          _yield$Promise$all2,
-          pointEvaluationData,
-          segmentEvaluationData,
-          routeEvaluationData,
-          gridData,
-          _args = arguments;
+      var _start = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(geoJson) {
+        var translatedSource, points, _yield$Promise$all, _yield$Promise$all2, pointEvaluationData, segmentEvaluationData, routeEvaluationData, gridData;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              geoJson = _args.length > 0 && _args[0] !== undefined ? _args[0] : {
-                type: 'Feature',
-                geometry: {
-                  type: 'LineString',
-                  coordinates: [[114.269292, 22.692453, 95.75], [114.26916666666668, 22.693055555555556, 95.75], [114.27083333333334, 22.69472222222222, 95.75], [114.2713888888889, 22.69527777777778, 118.73], [114.27861111111112, 22.7025, 118.73], [114.28861111111111, 22.7025, 126.39], [114.28972222222222, 22.703611111111112, 118.73], [114.29583333333333, 22.703611111111112, 118.73], [114.302994, 22.707242, 80], [114.292009, 22.72269, 80], [114.27916666666667, 22.733055555555556, 80.43], [114.27665, 22.73299, 80]]
-                }
-              };
               if (this._canOperate()) {
-                _context.next = 3;
+                _context.next = 2;
                 break;
               }
               return _context.abrupt("return");
-            case 3:
+            case 2:
               translatedSource = translateSource(geoJson);
               this.routeSource = flatten(translatedSource);
               points = [];
@@ -136,41 +110,48 @@ var FlightRiskEvaluation = /*#__PURE__*/function () {
                   };
                 })));
               });
-              _context.next = 9;
-              return Promise.all([fetch.post(POINT_EVALUATION_URL, {
+              _context.next = 8;
+              return Promise.all([fetch.post(this.options.POINT_EVALUATION_URL, {
                 points: points
-              }), fetch.post(SEGMENT_EVALUATION_URL, {
+              }), fetch.post(this.options.SEGMENT_EVALUATION_URL, {
                 points: points
-              }), fetch.post(ROUTE_EVALUATION_URL, {
+              }), fetch.post(this.options.ROUTE_EVALUATION_URL, {
                 points: points
-              }), fetch.post(GRID_RENDER_URL, {
+              }), fetch.post(this.options.GRID_RENDER_URL, {
                 points: points,
                 stepDistance: 30
               })]);
-            case 9:
+            case 8:
               _yield$Promise$all = _context.sent;
               _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 4);
               pointEvaluationData = _yield$Promise$all2[0].data.data;
               segmentEvaluationData = _yield$Promise$all2[1].data.data;
               routeEvaluationData = _yield$Promise$all2[2].data.data;
               gridData = _yield$Promise$all2[3].data.data;
-              this.routeResultSource = {
+              if (this.options.isDraw) {
+                this.routeResultSource = {
+                  pointEvaluationData: pointEvaluationData,
+                  segmentEvaluationData: segmentEvaluationData,
+                  routeEvaluationData: routeEvaluationData,
+                  gridData: gridData
+                };
+                this._createRoute();
+                this._createRiskPoints();
+                this._createGrids();
+              }
+              return _context.abrupt("return", {
                 pointEvaluationData: pointEvaluationData,
                 segmentEvaluationData: segmentEvaluationData,
                 routeEvaluationData: routeEvaluationData,
                 gridData: gridData
-              };
-              this._createRoute();
-              this._createRiskPoints();
-              this._createGrids();
-              console.log(pointEvaluationData, segmentEvaluationData, routeEvaluationData, gridData);
-            case 20:
+              });
+            case 16:
             case "end":
               return _context.stop();
           }
         }, _callee, this);
       }));
-      function start() {
+      function start(_x) {
         return _start.apply(this, arguments);
       }
       return start;
@@ -178,8 +159,8 @@ var FlightRiskEvaluation = /*#__PURE__*/function () {
   }, {
     key: "_createRoute",
     value: function _createRoute() {
-      var _this$routeResultSour,
-        _this = this;
+      var _this = this,
+        _this$routeResultSour;
       if (!this._canOperate) return;
       this._clearRoute();
       var allPoints = [];
@@ -200,8 +181,8 @@ var FlightRiskEvaluation = /*#__PURE__*/function () {
               coordinates: point
             },
             properties: {
-              text: TYPE_LABEL_MAP.START,
-              color: TYPE_COLOR_MAP.START
+              text: _this.options.TYPE_LABEL_MAP.START,
+              color: _this.options.TYPE_COLOR_MAP.START
             }
           });
         }
@@ -213,8 +194,8 @@ var FlightRiskEvaluation = /*#__PURE__*/function () {
               coordinates: point
             },
             properties: {
-              text: TYPE_LABEL_MAP.END,
-              color: TYPE_COLOR_MAP.END
+              text: _this.options.TYPE_LABEL_MAP.END,
+              color: _this.options.TYPE_COLOR_MAP.END
             }
           });
         }
@@ -288,8 +269,8 @@ var FlightRiskEvaluation = /*#__PURE__*/function () {
             translucent: true
           }
         });
-        this.routePipelineLayer.on(LAYER_EVENT_TYPE.LEFT_CLICK, function (e) {
-          console.log(e);
+        this._onClickSegmentEvent = this.routePipelineLayer.on(LAYER_EVENT_TYPE.LEFT_CLICK, function (e) {
+          _this.options.onClickSegment && _this.options.onClickSegment(e);
         });
       }
       this.routePointsLayer.flyTo();
@@ -308,15 +289,19 @@ var FlightRiskEvaluation = /*#__PURE__*/function () {
       this.routePointsLabelLayer = null;
     }
 
-    // 获取航段颜色使用segment接口返回的数据）
+    // 获取航段颜色 使用segment接口返回的数据
   }, {
     key: "_getSegmentColorFromEvaluation",
     value: function _getSegmentColorFromEvaluation(evaluation) {
       var confidence = evaluation === null || evaluation === void 0 ? void 0 : evaluation.confidence;
+      var step = -1;
+      for (var i = 0; i < this.options.segmentGradeColor.length; i++) {
+        if (confidence > this.options.segmentGradeColor[i].num) {
+          step = i;
+        }
+      }
       if (confidence == null) return 'rgba(6,182,212,0.95)';
-      if (confidence < 0) return 'rgba(239,68,68,0.95)';
-      if (confidence < 0.5) return 'rgba(245,158,11,0.95)';
-      return 'rgba(16,185,129,0.95)';
+      return this.options.segmentGradeColor[step].color;
     }
 
     // 风险点聚合函数：将相近位置的风险点聚合在一起
@@ -378,11 +363,12 @@ var FlightRiskEvaluation = /*#__PURE__*/function () {
   }, {
     key: "_createRiskPoints",
     value: function _createRiskPoints() {
-      var _this$routeResultSour2;
+      var _this$routeResultSour2,
+        _this2 = this;
       if (!this._canOperate()) return;
       this._clearRiskPoints();
       if ((_this$routeResultSour2 = this.routeResultSource) !== null && _this$routeResultSour2 !== void 0 && (_this$routeResultSour2 = _this$routeResultSour2.pointEvaluationData) !== null && _this$routeResultSour2 !== void 0 && _this$routeResultSour2.length) {
-        var riskPoints = [];
+        // const riskPoints = [];
         var allRiskPoints = [];
         // 第一步：收集所有风险点
         this.routeResultSource.pointEvaluationData.forEach(function (item, idx) {
@@ -412,24 +398,9 @@ var FlightRiskEvaluation = /*#__PURE__*/function () {
         var clusters = this._clusterRiskPoints(allRiskPoints, 0.005); // 约55米聚合距离
         var clustersGeoJson = {
           type: 'FeatureCollection',
-          features: clusters === null || clusters === void 0 ? void 0 : clusters.map(function (cluster, clusterIdx) {
+          features: clusters === null || clusters === void 0 ? void 0 : clusters.map(function (cluster) {
             var isClustered = cluster.points.length > 1;
             var displayHeight = cluster.centerAlt + 20; // 管道上方20米
-            var clusterData = {
-              index: clusterIdx,
-              lng: cluster.centerLng,
-              lat: cluster.centerLat,
-              alt: cluster.centerAlt,
-              displayHeight: displayHeight,
-              riskCount: cluster.totalRiskCount,
-              pointCount: cluster.points.length,
-              // 聚合的点数量
-              isClustered: isClustered,
-              points: cluster.points,
-              // 包含的所有风险点
-              evaluation: cluster.evaluations[0] // 使用第一个点的评估数据
-            };
-            riskPoints.push(clusterData);
             // 创建聚合风险点标记
             // 如果是聚合点，使用更大的标记和不同的颜色
             var markerSize = isClustered ? 50 : 40;
@@ -441,13 +412,16 @@ var FlightRiskEvaluation = /*#__PURE__*/function () {
                 type: 'Point',
                 coordinates: [cluster.centerLng, cluster.centerLat, displayHeight]
               },
-              properties: {
-                totalRiskCount: cluster.totalRiskCount,
+              properties: _objectSpread({
                 isClustered: isClustered,
                 markerSize: markerSize,
                 markerColor: markerColor,
-                markerText: markerText
-              }
+                markerText: markerText,
+                displayHeight: displayHeight,
+                riskCount: cluster.totalRiskCount,
+                // 风险数量
+                pointCount: cluster.points.length
+              }, cluster)
             };
           })
         };
@@ -462,6 +436,9 @@ var FlightRiskEvaluation = /*#__PURE__*/function () {
             disableDepthTestDistance: Number.POSITIVE_INFINITY
           }
         });
+        this._onClickRiskPointEvent = this.riskPointsLayer.on(LAYER_EVENT_TYPE.LEFT_CLICK, function (e) {
+          _this2.options.onClickRisk && _this2.options.onClickRisk(e);
+        });
         this.riskPointsLabelLayer = this.getMap().addGraphicLayer(clustersGeoJson, {
           type: 'labelP',
           style: {
@@ -482,6 +459,9 @@ var FlightRiskEvaluation = /*#__PURE__*/function () {
             disableDepthTestDistance: Number.POSITIVE_INFINITY
           }
         });
+        this._onClickRiskPointLabelEvent = this.riskPointsLabelLayer.on(LAYER_EVENT_TYPE.LEFT_CLICK, function (e) {
+          _this2.options.onClickRisk && _this2.options.onClickRisk(e);
+        });
       }
     }
 
@@ -536,14 +516,25 @@ var FlightRiskEvaluation = /*#__PURE__*/function () {
       });
     }
 
-    // 销毁
+    // 清除
   }, {
-    key: "destroy",
-    value: function destroy() {
+    key: "clear",
+    value: function clear() {
       if (!this._canOperate()) return;
       this._clearRoute();
       this._clearRiskPoints();
       this.routeResultSource = null;
+      this._onClickSegmentEvent && this._onClickSegmentEvent.off();
+      this._onClickRiskPointEvent && this._onClickRiskPointEvent.off();
+      this._onClickRiskPointLabelEvent && this._onClickRiskPointLabelEvent.off();
+    }
+
+    // 销毁
+  }, {
+    key: "destroy",
+    value: function destroy() {
+      if (!this._canOperate()) return;
+      this.clear();
       this.isDestroyed = true;
     }
   }]);

package/dist/esm/lowAltitude/GridDraw.js

@@ -46,7 +46,7 @@ var GridDraw = /*#__PURE__*/function () {
     key: "_canOperate",
     value: function _canOperate() {
       if (this.isDestroyed) {
-        utils.error('Airspace实例已销毁');
+        utils.error('GridDraw实例已销毁');
         return false;
       }
       return true;

package/dist/esm/lowAltitude/PoiLayer.js

@@ -28,7 +28,7 @@ var PoiLayer = /*#__PURE__*/function () {
     key: "_canOperate",
     value: function _canOperate() {
       if (this.isDestroyed) {
-        utils.error('SubmergenceAnalysis实例已销毁');
+        utils.error('PoiLayer实例已销毁');
         return false;
       }
       return true;

package/dist/esm/map/Event.js

@@ -1,4 +1,6 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -245,6 +247,7 @@ var Event = /*#__PURE__*/function () {
         var pickedObject = _this4._getPickedObject(position);
         if (pickedObject) {
           var currLayer;
+          var primitiveInstance;
           if (layer.isEntity) {
             currLayer = layer.layers.find(function (t) {
               var _pickedObject$id;
@@ -254,12 +257,35 @@ var Event = /*#__PURE__*/function () {
             currLayer = layer.layers.find(function (t) {
               return t.id === (pickedObject === null || pickedObject === void 0 ? void 0 : pickedObject.id);
             });
+            if (!['pointP', 'billboardP', 'labelP'].includes(layer.type)) {
+              var _layer$primitiveColle;
+              primitiveInstance = layer === null || layer === void 0 || (_layer$primitiveColle = layer.primitiveCollection) === null || _layer$primitiveColle === void 0 || (_layer$primitiveColle = _layer$primitiveColle.primitive) === null || _layer$primitiveColle === void 0 || (_layer$primitiveColle = _layer$primitiveColle.geometryInstances) === null || _layer$primitiveColle === void 0 ? void 0 : _layer$primitiveColle.find(function (t) {
+                return t.id === (pickedObject === null || pickedObject === void 0 ? void 0 : pickedObject.id);
+              });
+            } else if (layer.type === 'pointP') {
+              var _layer$primitiveColle2;
+              primitiveInstance = layer === null || layer === void 0 || (_layer$primitiveColle2 = layer.primitiveCollection) === null || _layer$primitiveColle2 === void 0 || (_layer$primitiveColle2 = _layer$primitiveColle2._pointPrimitives) === null || _layer$primitiveColle2 === void 0 ? void 0 : _layer$primitiveColle2.find(function (t) {
+                return t.id === (pickedObject === null || pickedObject === void 0 ? void 0 : pickedObject.id);
+              });
+            } else if (layer.type === 'billboardP') {
+              var _layer$primitiveColle3;
+              primitiveInstance = layer === null || layer === void 0 || (_layer$primitiveColle3 = layer.primitiveCollection) === null || _layer$primitiveColle3 === void 0 || (_layer$primitiveColle3 = _layer$primitiveColle3._billboards) === null || _layer$primitiveColle3 === void 0 ? void 0 : _layer$primitiveColle3.find(function (t) {
+                return t.id === (pickedObject === null || pickedObject === void 0 ? void 0 : pickedObject.id);
+              });
+            } else if (layer.type === 'labelP') {
+              var _layer$primitiveColle4;
+              primitiveInstance = layer === null || layer === void 0 || (_layer$primitiveColle4 = layer.primitiveCollection) === null || _layer$primitiveColle4 === void 0 || (_layer$primitiveColle4 = _layer$primitiveColle4._labels) === null || _layer$primitiveColle4 === void 0 ? void 0 : _layer$primitiveColle4.find(function (t) {
+                return t.id === (pickedObject === null || pickedObject === void 0 ? void 0 : pickedObject.id);
+              });
+            }
           }
           if (currLayer) {
             var result = {
               original: e,
               position: _this4._getPosition(position),
-              layer: currLayer
+              layer: _objectSpread(_objectSpread({}, currLayer), {}, {
+                primitiveInstance: primitiveInstance
+              })
             };
             if (type === Cesium.ScreenSpaceEventType.MOUSE_MOVE) {
               result.mouseType = !isHoverLayer ? 'mouseEnter' : 'mouseMove';

package/dist/esm/videoFusion/BaseVideo.js

@@ -66,9 +66,9 @@ var BaseVideo = /*#__PURE__*/function () {
       if (!videoContainer) {
         return;
       }
-      this.videoElement = document.createElement('video');
-      this.videoElement.id = uuidv4();
       if (this.videoType === 'video') {
+        this.videoElement = document.createElement('video');
+        this.videoElement.id = uuidv4();
         var _merge = merge(DEFAULT_VIDEO_TEXTURE_VIDEO(), this.options.video),
           loop = _merge.loop,
           muted = _merge.muted,
@@ -89,6 +89,8 @@ var BaseVideo = /*#__PURE__*/function () {
         this.videoElement.appendChild(sourceEl);
         videoContainer.appendChild(this.videoElement);
       } else if (this.videoType === 'hls') {
+        this.videoElement = document.createElement('video');
+        this.videoElement.id = uuidv4();
         var _merge2 = merge(DEFAULT_VIDEO_TEXTURE_HLS(), this.options.hls),
           _muted = _merge2.muted,
           _autoPlay = _merge2.autoPlay,
@@ -128,16 +130,15 @@ var BaseVideo = /*#__PURE__*/function () {
           });
         }
       } else if (this.videoType === 'custom') {
-        var _this$options$custom = this.options.custom,
-          _width2 = _this$options$custom.width,
-          _height2 = _this$options$custom.height,
-          onReady = _this$options$custom.onReady;
-        this.videoElement.width = _width2;
-        this.videoElement.height = _height2;
-        videoContainer.appendChild(this.videoElement);
+        var element = document.createElement('div');
+        element.id = uuidv4();
+        var onReady = this.options.custom.onReady;
+        videoContainer.appendChild(element);
         if (onReady) {
           this.status = 'READY';
-          onReady(this.videoElement, this.play, this.pause);
+          onReady(element, function (video) {
+            _this.videoElement = video;
+          });
         }
       }
     }
@@ -313,7 +314,7 @@ var BaseVideo = /*#__PURE__*/function () {
       this.isDestroyed = true;
       if (this.videoType === 'hls') {
         this.synchronizer && this.synchronizer.destroy();
-        this.hls && this.hls.destroyed();
+        this.hls && this.hls.destroy();
         this.getMap().clock.shouldAnimate = false;
       }
       if (this.videoType === 'custom') {

package/dist/esm/videoFusion/VideoProject.d.ts

@@ -4,7 +4,7 @@ export default class VideoProject extends BaseVideo {
     frustum: any;
     frustumLineLayer: any;
     constructor(map: any, options: any);
-    addToMap(map: any): void;
+    addToMap(): void;
     show(isShow: boolean): void;
     private _drawLine;
     private _getInterPointByLine;