@kq_npm/client3d_webgl_vue 3.3.0-beta → 3.3.2-beta

package/adddata/index.js

@@ -897,6 +897,27 @@ class AddDataViewModel {
         cb && cb(node);
         break;
 
+      case "mvt":
+        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dMvtImageryProviderExt({
+          name: name,
+          style: url
+        }));
+        this.flyToLayer(layer);
+        node = {
+          guid: layer.guid,
+          name: name,
+          visible: true,
+          serverType: "imagerylayer",
+          lsType: "ls",
+          url: url,
+          addType: type
+        };
+
+        this._layerManager.addTempLayerNode(node);
+
+        cb && cb(node);
+        break;
+
       case "wms":
         this._viewer.addWMSLayerGroup(url).then(group => {
           node = {
@@ -933,6 +954,7 @@ class AddDataViewModel {
         break;
 
       case "wmts":
+      case "kqgistileserver":
         this._viewer.addWMTSLayerGroup(url).then(group => {
           node = {
             guid: group.guid,
@@ -1332,9 +1354,9 @@ const __default__ = {
             description: language.value.imagertyDataflowServerdescription
           }, {
             type: "kqgistileserver",
-            name: language.value.KQGISTileServer + "（未实现）",
+            name: language.value.KQGISTileServer,
             namePlaceholder: language.value.unnamedLayer,
-            urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/tile",
+            urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/tile/wmts",
             description: language.value.imagertyTileServerdescription
           }, {
             type: "arcgismapserver",
@@ -1370,11 +1392,11 @@ const __default__ = {
             type: "geojson",
             name: language.value.GeoJson,
             namePlaceholder: language.value.unnamedLayer,
-            urlPlaceholder: language.value.format + ": http://<host>:<port>/xxx.geojson",
+            urlPlaceholder: language.value.format + ":http://<host>:<port>/xxx.geojson",
             description: language.value.imagertyGeoJsondescription
           }, {
             type: "mvt",
-            name: language.value.MVT + "（未实现）",
+            name: language.value.MVT,
             namePlaceholder: language.value.unnamedLayer,
             urlPlaceholder: language.value.format + ":http://<host>:<port>/mvt/style.json",
             description: language.value.imagertyMVTdescription

package/index.js

@@ -759,7 +759,7 @@ class DrawManager {
 
     if (type === "point") {
       type = "marker";
-      this._viewer.scene.globe.depthTestAgainstTerrain = false;
+      options.disableDepthTestDistance = Number.POSITIVE_INFINITY;
     }
 
     if (!options) options = {};
@@ -1142,7 +1142,6 @@ class LayerManager {
   //记录置顶图层index
   //地形集合
   //加载geojson数据样式
-  //guid映射
   constructor(scenceView) {
     _defineProperty(this, "_scenceView", null);
 
@@ -1197,8 +1196,6 @@ class LayerManager {
       }
     });
 
-    _defineProperty(this, "_guidMapping", {});
-
     this._scenceView = scenceView;
     this._viewer = scenceView._viewer;
     this._scenceShowLayers = scenceView._props.defaultShowLayerNames;
@@ -1394,7 +1391,7 @@ class LayerManager {
           url: url,
           ...params
         }));
-        this._guidMapping[layerData.guid] = layer.guid;
+        layer._guid = layerData.guid;
         layerData.visible = true;
         layerData.serverType = "imagerylayer";
         break;
@@ -1406,8 +1403,7 @@ class LayerManager {
           url: url,
           ...params
         });
-        if (!layer.guid) layer.guid = Cesium.createGuid();
-        this._guidMapping[layerData.guid] = layer.guid;
+        layer.guid = layerData.guid;
         layerData.visible = true;
         layerData.serverType = "terrainprovider";
         this._viewer.terrainProvider = layer;
@@ -1425,12 +1421,11 @@ class LayerManager {
           requestWaterMask: false,
           ...params
         });
-        if (!layer.guid) layer.guid = Cesium.createGuid();
+        layer.guid = layerData.guid;
         this._viewer.terrainProvider = layer;
 
         this._terrainProviders.push(layer);
 
-        this._guidMapping[layerData.guid] = layer.guid;
         layerData.visible = true;
         layerData.serverType = "terrainprovider";
         break;
@@ -1441,7 +1436,9 @@ class LayerManager {
           url: url,
           ...params
         }));
-        this._guidMapping[layerData.guid] = layer.guid;
+        if (layerData.style && layer) layer.style = layerData.style;
+        if (layerData.shader && layer) layer.kq3dCustomShader = layerData.shader;
+        layer._guid = layerData.guid;
         layerData.visible = true;
         layerData.serverType = "3dtiles";
         break;
@@ -1461,14 +1458,14 @@ class LayerManager {
               serverType = "imagerylayer";
             } else if (layer instanceof Cesium.Kq3dFileTerrainProvider || layer instanceof Cesium.CesiumTerrainProvider) {
               serverType = "terrainprovider";
+              layer.guid = layerData.guid;
 
               that._terrainProviders.push(layer);
             } else if (layer instanceof Cesium.Kq3dGeoJsonDataSource) {
               serverType = "datasource";
             }
 
-            if (!layer.guid) layer.guid = Cesium.createGuid();
-            this._guidMapping[layerData.guid] = layer.guid;
+            layer._guid = layerData.guid;
             layerData.visible = true;
             layerData.serverType = serverType;
           }
@@ -1482,7 +1479,7 @@ class LayerManager {
           layerName: layerData.layerName,
           ...params
         }));
-        this._guidMapping[layerData.guid] = layer.guid;
+        layer._guid = layerData.guid;
         layerData.visible = true;
         layerData.serverType = "imagerylayer";
         break;
@@ -1513,7 +1510,7 @@ class LayerManager {
 
         this._viewer.imageryLayers.add(layer);
 
-        this._guidMapping[layerData.guid] = layer.guid;
+        layer._guid = layerData.guid;
         layerData.serverType = "imagerylayer";
         break;
 
@@ -1524,9 +1521,18 @@ class LayerManager {
           layers: layerData.id + "",
           ...params
         }));
-        if (layerData.style && layer) layer.style = layerData.style;
-        if (layerData.shader && layer) layer.kq3dCustomShader = layerData.shader;
-        this._guidMapping[layerData.guid] = layer.guid;
+        layer._guid = layerData.guid;
+        layerData.visible = true;
+        layerData.serverType = "imagerylayer";
+        break;
+
+      case "mvt":
+        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dMvtImageryProviderExt({
+          name: name,
+          url: url,
+          ...params
+        }));
+        layer._guid = layerData.guid;
         layerData.visible = true;
         layerData.serverType = "imagerylayer";
         break;
@@ -1547,7 +1553,7 @@ class LayerManager {
           };
           if (layerData.styles) options.parameters.styles = layerData.styles;
           layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.WebMapServiceImageryProvider(options));
-          this._guidMapping[layerData.guid] = layer.guid;
+          layer._guid = layerData.guid;
           layerData.visible = true;
           layerData.serverType = "imagerylayer";
         } else {
@@ -1572,7 +1578,7 @@ class LayerManager {
                 }
               }
 
-              this._guidMapping[layerData.guid] = layers[0].guid;
+              layers[0]._guid = layerData.guid;
               layerData.name = name || layers[0].name;
               layerData.visible = true;
               layerData.serverType = "imagerylayer";
@@ -1583,6 +1589,7 @@ class LayerManager {
         break;
 
       case "wmts":
+      case "kqgistileserver":
         //配置id时只能是单个图层
         promise = this._viewer.addWMTSLayerGroup(url, {
           layers: layerData.id + ""
@@ -1605,7 +1612,7 @@ class LayerManager {
               }
             }
 
-            this._guidMapping[layerData.guid] = layers[0].guid;
+            layers[0]._guid = layerData.guid;
             layerData.name = name || layers[0].name;
             layerData.visible = true;
             layerData.serverType = "imagerylayer";
@@ -1646,7 +1653,7 @@ class LayerManager {
           this._viewer.dataSources.add(ds);
 
           ds.autoAvoid(this._viewer);
-          this._guidMapping[layerData.guid] = ds.guid;
+          ds._guid = layerData.guid;
           layerData.visible = true;
           layerData.serverType = "datasource";
         });
@@ -1662,7 +1669,7 @@ class LayerManager {
         promise = ds.load(url).then(ds => {
           this._viewer.dataSources.add(ds);
 
-          this._guidMapping[layerData.guid] = ds.guid;
+          ds._guid = layerData.guid;
           layerData.visible = true;
           layerData.serverType = "datasource";
         });
@@ -1673,7 +1680,7 @@ class LayerManager {
         promise = ds.load(url).then(ds => {
           this._viewer.dataSources.add(ds);
 
-          this._guidMapping[layerData.guid] = ds.guid;
+          ds._guid = layerData.guid;
           layerData.visible = true;
           layerData.serverType = "datasource";
         });
@@ -1685,7 +1692,7 @@ class LayerManager {
           mapStyle: layerData.layerType + "_c",
           ...params
         }));
-        this._guidMapping[layerData.guid] = layer.guid;
+        layer._guid = layerData.guid;
         layerData.visible = true;
         layerData.serverType = "imagerylayer";
         break;
@@ -1696,7 +1703,7 @@ class LayerManager {
           mapStyle: layerData.layerType,
           ...params
         }));
-        this._guidMapping[layerData.guid] = layer.guid;
+        layer._guid = layerData.guid;
         layerData.visible = true;
         layerData.serverType = "imagerylayer";
         break;
@@ -1707,7 +1714,7 @@ class LayerManager {
           mapStyle: layerData.layerType,
           ...params
         }));
-        this._guidMapping[layerData.guid] = layer.guid;
+        layer._guid = layerData.guid;
         layerData.visible = true;
         layerData.serverType = "imagerylayer";
         break;
@@ -1718,7 +1725,7 @@ class LayerManager {
           mapStyle: layerData.layerType,
           ...params
         }));
-        this._guidMapping[layerData.guid] = layer.guid;
+        layer._guid = layerData.guid;
         layerData.visible = true;
         layerData.serverType = "imagerylayer";
         break;
@@ -1787,7 +1794,7 @@ class LayerManager {
           layers: layer.id + ""
         });
         var imageryLayer = new Cesium.ImageryLayer(imageryProvider);
-        imageryLayer.name = layer.guid;
+        imageryLayer._guid = layer.guid;
 
         that._viewer.imageryLayers.add(imageryLayer);
       }
@@ -1871,7 +1878,7 @@ class LayerManager {
                 layers: this._layerListData[i].id + ""
               });
               var imageryLayer = new Cesium.ImageryLayer(imageryProvider);
-              imageryLayer.name = this._layerListData[i].guid;
+              imageryLayer._guid = this._layerListData[i].guid;
               var addIndex = this.getImageryLayerAddIndex(ids[z]);
 
               if (addIndex > -1) {
@@ -1991,15 +1998,7 @@ class LayerManager {
       type = this.getLayerTypeByGuid(guid);
     }
 
-    guid = this._guidMapping[guid] || guid;
-
-    if (type === "kqserver") {
-      let imageryLayers = this._viewer.imageryLayers._layers;
-      let layer = imageryLayers.find(item => {
-        return item.name === guid;
-      });
-      return layer;
-    } else if (type === "imagerylayer") {
+    if (type === "kqserver" || type === "imagerylayer") {
       let imageryLayers = this._viewer.imageryLayers._layers;
       let layer = imageryLayers.find(item => {
         return item.guid === guid;
@@ -2626,16 +2625,13 @@ class ScenceViewViewModel extends (mitt_default()) {
   } //销毁
 
 
-  destroy() {
-    if (this._removeEventListener) {
-      this._removeEventListener();
-
-      this._removeEventListener = null;
-    }
-
-    this._viewer = null;
-    this._drawManager = null;
-    this._layerManager = null;
+  destroy() {// if (this._removeEventListener) {
+    //   this._removeEventListener();
+    //   this._removeEventListener = null;
+    // }
+    // this._viewer = null;
+    // this._drawManager = null;
+    // this._layerManager = null;
   } //创建底图
 
 
@@ -9477,6 +9473,7 @@ var update = injectStylesIntoStyleTag_default()(divpoint/* default */.Z, options
 ;// CONCATENATED MODULE: ./src/webgl/sightlineanalysis/SightlineAnalysisViewModel.js
 
 
+
  //通视分析逻辑类
 
 class SightlineAnalysisViewModel {
@@ -9490,6 +9487,7 @@ class SightlineAnalysisViewModel {
   //创建的divpoint集合
   //拾取的点位集合
   //高亮的障碍物的id集合
+  // 点位图标billboards集合
   constructor(scenceView, options) {
     _defineProperty(this, "_viewer", null);
 
@@ -9511,6 +9509,8 @@ class SightlineAnalysisViewModel {
 
     _defineProperty(this, "_highlightIds", []);
 
+    _defineProperty(this, "_billboards", []);
+
     this._viewer = scenceView._viewer;
     this._viewer.scene.postProcessStages._fxaa.enabled = true;
     this._viewer.scene.globe.depthTestAgainstTerrain = true; //开启深度检测
@@ -9533,9 +9533,14 @@ class SightlineAnalysisViewModel {
     options.isLabel = false;
     this._sightlineAnalysis = new Cesium.Kq3dSightAnalysis(options);
     this._drawManager = scenceView._drawManager;
+
+    this._drawManager.enableMultiDraw(true);
+
     let that = this;
     this._removeEventListener = this._drawManager.drawFinishedEvent.addEventListener(shape => {
       if (shape && shape.type === "marker") {
+        that.createBillboard(shape.position);
+
         if (that._addType === 1) {
           that._sightlineAnalysis.setSeePoint(shape.position);
 
@@ -9552,6 +9557,19 @@ class SightlineAnalysisViewModel {
         that._drawManager.clear();
       }
     });
+  } // 创建图标
+
+
+  createBillboard(pos) {
+    this._billboards.push(this._viewer.entities.add({
+      position: pos,
+      billboard: {
+        image: this._addType === 1 ? const_image_namespaceObject.OBSERVATION_POINT : const_image_namespaceObject.TARGET_POINT,
+        verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+        scale: 0.15,
+        disableDepthTestDistance: Number.POSITIVE_INFINITY
+      }
+    }));
   } //创建点位置
 
 
@@ -9648,7 +9666,7 @@ class SightlineAnalysisViewModel {
     this._addType = 1;
 
     this._drawManager.startDraw("point", {
-      image: null
+      image: const_image_namespaceObject.OBSERVATION_POINT
     });
   } //添加目标点
 
@@ -9658,7 +9676,7 @@ class SightlineAnalysisViewModel {
     this._addType = 2;
 
     this._drawManager.startDraw("point", {
-      image: null
+      image: const_image_namespaceObject.TARGET_POINT
     });
   } //清除显示结果
 
@@ -9670,6 +9688,15 @@ class SightlineAnalysisViewModel {
     }
 
     this._pointCollection = [];
+  } // 清楚billboards
+
+
+  clearBillboards() {
+    for (var i = 0; i < this._billboards.length; i++) {
+      this._viewer.entities.remove(this._billboards[i]);
+    }
+
+    this._billboards = [];
   } //清除全部
 
 
@@ -9678,6 +9705,7 @@ class SightlineAnalysisViewModel {
 
     this.clearDisplay();
     this.clearHighlights();
+    this.clearBillboards();
     this._sightlineAnalysis && this._sightlineAnalysis.remove();
   } //销毁
 
@@ -9690,6 +9718,8 @@ class SightlineAnalysisViewModel {
 
     this._removeEventListener && this._removeEventListener();
     this._removeEventListener = null;
+
+    this._drawManager.enableMultiDraw(false);
   } // //设置线宽
   // setLineWidth(lineWith) {
   //   this._sightlineAnalysis.lineWith = Number(lineWith);
@@ -22319,6 +22349,27 @@ class AddDataViewModel {
         cb && cb(node);
         break;
 
+      case "mvt":
+        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dMvtImageryProviderExt({
+          name: name,
+          style: url
+        }));
+        this.flyToLayer(layer);
+        node = {
+          guid: layer.guid,
+          name: name,
+          visible: true,
+          serverType: "imagerylayer",
+          lsType: "ls",
+          url: url,
+          addType: type
+        };
+
+        this._layerManager.addTempLayerNode(node);
+
+        cb && cb(node);
+        break;
+
       case "wms":
         this._viewer.addWMSLayerGroup(url).then(group => {
           node = {
@@ -22355,6 +22406,7 @@ class AddDataViewModel {
         break;
 
       case "wmts":
+      case "kqgistileserver":
         this._viewer.addWMTSLayerGroup(url).then(group => {
           node = {
             guid: group.guid,
@@ -22754,9 +22806,9 @@ const AddDatavue_type_script_setup_true_lang_js_default_ = {
             description: language.value.imagertyDataflowServerdescription
           }, {
             type: "kqgistileserver",
-            name: language.value.KQGISTileServer + "（未实现）",
+            name: language.value.KQGISTileServer,
             namePlaceholder: language.value.unnamedLayer,
-            urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/tile",
+            urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/tile/wmts",
             description: language.value.imagertyTileServerdescription
           }, {
             type: "arcgismapserver",
@@ -22792,11 +22844,11 @@ const AddDatavue_type_script_setup_true_lang_js_default_ = {
             type: "geojson",
             name: language.value.GeoJson,
             namePlaceholder: language.value.unnamedLayer,
-            urlPlaceholder: language.value.format + ": http://<host>:<port>/xxx.geojson",
+            urlPlaceholder: language.value.format + ":http://<host>:<port>/xxx.geojson",
             description: language.value.imagertyGeoJsondescription
           }, {
             type: "mvt",
-            name: language.value.MVT + "（未实现）",
+            name: language.value.MVT,
             namePlaceholder: language.value.unnamedLayer,
             urlPlaceholder: language.value.format + ":http://<host>:<port>/mvt/style.json",
             description: language.value.imagertyMVTdescription
@@ -23287,7 +23339,10 @@ class ParticleEffectViewModel {
     scenceView._viewer.clock.shouldAnimate = true;
     scenceView._viewer.scene.globe.depthTestAgainstTerrain = true;
     this._scene = scenceView._viewer.scene;
-    this._drawManager = scenceView._drawManager;
+    this._drawManager = scenceView._drawManager; // 启动连续绘制
+
+    this._drawManager.enableMultiDraw(true);
+
     _gravityScratch = new Cesium.Cartesian3();
     var that = this;
     that._removeEventListener = that._drawManager.drawFinishedEvent.addEventListener(shape => {
@@ -23390,6 +23445,8 @@ class ParticleEffectViewModel {
   clear() {
     this._drawManager.stopDraw();
 
+    this._drawManager.clear();
+
     for (let i = 0; i < this._particleSystemList.length; i++) {
       this._scene.primitives.remove(this._particleSystemList[i]);
     }
@@ -23399,7 +23456,10 @@ class ParticleEffectViewModel {
 
 
   destroy() {
-    this.clear(); //移除监听事件
+    this.clear();
+
+    this._drawManager.enableMultiDraw(false); //移除监听事件
+
 
     this._removeEventListener && this._removeEventListener();
     this._removeEventListener = null;
@@ -24430,6 +24490,8 @@ class WeatherEffectViewModel {
   clear() {
     this._drawManager.stopDraw();
 
+    this._drawManager.clear();
+
     this._particleSystem && this._scene.primitives.remove(this._particleSystem);
     this._particleSystem = null;
   } //销毁

package/package.json

@@ -1 +1 @@
-{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"3.3.0-beta","homepage":"","keywords":["KQGIS","webGL","Vue"],"browserslist":["> 1%","last 2 versions","not dead","not ie 11"],"author":"KQWEB GROUP","license":"Apache-2.0","dependencies":{"colorcolor":"^1.1.1","echarts":"^5.3.3","js-cookie":"^3.0.1","omit.js":"^2.0.2","save":"^2.5.0","tinycolor2":"^1.4.2","vue-i18n":"9.2.0-beta.36","xlsx":"^0.18.5","css-vars-ponyfill":"^2.4.8","html2canvas":"^1.4.1","xe-utils":"^3.5.4"}}
+{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"3.3.2-beta","homepage":"","keywords":["KQGIS","webGL","Vue"],"browserslist":["> 1%","last 2 versions","not dead","not ie 11"],"author":"KQWEB GROUP","license":"Apache-2.0","dependencies":{"colorcolor":"^1.1.1","echarts":"^5.3.3","js-cookie":"^3.0.1","omit.js":"^2.0.2","save":"^2.5.0","tinycolor2":"^1.4.2","vue-i18n":"9.2.0-beta.36","xlsx":"^0.18.5","css-vars-ponyfill":"^2.4.8","html2canvas":"^1.4.1","xe-utils":"^3.5.4"}}

package/particleeffect/index.js

@@ -189,7 +189,10 @@ class ParticleEffectViewModel {
     scenceView._viewer.clock.shouldAnimate = true;
     scenceView._viewer.scene.globe.depthTestAgainstTerrain = true;
     this._scene = scenceView._viewer.scene;
-    this._drawManager = scenceView._drawManager;
+    this._drawManager = scenceView._drawManager; // 启动连续绘制
+
+    this._drawManager.enableMultiDraw(true);
+
     _gravityScratch = new Cesium.Cartesian3();
     var that = this;
     that._removeEventListener = that._drawManager.drawFinishedEvent.addEventListener(shape => {
@@ -292,6 +295,8 @@ class ParticleEffectViewModel {
   clear() {
     this._drawManager.stopDraw();
 
+    this._drawManager.clear();
+
     for (let i = 0; i < this._particleSystemList.length; i++) {
       this._scene.primitives.remove(this._particleSystemList[i]);
     }
@@ -301,7 +306,10 @@ class ParticleEffectViewModel {
 
 
   destroy() {
-    this.clear(); //移除监听事件
+    this.clear();
+
+    this._drawManager.enableMultiDraw(false); //移除监听事件
+
 
     this._removeEventListener && this._removeEventListener();
     this._removeEventListener = null;

package/scenceview/index.js

@@ -821,6 +821,27 @@ class AddDataViewModel {
         cb && cb(node);
         break;
 
+      case "mvt":
+        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dMvtImageryProviderExt({
+          name: name,
+          style: url
+        }));
+        this.flyToLayer(layer);
+        node = {
+          guid: layer.guid,
+          name: name,
+          visible: true,
+          serverType: "imagerylayer",
+          lsType: "ls",
+          url: url,
+          addType: type
+        };
+
+        this._layerManager.addTempLayerNode(node);
+
+        cb && cb(node);
+        break;
+
       case "wms":
         this._viewer.addWMSLayerGroup(url).then(group => {
           node = {
@@ -857,6 +878,7 @@ class AddDataViewModel {
         break;
 
       case "wmts":
+      case "kqgistileserver":
         this._viewer.addWMTSLayerGroup(url).then(group => {
           node = {
             guid: group.guid,
@@ -1256,9 +1278,9 @@ const __default__ = {
             description: language.value.imagertyDataflowServerdescription
           }, {
             type: "kqgistileserver",
-            name: language.value.KQGISTileServer + "（未实现）",
+            name: language.value.KQGISTileServer,
             namePlaceholder: language.value.unnamedLayer,
-            urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/tile",
+            urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/tile/wmts",
             description: language.value.imagertyTileServerdescription
           }, {
             type: "arcgismapserver",
@@ -1294,11 +1316,11 @@ const __default__ = {
             type: "geojson",
             name: language.value.GeoJson,
             namePlaceholder: language.value.unnamedLayer,
-            urlPlaceholder: language.value.format + ": http://<host>:<port>/xxx.geojson",
+            urlPlaceholder: language.value.format + ":http://<host>:<port>/xxx.geojson",
             description: language.value.imagertyGeoJsondescription
           }, {
             type: "mvt",
-            name: language.value.MVT + "（未实现）",
+            name: language.value.MVT,
             namePlaceholder: language.value.unnamedLayer,
             urlPlaceholder: language.value.format + ":http://<host>:<port>/mvt/style.json",
             description: language.value.imagertyMVTdescription
@@ -14832,7 +14854,10 @@ class ParticleEffectViewModel {
     scenceView._viewer.clock.shouldAnimate = true;
     scenceView._viewer.scene.globe.depthTestAgainstTerrain = true;
     this._scene = scenceView._viewer.scene;
-    this._drawManager = scenceView._drawManager;
+    this._drawManager = scenceView._drawManager; // 启动连续绘制
+
+    this._drawManager.enableMultiDraw(true);
+
     _gravityScratch = new Cesium.Cartesian3();
     var that = this;
     that._removeEventListener = that._drawManager.drawFinishedEvent.addEventListener(shape => {
@@ -14935,6 +14960,8 @@ class ParticleEffectViewModel {
   clear() {
     this._drawManager.stopDraw();
 
+    this._drawManager.clear();
+
     for (let i = 0; i < this._particleSystemList.length; i++) {
       this._scene.primitives.remove(this._particleSystemList[i]);
     }
@@ -14944,7 +14971,10 @@ class ParticleEffectViewModel {
 
 
   destroy() {
-    this.clear(); //移除监听事件
+    this.clear();
+
+    this._drawManager.enableMultiDraw(false); //移除监听事件
+
 
     this._removeEventListener && this._removeEventListener();
     this._removeEventListener = null;
@@ -20039,9 +20069,12 @@ var update = injectStylesIntoStyleTag_default()(divpoint/* default */.Z, options
 
 
 /* harmony default export */ var style_divpoint = (divpoint/* default.locals */.Z.locals || {});
+// EXTERNAL MODULE: external "@kq_npm/client_common_vue/_utils/const-image"
+var const_image_ = __webpack_require__(9702);
 ;// CONCATENATED MODULE: ./src/webgl/sightlineanalysis/SightlineAnalysisViewModel.js
 
 
+
  //通视分析逻辑类
 
 class SightlineAnalysisViewModel {
@@ -20055,6 +20088,7 @@ class SightlineAnalysisViewModel {
   //创建的divpoint集合
   //拾取的点位集合
   //高亮的障碍物的id集合
+  // 点位图标billboards集合
   constructor(scenceView, options) {
     (0,defineProperty/* default */.Z)(this, "_viewer", null);
 
@@ -20076,6 +20110,8 @@ class SightlineAnalysisViewModel {
 
     (0,defineProperty/* default */.Z)(this, "_highlightIds", []);
 
+    (0,defineProperty/* default */.Z)(this, "_billboards", []);
+
     this._viewer = scenceView._viewer;
     this._viewer.scene.postProcessStages._fxaa.enabled = true;
     this._viewer.scene.globe.depthTestAgainstTerrain = true; //开启深度检测
@@ -20098,9 +20134,14 @@ class SightlineAnalysisViewModel {
     options.isLabel = false;
     this._sightlineAnalysis = new Cesium.Kq3dSightAnalysis(options);
     this._drawManager = scenceView._drawManager;
+
+    this._drawManager.enableMultiDraw(true);
+
     let that = this;
     this._removeEventListener = this._drawManager.drawFinishedEvent.addEventListener(shape => {
       if (shape && shape.type === "marker") {
+        that.createBillboard(shape.position);
+
         if (that._addType === 1) {
           that._sightlineAnalysis.setSeePoint(shape.position);
 
@@ -20117,6 +20158,19 @@ class SightlineAnalysisViewModel {
         that._drawManager.clear();
       }
     });
+  } // 创建图标
+
+
+  createBillboard(pos) {
+    this._billboards.push(this._viewer.entities.add({
+      position: pos,
+      billboard: {
+        image: this._addType === 1 ? const_image_.OBSERVATION_POINT : const_image_.TARGET_POINT,
+        verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+        scale: 0.15,
+        disableDepthTestDistance: Number.POSITIVE_INFINITY
+      }
+    }));
   } //创建点位置
 
 
@@ -20213,7 +20267,7 @@ class SightlineAnalysisViewModel {
     this._addType = 1;
 
     this._drawManager.startDraw("point", {
-      image: null
+      image: const_image_.OBSERVATION_POINT
     });
   } //添加目标点
 
@@ -20223,7 +20277,7 @@ class SightlineAnalysisViewModel {
     this._addType = 2;
 
     this._drawManager.startDraw("point", {
-      image: null
+      image: const_image_.TARGET_POINT
     });
   } //清除显示结果
 
@@ -20235,6 +20289,15 @@ class SightlineAnalysisViewModel {
     }
 
     this._pointCollection = [];
+  } // 清楚billboards
+
+
+  clearBillboards() {
+    for (var i = 0; i < this._billboards.length; i++) {
+      this._viewer.entities.remove(this._billboards[i]);
+    }
+
+    this._billboards = [];
   } //清除全部
 
 
@@ -20243,6 +20306,7 @@ class SightlineAnalysisViewModel {
 
     this.clearDisplay();
     this.clearHighlights();
+    this.clearBillboards();
     this._sightlineAnalysis && this._sightlineAnalysis.remove();
   } //销毁
 
@@ -20255,6 +20319,8 @@ class SightlineAnalysisViewModel {
 
     this._removeEventListener && this._removeEventListener();
     this._removeEventListener = null;
+
+    this._drawManager.enableMultiDraw(false);
   } // //设置线宽
   // setLineWidth(lineWith) {
   //   this._sightlineAnalysis.lineWith = Number(lineWith);
@@ -24354,6 +24420,8 @@ class WeatherEffectViewModel {
   clear() {
     this._drawManager.stopDraw();
 
+    this._drawManager.clear();
+
     this._particleSystem && this._scene.primitives.remove(this._particleSystem);
     this._particleSystem = null;
   } //销毁
@@ -25995,7 +26063,7 @@ class DrawManager {
 
     if (type === "point") {
       type = "marker";
-      this._viewer.scene.globe.depthTestAgainstTerrain = false;
+      options.disableDepthTestDistance = Number.POSITIVE_INFINITY;
     }
 
     if (!options) options = {};
@@ -26365,7 +26433,6 @@ class LayerManager {
   //记录置顶图层index
   //地形集合
   //加载geojson数据样式
-  //guid映射
   constructor(scenceView) {
     (0,defineProperty/* default */.Z)(this, "_scenceView", null);
 
@@ -26420,8 +26487,6 @@ class LayerManager {
       }
     });
 
-    (0,defineProperty/* default */.Z)(this, "_guidMapping", {});
-
     this._scenceView = scenceView;
     this._viewer = scenceView._viewer;
     this._scenceShowLayers = scenceView._props.defaultShowLayerNames;
@@ -26617,7 +26682,7 @@ class LayerManager {
           url: url,
           ...params
         }));
-        this._guidMapping[layerData.guid] = layer.guid;
+        layer._guid = layerData.guid;
         layerData.visible = true;
         layerData.serverType = "imagerylayer";
         break;
@@ -26629,8 +26694,7 @@ class LayerManager {
           url: url,
           ...params
         });
-        if (!layer.guid) layer.guid = Cesium.createGuid();
-        this._guidMapping[layerData.guid] = layer.guid;
+        layer.guid = layerData.guid;
         layerData.visible = true;
         layerData.serverType = "terrainprovider";
         this._viewer.terrainProvider = layer;
@@ -26648,12 +26712,11 @@ class LayerManager {
           requestWaterMask: false,
           ...params
         });
-        if (!layer.guid) layer.guid = Cesium.createGuid();
+        layer.guid = layerData.guid;
         this._viewer.terrainProvider = layer;
 
         this._terrainProviders.push(layer);
 
-        this._guidMapping[layerData.guid] = layer.guid;
         layerData.visible = true;
         layerData.serverType = "terrainprovider";
         break;
@@ -26664,7 +26727,9 @@ class LayerManager {
           url: url,
           ...params
         }));
-        this._guidMapping[layerData.guid] = layer.guid;
+        if (layerData.style && layer) layer.style = layerData.style;
+        if (layerData.shader && layer) layer.kq3dCustomShader = layerData.shader;
+        layer._guid = layerData.guid;
         layerData.visible = true;
         layerData.serverType = "3dtiles";
         break;
@@ -26684,14 +26749,14 @@ class LayerManager {
               serverType = "imagerylayer";
             } else if (layer instanceof Cesium.Kq3dFileTerrainProvider || layer instanceof Cesium.CesiumTerrainProvider) {
               serverType = "terrainprovider";
+              layer.guid = layerData.guid;
 
               that._terrainProviders.push(layer);
             } else if (layer instanceof Cesium.Kq3dGeoJsonDataSource) {
               serverType = "datasource";
             }
 
-            if (!layer.guid) layer.guid = Cesium.createGuid();
-            this._guidMapping[layerData.guid] = layer.guid;
+            layer._guid = layerData.guid;
             layerData.visible = true;
             layerData.serverType = serverType;
           }
@@ -26705,7 +26770,7 @@ class LayerManager {
           layerName: layerData.layerName,
           ...params
         }));
-        this._guidMapping[layerData.guid] = layer.guid;
+        layer._guid = layerData.guid;
         layerData.visible = true;
         layerData.serverType = "imagerylayer";
         break;
@@ -26736,7 +26801,7 @@ class LayerManager {
 
         this._viewer.imageryLayers.add(layer);
 
-        this._guidMapping[layerData.guid] = layer.guid;
+        layer._guid = layerData.guid;
         layerData.serverType = "imagerylayer";
         break;
 
@@ -26747,9 +26812,18 @@ class LayerManager {
           layers: layerData.id + "",
           ...params
         }));
-        if (layerData.style && layer) layer.style = layerData.style;
-        if (layerData.shader && layer) layer.kq3dCustomShader = layerData.shader;
-        this._guidMapping[layerData.guid] = layer.guid;
+        layer._guid = layerData.guid;
+        layerData.visible = true;
+        layerData.serverType = "imagerylayer";
+        break;
+
+      case "mvt":
+        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dMvtImageryProviderExt({
+          name: name,
+          url: url,
+          ...params
+        }));
+        layer._guid = layerData.guid;
         layerData.visible = true;
         layerData.serverType = "imagerylayer";
         break;
@@ -26770,7 +26844,7 @@ class LayerManager {
           };
           if (layerData.styles) options.parameters.styles = layerData.styles;
           layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.WebMapServiceImageryProvider(options));
-          this._guidMapping[layerData.guid] = layer.guid;
+          layer._guid = layerData.guid;
           layerData.visible = true;
           layerData.serverType = "imagerylayer";
         } else {
@@ -26795,7 +26869,7 @@ class LayerManager {
                 }
               }
 
-              this._guidMapping[layerData.guid] = layers[0].guid;
+              layers[0]._guid = layerData.guid;
               layerData.name = name || layers[0].name;
               layerData.visible = true;
               layerData.serverType = "imagerylayer";
@@ -26806,6 +26880,7 @@ class LayerManager {
         break;
 
       case "wmts":
+      case "kqgistileserver":
         //配置id时只能是单个图层
         promise = this._viewer.addWMTSLayerGroup(url, {
           layers: layerData.id + ""
@@ -26828,7 +26903,7 @@ class LayerManager {
               }
             }
 
-            this._guidMapping[layerData.guid] = layers[0].guid;
+            layers[0]._guid = layerData.guid;
             layerData.name = name || layers[0].name;
             layerData.visible = true;
             layerData.serverType = "imagerylayer";
@@ -26869,7 +26944,7 @@ class LayerManager {
           this._viewer.dataSources.add(ds);
 
           ds.autoAvoid(this._viewer);
-          this._guidMapping[layerData.guid] = ds.guid;
+          ds._guid = layerData.guid;
           layerData.visible = true;
           layerData.serverType = "datasource";
         });
@@ -26885,7 +26960,7 @@ class LayerManager {
         promise = ds.load(url).then(ds => {
           this._viewer.dataSources.add(ds);
 
-          this._guidMapping[layerData.guid] = ds.guid;
+          ds._guid = layerData.guid;
           layerData.visible = true;
           layerData.serverType = "datasource";
         });
@@ -26896,7 +26971,7 @@ class LayerManager {
         promise = ds.load(url).then(ds => {
           this._viewer.dataSources.add(ds);
 
-          this._guidMapping[layerData.guid] = ds.guid;
+          ds._guid = layerData.guid;
           layerData.visible = true;
           layerData.serverType = "datasource";
         });
@@ -26908,7 +26983,7 @@ class LayerManager {
           mapStyle: layerData.layerType + "_c",
           ...params
         }));
-        this._guidMapping[layerData.guid] = layer.guid;
+        layer._guid = layerData.guid;
         layerData.visible = true;
         layerData.serverType = "imagerylayer";
         break;
@@ -26919,7 +26994,7 @@ class LayerManager {
           mapStyle: layerData.layerType,
           ...params
         }));
-        this._guidMapping[layerData.guid] = layer.guid;
+        layer._guid = layerData.guid;
         layerData.visible = true;
         layerData.serverType = "imagerylayer";
         break;
@@ -26930,7 +27005,7 @@ class LayerManager {
           mapStyle: layerData.layerType,
           ...params
         }));
-        this._guidMapping[layerData.guid] = layer.guid;
+        layer._guid = layerData.guid;
         layerData.visible = true;
         layerData.serverType = "imagerylayer";
         break;
@@ -26941,7 +27016,7 @@ class LayerManager {
           mapStyle: layerData.layerType,
           ...params
         }));
-        this._guidMapping[layerData.guid] = layer.guid;
+        layer._guid = layerData.guid;
         layerData.visible = true;
         layerData.serverType = "imagerylayer";
         break;
@@ -27010,7 +27085,7 @@ class LayerManager {
           layers: layer.id + ""
         });
         var imageryLayer = new Cesium.ImageryLayer(imageryProvider);
-        imageryLayer.name = layer.guid;
+        imageryLayer._guid = layer.guid;
 
         that._viewer.imageryLayers.add(imageryLayer);
       }
@@ -27094,7 +27169,7 @@ class LayerManager {
                 layers: this._layerListData[i].id + ""
               });
               var imageryLayer = new Cesium.ImageryLayer(imageryProvider);
-              imageryLayer.name = this._layerListData[i].guid;
+              imageryLayer._guid = this._layerListData[i].guid;
               var addIndex = this.getImageryLayerAddIndex(ids[z]);
 
               if (addIndex > -1) {
@@ -27214,15 +27289,7 @@ class LayerManager {
       type = this.getLayerTypeByGuid(guid);
     }
 
-    guid = this._guidMapping[guid] || guid;
-
-    if (type === "kqserver") {
-      let imageryLayers = this._viewer.imageryLayers._layers;
-      let layer = imageryLayers.find(item => {
-        return item.name === guid;
-      });
-      return layer;
-    } else if (type === "imagerylayer") {
+    if (type === "kqserver" || type === "imagerylayer") {
       let imageryLayers = this._viewer.imageryLayers._layers;
       let layer = imageryLayers.find(item => {
         return item.guid === guid;
@@ -27849,16 +27916,13 @@ class ScenceViewViewModel extends (mitt_default()) {
   } //销毁
 
 
-  destroy() {
-    if (this._removeEventListener) {
-      this._removeEventListener();
-
-      this._removeEventListener = null;
-    }
-
-    this._viewer = null;
-    this._drawManager = null;
-    this._layerManager = null;
+  destroy() {// if (this._removeEventListener) {
+    //   this._removeEventListener();
+    //   this._removeEventListener = null;
+    // }
+    // this._viewer = null;
+    // this._drawManager = null;
+    // this._layerManager = null;
   } //创建底图
 
 

package/sightlineanalysis/index.js

@@ -379,6 +379,13 @@ module.exports = require("core-js/modules/es.array.includes.js");
 
 /***/ }),
 
+/***/ 9702:
+/***/ (function(module) {
+
+module.exports = require("@kq_npm/client_common_vue/_utils/const-image");
+
+/***/ }),
+
 /***/ 826:
 /***/ (function(module) {
 
@@ -542,9 +549,12 @@ var update = injectStylesIntoStyleTag_default()(divpoint/* default */.Z, options
 
 
 /* harmony default export */ var style_divpoint = (divpoint/* default.locals */.Z.locals || {});
+// EXTERNAL MODULE: external "@kq_npm/client_common_vue/_utils/const-image"
+var const_image_ = __webpack_require__(9702);
 ;// CONCATENATED MODULE: ./src/webgl/sightlineanalysis/SightlineAnalysisViewModel.js
 
 
+
  //通视分析逻辑类
 
 class SightlineAnalysisViewModel {
@@ -558,6 +568,7 @@ class SightlineAnalysisViewModel {
   //创建的divpoint集合
   //拾取的点位集合
   //高亮的障碍物的id集合
+  // 点位图标billboards集合
   constructor(scenceView, options) {
     (0,defineProperty/* default */.Z)(this, "_viewer", null);
 
@@ -579,6 +590,8 @@ class SightlineAnalysisViewModel {
 
     (0,defineProperty/* default */.Z)(this, "_highlightIds", []);
 
+    (0,defineProperty/* default */.Z)(this, "_billboards", []);
+
     this._viewer = scenceView._viewer;
     this._viewer.scene.postProcessStages._fxaa.enabled = true;
     this._viewer.scene.globe.depthTestAgainstTerrain = true; //开启深度检测
@@ -601,9 +614,14 @@ class SightlineAnalysisViewModel {
     options.isLabel = false;
     this._sightlineAnalysis = new Cesium.Kq3dSightAnalysis(options);
     this._drawManager = scenceView._drawManager;
+
+    this._drawManager.enableMultiDraw(true);
+
     let that = this;
     this._removeEventListener = this._drawManager.drawFinishedEvent.addEventListener(shape => {
       if (shape && shape.type === "marker") {
+        that.createBillboard(shape.position);
+
         if (that._addType === 1) {
           that._sightlineAnalysis.setSeePoint(shape.position);
 
@@ -620,6 +638,19 @@ class SightlineAnalysisViewModel {
         that._drawManager.clear();
       }
     });
+  } // 创建图标
+
+
+  createBillboard(pos) {
+    this._billboards.push(this._viewer.entities.add({
+      position: pos,
+      billboard: {
+        image: this._addType === 1 ? const_image_.OBSERVATION_POINT : const_image_.TARGET_POINT,
+        verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+        scale: 0.15,
+        disableDepthTestDistance: Number.POSITIVE_INFINITY
+      }
+    }));
   } //创建点位置
 
 
@@ -716,7 +747,7 @@ class SightlineAnalysisViewModel {
     this._addType = 1;
 
     this._drawManager.startDraw("point", {
-      image: null
+      image: const_image_.OBSERVATION_POINT
     });
   } //添加目标点
 
@@ -726,7 +757,7 @@ class SightlineAnalysisViewModel {
     this._addType = 2;
 
     this._drawManager.startDraw("point", {
-      image: null
+      image: const_image_.TARGET_POINT
     });
   } //清除显示结果
 
@@ -738,6 +769,15 @@ class SightlineAnalysisViewModel {
     }
 
     this._pointCollection = [];
+  } // 清楚billboards
+
+
+  clearBillboards() {
+    for (var i = 0; i < this._billboards.length; i++) {
+      this._viewer.entities.remove(this._billboards[i]);
+    }
+
+    this._billboards = [];
   } //清除全部
 
 
@@ -746,6 +786,7 @@ class SightlineAnalysisViewModel {
 
     this.clearDisplay();
     this.clearHighlights();
+    this.clearBillboards();
     this._sightlineAnalysis && this._sightlineAnalysis.remove();
   } //销毁
 
@@ -758,6 +799,8 @@ class SightlineAnalysisViewModel {
 
     this._removeEventListener && this._removeEventListener();
     this._removeEventListener = null;
+
+    this._drawManager.enableMultiDraw(false);
   } // //设置线宽
   // setLineWidth(lineWith) {
   //   this._sightlineAnalysis.lineWith = Number(lineWith);

package/weathereffect/index.js

@@ -258,6 +258,8 @@ class WeatherEffectViewModel {
   clear() {
     this._drawManager.stopDraw();
 
+    this._drawManager.clear();
+
     this._particleSystem && this._scene.primitives.remove(this._particleSystem);
     this._particleSystem = null;
   } //销毁