@kq_npm/client3d_webgl_vue 0.7.4-beta → 0.7.5-beta

package/index.js

@@ -936,7 +936,7 @@ class DrawManager {
         });
       }
 
-      callFun && callFun();
+      callFun && callFun(that._viewer);
     });
   } //删除指定绘图分组的所有图形
 
@@ -2537,7 +2537,8 @@ class ScenceViewViewModel extends (mitt_default()) {
   _createBaseLayer(layerConfig) {
     let layer = null;
     let index = 1;
-    let layerType = layerConfig.serverType.toLowerCase();
+    let layerType = layerConfig.serverType;
+    if (layerType) layerType = layerType.toLowerCase();
 
     switch (layerType) {
       case "kqserver":
@@ -2662,6 +2663,102 @@ class ScenceViewViewModel extends (mitt_default()) {
         });
       }
     }
+  } //创建在线底图
+
+
+  _createOnlineLayer(layerConfig) {
+    let layer = null;
+    let layerType = layerConfig.renderType;
+    if (layerType) layerType = layerType.toLowerCase();
+
+    switch (layerType) {
+      case "kqserver":
+        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dKQGISMapServerImageryProviderExt({
+          url: layerConfig.url,
+          ua_token: layerConfig.accessToken
+        }));
+        break;
+
+      case "wmts":
+        let options = {
+          url: layerConfig.url,
+          layer: layerConfig.id,
+          tileMatrixSetID: layerConfig.tilematrixSet || "default028mm",
+          tileMatrixLabels: layerConfig.tileMatrixLabels,
+          style: layerConfig.style || "default",
+          format: layerConfig.format || "image/png",
+          minimumLevel: layerConfig.minZoom,
+          maximumLevel: layerConfig.maxZoom,
+          subdomains: layerConfig.subdomains,
+          tilingScheme: layerConfig.epsg === "4326" ? new Cesium.GeographicTilingScheme() : new Cesium.WebMercatorTilingScheme()
+        };
+        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.WebMapTileServiceImageryProvider(options));
+        break;
+
+      case "wms":
+        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.WebMapServiceImageryProvider({
+          url: layerConfig.url,
+          layers: layerConfig.id,
+          parameters: {
+            transparent: "true",
+            format: "image/png"
+          }
+        }));
+        break;
+
+      case "tianditu":
+        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dTiandituImageryProvider({
+          mapStyle: layerConfig.layerType + "_c"
+        }));
+        break;
+
+      case "baidu":
+        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dBaiduMapsImageryProvider({
+          mapStyle: layerConfig.layerType
+        }));
+        break;
+
+      case "gaode":
+        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dAMapsImageryProvider({
+          mapStyle: layerConfig.layerType
+        }));
+        break;
+
+      case "tencent":
+        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dQQMapsImageryProvider({
+          mapStyle: layerConfig.layerType
+        }));
+        break;
+
+      case "bing":
+        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.BingMapsImageryProvider({
+          url: layerConfig.url || "https://dev.virtualearth.net",
+          key: layerConfig.key || "AmXdbd8UeUJtaRSn7yVwyXgQlBBUqliLbHpgn2c76DfuHwAXfRrgS5qwfHU6Rhm8",
+          mapStyle: layerConfig.layerType
+        }));
+        break;
+
+      case "arcgisonline":
+        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dArcGISMapServerImageryProvider({
+          url: layerConfig.url
+        }));
+        break;
+
+      case "mapbox":
+        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.MapboxImageryProvider({
+          mapId: "mapbox." + layerConfig.layerType,
+          accessToken: layerConfig.key || "pk.eyJ1IjoiZXhhbXBsZXMiLCJhIjoiY2p1dHRybDR5MGJuZjQzcGhrZ2doeGgwNyJ9.a-vxW4UaxOoUMWUTGnEArw"
+        }));
+        break;
+
+      case "osm":
+        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.createOpenStreetMapImageryProvider({
+          url: layerConfig.url
+        }));
+        break;
+    }
+
+    return layer;
   }
   /**
    * 操作在线底图，添加显示隐藏图层
@@ -2678,12 +2775,18 @@ class ScenceViewViewModel extends (mitt_default()) {
     });
 
     if (!layer) {
-      layer = this._createBaseLayer(layerConfig);
+      layer = this._createOnlineLayer(layerConfig);
       layer.name = guid;
       layer.target = "online";
     }
 
-    if (layer) layer.show = visible;
+    if (layer) {
+      if (visible) {
+        layer.show = visible;
+      } else {
+        this._viewer.imageryLayers.remove(layer);
+      }
+    }
   }
   /**
    * 移除所有在线底图在地图中的显示
@@ -2691,12 +2794,18 @@ class ScenceViewViewModel extends (mitt_default()) {
 
 
   removeAllOnlineBaseLayer() {
-    let imageryLayers = this._viewer.imageryLayers._layers;
-    imageryLayers.forEach(layer => {
+    let imageryLayers = this._viewer.imageryLayers;
+    let removeLayers = [];
+
+    imageryLayers._layers.forEach(layer => {
       if (layer.target === "online") {
-        imageryLayers.remove(layer);
+        removeLayers.push(layer);
       }
     });
+
+    removeLayers.forEach(layer => {
+      imageryLayers.remove(layer);
+    });
   } //获取三维视角
 
 
@@ -6746,26 +6855,39 @@ SightlineAnalysis.install = (Vue, opts) => {
 //可视域分析逻辑类
 class ViewshedAnalysisViewModel {
   //可视域分析三维对象
+  //三维场景对象
+  //可视域分析存储参数对象
   constructor(scenceView, options) {
     _defineProperty(this, "_viewshedAnalysis", null);
 
-    var scene = scenceView._viewer.scene;
-    scene.globe.depthTestAgainstTerrain = true;
+    _defineProperty(this, "_scene", null);
 
-    if (options.visibleColor) {
-      options.visibleColor = Cesium.Color.fromCssColorString(options.visibleColor);
+    _defineProperty(this, "_options", null);
+
+    this._scene = scenceView._viewer.scene;
+    this._scene.globe.depthTestAgainstTerrain = true;
+    this._options = options;
+
+    if (this._options.visibleColor) {
+      this._options.visibleColor = Cesium.Color.fromCssColorString(this._options.visibleColor);
     }
 
-    if (options.visibleColor) {
-      options.invisibleColor = Cesium.Color.fromCssColorString(options.invisibleColor);
+    if (this._options.visibleColor) {
+      this._options.invisibleColor = Cesium.Color.fromCssColorString(this._options.invisibleColor);
     }
 
-    this._viewshedAnalysis = new Cesium.Kq3dViewshedInteractive(scene, options);
+    this._viewshedAnalysis = new Cesium.Kq3dViewshedInteractive(this._scene, this._options);
   } //开始分析
 
 
   start() {
-    this._viewshedAnalysis.start(); // if (!this._viewshedAnalysis.isRunning()) {
+    if (this._viewshedAnalysis) {
+      this._viewshedAnalysis.start();
+    } else {
+      this._viewshedAnalysis = new Cesium.Kq3dViewshedInteractive(this._scene, this._options);
+
+      this._viewshedAnalysis.start();
+    } // if (!this._viewshedAnalysis.isRunning()) {
     //   // 绘制完成后，需要释放绘制事件
     // }
 
@@ -6774,6 +6896,8 @@ class ViewshedAnalysisViewModel {
 
   clear() {
     this._viewshedAnalysis && this._viewshedAnalysis.pause();
+    this._viewshedAnalysis && this._viewshedAnalysis.destroy();
+    this._viewshedAnalysis = null;
   } //销毁
 
 
@@ -6785,26 +6909,31 @@ class ViewshedAnalysisViewModel {
 
 
   setOffsetHeight(offsetHeight) {
+    this._options.offsetHeight = offsetHeight;
     this._viewshedAnalysis.attachedViewshed.offsetHeight = Number(offsetHeight);
   } //设置水平角
 
 
   setFovH(fovH) {
+    this._options.fovH = fovH;
     this._viewshedAnalysis.attachedViewshed.fovH = Number(fovH);
   } //设置竖直角
 
 
   setFovV(fovV) {
+    this._options.fovV = fovV;
     this._viewshedAnalysis.attachedViewshed.fovV = Number(fovV);
   } //设置可视颜色
 
 
   setVisibleColor(visibleColor) {
+    this._options.visibleColor = visibleColor;
     this._viewshedAnalysis.attachedViewshed.visibleColor = Cesium.Color.fromCssColorString(visibleColor);
   } //设置不可视颜色
 
 
   setInvisibleColor(invisibleColor) {
+    this._options.invisibleColor = invisibleColor;
     this._viewshedAnalysis.attachedViewshed.invisibleColor = Cesium.Color.fromCssColorString(invisibleColor);
   } //设置网格线颜色
 
@@ -7464,8 +7593,8 @@ class ShadowAnalysisViewModel {
   destroy() {
     this.clear(); //移除监听事件
 
-    this._drawFinishedEventListener && this._drawFinishedEventListener();
-    this._drawFinishedEventListener = null;
+    this._globaOptions._drawFinishedEventListener && this._globaOptions._drawFinishedEventListener();
+    this._globaOptions._drawFinishedEventListener = null;
   }
 
 }

package/package.json

@@ -1 +1 @@
-{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"0.7.4-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","@turf/turf":"^6.5.0","css-vars-ponyfill":"^2.4.8","xe-utils":"^3.5.4"}}
+{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"0.7.5-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","@turf/turf":"^6.5.0","css-vars-ponyfill":"^2.4.8","xe-utils":"^3.5.4"}}

package/scenceview/index.js

@@ -483,7 +483,7 @@ class DrawManager {
         });
       }
 
-      callFun && callFun();
+      callFun && callFun(that._viewer);
     });
   } //删除指定绘图分组的所有图形
 
@@ -2084,7 +2084,8 @@ class ScenceViewViewModel extends (mitt_default()) {
   _createBaseLayer(layerConfig) {
     let layer = null;
     let index = 1;
-    let layerType = layerConfig.serverType.toLowerCase();
+    let layerType = layerConfig.serverType;
+    if (layerType) layerType = layerType.toLowerCase();
 
     switch (layerType) {
       case "kqserver":
@@ -2209,6 +2210,102 @@ class ScenceViewViewModel extends (mitt_default()) {
         });
       }
     }
+  } //创建在线底图
+
+
+  _createOnlineLayer(layerConfig) {
+    let layer = null;
+    let layerType = layerConfig.renderType;
+    if (layerType) layerType = layerType.toLowerCase();
+
+    switch (layerType) {
+      case "kqserver":
+        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dKQGISMapServerImageryProviderExt({
+          url: layerConfig.url,
+          ua_token: layerConfig.accessToken
+        }));
+        break;
+
+      case "wmts":
+        let options = {
+          url: layerConfig.url,
+          layer: layerConfig.id,
+          tileMatrixSetID: layerConfig.tilematrixSet || "default028mm",
+          tileMatrixLabels: layerConfig.tileMatrixLabels,
+          style: layerConfig.style || "default",
+          format: layerConfig.format || "image/png",
+          minimumLevel: layerConfig.minZoom,
+          maximumLevel: layerConfig.maxZoom,
+          subdomains: layerConfig.subdomains,
+          tilingScheme: layerConfig.epsg === "4326" ? new Cesium.GeographicTilingScheme() : new Cesium.WebMercatorTilingScheme()
+        };
+        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.WebMapTileServiceImageryProvider(options));
+        break;
+
+      case "wms":
+        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.WebMapServiceImageryProvider({
+          url: layerConfig.url,
+          layers: layerConfig.id,
+          parameters: {
+            transparent: "true",
+            format: "image/png"
+          }
+        }));
+        break;
+
+      case "tianditu":
+        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dTiandituImageryProvider({
+          mapStyle: layerConfig.layerType + "_c"
+        }));
+        break;
+
+      case "baidu":
+        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dBaiduMapsImageryProvider({
+          mapStyle: layerConfig.layerType
+        }));
+        break;
+
+      case "gaode":
+        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dAMapsImageryProvider({
+          mapStyle: layerConfig.layerType
+        }));
+        break;
+
+      case "tencent":
+        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dQQMapsImageryProvider({
+          mapStyle: layerConfig.layerType
+        }));
+        break;
+
+      case "bing":
+        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.BingMapsImageryProvider({
+          url: layerConfig.url || "https://dev.virtualearth.net",
+          key: layerConfig.key || "AmXdbd8UeUJtaRSn7yVwyXgQlBBUqliLbHpgn2c76DfuHwAXfRrgS5qwfHU6Rhm8",
+          mapStyle: layerConfig.layerType
+        }));
+        break;
+
+      case "arcgisonline":
+        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dArcGISMapServerImageryProvider({
+          url: layerConfig.url
+        }));
+        break;
+
+      case "mapbox":
+        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.MapboxImageryProvider({
+          mapId: "mapbox." + layerConfig.layerType,
+          accessToken: layerConfig.key || "pk.eyJ1IjoiZXhhbXBsZXMiLCJhIjoiY2p1dHRybDR5MGJuZjQzcGhrZ2doeGgwNyJ9.a-vxW4UaxOoUMWUTGnEArw"
+        }));
+        break;
+
+      case "osm":
+        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.createOpenStreetMapImageryProvider({
+          url: layerConfig.url
+        }));
+        break;
+    }
+
+    return layer;
   }
   /**
    * 操作在线底图，添加显示隐藏图层
@@ -2225,12 +2322,18 @@ class ScenceViewViewModel extends (mitt_default()) {
     });
 
     if (!layer) {
-      layer = this._createBaseLayer(layerConfig);
+      layer = this._createOnlineLayer(layerConfig);
       layer.name = guid;
       layer.target = "online";
     }
 
-    if (layer) layer.show = visible;
+    if (layer) {
+      if (visible) {
+        layer.show = visible;
+      } else {
+        this._viewer.imageryLayers.remove(layer);
+      }
+    }
   }
   /**
    * 移除所有在线底图在地图中的显示
@@ -2238,12 +2341,18 @@ class ScenceViewViewModel extends (mitt_default()) {
 
 
   removeAllOnlineBaseLayer() {
-    let imageryLayers = this._viewer.imageryLayers._layers;
-    imageryLayers.forEach(layer => {
+    let imageryLayers = this._viewer.imageryLayers;
+    let removeLayers = [];
+
+    imageryLayers._layers.forEach(layer => {
       if (layer.target === "online") {
-        imageryLayers.remove(layer);
+        removeLayers.push(layer);
       }
     });
+
+    removeLayers.forEach(layer => {
+      imageryLayers.remove(layer);
+    });
   } //获取三维视角
 
 

package/shadowanalysis/index.js

@@ -294,8 +294,8 @@ class ShadowAnalysisViewModel {
   destroy() {
     this.clear(); //移除监听事件
 
-    this._drawFinishedEventListener && this._drawFinishedEventListener();
-    this._drawFinishedEventListener = null;
+    this._globaOptions._drawFinishedEventListener && this._globaOptions._drawFinishedEventListener();
+    this._globaOptions._drawFinishedEventListener = null;
   }
 
 }

package/viewshedanalysis/index.js

@@ -79,26 +79,39 @@ function _defineProperty(obj, key, value) {
 //可视域分析逻辑类
 class ViewshedAnalysisViewModel {
   //可视域分析三维对象
+  //三维场景对象
+  //可视域分析存储参数对象
   constructor(scenceView, options) {
     _defineProperty(this, "_viewshedAnalysis", null);
 
-    var scene = scenceView._viewer.scene;
-    scene.globe.depthTestAgainstTerrain = true;
+    _defineProperty(this, "_scene", null);
 
-    if (options.visibleColor) {
-      options.visibleColor = Cesium.Color.fromCssColorString(options.visibleColor);
+    _defineProperty(this, "_options", null);
+
+    this._scene = scenceView._viewer.scene;
+    this._scene.globe.depthTestAgainstTerrain = true;
+    this._options = options;
+
+    if (this._options.visibleColor) {
+      this._options.visibleColor = Cesium.Color.fromCssColorString(this._options.visibleColor);
     }
 
-    if (options.visibleColor) {
-      options.invisibleColor = Cesium.Color.fromCssColorString(options.invisibleColor);
+    if (this._options.visibleColor) {
+      this._options.invisibleColor = Cesium.Color.fromCssColorString(this._options.invisibleColor);
     }
 
-    this._viewshedAnalysis = new Cesium.Kq3dViewshedInteractive(scene, options);
+    this._viewshedAnalysis = new Cesium.Kq3dViewshedInteractive(this._scene, this._options);
   } //开始分析
 
 
   start() {
-    this._viewshedAnalysis.start(); // if (!this._viewshedAnalysis.isRunning()) {
+    if (this._viewshedAnalysis) {
+      this._viewshedAnalysis.start();
+    } else {
+      this._viewshedAnalysis = new Cesium.Kq3dViewshedInteractive(this._scene, this._options);
+
+      this._viewshedAnalysis.start();
+    } // if (!this._viewshedAnalysis.isRunning()) {
     //   // 绘制完成后，需要释放绘制事件
     // }
 
@@ -107,6 +120,8 @@ class ViewshedAnalysisViewModel {
 
   clear() {
     this._viewshedAnalysis && this._viewshedAnalysis.pause();
+    this._viewshedAnalysis && this._viewshedAnalysis.destroy();
+    this._viewshedAnalysis = null;
   } //销毁
 
 
@@ -118,26 +133,31 @@ class ViewshedAnalysisViewModel {
 
 
   setOffsetHeight(offsetHeight) {
+    this._options.offsetHeight = offsetHeight;
     this._viewshedAnalysis.attachedViewshed.offsetHeight = Number(offsetHeight);
   } //设置水平角
 
 
   setFovH(fovH) {
+    this._options.fovH = fovH;
     this._viewshedAnalysis.attachedViewshed.fovH = Number(fovH);
   } //设置竖直角
 
 
   setFovV(fovV) {
+    this._options.fovV = fovV;
     this._viewshedAnalysis.attachedViewshed.fovV = Number(fovV);
   } //设置可视颜色
 
 
   setVisibleColor(visibleColor) {
+    this._options.visibleColor = visibleColor;
     this._viewshedAnalysis.attachedViewshed.visibleColor = Cesium.Color.fromCssColorString(visibleColor);
   } //设置不可视颜色
 
 
   setInvisibleColor(invisibleColor) {
+    this._options.invisibleColor = invisibleColor;
     this._viewshedAnalysis.attachedViewshed.invisibleColor = Cesium.Color.fromCssColorString(invisibleColor);
   } //设置网格线颜色