@antv/l7-layers 2.9.27-alpha.3 → 2.9.27

package/es/Geometry/models/billboard.js

@@ -191,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
@@ -203,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

@@ -300,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++) {
@@ -405,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
       });
 

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';
@@ -79,7 +79,6 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
      */
     protected container: Container;
     private encodedData;
-    private configSchema;
     private currentPickId;
     protected rawConfig: Partial<ILayerConfig & ChildLayerStyleOptions>;
     private needUpdateConfig;
@@ -95,9 +94,9 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
     }>;
     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;
@@ -116,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;
     /**
@@ -194,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;

package/es/core/BaseLayer.js

@@ -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);
 
@@ -251,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;
     }
@@ -418,7 +413,7 @@ 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;
       }
     }
   }, {
@@ -497,8 +492,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
 
       this.updateLayerConfig({
         animateOption: rawAnimate
-      }); // this.animateOptions = options;
-
+      });
       return this;
     }
   }, {
@@ -957,11 +951,11 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
   }, {
     key: "destroy",
     value: function destroy() {
-      var _this$multiPassRender, _this$layerModel2;
+      var _this$multiPassRender, _this$layerModel2, _this$tileLayer;
 
       var refresh = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
 
-      if (this.isDestroied) {
+      if (this.isDestroyed) {
         return;
       } // remove child layer
 
@@ -985,6 +979,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
       this.hooks.afterDestroy.call(); // Tip: 清除各个图层自定义的 models 资源
 
       (_this$layerModel2 = this.layerModel) === null || _this$layerModel2 === void 0 ? void 0 : _this$layerModel2.clearModels(refresh);
+      (_this$tileLayer = this.tileLayer) === null || _this$tileLayer === void 0 ? void 0 : _this$tileLayer.destroy();
       this.models = [];
       this.layerService.cleanRemove(this, refresh);
       this.emit('remove', {
@@ -998,7 +993,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
       this.removeAllListeners(); // 解绑图层容器中的服务
       // this.container.unbind(TYPES.IStyleAttributeService);
 
-      this.isDestroied = true;
+      this.isDestroyed = true;
     }
   }, {
     key: "clear",
@@ -1184,7 +1179,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
                 elements = _this9$styleAttribute.elements,
                 count = _this9$styleAttribute.count;
 
-            var modeloptions = _objectSpread({
+            var modelOptions = _objectSpread({
               attributes: attributes,
               uniforms: uniforms,
               fs: fs,
@@ -1194,18 +1189,18 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
             }, rest);
 
             if (count) {
-              modeloptions.count = count;
+              modelOptions.count = count;
             }
 
-            var m = createModel(modeloptions);
+            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),
@@ -1226,9 +1221,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

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;

package/es/core/BaseModel.js

@@ -61,7 +61,7 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
       stroke: undefined,
       offsets: undefined
     };
-    this.stylePropertyesExist = {
+    this.stylePropertiesExist = {
       hasThetaOffset: 0,
       hasOpacity: 0,
       hasStrokeOpacity: 0,
@@ -97,7 +97,7 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
 
       this.cellLength = 0; // 清空上一次计算的 cell 的长度
 
-      this.stylePropertyesExist = {
+      this.stylePropertiesExist = {
         // 全量清空上一次是否需要对 style 属性进行数据映射的判断
         hasThetaOffset: 0,
         hasOpacity: 0,
@@ -115,13 +115,13 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
         this.rowCount, // 数据纹理有几行
         this.DATA_TEXTURE_WIDTH, // 数据纹理有几列
         0.0, 0.0, // 1
-        this.stylePropertyesExist.hasOpacity, // cell 中是否存在 opacity
-        this.stylePropertyesExist.hasStrokeOpacity, // cell 中是否存在 strokeOpacity
-        this.stylePropertyesExist.hasStrokeWidth, // cell 中是否存在 strokeWidth
-        this.stylePropertyesExist.hasStroke, // cell 中是否存在 stroke
+        this.stylePropertiesExist.hasOpacity, // cell 中是否存在 opacity
+        this.stylePropertiesExist.hasStrokeOpacity, // cell 中是否存在 strokeOpacity
+        this.stylePropertiesExist.hasStrokeWidth, // cell 中是否存在 strokeWidth
+        this.stylePropertiesExist.hasStroke, // cell 中是否存在 stroke
         // 2
-        this.stylePropertyesExist.hasOffsets, // cell 中是否存在 offsets
-        this.stylePropertyesExist.hasThetaOffset, // cell 中是否存在 thetaOffset
+        this.stylePropertiesExist.hasOffsets, // cell 中是否存在 offsets
+        this.stylePropertiesExist.hasThetaOffset, // cell 中是否存在 thetaOffset
         0.0, 0.0, // 3
         0.0, 0.0, 0.0, 1.0];
       } else {
@@ -198,7 +198,7 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
           attr: 'opacity',
           count: 1
         });
-        this.stylePropertyesExist.hasOpacity = 1;
+        this.stylePropertiesExist.hasOpacity = 1;
         this.cellLength += 1;
       }
 
@@ -208,7 +208,7 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
           attr: 'strokeOpacity',
           count: 1
         });
-        this.stylePropertyesExist.hasStrokeOpacity = 1;
+        this.stylePropertiesExist.hasStrokeOpacity = 1;
         this.cellLength += 1;
       }
 
@@ -218,7 +218,7 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
           attr: 'strokeWidth',
           count: 1
         });
-        this.stylePropertyesExist.hasStrokeWidth = 1;
+        this.stylePropertiesExist.hasStrokeWidth = 1;
         this.cellLength += 1;
       }
 
@@ -228,7 +228,7 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
           attr: 'stroke',
           count: 4
         });
-        this.stylePropertyesExist.hasStroke = 1;
+        this.stylePropertiesExist.hasStroke = 1;
         this.cellLength += 4;
       }
 
@@ -238,7 +238,7 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
           attr: 'offsets',
           count: 2
         });
-        this.stylePropertyesExist.hasOffsets = 1;
+        this.stylePropertiesExist.hasOffsets = 1;
         this.cellLength += 2;
       }
 
@@ -248,10 +248,9 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
           attr: 'thetaOffset',
           count: 1
         });
-        this.stylePropertyesExist.hasThetaOffset = 1;
+        this.stylePropertiesExist.hasThetaOffset = 1;
         this.cellLength += 1;
-      } // console.log('this.cellLength', this.cellLength)
-
+      }
     }
     /**
      * 判断变量 stroke 是否是常量值

package/es/core/interface.d.ts

@@ -1,4 +1,4 @@
-import { IAnimateOption, IMapService } from '@antv/l7-core';
+import { IAnimateOption, IMapService, ITexture2D } from '@antv/l7-core';
 import { IColorRamp, IImagedata } from '@antv/l7-utils';
 import { styleOffset } from '../core/BaseModel';
 import { anchorType } from '../utils/symbol-layout';
@@ -143,6 +143,7 @@ export interface IImageLayerStyleOptions extends IBaseLayerStyleOptions {
     clampHigh?: boolean;
     rampColors?: IColorRamp;
     rampColorsData?: ImageData | IImagedata;
+    colorTexture?: ITexture2D;
     pixelConstant?: number;
     pixelConstantR?: number;
     pixelConstantG?: number;
@@ -209,6 +210,7 @@ export interface IHeatMapLayerStyleOptions extends IBaseLayerStyleOptions {
     coverage?: number;
 }
 export interface IRasterLayerStyleOptions extends IBaseLayerStyleOptions {
+    colorTexture?: ITexture2D;
     domain: [number, number];
     noDataValue: number;
     clampLow: boolean;

package/es/earth/models/atmosphere.js

@@ -14,7 +14,7 @@ import BaseModel from "../../core/BaseModel";
 import { earthTriangulation } from "../../core/triangulation";
 
 /* babel-plugin-inline-import '../shaders/atmosphere_frag.glsl' */
-var atmoSphereFrag = "\nuniform float u_opacity;\nuniform vec3 u_CameraPosition;\n\nvarying vec3 vVertexNormal;\nvarying float v_offset;\nvarying vec4 v_Color;\nvoid main() {\n    \n    \n    // float intensity = pow(0.5 + dot(normalize(vVertexNormal), normalize(u_CameraPosition)), 3.0);\n    float intensity = pow(v_offset + dot(normalize(vVertexNormal), normalize(u_CameraPosition)), 3.0);\n    // TODO: \u53BB\u9664\u80CC\u9762\n    if(intensity > 1.0) intensity = 0.0;\n\n    gl_FragColor = vec4(v_Color.rgb, v_Color.a * intensity * u_opacity);\n}\n";
+var atmoSphereFrag = "\nuniform float u_opacity;\nuniform vec3 u_CameraPosition;\n\nvarying vec3 vVertexNormal;\nvarying float v_offset;\nvarying vec4 v_Color;\nvoid main() {\n    \n    \n    // float intensity = pow(0.5 + dot(normalize(vVertexNormal), normalize(u_CameraPosition)), 3.0);\n    float intensity = pow(v_offset + dot(normalize(vVertexNormal), normalize(u_CameraPosition)), 3.0);\n    // \u53BB\u9664\u80CC\u9762\n    if(intensity > 1.0) intensity = 0.0;\n\n    gl_FragColor = vec4(v_Color.rgb, v_Color.a * intensity * u_opacity);\n}\n";
 
 /* babel-plugin-inline-import '../shaders/atmosphere_vert.glsl' */
 var atmoSphereVert = "\nattribute vec3 a_Position;\nattribute vec3 a_Normal;\nattribute vec2 a_Uv;\nattribute vec4 a_Color;\nuniform vec3 u_CameraPosition;\nvarying float v_CamreaDistance;\n\nuniform mat4 u_ViewProjectionMatrix;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_ViewMatrix;\n\nvarying vec3 vVertexNormal;\nvarying vec4 v_Color;\nvarying float v_offset;\n\nvoid main() {\n    float EARTH_RADIUS = 100.0;\n    \n    v_Color = a_Color;\n\n    v_offset = min(((length(u_CameraPosition) - EARTH_RADIUS)/600.0) * 0.5 + 0.4, 1.0);\n    vVertexNormal = a_Normal;\n\n    gl_Position = u_ViewProjectionMatrix * u_ModelMatrix * vec4(a_Position, 1.0);\n}\n";
@@ -57,7 +57,7 @@ var EarthAtomSphereModel = /*#__PURE__*/function (_BaseModel) {
       // TODO: 调整图层的绘制顺序 地球大气层
       this.layer.zIndex = -997;
       this.layer.buildLayerModel({
-        moduleName: 'earthAtmo',
+        moduleName: 'earthAtmoSphere',
         vertexShader: atmoSphereVert,
         fragmentShader: atmoSphereFrag,
         triangulation: earthTriangulation,
@@ -82,13 +82,12 @@ var EarthAtomSphereModel = /*#__PURE__*/function (_BaseModel) {
         descriptor: {
           name: 'a_Size',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: gl.DYNAMIC_DRAW,
             data: [],
             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 ? 1 : _feature$size;
             return Array.isArray(size) ? [size[0]] : [size];
@@ -101,7 +100,6 @@ var EarthAtomSphereModel = /*#__PURE__*/function (_BaseModel) {
         descriptor: {
           name: 'a_Normal',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: gl.STATIC_DRAW,
             data: [],
             type: gl.FLOAT
@@ -118,13 +116,12 @@ var EarthAtomSphereModel = /*#__PURE__*/function (_BaseModel) {
         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[3], vertex[4]];
           }
         }

package/es/earth/models/base.js

@@ -54,7 +54,7 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
     value: function getUninforms() {
       var _this$layer$getLayerC = this.layer.getLayerConfig(),
           animateOption = _this$layer$getLayerC.animateOption,
-          globelOtions = _this$layer$getLayerC.globelOtions;
+          globalOptions = _this$layer$getLayerC.globalOptions;
 
       if (animateOption !== null && animateOption !== void 0 && animateOption.enable) {
         // @ts-ignore
@@ -69,13 +69,12 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
       }
 
       return {
-        u_ambientRatio: (globelOtions === null || globelOtions === void 0 ? void 0 : globelOtions.ambientRatio) || 0.6,
+        u_ambientRatio: (globalOptions === null || globalOptions === void 0 ? void 0 : globalOptions.ambientRatio) || 0.6,
         // 环境光
-        u_diffuseRatio: (globelOtions === null || globelOtions === void 0 ? void 0 : globelOtions.diffuseRatio) || 0.4,
+        u_diffuseRatio: (globalOptions === null || globalOptions === void 0 ? void 0 : globalOptions.diffuseRatio) || 0.4,
         // 漫反射
-        u_specularRatio: (globelOtions === null || globelOtions === void 0 ? void 0 : globelOtions.specularRatio) || 0.1,
+        u_specularRatio: (globalOptions === null || globalOptions === void 0 ? void 0 : globalOptions.specularRatio) || 0.1,
         // 高光反射
-        // u_sunLight: [120, 120, 120],
         u_sunLight: [this.sunX, this.sunY, this.sunZ],
         u_texture: this.texture
       };
@@ -95,10 +94,10 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
       var _this2 = this;
 
       var _this$layer$getLayerC2 = this.layer.getLayerConfig(),
-          globelOtions = _this$layer$getLayerC2.globelOtions;
+          globalOptions = _this$layer$getLayerC2.globalOptions;
 
-      if ((globelOtions === null || globelOtions === void 0 ? void 0 : globelOtions.earthTime) !== undefined) {
-        this.setEarthTime(globelOtions.earthTime);
+      if ((globalOptions === null || globalOptions === void 0 ? void 0 : globalOptions.earthTime) !== undefined) {
+        this.setEarthTime(globalOptions.earthTime);
       }
 
       var source = this.layer.getSource();
@@ -126,7 +125,7 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "buildModels",
     value: function buildModels(callbackModel) {
-      // TODO: 调整图层的绘制顺序 地球大气层
+      // Tip: 调整图层的绘制顺序 地球大气层
       this.layer.zIndex = -998;
       this.layer.buildLayerModel({
         moduleName: 'earthBase',
@@ -147,20 +146,18 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {
-      // point layer size;
       this.styleAttributeService.registerStyleAttribute({
         name: 'size',
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_Size',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: gl.DYNAMIC_DRAW,
             data: [],
             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 ? 1 : _feature$size;
             return Array.isArray(size) ? [size[0]] : [size];
@@ -173,7 +170,6 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
         descriptor: {
           name: 'a_Normal',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: gl.STATIC_DRAW,
             data: [],
             type: gl.FLOAT
@@ -196,7 +192,7 @@ var BaseEarthModel = /*#__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/earth/models/bloomsphere.js

@@ -14,7 +14,7 @@ import BaseModel from "../../core/BaseModel";
 import { earthOuterTriangulation } from "../../core/triangulation";
 
 /* babel-plugin-inline-import '../shaders/bloomsphere_frag.glsl' */
-var bloomSphereFrag = "\nuniform float u_opacity;\nuniform vec3 u_CameraPosition;\nvarying vec3 vVertexNormal;\n\nvarying vec4 v_Color;\nvoid main() {\n\n\n    float intensity =  - dot(normalize(vVertexNormal), normalize(u_CameraPosition));\n    // TODO: \u53BB\u9664\u80CC\u9762\n    if(intensity > 1.0) intensity = 0.0;\n\n    gl_FragColor = vec4(v_Color.rgb, v_Color.a * intensity * u_opacity);\n}\n";
+var bloomSphereFrag = "\nuniform float u_opacity;\nuniform vec3 u_CameraPosition;\nvarying vec3 vVertexNormal;\n\nvarying vec4 v_Color;\nvoid main() {\n\n\n    float intensity =  - dot(normalize(vVertexNormal), normalize(u_CameraPosition));\n    // \u53BB\u9664\u80CC\u9762\n    if(intensity > 1.0) intensity = 0.0;\n\n    gl_FragColor = vec4(v_Color.rgb, v_Color.a * intensity * u_opacity);\n}\n";
 
 /* babel-plugin-inline-import '../shaders/bloomsphere_vert.glsl' */
 var bloomSphereVert = "\nattribute vec3 a_Position;\nattribute vec3 a_Normal;\nattribute vec2 a_Uv;\nattribute vec4 a_Color;\nuniform vec3 u_CameraPosition;\nuniform mat4 u_ViewProjectionMatrix;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_ViewMatrix;\n\nvarying vec3 vVertexNormal;\nvarying vec4 v_Color;\n\nvoid main() {\n    v_Color = a_Color;\n\n    vVertexNormal = a_Normal;\n\n    gl_Position = u_ViewProjectionMatrix * u_ModelMatrix * vec4(a_Position, 1.0);\n}\n";
@@ -54,7 +54,7 @@ var EarthBloomSphereModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "buildModels",
     value: function buildModels(callbackModel) {
-      // TODO: 调整图层的绘制顺序，让它保持在地球后面（减少锯齿现象）
+      // Tip: 调整图层的绘制顺序，让它保持在地球后面（减少锯齿现象）
       this.layer.zIndex = -999;
       this.layer.buildLayerModel({
         moduleName: 'earthBloom',
@@ -75,20 +75,18 @@ var EarthBloomSphereModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {
-      // point layer size;
       this.styleAttributeService.registerStyleAttribute({
         name: 'size',
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_Size',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: gl.DYNAMIC_DRAW,
             data: [],
             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 ? 1 : _feature$size;
             return Array.isArray(size) ? [size[0]] : [size];
@@ -101,7 +99,6 @@ var EarthBloomSphereModel = /*#__PURE__*/function (_BaseModel) {
         descriptor: {
           name: 'a_Normal',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: gl.STATIC_DRAW,
             data: [],
             type: gl.FLOAT
@@ -118,13 +115,12 @@ var EarthBloomSphereModel = /*#__PURE__*/function (_BaseModel) {
         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[3], vertex[4]];
           }
         }

package/es/heatmap/index.d.ts

@@ -1,4 +1,4 @@
-import { IAttrubuteAndElements } from '@antv/l7-core';
+import { IAttributeAndElements } from '@antv/l7-core';
 import BaseLayer from '../core/BaseLayer';
 import { IHeatMapLayerStyleOptions } from '../core/interface';
 import { HeatMapModelType } from './models';
@@ -7,7 +7,7 @@ export default class HeatMapLayer extends BaseLayer<IHeatMapLayerStyleOptions> {
     buildModels(): void;
     rebuildModels(): void;
     renderModels(): this;
-    updateModelData(data: IAttrubuteAndElements): void;
+    updateModelData(data: IAttributeAndElements): void;
     protected getConfigSchema(): {
         properties: {
             opacity: {

package/es/heatmap/index.js

@@ -78,9 +78,7 @@ var HeatMapLayer = /*#__PURE__*/function (_BaseLayer) {
       if (this.layerModelNeedUpdate) {
         this.layerModel.buildModels(function (models) {
           return _this4.models = models;
-        }); // @ts-ignore
-        // this.models = this.layerModel.buildModels();
-
+        });
         this.layerModelNeedUpdate = false;
       }
 

package/es/heatmap/models/grid.js

@@ -86,14 +86,12 @@ var GridModel = /*#__PURE__*/function (_BaseModel) {
         descriptor: {
           name: 'a_Pos',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: gl.DYNAMIC_DRAW,
             data: [],
             type: gl.FLOAT
           },
           size: 3,
-          update: function update(feature, featureIdx) {
-            // const coordinates = feature.coordinates as number[];
+          update: function update(feature) {
             var coordinates = feature.version === 'GAODE2.x' ? feature.originCoordinates : feature.coordinates;
             return [coordinates[0], coordinates[1], 0];
           }