deeptwins-engine-3d 0.1.50 → 0.1.51

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): "clampedPolygonGrid" | "wkt" | "sourceId" | "sourceInstance" | "geoJson" | "other";
+    static analysisSourceType(data: any): "wkt" | "sourceId" | "sourceInstance" | "geoJson" | "clampedPolygonGrid" | "other";
     static wktToGeoJon(wkt: string): any;
     static geoJsonToGeoCartesian3Array(geoJson: any): any[];
     static handleFeaturePoint(feature: any): any;

package/dist/esm/index.js

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

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

@@ -10,6 +10,7 @@ export default class Map extends Cesium.Viewer implements MapContext {
     private _defaultSkybox;
     private _handleSkyBox;
     private _yunjing;
+    private _hasGSModel;
     private _event;
     private _eventTrick;
     constructor(container: any, options: any);

package/dist/esm/map/Map.js

@@ -76,6 +76,8 @@ var Map = /*#__PURE__*/function (_Cesium$Viewer) {
     _defineProperty(_assertThisInitialized(_this), "_handleSkyBox", null);
     // 云镜模型实例
     _defineProperty(_assertThisInitialized(_this), "_yunjing", void 0);
+    // 是否有云镜高斯模型
+    _defineProperty(_assertThisInitialized(_this), "_hasGSModel", false);
     // 事件
     _defineProperty(_assertThisInitialized(_this), "_event", void 0);
     // 默认的事件监听
@@ -83,6 +85,7 @@ var Map = /*#__PURE__*/function (_Cesium$Viewer) {
     // 添加yunjing 模型
     _defineProperty(_assertThisInitialized(_this), "addModuleLayer", function (moduleLayer) {
       var yunjing = moduleLayer.addToMap(_assertThisInitialized(_this));
+      _this._hasGSModel = true;
       common.removeYjIcon();
       return yunjing;
     });
@@ -94,6 +97,7 @@ var Map = /*#__PURE__*/function (_Cesium$Viewer) {
     if (deepTwins) {
       if (deepTwins.moduleLayer) {
         _this._yunjing = deepTwins.moduleLayer.addToMap(_assertThisInitialized(_this));
+        _this._hasGSModel = true;
         common.removeYjIcon();
       }
     } else {
@@ -699,6 +703,7 @@ var Map = /*#__PURE__*/function (_Cesium$Viewer) {
         this._yunjing.destroy();
         this._yunjing = null;
       }
+      this._hasGSModel = false;
       _get(_getPrototypeOf(Map.prototype), "destroy", this).call(this);
     }
   }]);

package/dist/esm/tool/BuildClampedPolygonGrid.js

@@ -180,17 +180,22 @@ function _BuildClampedPolygonGridUnified() {
                   // await scene.render();
                   modelClamped = null;
                   _context.prev = 33;
-                  _context.next = 36;
+                  if (map._hasGSModel) {
+                    _context.next = 38;
+                    break;
+                  }
+                  _context.next = 37;
                   return scene.clampToHeightMostDetailed(JSON.parse(JSON.stringify(positions3D)));
-                case 36:
+                case 37:
                   modelClamped = _context.sent;
-                  _context.next = 42;
+                case 38:
+                  _context.next = 43;
                   break;
-                case 39:
-                  _context.prev = 39;
+                case 40:
+                  _context.prev = 40;
                   _context.t0 = _context["catch"](33);
                   modelClamped = null;
-                case 42:
+                case 43:
                   /* ---------------------------------- */
                   /* 8. terrain fallback（只给失败点） */
                   /* ---------------------------------- */
@@ -199,20 +204,20 @@ function _BuildClampedPolygonGridUnified() {
                   });
                   terrainClamped = null;
                   if (!needTerrain) {
-                    _context.next = 50;
+                    _context.next = 51;
                     break;
                   }
                   cartos = JSON.parse(JSON.stringify(positions3D)).map(function (p) {
                     return Cesium.Cartographic.fromCartesian(p);
                   });
-                  _context.next = 48;
+                  _context.next = 49;
                   return Cesium.sampleTerrainMostDetailed(map.terrainProvider, cartos);
-                case 48:
+                case 49:
                   sampled = _context.sent;
                   terrainClamped = sampled.map(function (c) {
                     return Cesium.Cartesian3.fromRadians(c.longitude, c.latitude, c.height);
                   });
-                case 50:
+                case 51:
                   /* ---------------------------------- */
                   /* 9. 合并结果（模型优先，terrain 兜底） */
                   /* ---------------------------------- */
@@ -225,21 +230,21 @@ function _BuildClampedPolygonGridUnified() {
                   if (!finalPositions.some(function (p) {
                     return !p;
                   })) {
-                    _context.next = 54;
+                    _context.next = 55;
                     break;
                   }
                   console.warn('存在无法贴地/贴模型的点，已跳过该 polygon');
                   return _context.abrupt("return", 1);
-                case 54:
+                case 55:
                   finalSource.push(_objectSpread(_objectSpread({}, source[i]), {}, {
                     positions: finalPositions,
                     indices: indices
                   }));
-                case 55:
+                case 56:
                 case "end":
                   return _context.stop();
               }
-            }, _loop, null, [[33, 39]]);
+            }, _loop, null, [[33, 40]]);
           });
           i = 0;
         case 10: