@kq_npm/client3d_webgl_vue 3.3.1-beta → 3.3.2-beta

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;
@@ -9534,6 +9533,9 @@ 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") {
@@ -9564,7 +9566,8 @@ class SightlineAnalysisViewModel {
       billboard: {
         image: this._addType === 1 ? const_image_namespaceObject.OBSERVATION_POINT : const_image_namespaceObject.TARGET_POINT,
         verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
-        scale: 0.15
+        scale: 0.15,
+        disableDepthTestDistance: Number.POSITIVE_INFINITY
       }
     }));
   } //创建点位置
@@ -9715,6 +9718,8 @@ class SightlineAnalysisViewModel {
 
     this._removeEventListener && this._removeEventListener();
     this._removeEventListener = null;
+
+    this._drawManager.enableMultiDraw(false);
   } // //设置线宽
   // setLineWidth(lineWith) {
   //   this._sightlineAnalysis.lineWith = Number(lineWith);

package/package.json

@@ -1 +1 @@
-{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"3.3.1-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/scenceview/index.js

@@ -20134,6 +20134,9 @@ 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") {
@@ -20164,7 +20167,8 @@ class SightlineAnalysisViewModel {
       billboard: {
         image: this._addType === 1 ? const_image_.OBSERVATION_POINT : const_image_.TARGET_POINT,
         verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
-        scale: 0.15
+        scale: 0.15,
+        disableDepthTestDistance: Number.POSITIVE_INFINITY
       }
     }));
   } //创建点位置
@@ -20315,6 +20319,8 @@ class SightlineAnalysisViewModel {
 
     this._removeEventListener && this._removeEventListener();
     this._removeEventListener = null;
+
+    this._drawManager.enableMultiDraw(false);
   } // //设置线宽
   // setLineWidth(lineWith) {
   //   this._sightlineAnalysis.lineWith = Number(lineWith);
@@ -26057,7 +26063,7 @@ class DrawManager {
 
     if (type === "point") {
       type = "marker";
-      this._viewer.scene.globe.depthTestAgainstTerrain = false;
+      options.disableDepthTestDistance = Number.POSITIVE_INFINITY;
     }
 
     if (!options) options = {};
@@ -26427,7 +26433,6 @@ class LayerManager {
   //记录置顶图层index
   //地形集合
   //加载geojson数据样式
-  //guid映射
   constructor(scenceView) {
     (0,defineProperty/* default */.Z)(this, "_scenceView", null);
 
@@ -26482,8 +26487,6 @@ class LayerManager {
       }
     });
 
-    (0,defineProperty/* default */.Z)(this, "_guidMapping", {});
-
     this._scenceView = scenceView;
     this._viewer = scenceView._viewer;
     this._scenceShowLayers = scenceView._props.defaultShowLayerNames;
@@ -26679,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;
@@ -26691,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;
@@ -26710,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;
@@ -26726,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;
@@ -26746,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;
           }
@@ -26767,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;
@@ -26798,7 +26801,7 @@ class LayerManager {
 
         this._viewer.imageryLayers.add(layer);
 
-        this._guidMapping[layerData.guid] = layer.guid;
+        layer._guid = layerData.guid;
         layerData.serverType = "imagerylayer";
         break;
 
@@ -26809,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;
@@ -26832,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 {
@@ -26857,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";
@@ -26868,6 +26880,7 @@ class LayerManager {
         break;
 
       case "wmts":
+      case "kqgistileserver":
         //配置id时只能是单个图层
         promise = this._viewer.addWMTSLayerGroup(url, {
           layers: layerData.id + ""
@@ -26890,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";
@@ -26931,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";
         });
@@ -26947,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";
         });
@@ -26958,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";
         });
@@ -26970,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;
@@ -26981,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;
@@ -26992,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;
@@ -27003,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;
@@ -27072,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);
       }
@@ -27156,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) {
@@ -27276,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;

package/sightlineanalysis/index.js

@@ -614,6 +614,9 @@ 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") {
@@ -644,7 +647,8 @@ class SightlineAnalysisViewModel {
       billboard: {
         image: this._addType === 1 ? const_image_.OBSERVATION_POINT : const_image_.TARGET_POINT,
         verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
-        scale: 0.15
+        scale: 0.15,
+        disableDepthTestDistance: Number.POSITIVE_INFINITY
       }
     }));
   } //创建点位置
@@ -795,6 +799,8 @@ class SightlineAnalysisViewModel {
 
     this._removeEventListener && this._removeEventListener();
     this._removeEventListener = null;
+
+    this._drawManager.enableMultiDraw(false);
   } // //设置线宽
   // setLineWidth(lineWith) {
   //   this._sightlineAnalysis.lineWith = Number(lineWith);