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

package/lib/core/BaseLayer.js

@@ -149,9 +149,9 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "currentPickId", null);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "pendingStyleAttributes", []);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "scaleOptions", {});
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "aniamateStatus", false);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "animateStatus", false);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "bottomColor", 'rgba(0, 0, 0, 0)');
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "isDestroied", false);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "isDestroyed", false);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "encodeDataLength", 0);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "sourceEvent", function () {
       _this.dataState.dataSourceNeedUpdate = true;
@@ -251,11 +251,6 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     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 = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
 
       if (animateOption !== null && animateOption !== void 0 && animateOption.enable) {
         this.layerService.startAnimate();
-        this.aniamateStatus = true;
+        this.animateStatus = true;
       }
     }
   }, {
@@ -497,8 +492,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
 
       this.updateLayerConfig({
         animateOption: rawAnimate
-      }); // this.animateOptions = options;
-
+      });
       return this;
     }
   }, {
@@ -955,11 +949,11 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     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
 
@@ -983,6 +977,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
       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', {
@@ -996,7 +991,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
       this.removeAllListeners(); // 解绑图层容器中的服务
       // this.container.unbind(TYPES.IStyleAttributeService);
 
-      this.isDestroied = true;
+      this.isDestroyed = true;
     }
   }, {
     key: "clear",
@@ -1181,7 +1176,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
                 elements = _this9$styleAttribute.elements,
                 count = _this9$styleAttribute.count;
 
-            var modeloptions = (0, _objectSpread2.default)({
+            var modelOptions = (0, _objectSpread2.default)({
               attributes: attributes,
               uniforms: uniforms,
               fs: fs,
@@ -1191,18 +1186,18 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
             }, 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),
@@ -1223,9 +1218,9 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     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/lib/core/BaseModel.js

@@ -79,7 +79,7 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
       stroke: undefined,
       offsets: undefined
     };
-    this.stylePropertyesExist = {
+    this.stylePropertiesExist = {
       hasThetaOffset: 0,
       hasOpacity: 0,
       hasStrokeOpacity: 0,
@@ -115,7 +115,7 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
 
       this.cellLength = 0; // 清空上一次计算的 cell 的长度
 
-      this.stylePropertyesExist = {
+      this.stylePropertiesExist = {
         // 全量清空上一次是否需要对 style 属性进行数据映射的判断
         hasThetaOffset: 0,
         hasOpacity: 0,
@@ -133,13 +133,13 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
         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 {
@@ -216,7 +216,7 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
           attr: 'opacity',
           count: 1
         });
-        this.stylePropertyesExist.hasOpacity = 1;
+        this.stylePropertiesExist.hasOpacity = 1;
         this.cellLength += 1;
       }
 
@@ -226,7 +226,7 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
           attr: 'strokeOpacity',
           count: 1
         });
-        this.stylePropertyesExist.hasStrokeOpacity = 1;
+        this.stylePropertiesExist.hasStrokeOpacity = 1;
         this.cellLength += 1;
       }
 
@@ -236,7 +236,7 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
           attr: 'strokeWidth',
           count: 1
         });
-        this.stylePropertyesExist.hasStrokeWidth = 1;
+        this.stylePropertiesExist.hasStrokeWidth = 1;
         this.cellLength += 1;
       }
 
@@ -246,7 +246,7 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
           attr: 'stroke',
           count: 4
         });
-        this.stylePropertyesExist.hasStroke = 1;
+        this.stylePropertiesExist.hasStroke = 1;
         this.cellLength += 4;
       }
 
@@ -256,7 +256,7 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
           attr: 'offsets',
           count: 2
         });
-        this.stylePropertyesExist.hasOffsets = 1;
+        this.stylePropertiesExist.hasOffsets = 1;
         this.cellLength += 2;
       }
 
@@ -266,10 +266,9 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
           attr: 'thetaOffset',
           count: 1
         });
-        this.stylePropertyesExist.hasThetaOffset = 1;
+        this.stylePropertiesExist.hasThetaOffset = 1;
         this.cellLength += 1;
-      } // console.log('this.cellLength', this.cellLength)
-
+      }
     }
     /**
      * 判断变量 stroke 是否是常量值

package/lib/earth/models/atmosphere.js

@@ -30,7 +30,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 /* 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";
@@ -72,7 +72,7 @@ var EarthAtomSphereModel = /*#__PURE__*/function (_BaseModel) {
       // TODO: 调整图层的绘制顺序 地球大气层
       this.layer.zIndex = -997;
       this.layer.buildLayerModel({
-        moduleName: 'earthAtmo',
+        moduleName: 'earthAtmoSphere',
         vertexShader: atmoSphereVert,
         fragmentShader: atmoSphereFrag,
         triangulation: _triangulation.earthTriangulation,
@@ -97,13 +97,12 @@ var EarthAtomSphereModel = /*#__PURE__*/function (_BaseModel) {
         descriptor: {
           name: 'a_Size',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: _l7Core.gl.DYNAMIC_DRAW,
             data: [],
             type: _l7Core.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];
@@ -116,7 +115,6 @@ var EarthAtomSphereModel = /*#__PURE__*/function (_BaseModel) {
         descriptor: {
           name: 'a_Normal',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: _l7Core.gl.STATIC_DRAW,
             data: [],
             type: _l7Core.gl.FLOAT
@@ -133,13 +131,12 @@ var EarthAtomSphereModel = /*#__PURE__*/function (_BaseModel) {
         descriptor: {
           name: 'a_Uv',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: _l7Core.gl.DYNAMIC_DRAW,
             data: [],
             type: _l7Core.gl.FLOAT
           },
           size: 2,
-          update: function update(feature, featureIdx, vertex, attributeIdx) {
+          update: function update(feature, featureIdx, vertex) {
             return [vertex[3], vertex[4]];
           }
         }

package/lib/earth/models/base.js

@@ -65,7 +65,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
@@ -80,13 +80,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
       };
@@ -106,10 +105,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();
@@ -137,7 +136,7 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "buildModels",
     value: function buildModels(callbackModel) {
-      // TODO: 调整图层的绘制顺序 地球大气层
+      // Tip: 调整图层的绘制顺序 地球大气层
       this.layer.zIndex = -998;
       this.layer.buildLayerModel({
         moduleName: 'earthBase',
@@ -158,20 +157,18 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {
-      // point layer size;
       this.styleAttributeService.registerStyleAttribute({
         name: 'size',
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
           name: 'a_Size',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: _l7Core.gl.DYNAMIC_DRAW,
             data: [],
             type: _l7Core.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];
@@ -184,7 +181,6 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
         descriptor: {
           name: 'a_Normal',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: _l7Core.gl.STATIC_DRAW,
             data: [],
             type: _l7Core.gl.FLOAT
@@ -207,7 +203,7 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
             type: _l7Core.gl.FLOAT
           },
           size: 2,
-          update: function update(feature, featureIdx, vertex, attributeIdx) {
+          update: function update(feature, featureIdx, vertex) {
             return [vertex[3], vertex[4]];
           }
         }

package/lib/earth/models/bloomsphere.js

@@ -30,7 +30,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 /* 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";
@@ -69,7 +69,7 @@ var EarthBloomSphereModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "buildModels",
     value: function buildModels(callbackModel) {
-      // TODO: 调整图层的绘制顺序，让它保持在地球后面（减少锯齿现象）
+      // Tip: 调整图层的绘制顺序，让它保持在地球后面（减少锯齿现象）
       this.layer.zIndex = -999;
       this.layer.buildLayerModel({
         moduleName: 'earthBloom',
@@ -90,20 +90,18 @@ var EarthBloomSphereModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {
-      // point layer size;
       this.styleAttributeService.registerStyleAttribute({
         name: 'size',
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
           name: 'a_Size',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: _l7Core.gl.DYNAMIC_DRAW,
             data: [],
             type: _l7Core.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];
@@ -116,7 +114,6 @@ var EarthBloomSphereModel = /*#__PURE__*/function (_BaseModel) {
         descriptor: {
           name: 'a_Normal',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: _l7Core.gl.STATIC_DRAW,
             data: [],
             type: _l7Core.gl.FLOAT
@@ -133,13 +130,12 @@ var EarthBloomSphereModel = /*#__PURE__*/function (_BaseModel) {
         descriptor: {
           name: 'a_Uv',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: _l7Core.gl.DYNAMIC_DRAW,
             data: [],
             type: _l7Core.gl.FLOAT
           },
           size: 2,
-          update: function update(feature, featureIdx, vertex, attributeIdx) {
+          update: function update(feature, featureIdx, vertex) {
             return [vertex[3], vertex[4]];
           }
         }

package/lib/heatmap/index.js

@@ -92,9 +92,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/lib/heatmap/models/grid.js

@@ -101,14 +101,12 @@ var GridModel = /*#__PURE__*/function (_BaseModel) {
         descriptor: {
           name: 'a_Pos',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: _l7Core.gl.DYNAMIC_DRAW,
             data: [],
             type: _l7Core.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];
           }

package/lib/heatmap/models/grid3d.js

@@ -95,33 +95,29 @@ var Grid3DModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {
-      // point layer size;
       this.styleAttributeService.registerStyleAttribute({
         name: 'size',
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
           name: 'a_Size',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: _l7Core.gl.DYNAMIC_DRAW,
             data: [],
             type: _l7Core.gl.FLOAT
           },
           size: 1,
-          update: function update(feature, featureIdx, vertex, attributeIdx) {
+          update: function update(feature) {
             var size = feature.size;
             return Array.isArray(size) ? [size[0]] : [size];
           }
         }
-      }); // point layer size;
-
+      });
       this.styleAttributeService.registerStyleAttribute({
         name: 'normal',
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
           name: 'a_Normal',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: _l7Core.gl.STATIC_DRAW,
             data: [],
             type: _l7Core.gl.FLOAT
@@ -139,16 +135,13 @@ var Grid3DModel = /*#__PURE__*/function (_BaseModel) {
         descriptor: {
           name: 'a_Pos',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: _l7Core.gl.DYNAMIC_DRAW,
             data: [],
             type: _l7Core.gl.FLOAT
           },
           size: 3,
-          update: function update(feature, featureIdx) {
-            var coordinates = feature.version === 'GAODE2.x' ? feature.originCoordinates : feature.coordinates; // const coordinates = feature.coordinates as number[];
-            // const coordinates = feature.originCoordinates as number[];
-
+          update: function update(feature) {
+            var coordinates = feature.version === 'GAODE2.x' ? feature.originCoordinates : feature.coordinates;
             return [coordinates[0], coordinates[1], 0];
           }
         }

package/lib/heatmap/models/heatmap.js

@@ -174,18 +174,16 @@ var HeatMapModel = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE
         descriptor: {
           name: 'a_Dir',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: _l7Core.gl.DYNAMIC_DRAW,
             data: [],
             type: _l7Core.gl.FLOAT
           },
           size: 2,
-          update: function update(feature, featureIdx, vertex, attributeIdx) {
+          update: function update(feature, featureIdx, vertex) {
             return [vertex[3], vertex[4]];
           }
         }
-      }); // point layer size;
-
+      });
       this.styleAttributeService.registerStyleAttribute({
         name: 'size',
         type: _l7Core.AttributeType.Attribute,
@@ -198,7 +196,7 @@ var HeatMapModel = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE
             type: _l7Core.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 [size];
@@ -308,7 +306,6 @@ var HeatMapModel = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE
           enable: false
         },
         blend: this.getBlend(),
-        // count: 6,
         elements: createElements({
           data: [0, 2, 1, 2, 3, 1],
           type: _l7Core.gl.UNSIGNED_INT,

package/lib/heatmap/models/hexagon.js

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

package/lib/heatmap/triangulation.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.heatMap3DTriangulation = heatMap3DTriangulation;
 
-// @ts-ignore
 function heatMap3DTriangulation(width, height) {
   var indices = [];
   var vertices = [];

package/lib/image/index.js

@@ -93,7 +93,8 @@ var ImageLayer = /*#__PURE__*/function (_BaseLayer) {
       var type = this.getModelType();
       var defaultConfig = {
         image: {},
-        dataImage: {}
+        dataImage: {},
+        tileDataImage: {}
       };
       return defaultConfig[type];
     }
@@ -109,6 +110,8 @@ var ImageLayer = /*#__PURE__*/function (_BaseLayer) {
         return 'dataImage';
       } else if (shape === 'image') {
         return 'image';
+      } else if (shape === 'tileDataImage') {
+        return 'tileDataImage';
       } else {
         return 'image';
       }