@kq_npm/client3d_webgl_vue 4.5.54 → 4.5.56

package/videofusion/index.js

@@ -1,13 +1,13 @@
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
-		module.exports = factory(require("vue"), require("@kq_npm/client_common_vue/_utils/gis-utils"), require("@kq_npm/client_common_vue/_utils/util"), require("@kq_npm/client_common_vue/init.js"), require("@kq_npm/client_common_vue/configprovider/useGlobalConfig"));
+		module.exports = factory(require("vue"), require("@kq_npm/client_common_vue/_utils/gis-utils"), require("@kq_npm/client_common_vue/init.js"), require("@kq_npm/client_common_vue/configprovider/useGlobalConfig"), require("@kq_npm/client_common_vue/_utils/util"));
 	else if(typeof define === 'function' && define.amd)
-		define("@kq_npm/client3d_webgl_vue", ["vue", "@kq_npm/client_common_vue/_utils/gis-utils", "@kq_npm/client_common_vue/_utils/util", "@kq_npm/client_common_vue/init.js", "@kq_npm/client_common_vue/configprovider/useGlobalConfig"], factory);
+		define("@kq_npm/client3d_webgl_vue", ["vue", "@kq_npm/client_common_vue/_utils/gis-utils", "@kq_npm/client_common_vue/init.js", "@kq_npm/client_common_vue/configprovider/useGlobalConfig", "@kq_npm/client_common_vue/_utils/util"], factory);
 	else if(typeof exports === 'object')
-		exports["@kq_npm/client3d_webgl_vue"] = factory(require("vue"), require("@kq_npm/client_common_vue/_utils/gis-utils"), require("@kq_npm/client_common_vue/_utils/util"), require("@kq_npm/client_common_vue/init.js"), require("@kq_npm/client_common_vue/configprovider/useGlobalConfig"));
+		exports["@kq_npm/client3d_webgl_vue"] = factory(require("vue"), require("@kq_npm/client_common_vue/_utils/gis-utils"), require("@kq_npm/client_common_vue/init.js"), require("@kq_npm/client_common_vue/configprovider/useGlobalConfig"), require("@kq_npm/client_common_vue/_utils/util"));
 	else
-		root["@kq_npm/client3d_webgl_vue"] = factory(root["Vue"], root["@kq_npm/client_common_vue/_utils/gis-utils"], root["@kq_npm/client_common_vue/_utils/util"], root["@kq_npm/client_common_vue/init.js"], root["@kq_npm/client_common_vue/configprovider/useGlobalConfig"]);
-})(this, function(__WEBPACK_EXTERNAL_MODULE__50154__, __WEBPACK_EXTERNAL_MODULE__20064__, __WEBPACK_EXTERNAL_MODULE__42975__, __WEBPACK_EXTERNAL_MODULE__20455__, __WEBPACK_EXTERNAL_MODULE__22686__) {
+		root["@kq_npm/client3d_webgl_vue"] = factory(root["Vue"], root["@kq_npm/client_common_vue/_utils/gis-utils"], root["@kq_npm/client_common_vue/init.js"], root["@kq_npm/client_common_vue/configprovider/useGlobalConfig"], root["@kq_npm/client_common_vue/_utils/util"]);
+})(this, function(__WEBPACK_EXTERNAL_MODULE__50154__, __WEBPACK_EXTERNAL_MODULE__20064__, __WEBPACK_EXTERNAL_MODULE__20455__, __WEBPACK_EXTERNAL_MODULE__22686__, __WEBPACK_EXTERNAL_MODULE__42975__) {
 return /******/ (function() { // webpackBootstrap
 /******/ 	"use strict";
 /******/ 	var __webpack_modules__ = ({
@@ -101,7 +101,7 @@ var _default = exports.A = /*@__PURE__*/Object.assign(__default__, {
     const lonlatOffset = 0.00001;
     const heightOffset = 10.0;
     let formItem = (0, _vue.reactive)({
-      collapseValue: props?.settingParams?.collapseValue === '' ? '' : props?.settingParams?.collapseValue ?? "setting",
+      collapseValue: props?.settingParams?.collapseValue === "" ? "" : props?.settingParams?.collapseValue ?? "setting",
       // 默认展开属性设置
       longitude: 0,
       minLongitude: -lonlatOffset,
@@ -169,7 +169,7 @@ var _default = exports.A = /*@__PURE__*/Object.assign(__default__, {
     const watchCreateHeaderTemp = () => {
       if (props.showHeaderTemp) {
         // 生成headerTemp
-        headerTemp.value = (0, _util.createHeaderTemp)(boxRef.value, (0, _vue.toRefs)(props), headerTempRef, 'webgl.videoFusion');
+        headerTemp.value = (0, _util.createHeaderTemp)(boxRef.value, (0, _vue.toRefs)(props), headerTempRef, "webgl.videoFusion");
       }
     };
     function selectVideo(file) {
@@ -222,14 +222,17 @@ var _default = exports.A = /*@__PURE__*/Object.assign(__default__, {
     function fusion() {
       if (formItem.videoPath === "") {
         (0, _message.default)({
-          message: t('webgl.videoPathEmpty'),
+          message: t("webgl.videoPathEmpty"),
           type: "warning"
         });
       } else {
         if (viewModel) {
-          viewModel.fusion();
-          setCoordinate();
-          serHpr();
+          viewModel.fusion(function (bool) {
+            if (bool) {
+              setCoordinate();
+              serHpr();
+            }
+          });
         }
       }
     }
@@ -314,7 +317,7 @@ var _default = exports.A = /*@__PURE__*/Object.assign(__default__, {
           span: 6,
           class: "colClass"
         }, {
-          default: (0, _vue.withCtx)(() => [(0, _vue.createElementVNode)("span", _hoisted_2, (0, _vue.toDisplayString)((0, _vue.unref)(t)('webgl.videoPath')), 1 /* TEXT */)]),
+          default: (0, _vue.withCtx)(() => [(0, _vue.createElementVNode)("span", _hoisted_2, (0, _vue.toDisplayString)((0, _vue.unref)(t)("webgl.videoPath")), 1 /* TEXT */)]),
           _: 1 /* STABLE */
         }), (0, _vue.createVNode)(_component_kq_col, {
           span: 18
@@ -350,7 +353,7 @@ var _default = exports.A = /*@__PURE__*/Object.assign(__default__, {
       }), (0, _vue.createVNode)(_component_kq_row, {
         class: "kq3d-video-fusion-tip"
       }, {
-        default: (0, _vue.withCtx)(() => [(0, _vue.createElementVNode)("p", null, (0, _vue.toDisplayString)((0, _vue.unref)(t)('webgl.videoFusionTips')), 1 /* TEXT */)]),
+        default: (0, _vue.withCtx)(() => [(0, _vue.createElementVNode)("p", null, (0, _vue.toDisplayString)((0, _vue.unref)(t)("webgl.videoFusionTips")), 1 /* TEXT */)]),
         _: 1 /* STABLE */
       }), (0, _vue.createVNode)(_component_kq_collapse, {
         "model-value": (0, _vue.unref)(formItem).collapseValue,
@@ -794,20 +797,20 @@ var _default = exports.A = /*@__PURE__*/Object.assign(__default__, {
         title: (0, _vue.unref)(t)('webgl.fusion'),
         type: "primary"
       }, {
-        default: (0, _vue.withCtx)(() => [(0, _vue.createTextVNode)((0, _vue.toDisplayString)((0, _vue.unref)(t)('webgl.fusion')), 1 /* TEXT */)]),
+        default: (0, _vue.withCtx)(() => [(0, _vue.createTextVNode)((0, _vue.toDisplayString)((0, _vue.unref)(t)("webgl.fusion")), 1 /* TEXT */)]),
         _: 1 /* STABLE */
       }, 8 /* PROPS */, ["title"]), (0, _vue.createVNode)(_component_kq_button, {
         onClick: _cache[39] || (_cache[39] = (0, _vue.withModifiers)($event => flyTo(), ["stop"])),
         title: (0, _vue.unref)(t)('webgl.flyTo'),
         type: "primary"
       }, {
-        default: (0, _vue.withCtx)(() => [(0, _vue.createTextVNode)((0, _vue.toDisplayString)((0, _vue.unref)(t)('webgl.flyTo')), 1 /* TEXT */)]),
+        default: (0, _vue.withCtx)(() => [(0, _vue.createTextVNode)((0, _vue.toDisplayString)((0, _vue.unref)(t)("webgl.flyTo")), 1 /* TEXT */)]),
         _: 1 /* STABLE */
       }, 8 /* PROPS */, ["title"]), (0, _vue.createVNode)(_component_kq_button, {
         onClick: _cache[40] || (_cache[40] = (0, _vue.withModifiers)($event => clearResult(), ["stop"])),
         title: (0, _vue.unref)(t)('webgl.clear')
       }, {
-        default: (0, _vue.withCtx)(() => [(0, _vue.createTextVNode)((0, _vue.toDisplayString)((0, _vue.unref)(t)('webgl.clear')), 1 /* TEXT */)]),
+        default: (0, _vue.withCtx)(() => [(0, _vue.createTextVNode)((0, _vue.toDisplayString)((0, _vue.unref)(t)("webgl.clear")), 1 /* TEXT */)]),
         _: 1 /* STABLE */
       }, 8 /* PROPS */, ["title"])])])], 2 /* CLASS */);
     };
@@ -926,19 +929,23 @@ _KqGIS.kq_npm_client_common_vue.KqMessage = _indexFull.ElMessage;
 /***/ }),
 
 /***/ 93012:
-/***/ (function(__unused_webpack_module, exports) {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 
 
+var _interopRequireDefault = __webpack_require__(33751);
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
 exports["default"] = void 0;
+var _message = _interopRequireDefault(__webpack_require__(71323));
+var _useGlobalConfig = __webpack_require__(22686);
 /*
  * Copyright (C) 2019 KQ GEO Technologies Co., Ltd.
  * All rights reserved.
  */
 //视频融合逻辑类
+
 class VideoFusiontViewModel {
   constructor(scenceView, options) {
     this._viewer = null;
@@ -948,47 +955,69 @@ class VideoFusiontViewModel {
     this._videoFusion = null;
     //视频融合对象
     this._videoFusionCollection = null;
+    this._language = {};
+    const {
+      locale
+    } = (0, _useGlobalConfig.useLocale)();
+    this._language = locale;
     this._options = Object.assign({}, options);
     this._viewer = scenceView._viewer;
     this._videoFusionCollection = new Cesium.Kq3dVideoFusionCollection(this._viewer);
   }
 
   // 融合
-  fusion() {
-    let type = 3;
-    if (this._options.videoPath.indexOf('.m3u8') > 0) {
-      type = 5;
+  fusion(cb) {
+    // 判断是否添加了模型
+    var flag = false;
+    var models = this._viewer.scene.primitives._primitives;
+    for (let i = 0; i < models.length; i++) {
+      if (models[i]._url && models[i] instanceof Cesium.Cesium3DTileset) {
+        flag = true;
+      }
+    }
+    if (flag) {
+      let type = 3;
+      if (this._options.videoPath.indexOf('.m3u8') > 0) {
+        type = 5;
+      }
+      this.clear();
+      let cartographic = Cesium.Cartographic.fromCartesian(this._viewer.camera.positionWC);
+      this._options.heading = Cesium.Math.toDegrees(this._viewer.camera.heading);
+      this._options.pitch = Cesium.Math.toDegrees(this._viewer.camera.pitch);
+      this._options.roll = Cesium.Math.toDegrees(this._viewer.camera.roll);
+      var param = {
+        url: this._options.videoPath,
+        type: type,
+        position: {
+          x: Cesium.Math.toDegrees(cartographic.longitude),
+          y: Cesium.Math.toDegrees(cartographic.latitude),
+          z: cartographic.height
+        },
+        hpr: {
+          heading: this._options.heading,
+          pitch: this._options.pitch,
+          roll: this._options.roll
+        },
+        alpha: this._options.alpha,
+        far: this._options.far,
+        fov: this._options.fov,
+        featheringDelta: this._options.eclosion,
+        debugFrustum: this._options.showHideLine,
+        k1: 0,
+        k2: 0,
+        cx: 300,
+        cy: 60,
+        f: 3000
+      };
+      this._videoFusion = this._videoFusionCollection.addVideoTarget(param);
+      typeof cb === "function" && cb(true);
+    } else {
+      (0, _message.default)({
+        message: this._language.value.webgl["addModelFusionTips"],
+        type: "warning"
+      });
+      typeof cb === "function" && cb(false);
     }
-    this.clear();
-    let cartographic = Cesium.Cartographic.fromCartesian(this._viewer.camera.positionWC);
-    this._options.heading = Cesium.Math.toDegrees(this._viewer.camera.heading);
-    this._options.pitch = Cesium.Math.toDegrees(this._viewer.camera.pitch);
-    this._options.roll = Cesium.Math.toDegrees(this._viewer.camera.roll);
-    var param = {
-      url: this._options.videoPath,
-      type: type,
-      position: {
-        x: Cesium.Math.toDegrees(cartographic.longitude),
-        y: Cesium.Math.toDegrees(cartographic.latitude),
-        z: cartographic.height
-      },
-      hpr: {
-        heading: this._options.heading,
-        pitch: this._options.pitch,
-        roll: this._options.roll
-      },
-      alpha: this._options.alpha,
-      far: this._options.far,
-      fov: this._options.fov,
-      featheringDelta: this._options.eclosion,
-      debugFrustum: this._options.showHideLine,
-      k1: 0,
-      k2: 0,
-      cx: 300,
-      cy: 60,
-      f: 3000
-    };
-    this._videoFusion = this._videoFusionCollection.addVideoTarget(param);
   }
 
   // 获取融合坐标

package/viewshedanalysis/index.js

@@ -1289,7 +1289,9 @@ class ViewshedAnalysisViewModel {
   //清除全部结果
   clear() {
     // this._drawManager?.stopDraw?.();
-    this._viewshedAnalysis && this._viewshedAnalysis.destroy();
+    this._viewshedAnalysis?.pause();
+    this._viewshedAnalysis?.stopHandle();
+    this._viewshedAnalysis?.destroy();
     this._viewshedAnalysis = null;
     if (this._marker) {
       this._viewer.entities.remove(this._marker);