deeptwins-engine-3d 0.1.30 → 0.1.32

package/dist/esm/graphicLayer/PolygonPrimitiveInstance.js

@@ -67,7 +67,7 @@ var PolygonPrimitiveInstance = /*#__PURE__*/function (_BasePrimitiveInstanc) {
         vertexFormat: currVertexFormat,
         stRotation: stRotation
       }, style));
-      if (materialAppearance) {
+      if (materialAppearance && !style.extrudedHeight) {
         geometry = Cesium.PolygonGeometry.createGeometry(polygonGeometry);
         geometry.attributes.st = new Cesium.GeometryAttribute({
           componentDatatype: Cesium.ComponentDatatype.FLOAT,

package/dist/esm/index.js

@@ -51,7 +51,7 @@ loadCss(Cesium.buildModuleUrl('Widgets/widgets.css'));
 export var DeepTwinsEngine3D = /*#__PURE__*/_createClass(function DeepTwinsEngine3D() {
   _classCallCheck(this, DeepTwinsEngine3D);
 });
-_defineProperty(DeepTwinsEngine3D, "Version", "0.1.30");
+_defineProperty(DeepTwinsEngine3D, "Version", "0.1.32");
 _defineProperty(DeepTwinsEngine3D, "Map", Map);
 _defineProperty(DeepTwinsEngine3D, "GroundSkyBox", GroundSkyBox);
 _defineProperty(DeepTwinsEngine3D, "RasterLayer", RasterLayer);

package/dist/esm/map/Map.d.ts

@@ -61,6 +61,7 @@ export default class Map extends Cesium.Viewer implements MapContext {
     flyToGraphicLayers(layers: any[], options: any): void;
     flyToPoints(geoJson: any, options: any): void;
     addTrafficHistory(TrafficHistoryLayer: any): any;
+    addTerrainUrl(url: string): Promise<unknown>;
     addTerrain(terrain: any): Promise<unknown>;
     resetTerrain(): void;
     showModuleLayer(isShow: boolean): void;

package/dist/esm/map/Map.js

@@ -606,15 +606,33 @@ var Map = /*#__PURE__*/function (_Cesium$Viewer) {
       return new TrafficHistoryLayer(this);
     }
 
+    // 添加地形url
+  }, {
+    key: "addTerrainUrl",
+    value: function addTerrainUrl(url) {
+      var _this5 = this;
+      var terrain = new Cesium.Terrain(Cesium.CesiumTerrainProvider.fromUrl(url));
+      this.scene.setTerrain(terrain);
+      return new Promise(function (resolve, reject) {
+        terrain.readyEvent.addEventListener(function (provider) {
+          _this5.scene.globe.enableLighting = true;
+          resolve(provider);
+        });
+        terrain.errorEvent.addEventListener(function (error) {
+          reject(error);
+        });
+      });
+    }
+
     // 添加地形
   }, {
     key: "addTerrain",
     value: function addTerrain(terrain) {
-      var _this5 = this;
+      var _this6 = this;
       this.scene.setTerrain(terrain);
       return new Promise(function (resolve, reject) {
         terrain.readyEvent.addEventListener(function (provider) {
-          _this5.scene.globe.enableLighting = true;
+          _this6.scene.globe.enableLighting = true;
           resolve(provider);
         });
         terrain.errorEvent.addEventListener(function (error) {

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

@@ -11,7 +11,7 @@ export default class BaseVideo {
     hls: any;
     private onErrorFun;
     private _maskImage;
-    constructor(options: any);
+    constructor(map: any, options: any);
     getMap(): any;
     _canOperate(): boolean;
     private _init;

package/dist/esm/videoFusion/BaseVideo.js

@@ -14,7 +14,7 @@ import * as utils from "../tool/utils";
 
 // 视频
 var BaseVideo = /*#__PURE__*/function () {
-  function BaseVideo(options) {
+  function BaseVideo(map, options) {
     _classCallCheck(this, BaseVideo);
     _defineProperty(this, "_mapContext", void 0);
     _defineProperty(this, "options", void 0);
@@ -28,6 +28,7 @@ var BaseVideo = /*#__PURE__*/function () {
     _defineProperty(this, "onErrorFun", void 0);
     _defineProperty(this, "_maskImage", null);
     this.options = options;
+    this._mapContext = map._mapContext;
     if (options.video) {
       this.videoType = 'video';
     }

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

@@ -3,7 +3,7 @@ export default class VideoProject extends BaseVideo {
     type: 'fixed' | 'projection';
     frustum: any;
     frustumLineLayer: any;
-    constructor(options: any);
+    constructor(map: any, options: any);
     addToMap(map: any): void;
     show(isShow: boolean): void;
     private _drawLine;

package/dist/esm/videoFusion/VideoProject.js

@@ -25,10 +25,10 @@ import BaseVideo from "./BaseVideo";
 var VideoProject = /*#__PURE__*/function (_BaseVideo) {
   _inherits(VideoProject, _BaseVideo);
   var _super = _createSuper(VideoProject);
-  function VideoProject(options) {
+  function VideoProject(map, options) {
     var _this;
     _classCallCheck(this, VideoProject);
-    _this = _super.call(this, options);
+    _this = _super.call(this, map, options);
     _defineProperty(_assertThisInitialized(_this), "type", 'fixed');
     _defineProperty(_assertThisInitialized(_this), "frustum", void 0);
     _defineProperty(_assertThisInitialized(_this), "frustumLineLayer", void 0);
@@ -41,7 +41,6 @@ var VideoProject = /*#__PURE__*/function (_BaseVideo) {
       if (!this._canOperate()) {
         return;
       }
-      this._mapContext = map._mapContext;
       var videoOptions;
       if (this.videoType === 'video') {
         this.options.video.autoPlay && this.play();

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

@@ -1,5 +1,5 @@
 import BaseVideo from './BaseVideo';
 export default class VideoTexture extends BaseVideo {
-    constructor(options: any);
+    constructor(map: any, options: any);
     addToMap(map: any): void;
 }

package/dist/esm/videoFusion/VideoTexture.js

@@ -26,9 +26,9 @@ import BaseVideo from "./BaseVideo";
 var VideoTexture = /*#__PURE__*/function (_BaseVideo) {
   _inherits(VideoTexture, _BaseVideo);
   var _super = _createSuper(VideoTexture);
-  function VideoTexture(options) {
+  function VideoTexture(map, options) {
     _classCallCheck(this, VideoTexture);
-    return _super.call(this, options);
+    return _super.call(this, map, options);
   }
   _createClass(VideoTexture, [{
     key: "addToMap",
@@ -37,7 +37,6 @@ var VideoTexture = /*#__PURE__*/function (_BaseVideo) {
       if (!this._canOperate()) {
         return;
       }
-      this._mapContext = map._mapContext;
       var videoOptions;
       if (this.videoType === 'video') {
         this.options.video.autoPlay && this.play();

package/dist/esm/visualization/BaseHeatmap.d.ts

@@ -15,6 +15,7 @@ export default class BaseHeatmap {
     heatmapEntity: any;
     heatmapPrimitive: any;
     constructor(options?: any);
+    _init(): void;
     _canOperate(): boolean;
     getMap(): any;
     flyTo(options: any): void;

package/dist/esm/visualization/BaseHeatmap.js

@@ -19,7 +19,6 @@ import h337 from "../tool/heatmap.js";
 import * as utils from "../tool/utils";
 var BaseHeatmap = /*#__PURE__*/function () {
   function BaseHeatmap() {
-    var _this$getMap;
     var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     _classCallCheck(this, BaseHeatmap);
     _defineProperty(this, "_mapContext", void 0);
@@ -40,26 +39,31 @@ var BaseHeatmap = /*#__PURE__*/function () {
       _options$style = options.style,
       style = _options$style === void 0 ? {} : _options$style;
     this.id = uuidv4();
-    this.style = merge(constant.DEFAULT_HEATMAP_STYLE(), cloneDeep(style));
-    var el = document.createElement('div');
-    el.id = this.id;
-    el.style.cssText = 'width: 100%; height: 100%; pointer-events: none; overflow: hidden; opacity: 0;';
-    var heatmapContainer = (_this$getMap = this.getMap()) === null || _this$getMap === void 0 || (_this$getMap = _this$getMap.container) === null || _this$getMap === void 0 ? void 0 : _this$getMap.querySelector('#' + constant.HEATMAP_CONTAINER_ID);
-    if (!heatmapContainer) {
-      return;
-    }
-    heatmapContainer.appendChild(el);
-    this.heatmapInstance = h337.create(_objectSpread({
-      container: el
-    }, this.style));
-    this.canvasW = this.heatmapInstance._renderer.canvas.width;
-    this.canvasH = this.heatmapInstance._renderer.canvas.height;
     this.positions = positions;
-    this._translatePositions();
+    this.style = merge(constant.DEFAULT_HEATMAP_STYLE(), cloneDeep(style));
   }
-
-  // 是否能进行操作
   _createClass(BaseHeatmap, [{
+    key: "_init",
+    value: function _init() {
+      var _this$getMap;
+      var el = document.createElement('div');
+      el.id = this.id;
+      el.style.cssText = 'width: 100%; height: 100%; pointer-events: none; overflow: hidden; opacity: 0;';
+      var heatmapContainer = (_this$getMap = this.getMap()) === null || _this$getMap === void 0 || (_this$getMap = _this$getMap.container) === null || _this$getMap === void 0 ? void 0 : _this$getMap.querySelector('#' + constant.HEATMAP_CONTAINER_ID);
+      if (!heatmapContainer) {
+        return;
+      }
+      heatmapContainer.appendChild(el);
+      this.heatmapInstance = h337.create(_objectSpread({
+        container: el
+      }, this.style));
+      this.canvasW = this.heatmapInstance._renderer.canvas.width;
+      this.canvasH = this.heatmapInstance._renderer.canvas.height;
+      this._translatePositions();
+    }
+
+    // 是否能进行操作
+  }, {
     key: "_canOperate",
     value: function _canOperate() {
       if (this.isDestroyed) {

package/dist/esm/visualization/Heatmap2d.js

@@ -36,6 +36,7 @@ var Heatmap2d = /*#__PURE__*/function (_BaseHeatmap) {
         return;
       }
       this._mapContext = map._mapContext;
+      this._init();
       if (!this.boundBox) return;
       var _this$style = this.style,
         min = _this$style.min,

package/dist/esm/visualization/Heatmap3d.js

@@ -36,6 +36,7 @@ var Heatmap3d = /*#__PURE__*/function (_BaseHeatmap) {
         return;
       }
       this._mapContext = map._mapContext;
+      this._init();
       if (!this.boundBox) return;
       var _this$style = this.style,
         min = _this$style.min,