@antv/l7-layers 2.9.27-alpha.2 → 2.9.27-alpha.4

package/es/Geometry/index.js

@@ -58,7 +58,9 @@ var GeometryLayer = /*#__PURE__*/function (_BaseLayer) {
       this.layerModel.initModels(function (models) {
         _this2.models = models;
 
-        _this2.renderLayers();
+        _this2.emit('modelLoaded', null);
+
+        _this2.layerService.throttleRenderLayers();
       });
     }
   }, {
@@ -67,7 +69,9 @@ var GeometryLayer = /*#__PURE__*/function (_BaseLayer) {
       var _this3 = this;
 
       this.layerModel.buildModels(function (models) {
-        return _this3.models = models;
+        _this3.models = models;
+
+        _this3.emit('modelLoaded', null);
       });
     }
   }, {

package/es/Geometry/models/billboard.js

@@ -166,8 +166,7 @@ var BillBoardModel = /*#__PURE__*/function (_BaseModel) {
           wrapS: gl.CLAMP_TO_EDGE,
           wrapT: gl.CLAMP_TO_EDGE
         });
-        this.layerService.updateLayerRenderList();
-        this.layerService.renderLayers();
+        this.layerService.reRender();
       }
     }
   }, {
@@ -192,7 +191,6 @@ var BillBoardModel = /*#__PURE__*/function (_BaseModel) {
         descriptor: {
           name: 'a_Extrude',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: gl.DYNAMIC_DRAW,
             data: [],
             type: gl.FLOAT
@@ -204,21 +202,19 @@ var BillBoardModel = /*#__PURE__*/function (_BaseModel) {
             return [extrude[extrudeIndex], extrude[extrudeIndex + 1], extrude[extrudeIndex + 2]];
           }
         }
-      }); // point layer size;
-
+      });
       this.styleAttributeService.registerStyleAttribute({
         name: 'uv',
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_Uv',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: gl.DYNAMIC_DRAW,
             data: [],
             type: gl.FLOAT
           },
           size: 2,
-          update: function update(feature, featureIdx, vertex, attributeIdx) {
+          update: function update(feature, featureIdx, vertex) {
             return [vertex[2], vertex[3]];
           }
         }

package/es/Geometry/models/plane.js

@@ -265,9 +265,7 @@ var PlaneModel = /*#__PURE__*/function (_BaseModel) {
             wrapT: gl.CLAMP_TO_EDGE
           });
 
-          _this3.layerService.updateLayerRenderList();
-
-          _this3.layerService.renderLayers();
+          _this3.layerService.reRender();
         };
 
         img.src = mapTexture;
@@ -302,10 +300,10 @@ var PlaneModel = /*#__PURE__*/function (_BaseModel) {
       var gridX1 = gridX + 1;
       var gridY1 = gridY + 1;
       var widthStep = imgWidth / gridX;
-      var heihgtStep = imgHeight / gridY;
+      var heightStep = imgHeight / gridY;
 
       for (var iy = 0; iy < gridY1; iy++) {
-        var imgIndexY = Math.floor(iy * heihgtStep);
+        var imgIndexY = Math.floor(iy * heightStep);
         var imgLen = imgIndexY * imgWidth;
 
         for (var ix = 0; ix < gridX1; ix++) {
@@ -328,7 +326,7 @@ var PlaneModel = /*#__PURE__*/function (_BaseModel) {
         };
       });
       this.layer.updateModelData(modelData);
-      this.layerService.renderLayers();
+      this.layerService.throttleRenderLayers();
     }
     /**
      * load terrain texture & offset attribute z
@@ -407,7 +405,7 @@ var PlaneModel = /*#__PURE__*/function (_BaseModel) {
             type: gl.FLOAT
           },
           size: 2,
-          update: function update(feature, featureIdx, vertex, attributeIdx) {
+          update: function update(feature, featureIdx, vertex) {
             return [vertex[3], vertex[4]];
           }
         }

package/es/Geometry/models/sprite.js

@@ -49,8 +49,7 @@ var SpriteModel = /*#__PURE__*/function (_BaseModel) {
           _ref$spriteBottom = _ref.spriteBottom,
           spriteBottom = _ref$spriteBottom === void 0 ? -100000 : _ref$spriteBottom;
 
-      var updateZ = _this.spriteUpdate; // const bottomZ = -100000;
-
+      var updateZ = _this.spriteUpdate;
       var bottomZ = spriteBottom;
       var topZ = _this.spriteTop;
 
@@ -79,7 +78,7 @@ var SpriteModel = /*#__PURE__*/function (_BaseModel) {
 
     _defineProperty(_assertThisInitialized(_this), "updateModel", function () {
       // @ts-ignore
-      var attributes = _this.layer.createAttrubutes({
+      var attributes = _this.layer.createAttributes({
         triangulation: _this.planeGeometryUpdateTriangulation
       });
 
@@ -87,7 +86,7 @@ var SpriteModel = /*#__PURE__*/function (_BaseModel) {
         m.updateAttributes(attributes);
       });
 
-      _this.layer.renderLayers();
+      _this.layerService.throttleRenderLayers();
 
       _this.timer = requestAnimationFrame(_this.updateModel);
     });
@@ -265,9 +264,7 @@ var SpriteModel = /*#__PURE__*/function (_BaseModel) {
             wrapT: gl.CLAMP_TO_EDGE
           });
 
-          _this4.layerService.updateLayerRenderList();
-
-          _this4.layerService.renderLayers();
+          _this4.layerService.reRender();
         };
 
         img.src = mapTexture;

package/es/canvas/index.d.ts

@@ -1,10 +1,14 @@
 import BaseLayer from '../core/BaseLayer';
+import { ILayer } from '@antv/l7-core';
 import { ICanvasLayerStyleOptions } from '../core/interface';
 import { CanvasModelType } from './models/index';
 export default class CanvasLayer extends BaseLayer<ICanvasLayerStyleOptions> {
     type: string;
+    forceRender: boolean;
     buildModels(): void;
     rebuildModels(): void;
+    hide(): ILayer;
+    renderModels(): this;
     protected getConfigSchema(): {
         properties: {
             opacity: {

package/es/canvas/index.js

@@ -31,6 +31,8 @@ var CanvasLayer = /*#__PURE__*/function (_BaseLayer) {
 
     _defineProperty(_assertThisInitialized(_this), "type", 'CanvasLayer');
 
+    _defineProperty(_assertThisInitialized(_this), "forceRender", true);
+
     return _this;
   }
 
@@ -44,7 +46,9 @@ var CanvasLayer = /*#__PURE__*/function (_BaseLayer) {
       this.layerModel.initModels(function (models) {
         _this2.models = models;
 
-        _this2.renderLayers();
+        _this2.emit('modelLoaded', null);
+
+        _this2.layerService.throttleRenderLayers();
       });
     }
   }, {
@@ -53,8 +57,40 @@ var CanvasLayer = /*#__PURE__*/function (_BaseLayer) {
       var _this3 = this;
 
       this.layerModel.buildModels(function (models) {
-        return _this3.models = models;
+        _this3.models = models;
+
+        _this3.emit('modelLoaded', null);
+      });
+    }
+  }, {
+    key: "hide",
+    value: function hide() {
+      var _this$layerModel;
+
+      // 清除画布
+      this.layerModel.clearCanvas && ((_this$layerModel = this.layerModel) === null || _this$layerModel === void 0 ? void 0 : _this$layerModel.clearCanvas());
+      this.updateLayerConfig({
+        visible: false
+      });
+      this.reRender();
+      return this;
+    }
+  }, {
+    key: "renderModels",
+    value: function renderModels() {
+      var _this$layerModel2,
+          _this4 = this;
+
+      if (this !== null && this !== void 0 && (_this$layerModel2 = this.layerModel) !== null && _this$layerModel2 !== void 0 && _this$layerModel2.renderUpdate) {
+        this.layerModel.renderUpdate();
+      }
+
+      this.models.forEach(function (model) {
+        model.draw({
+          uniforms: _this4.layerModel.getUninforms()
+        }, false);
       });
+      return this;
     }
   }, {
     key: "getConfigSchema",

package/es/citybuliding/building.js

@@ -43,7 +43,9 @@ var CityBuildingLayer = /*#__PURE__*/function (_BaseLayer) {
       this.layerModel.initModels(function (models) {
         _this2.models = models;
 
-        _this2.renderLayers();
+        _this2.emit('modelLoaded', null);
+
+        _this2.layerService.throttleRenderLayers();
       });
     }
   }, {
@@ -52,7 +54,9 @@ var CityBuildingLayer = /*#__PURE__*/function (_BaseLayer) {
       var _this3 = this;
 
       this.layerModel.buildModels(function (models) {
-        return _this3.models = models;
+        _this3.models = models;
+
+        _this3.emit('modelLoaded', null);
       });
     }
   }, {

package/es/citybuliding/models/build.js

@@ -154,7 +154,7 @@ var CityBuildModel = /*#__PURE__*/function (_BaseModel) {
             type: gl.FLOAT
           },
           size: 1,
-          update: function update(feature, featureIdx, vertex, attributeIdx) {
+          update: function update(feature) {
             var _feature$size = feature.size,
                 size = _feature$size === void 0 ? 10 : _feature$size;
             return Array.isArray(size) ? [size[0]] : [size];
@@ -173,8 +173,7 @@ var CityBuildModel = /*#__PURE__*/function (_BaseModel) {
             type: gl.FLOAT
           },
           size: 2,
-          update: function update(feature, featureIdx, vertex, attributeIdx) {
-            var size = feature.size;
+          update: function update(feature, featureIdx, vertex) {
             return [vertex[3], vertex[4]];
           }
         }

package/es/core/BaseLayer.d.ts

@@ -1,5 +1,5 @@
 import { SyncBailHook, SyncHook, SyncWaterfallHook } from '@antv/async-hook';
-import { BlendType, IActiveOption, IAnimateOption, IAttrubuteAndElements, ICameraService, ICoordinateSystemService, IDataState, IEncodeFeature, IFontService, IGlobalConfigService, IIconService, IInteractionService, ILayer, ILayerConfig, ILayerModel, ILayerModelInitializationOptions, ILayerPlugin, ILayerService, IMapService, IModel, IModelInitializationOptions, IMultiPassRenderer, IPass, IPickingService, IPostProcessingPass, IRendererService, IScale, IScaleOptions, IShaderModuleService, ISourceCFG, IStyleAttributeService, IStyleAttributeUpdateOptions, LayerEventType, LegendItems, StyleAttributeField, StyleAttributeOption, Triangulation } from '@antv/l7-core';
+import { BlendType, IActiveOption, IAnimateOption, IAttributeAndElements, ICameraService, ICoordinateSystemService, IDataState, IEncodeFeature, IFontService, IGlobalConfigService, IIconService, IInteractionService, ILayer, ILayerConfig, ILayerModel, ILayerModelInitializationOptions, ILayerPlugin, ILayerService, IMapService, IModel, IModelInitializationOptions, IMultiPassRenderer, IPass, IPickingService, IPostProcessingPass, IRendererService, IScale, IScaleOptions, IShaderModuleService, ISourceCFG, IStyleAttributeService, IStyleAttributeUpdateOptions, LayerEventType, LegendItems, StyleAttributeField, StyleAttributeOption, Triangulation } from '@antv/l7-core';
 import Source from '@antv/l7-source';
 import { EventEmitter } from 'eventemitter3';
 import { Container } from 'inversify';
@@ -77,21 +77,26 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
     /**
      * 图层容器
      */
-    private container;
+    protected container: Container;
     private encodedData;
-    private configSchema;
     private currentPickId;
-    private rawConfig;
+    protected rawConfig: Partial<ILayerConfig & ChildLayerStyleOptions>;
     private needUpdateConfig;
     /**
      * 待更新样式属性，在初始化阶段完成注册
      */
-    private pendingStyleAttributes;
+    protected pendingStyleAttributes: Array<{
+        attributeName: string;
+        attributeField: StyleAttributeField;
+        attributeValues?: StyleAttributeOption;
+        defaultName?: string;
+        updateOptions?: Partial<IStyleAttributeUpdateOptions>;
+    }>;
     private scaleOptions;
     private animateStartTime;
-    private aniamateStatus;
+    private animateStatus;
     private bottomColor;
-    private isDestroied;
+    private isDestroyed;
     constructor(config?: Partial<ILayerConfig & ChildLayerStyleOptions>);
     addMaskLayer(maskLayer: ILayer): void;
     removeMaskLayer(maskLayer: ILayer): void;
@@ -110,7 +115,7 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
     getBottomColor(): string;
     addPlugin(plugin: ILayerPlugin): ILayer;
     init(): this;
-    updateModelData(data: IAttrubuteAndElements): void;
+    updateModelData(data: IAttributeAndElements): void;
     createModelData(data: any, option?: ISourceCFG): any;
     calculateEncodeData(data: any, option?: ISourceCFG): IEncodeFeature[] | null;
     /**
@@ -188,7 +193,7 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
     }): void;
     boxSelect(box: [number, number, number, number], cb: (...args: any[]) => void): void;
     buildLayerModel(options: ILayerModelInitializationOptions & Partial<IModelInitializationOptions>): Promise<IModel>;
-    createAttrubutes(options: ILayerModelInitializationOptions & Partial<IModelInitializationOptions>): any;
+    createAttributes(options: ILayerModelInitializationOptions & Partial<IModelInitializationOptions>): any;
     getTime(): number;
     setAnimateStartTime(): void;
     stopAnimate(): void;
@@ -208,7 +213,10 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
     protected getConfigSchema(): void;
     protected getModelType(): unknown;
     protected getDefaultConfig(): {};
-    private sourceEvent;
-    private reRender;
-    private splitValuesAndCallbackInAttribute;
+    protected sourceEvent: () => void;
+    protected reRender(): void;
+    protected splitValuesAndCallbackInAttribute(valuesOrCallback?: unknown[], defaultValues?: unknown[]): {
+        values: unknown[] | undefined;
+        callback: (unknown[] & ((...args: any[]) => any)) | undefined;
+    };
 }

package/es/core/BaseLayer.js

@@ -52,13 +52,13 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
 
   // 生命周期钩子
   // 待渲染 model 列表
-  // TODO: 用于保存子图层对象
+  // 用于保存子图层对象
   // Tip: 用于标识矢量图层
 
   /**
    * 待更新样式属性，在初始化阶段完成注册
    */
-  // TODO: layer 保底颜色
+  // Tip: layer 保底颜色
   // private pickingPassRender: IPass<'pixelPicking'>;
   function BaseLayer() {
     var _this;
@@ -144,11 +144,11 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
 
     _defineProperty(_assertThisInitialized(_this), "scaleOptions", {});
 
-    _defineProperty(_assertThisInitialized(_this), "aniamateStatus", false);
+    _defineProperty(_assertThisInitialized(_this), "animateStatus", false);
 
     _defineProperty(_assertThisInitialized(_this), "bottomColor", 'rgba(0, 0, 0, 0)');
 
-    _defineProperty(_assertThisInitialized(_this), "isDestroied", false);
+    _defineProperty(_assertThisInitialized(_this), "isDestroyed", false);
 
     _defineProperty(_assertThisInitialized(_this), "encodeDataLength", 0);
 
@@ -159,9 +159,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
 
       if (layerConfig && layerConfig.autoFit) {
         _this.fitBounds(layerConfig.fitBoundsOptions);
-      } // 对外暴露事件 迁移到 DataMappingPlugin generateMapping，保证在重新重新映射后触发
-      // this.emit('dataUpdate');
-
+      }
 
       _this.reRender();
     });
@@ -253,11 +251,6 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
   }, {
     key: "addPlugin",
     value: function addPlugin(plugin) {
-      // TODO: 控制插件注册顺序
-      // @example:
-      // pointLayer.addPlugin(new MyCustomPlugin(), {
-      //   before: 'L7BuiltinPlugin'
-      // });
       this.plugins.push(plugin);
       return this;
     }
@@ -420,21 +413,13 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
 
       if (animateOption !== null && animateOption !== void 0 && animateOption.enable) {
         this.layerService.startAnimate();
-        this.aniamateStatus = true;
+        this.animateStatus = true;
       }
     }
   }, {
     key: "color",
     value: function color(field, values, updateOptions) {
-      // 设置 color、size、shape、style 时由于场景服务尚未完成（并没有调用 scene.addLayer），因此暂时加入待更新属性列表
-      this.updateStyleAttribute('color', field, values, updateOptions); // this.pendingStyleAttributes.push({
-      //   attributeName: 'color',
-      //   attributeField: field,
-      //   attributeValues: values,
-      //   defaultName: 'colors',
-      //   updateOptions,
-      // });
-
+      this.updateStyleAttribute('color', field, values, updateOptions);
       return this;
     } // 为对应的图层传入纹理的编号名称（point/image 在 shape 方法中传入纹理名称的方法并不通用）
 
@@ -474,7 +459,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
         field: field,
         values: values
       };
-      this.updateStyleAttribute('shape', field, values, updateOptions); // TODO: 根据 shape 判断是否需要更新 model
+      this.updateStyleAttribute('shape', field, values, updateOptions); // Tip: 根据 shape 判断是否需要更新 model
 
       if (!this.tileLayer) {
         updateShape(this, lastShape, currentShape);
@@ -507,8 +492,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
 
       this.updateLayerConfig({
         animateOption: rawAnimate
-      }); // this.animateOptions = options;
-
+      });
       return this;
     }
   }, {
@@ -615,7 +599,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
   }, {
     key: "render",
     value: function render() {
-      if (this.tileLayer !== undefined) {
+      if (this.tileLayer) {
         // 瓦片图层执行单独的 render 渲染队列
         this.tileLayer.render();
         return this;
@@ -812,11 +796,6 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
   }, {
     key: "hide",
     value: function hide() {
-      if (this.type === 'CanvasLayer' && this.layerModel.clearCanvas) {
-        // 对 canvasLayer 的 hide 操作做特殊处理
-        this.layerModel.clearCanvas();
-      }
-
       this.updateLayerConfig({
         visible: false
       });
@@ -972,35 +951,34 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
   }, {
     key: "destroy",
     value: function destroy() {
-      var _this$layerModel2;
+      var _this$multiPassRender, _this$layerModel2;
 
       var refresh = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
 
-      if (this.isDestroied) {
+      if (this.isDestroyed) {
         return;
       } // remove child layer
 
 
       this.layerChildren.map(function (child) {
-        return child.destroy();
+        return child.destroy(false);
       });
       this.layerChildren = []; // remove mask list
 
       this.masks.map(function (mask) {
-        return mask.destroy();
+        return mask.destroy(false);
       });
       this.masks = [];
       this.hooks.beforeDestroy.call(); // 清除sources事件
 
       this.layerSource.off('sourceUpdate', this.sourceEvent);
-      this.multiPassRenderer.destroy(); // console.log(this.styleAttributeService.getAttributes())
-      // 清除所有属性以及关联的 vao == 销毁所有 => model this.models.forEach((model) => model.destroy());
+      (_this$multiPassRender = this.multiPassRenderer) === null || _this$multiPassRender === void 0 ? void 0 : _this$multiPassRender.destroy(); // 清除所有属性以及关联的 vao == 销毁所有 => model this.models.forEach((model) => model.destroy());
 
       this.styleAttributeService.clearAllAttributes(); // 执行每个图层单独的 clearModels 方法 （清除一些额外的 texture、program、buffer 等）
 
-      this.hooks.afterDestroy.call(); // TODO: 清除各个图层自定义的 models 资源
+      this.hooks.afterDestroy.call(); // Tip: 清除各个图层自定义的 models 资源
 
-      (_this$layerModel2 = this.layerModel) === null || _this$layerModel2 === void 0 ? void 0 : _this$layerModel2.clearModels();
+      (_this$layerModel2 = this.layerModel) === null || _this$layerModel2 === void 0 ? void 0 : _this$layerModel2.clearModels(refresh);
       this.models = [];
       this.layerService.cleanRemove(this, refresh);
       this.emit('remove', {
@@ -1014,7 +992,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
       this.removeAllListeners(); // 解绑图层容器中的服务
       // this.container.unbind(TYPES.IStyleAttributeService);
 
-      this.isDestroied = true;
+      this.isDestroyed = true;
     }
   }, {
     key: "clear",
@@ -1176,50 +1154,52 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
 
       var createModel = this.rendererService.createModel;
       return new Promise(function (resolve, reject) {
-        // filter supported worker & worker enabled layer
-        if (workerOptions && workerOptions.modelType in WorkerSourceMap && workerEnabled) {
-          _this9.styleAttributeService.createAttributesAndIndicesAscy(_this9.encodedData, segmentNumber, workerOptions).then(function (_ref7) {
-            var attributes = _ref7.attributes,
-                elements = _ref7.elements;
-            var m = createModel(_objectSpread({
+        setTimeout(function () {
+          // filter supported worker & worker enabled layer
+          if (workerOptions && workerOptions.modelType in WorkerSourceMap && workerEnabled) {
+            _this9.styleAttributeService.createAttributesAndIndicesAscy(_this9.encodedData, segmentNumber, workerOptions).then(function (_ref7) {
+              var attributes = _ref7.attributes,
+                  elements = _ref7.elements;
+              var m = createModel(_objectSpread({
+                attributes: attributes,
+                uniforms: uniforms,
+                fs: fs,
+                vs: vs,
+                elements: elements,
+                blend: BlendTypes[BlendType.normal]
+              }, rest));
+              resolve(m);
+            }).catch(function (err) {
+              return reject(err);
+            });
+          } else {
+            var _this9$styleAttribute = _this9.styleAttributeService.createAttributesAndIndices(_this9.encodedData, triangulation, segmentNumber),
+                attributes = _this9$styleAttribute.attributes,
+                elements = _this9$styleAttribute.elements,
+                count = _this9$styleAttribute.count;
+
+            var modelOptions = _objectSpread({
               attributes: attributes,
               uniforms: uniforms,
               fs: fs,
               vs: vs,
               elements: elements,
               blend: BlendTypes[BlendType.normal]
-            }, rest));
+            }, rest);
+
+            if (count) {
+              modelOptions.count = count;
+            }
+
+            var m = createModel(modelOptions);
             resolve(m);
-          }).catch(function (err) {
-            return reject(err);
-          });
-        } else {
-          var _this9$styleAttribute = _this9.styleAttributeService.createAttributesAndIndices(_this9.encodedData, triangulation, segmentNumber),
-              attributes = _this9$styleAttribute.attributes,
-              elements = _this9$styleAttribute.elements,
-              count = _this9$styleAttribute.count;
-
-          var modeloptions = _objectSpread({
-            attributes: attributes,
-            uniforms: uniforms,
-            fs: fs,
-            vs: vs,
-            elements: elements,
-            blend: BlendTypes[BlendType.normal]
-          }, rest);
-
-          if (count) {
-            modeloptions.count = count;
           }
-
-          var m = createModel(modeloptions);
-          resolve(m);
-        }
+        });
       });
     }
   }, {
-    key: "createAttrubutes",
-    value: function createAttrubutes(options) {
+    key: "createAttributes",
+    value: function createAttributes(options) {
       var triangulation = options.triangulation; // @ts-ignore
 
       var _this$styleAttributeS4 = this.styleAttributeService.createAttributes(this.encodedData, triangulation),
@@ -1240,9 +1220,9 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
   }, {
     key: "stopAnimate",
     value: function stopAnimate() {
-      if (this.aniamateStatus) {
+      if (this.animateStatus) {
         this.layerService.stopAnimate();
-        this.aniamateStatus = false;
+        this.animateStatus = false;
         this.updateLayerConfig({
           animateOption: {
             enable: false
@@ -1258,6 +1238,9 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
   }, {
     key: "needPick",
     value: function needPick(type) {
+      // 地图图层的判断
+      if (this.rawConfig.usage === 'basemap') return false;
+
       var _this$getLayerConfig10 = this.getLayerConfig(),
           _this$getLayerConfig11 = _this$getLayerConfig10.enableHighlight,
           enableHighlight = _this$getLayerConfig11 === void 0 ? true : _this$getLayerConfig11,
@@ -1315,8 +1298,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
   }, {
     key: "renderModels",
     value: function renderModels(isPicking) {
-      var _this10 = this,
-          _this$layerModel4;
+      var _this10 = this;
 
       // TODO: this.getEncodedData().length > 0 这个判断是为了解决在 2.5.x 引入数据纹理后产生的 空数据渲染导致 texture 超出上限问题
       if (this.encodeDataLength <= 0 && !this.forceRender) return this;
@@ -1331,10 +1313,6 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
         });
       }
 
-      if (this !== null && this !== void 0 && (_this$layerModel4 = this.layerModel) !== null && _this$layerModel4 !== void 0 && _this$layerModel4.renderUpdate) {
-        this.layerModel.renderUpdate();
-      }
-
       this.models.forEach(function (model) {
         model.draw({
           uniforms: _this10.layerModel.getUninforms()
@@ -1373,6 +1351,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
      * 继承空方法
      * @param time
      */
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
 
   }, {
     key: "setEarthTime",
@@ -1397,10 +1376,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
   }, {
     key: "reRender",
     value: function reRender() {
-      if (this.inited) {
-        this.layerService.updateLayerRenderList();
-        this.layerService.renderLayers();
-      }
+      this.inited && this.layerService.reRender();
     }
   }, {
     key: "splitValuesAndCallbackInAttribute",

package/es/core/BaseModel.d.ts

@@ -29,7 +29,7 @@ export default class BaseModel<ChildLayerStyleOptions = {}> implements ILayerMod
     protected cellLength: number;
     protected cellProperties: ICellProperty[];
     protected cellTypeLayout: number[];
-    protected stylePropertyesExist: {
+    protected stylePropertiesExist: {
         hasThetaOffset: number;
         hasOpacity: number;
         hasStrokeOpacity: number;
@@ -126,7 +126,7 @@ export default class BaseModel<ChildLayerStyleOptions = {}> implements ILayerMod
     needUpdate(): boolean;
     buildModels(callbackModel: (models: IModel[]) => void): void;
     initModels(callbackModel: (models: IModel[]) => void): void;
-    clearModels(): void;
+    clearModels(refresh?: boolean): void;
     getAttribute(): {
         attributes: {
             [attributeName: string]: IAttribute;