deeptwins-engine-3d 0.1.61 → 0.1.63

package/dist/esm/cameraControl/ModelRoamRealTime.js

@@ -235,6 +235,11 @@ var ModelRoamRealTime = /*#__PURE__*/function () {
       // 检查是否与上一个位置相同
       var lastPos = this.receivedPositions[this.receivedPositions.length - 1];
       if (this.isSamePosition(newPosition, lastPos)) {
+        // 同位置数据只刷新最后一次采样时间，避免静止时长被并入下一段移动时间
+        if (newPosition.timestamp >= lastPos.timestamp) {
+          lastPos.timestamp = newPosition.timestamp;
+          lastPos.alt = newPosition.alt;
+        }
         return;
       }
 
@@ -269,7 +274,7 @@ var ModelRoamRealTime = /*#__PURE__*/function () {
       var endC3 = Cesium.Cartesian3.fromDegrees(endPos.lng, endPos.lat, endPos.alt);
 
       // 计算飞行时间
-      var flightTime = (endPos.timestamp - startPos.timestamp) / 1000;
+      var flightTime = Math.max(0, (endPos.timestamp - startPos.timestamp) / 1000);
 
       // 计算插值点
       var interpolatedPoints = this._getInterPosition(startC3, endC3, flightTime);

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

@@ -15,7 +15,7 @@ export default class BaseSource {
     remove(): void;
     setData(data: any): this | undefined;
     _toDestroy(): void;
-    static analysisSourceType(data: any): "wkt" | "sourceId" | "sourceInstance" | "geoJson" | "clampedPolygonGrid" | "other";
+    static analysisSourceType(data: any): "other" | "clampedPolygonGrid" | "wkt" | "sourceId" | "sourceInstance" | "geoJson";
     static wktToGeoJon(wkt: string): any;
     static geoJsonToGeoCartesian3Array(geoJson: any): any[];
     static handleFeaturePoint(feature: any): any;

package/dist/esm/index.d.ts

@@ -8,6 +8,7 @@ export declare class DeepTwinsEngine3D {
     static WmtsLayer: any;
     static ArcGisLayer: any;
     static BarrierLayer: any;
+    static FactorLayer: any;
     static DeepTwins: any;
     static WeatherEffects: any;
     static Drawer: any;

package/dist/esm/index.js

@@ -22,6 +22,7 @@ import "./global.css";
 import BarrierLayer from "./lowAltitude/BarrierLayer";
 import FlightPlanning from "./lowAltitude/FlightPlanning";
 import FlightRiskEvaluation from "./lowAltitude/FlightRiskEvaluation";
+import FactorLayer from "./lowAltitude/FactorLayer";
 import GridDraw from "./lowAltitude/GridDraw";
 import PoiLayer from "./lowAltitude/PoiLayer";
 import VisitLayer from "./lowAltitude/VisitLayer";
@@ -62,11 +63,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.61");
+console.log('DeepTwinsEngine3D Version:', "0.1.63");
 export var DeepTwinsEngine3D = /*#__PURE__*/_createClass(function DeepTwinsEngine3D() {
   _classCallCheck(this, DeepTwinsEngine3D);
 });
-_defineProperty(DeepTwinsEngine3D, "Version", "0.1.61");
+_defineProperty(DeepTwinsEngine3D, "Version", "0.1.63");
 _defineProperty(DeepTwinsEngine3D, "Map", Map);
 _defineProperty(DeepTwinsEngine3D, "GroundSkyBox", GroundSkyBox);
 _defineProperty(DeepTwinsEngine3D, "RasterLayer", RasterLayer);
@@ -74,6 +75,7 @@ _defineProperty(DeepTwinsEngine3D, "WmsLayer", WmsLayer);
 _defineProperty(DeepTwinsEngine3D, "WmtsLayer", WmtsLayer);
 _defineProperty(DeepTwinsEngine3D, "ArcGisLayer", ArcGisLayer);
 _defineProperty(DeepTwinsEngine3D, "BarrierLayer", BarrierLayer);
+_defineProperty(DeepTwinsEngine3D, "FactorLayer", FactorLayer);
 _defineProperty(DeepTwinsEngine3D, "DeepTwins", DeepTwins);
 _defineProperty(DeepTwinsEngine3D, "WeatherEffects", WeatherEffects);
 _defineProperty(DeepTwinsEngine3D, "Drawer", Drawer);

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

@@ -0,0 +1,32 @@
+import BaseGridMvtLayer from './BaseGridMvtLayer';
+/**
+ * 要素图层 - 基于背景MVT数据筛选地面网格进行渲染
+ */
+declare class FactorLayer extends BaseGridMvtLayer {
+    constructor(map: any, options?: any);
+    /**
+     * 创建 primitives
+     */
+    private _createPrimitives;
+    /**
+     * 对当前要素过滤并指定颜色
+     */
+    private _colorFeature;
+    /**
+     * 销毁 primitives
+     */
+    private _destroyPrimitives;
+    /**
+     * 显示 primitives
+     */
+    private _showPrimitives;
+    /**
+     * 隐藏 primitives
+     */
+    private _hidePrimitives;
+    /**
+     * 更新 primitives
+     */
+    private _updatePrimitives;
+}
+export default FactorLayer;

package/dist/esm/lowAltitude/FactorLayer.js

@@ -0,0 +1,199 @@
+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; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
+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 * as Cesium from 'deeptwins-cesium';
+import BaseGridMvtLayer from "./BaseGridMvtLayer";
+
+/**
+ * 要素图层 - 基于背景MVT数据筛选地面网格进行渲染
+ */
+var FactorLayer = /*#__PURE__*/function (_BaseGridMvtLayer) {
+  _inherits(FactorLayer, _BaseGridMvtLayer);
+  var _super = _createSuper(FactorLayer);
+  function FactorLayer(map) {
+    var _this;
+    var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    _classCallCheck(this, FactorLayer);
+    _this = _super.call(this, map, _objectSpread({
+      dataType: 'background',
+      displayHeight: 100,
+      boxHeight: 10
+    }, options));
+    _this.createMvtLayer({
+      createPrimitives: function createPrimitives(_tileNum, renderData, viewer) {
+        var targetViewer = viewer || _this.getMap();
+        return _this._createPrimitives(renderData, targetViewer);
+      },
+      destroyPrimitives: function destroyPrimitives(_tileNum, primitives) {
+        return _this._destroyPrimitives(primitives);
+      },
+      showPrimitives: function showPrimitives(_tileNum, primitives) {
+        return _this._showPrimitives(primitives);
+      },
+      hidePrimitives: function hidePrimitives(_tileNum, primitives) {
+        return _this._hidePrimitives(primitives);
+      },
+      updatePrimitives: function updatePrimitives(_tileNum, _primitives) {
+        return _this._updatePrimitives(_tileNum, _primitives);
+      }
+    });
+    return _this;
+  }
+
+  /**
+   * 创建 primitives
+   */
+  _createClass(FactorLayer, [{
+    key: "_createPrimitives",
+    value: function _createPrimitives(renderData, viewer) {
+      var _this$options$display, _this$options$boxHeig;
+      if (!this._isViewerReady()) {
+        return [];
+      }
+      var features = (renderData === null || renderData === void 0 ? void 0 : renderData.default) || [];
+      var instances = [];
+      var displayHeight = (_this$options$display = this.options.displayHeight) !== null && _this$options$display !== void 0 ? _this$options$display : 100;
+      var boxHeight = (_this$options$boxHeig = this.options.boxHeight) !== null && _this$options$boxHeig !== void 0 ? _this$options$boxHeig : 10;
+      for (var i = 0; i < features.length; i++) {
+        var feature = features[i];
+        if (!feature || !feature.lnglat || !feature.gridSize) {
+          continue;
+        }
+        var color = this._colorFeature(feature) ? Cesium.Color.fromCssColorString(this._colorFeature(feature)) : null;
+        if (!color) {
+          continue;
+        }
+        var modelMatrix = Cesium.Transforms.eastNorthUpToFixedFrame(Cesium.Cartesian3.fromDegrees(feature.lnglat[0], feature.lnglat[1], displayHeight));
+        var instance = new Cesium.GeometryInstance({
+          geometry: Cesium.BoxGeometry.fromDimensions({
+            vertexFormat: Cesium.VertexFormat.POSITION_AND_NORMAL,
+            dimensions: new Cesium.Cartesian3(feature.gridSize[0], feature.gridSize[1], boxHeight)
+          }),
+          modelMatrix: modelMatrix,
+          attributes: {
+            color: Cesium.ColorGeometryInstanceAttribute.fromColor(color)
+          }
+        });
+        instances.push(instance);
+      }
+      if (!this._isViewerReady() || instances.length === 0) {
+        return [];
+      }
+      var primitive = new Cesium.Primitive({
+        geometryInstances: instances,
+        appearance: new Cesium.PerInstanceColorAppearance({
+          translucent: false,
+          closed: true
+        })
+      });
+      if (this._isViewerReady()) {
+        viewer.scene.primitives.add(primitive);
+      }
+      return [primitive];
+    }
+
+    /**
+     * 对当前要素过滤并指定颜色
+     */
+  }, {
+    key: "_colorFeature",
+    value: function _colorFeature(feature) {
+      var _this$options;
+      var properties = (feature === null || feature === void 0 ? void 0 : feature.properties) || {};
+      if (typeof ((_this$options = this.options) === null || _this$options === void 0 ? void 0 : _this$options.colorFeature) === 'function') {
+        var _this$options2;
+        return (_this$options2 = this.options) === null || _this$options2 === void 0 ? void 0 : _this$options2.colorFeature(properties, feature);
+      }
+      return false;
+    }
+
+    /**
+     * 销毁 primitives
+     */
+  }, {
+    key: "_destroyPrimitives",
+    value: function _destroyPrimitives(primitives) {
+      var _this2 = this;
+      if (!(primitives !== null && primitives !== void 0 && primitives.length)) {
+        return;
+      }
+      primitives.forEach(function (primitive) {
+        if (!primitive) {
+          return;
+        }
+        try {
+          primitive.show = false;
+          if (_this2._isViewerReady()) {
+            var isDestroyed = typeof primitive.isDestroyed === 'function' ? primitive.isDestroyed() : false;
+            if (!isDestroyed) {
+              _this2.getMap().scene.primitives.remove(primitive);
+            }
+            if (typeof primitive.destroy === 'function' && !isDestroyed) {
+              primitive.destroy();
+            }
+          }
+        } catch (error) {
+          console.warn('销毁绿地 primitive 失败', error);
+        }
+      });
+      primitives.length = 0;
+    }
+
+    /**
+     * 显示 primitives
+     */
+  }, {
+    key: "_showPrimitives",
+    value: function _showPrimitives(primitives) {
+      if (!(primitives !== null && primitives !== void 0 && primitives.length)) {
+        return;
+      }
+      primitives.forEach(function (primitive) {
+        if (primitive && typeof primitive.isDestroyed === 'function' && !primitive.isDestroyed()) {
+          primitive.show = true;
+        }
+      });
+    }
+
+    /**
+     * 隐藏 primitives
+     */
+  }, {
+    key: "_hidePrimitives",
+    value: function _hidePrimitives(primitives) {
+      if (!(primitives !== null && primitives !== void 0 && primitives.length)) {
+        return;
+      }
+      primitives.forEach(function (primitive) {
+        if (primitive && typeof primitive.isDestroyed === 'function' && !primitive.isDestroyed()) {
+          primitive.show = false;
+        }
+      });
+    }
+
+    /**
+     * 更新 primitives
+     */
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  }, {
+    key: "_updatePrimitives",
+    value: function _updatePrimitives(_tileNum, _primitives) {
+      // 预留接口，可根据需要实现更新逻辑
+    }
+  }]);
+  return FactorLayer;
+}(BaseGridMvtLayer);
+export default FactorLayer;