deeptwins-engine-3d 0.1.44 → 0.1.45

package/dist/esm/videoFusion/BaseVideo.js

@@ -157,9 +157,7 @@ var BaseVideo = /*#__PURE__*/function () {
     key: "_drawCanvas",
     value: function _drawCanvas(options) {
       var width = options.width,
-        height = options.height,
-        _options$featherSize = options.featherSize,
-        featherSize = _options$featherSize === void 0 ? 100 : _options$featherSize;
+        height = options.height;
       var canvas = document.createElement('canvas');
       canvas.width = width;
       canvas.height = height;

package/dist/esm/visualization/PointCluster.js

@@ -15,6 +15,7 @@ import { cloneDeep, flattenDeep, merge } from 'lodash';
 import { v4 as uuidv4 } from 'uuid';
 import { DEFAULT_POINT_CLUSTER_STYLE } from "../constant";
 import BaseSource from "../graphicLayer/BaseSource";
+import BillboardPrimitive from "../graphicLayer/BillboardPrimitive";
 import PrimitiveCluster from "../tool/PrimitiveCluster";
 import * as utils from "../tool/utils";
 var PointCluster = /*#__PURE__*/function () {
@@ -68,17 +69,21 @@ var PointCluster = /*#__PURE__*/function () {
       primitiveCluster.pixelRange = this.options.pixelRange;
       primitiveCluster.minimumClusterSize = 1;
       this.source.forEach(function (t) {
-        var billboard = _objectSpread(_objectSpread({
-          id: uuidv4()
-        }, merge({
+        var style = BillboardPrimitive.handleOptions(merge({
           width: 30,
           height: 30
-        }, _this.options.billboard || {})), {}, {
+        }, utils.styleFun(cloneDeep(_this.options.billboard || {}), t.properties)));
+        var billboard = _objectSpread(_objectSpread({
+          id: uuidv4()
+        }, style), {}, {
           position: t.positions,
-          source: t
+          properties: t.properties,
+          geometry: t.geometry,
+          style: _this.options.billboard
         });
         _this.billboards.push(billboard);
-        _this.billboardsCollectionCombine.add(billboard);
+        var billboarded = _this.billboardsCollectionCombine.add(billboard);
+        billboarded.properties = t.properties;
       });
 
       // 将数据传给primitiveCluster的标签属性
@@ -101,16 +106,38 @@ var PointCluster = /*#__PURE__*/function () {
           }
         }
         if (step == -1) {
-          if (_this.options.billboard) {
-            var _this$options$billboa, _this$options$billboa2, _this$options$billboa3;
-            cluster.billboard.image = (_this$options$billboa = _this.options.billboard) === null || _this$options$billboa === void 0 ? void 0 : _this$options$billboa.image;
-            cluster.billboard.width = (_this$options$billboa2 = _this.options.billboard) === null || _this$options$billboa2 === void 0 ? void 0 : _this$options$billboa2.width;
-            cluster.billboard.height = (_this$options$billboa3 = _this.options.billboard) === null || _this$options$billboa3 === void 0 ? void 0 : _this$options$billboa3.height;
-          } else {
+          if (_this.options.onCustomRender) {
             cluster.billboard.show = false;
+            var clusterPoints = _this.billboards.filter(function (t) {
+              return clusteredEntities.includes(t.id);
+            });
+            _this.options.onCustomRender(step, utils.cartesian3ToLngLatAlt(cluster.billboard.position), clusterPoints);
+          } else {
+            if (_this.options.billboard) {
+              var billboard = _this.billboardsCollectionCombine._billboards.find(function (t) {
+                return clusteredEntities.includes(t.id);
+              });
+              var style = BillboardPrimitive.handleOptions(merge({
+                width: 30,
+                height: 30
+              }, utils.styleFun(cloneDeep(_this.options.billboard || {}), (billboard === null || billboard === void 0 ? void 0 : billboard.properties) || {})));
+              Object.keys(style).forEach(function (key) {
+                cluster.billboard[key] = style[key];
+              });
+            } else {
+              cluster.billboard.show = false;
+            }
           }
         } else {
-          cluster.billboard.image = _this._drawImage(clusteredEntities.length, _this.options.grade[step].size, _this.options.grade[step].color);
+          if (_this.options.onCustomRender) {
+            cluster.billboard.show = false;
+            var _clusterPoints = _this.billboards.filter(function (t) {
+              return clusteredEntities.includes(t.id);
+            });
+            _this.options.onCustomRender(step, utils.cartesian3ToLngLatAlt(cluster.billboard.position), _clusterPoints);
+          } else {
+            cluster.billboard.image = _this._drawImage(clusteredEntities.length, _this.options.grade[step].size, _this.options.grade[step].color);
+          }
         }
       });
     }