【SDK】【修复】【修复优化Echarts图层跟随事件&减少无效的渲染次数】

Author: 潘卓然Y7000P

src/cesiumjs/core/Base.js

@@ -17,6 +17,8 @@ CesiumZondy.Manager = CesiumZondy.Manager || {};
 
 CesiumZondy.UI = CesiumZondy.UI || {};
 
+CesiumZondy.Query = CesiumZondy.Query || {};
+
 CesiumZondy.GeoSpark = CesiumZondy.GeoSpark || {};
 CesiumZondy.ElasticSearch = CesiumZondy.ElasticSearch || {};
 CesiumZondy.Overlayer = CesiumZondy.Overlayer || {};

src/cesiumjs/index.js

@@ -9,4 +9,4 @@ export * from './layer';
 export * from './overlay';
 export * from './provider';
 
-// export * from './render';
+export * from './render';

src/cesiumjs/layer/M3DLayer.js

@@ -82,7 +82,7 @@ export default class M3DLayer extends BaseLayer {
      * @param {Boolean} [optionsParam.showBoundingVolume = false] 是否显示包围盒
      * @param {Number} [optionsParam.maximumScreenSpaceError = 16] 用于控制模型显示细节  值较大将会渲染更少的贴图,进而可以提高性能,而较低的值将提高视觉质量
      * @see {@link https://cesium.com/docs/cesiumjs-ref-doc/Cesium3DTileset.html}
-     * @returns [Array<MapGISM3DSet>] 返回m3d图层对象数组,长度为图层对象个数
+     * @returns {Array<MapGISM3DSet>} 返回m3d图层对象数组,长度为图层对象个数
      * @example
      * function callBackfunction(layer){
      * console.log(layer)
@@ -225,7 +225,7 @@ export default class M3DLayer extends BaseLayer {
      * @function module:客户端数据服务.M3DLayer.prototype.setM3dLayerMovement
      * @param {MapGISM3DSet} layer m3d图层对象
      * @param {Cartesian3} direction 移动方向
-     * @param {Number}} distance 移动距离
+     * @param {Number} distance 移动距离
      * @example
      *  let tilelayer = m3d.append('http://develop.smaryun.com:6163/igs/rest/g3d/ModelM3D',{});
      *  let dir = new Cesium.Cartesian3(0.0, 1.0, 1.0); 分别表示xyz方向

src/cesiumjs/layer/TerrainLayer.js

@@ -59,7 +59,6 @@ export default class TerrainLayer extends BaseLayer {
      * @param {String} url 地形文档服务地址
      * @param {Object} optionsParam 包含以下参数
      * @param {Boolean} [optionsParam.synchronous = true] 是否异步请求
-     * @param {Function} [optionsParam.loaded = function] 回调函数
      * @param {DefaultProxy} [optionsParam.proxy = defaultProxy] 代理
      * @returns 地形层对象
      * @example

src/cesiumjs/layer/ThirdPartyLayer.js

@@ -19,7 +19,7 @@ export default class ThirdPartyLayer extends BaseLayer {
      * 添加谷歌服务地址
      * @function module:客户端数据服务.ThirdPartyLayer.prototype.appendGoogleMap
      * @param {Object} optionsParam 预留扩展参数
-     * @param {String} optionsParam.ptype 类型：矢量‘m@207000000’ 影像‘s@130’ 栅格‘t@130,r@207000000 道路‘h@207000000’
+     * @param {String} optionsParam.ptype 类型：矢量'm@207000000' 影像's@130' 栅格't@130,r@207000000' 道路'h@207000000'
      * @returns 瓦片层对象 可用于操作移除
      * @example
      * let tilelayer = thirdLayer.appendGoogleMap({ptype:'m@207000000'});
@@ -33,7 +33,7 @@ export default class ThirdPartyLayer extends BaseLayer {
         if (offset) {
             offsetLabel = '&gl=cn';
         }
-        let _url = `http://mt{s}.google.cn/vt/{type}&hl=zh-CN${offsetLabel}&x={x}&y={y}&z={z}&s=Galileo`;
+        let _url = `http://mt{s}.google.cn/vt/lyrs={type}&hl=zh-CN${offsetLabel}&x={x}&y={y}&z={z}&s=Galileo`;
         _url = _url.replace('{type}', options.ptype);
         const googleMap = this.viewer.imageryLayers.addImageryProvider(
             new Cesium.GoogleMapProvider({
@@ -48,11 +48,12 @@ export default class ThirdPartyLayer extends BaseLayer {
      * @function module:客户端数据服务.ThirdPartyLayer.prototype.appendGoogleMapExt
      * @param {Object} optionsParam 参数
      * @param {Object} optionsParam.ptype {ptype:'s'} 类型
-     * s:卫星地图
-     * h:skeleton map light
-     * m:全地图
-     * r:skeleton map dark
-     * t:地形图
+     * m：路线图
+     * t：地形图
+     * p：带标签的地形图
+     * s：卫星图
+     * y：带标签的卫星图
+     * h：标签层（路名、地名等）
      * 也可以进行组合，例如：s,r 或者 t,h
      * @returns {ImageryLayer} 瓦片层对象 可用于操作移除
      * @example
@@ -67,7 +68,7 @@ export default class ThirdPartyLayer extends BaseLayer {
      * 添加高德地图服务
      * @function module:客户端数据服务.ThirdPartyLayer.prototype.appendGaodeMap
      * @param {Object} optionsParam 参数
-     * @param {String} optionsParam.ptype 地图类型：'vec', 'raod', 'img'
+     * @param {String} optionsParam.ptype 地图类型：'vec', 'road', 'img'
      * @param {Number} [optionsParam.maximumLevel = 16] 最大级别
      * @returns 瓦片层对象
      * @example
@@ -119,6 +120,7 @@ export default class ThirdPartyLayer extends BaseLayer {
      * @function module:客户端数据服务.ThirdPartyLayer.prototype.appendOpenWeatherMap
      * @param {Object} optionsParam 参数
      * @param {Type} optionsParam.ptype 类型有: Pressure,Temperature,Windspeed,Clouds,Label
+     * @param {String} optionsParam.appid 授权码
      * @returns {ImageryLayer} 瓦片层对象
      * @example
      * let tilelayer = thirdLayer.appendOpenWeatherMap({ptype:'Label',appid:'b1b15e88fa797225412429c150c122a1'});

src/cesiumjs/overlay/EchartsLayer.js

@@ -131,6 +131,7 @@ export default class EchartsLayer {
 
         this.initDevicePixelRatio();
 
+        this.visible = true;
         this.canvas = this._createCanvas();
         this.postRenderTime = 0;
         this.postRenderFrame = options.postRenderFrame || 30;
@@ -252,10 +253,12 @@ export default class EchartsLayer {
     }
 
     _visible() {
+        this.visible = true;
         this.canvas.style.visibility = "visible";
     }
 
     _unvisible() {
+        this.visible = false;
         this.canvas.style.visibility = "hidden";
     }
 
@@ -277,7 +280,7 @@ export default class EchartsLayer {
                 var viewportRoot = api.getZr().painter.getViewportRoot()
                 var coordSys = mapModel.coordinateSystem
                 var moveHandler = function (type, target) {
-                    if (rendering  || !self.map) {
+                    if (rendering  || !self.map || !self.visible) {
                         return
                     }
                     self._unvisible();
@@ -298,7 +301,7 @@ export default class EchartsLayer {
                 }
 
                 var moveEndHandler = function (type, target) {
-                    if (rendering || !self.map) {
+                    if (rendering || !self.map || !self.visible) {
                         return
                     }
                     var offsetEl = self.map.canvas;