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

package/lib/core/BaseLayer.js

@@ -83,13 +83,13 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
 
   // 生命周期钩子
   // 待渲染 model 列表
-  // TODO: 用于保存子图层对象
+  // 用于保存子图层对象
   // Tip: 用于标识矢量图层
 
   /**
    * 待更新样式属性，在初始化阶段完成注册
    */
-  // TODO: layer 保底颜色
+  // Tip: layer 保底颜色
   // private pickingPassRender: IPass<'pixelPicking'>;
   function BaseLayer() {
     var _this;
@@ -106,7 +106,16 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "pickedFeatureID", null);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "selectedFeatureID", null);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "styleNeedUpdate", false);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "forceRender", false);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "clusterZoom", 0);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "defaultSourceConfig", {
+      data: [],
+      options: {
+        parser: {
+          type: 'json'
+        }
+      }
+    });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "dataState", {
       dataSourceNeedUpdate: false,
       dataMappingNeedUpdate: false,
@@ -143,6 +152,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "aniamateStatus", 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), "encodeDataLength", 0);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "sourceEvent", function () {
       _this.dataState.dataSourceNeedUpdate = true;
 
@@ -150,9 +160,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
 
       if (layerConfig && layerConfig.autoFit) {
         _this.fitBounds(layerConfig.fitBoundsOptions);
-      } // 对外暴露事件 迁移到 DataMappingPlugin generateMapping，保证在重新重新映射后触发
-      // this.emit('dataUpdate');
-
+      }
 
       _this.reRender();
     });
@@ -416,15 +424,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     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 方法中传入纹理名称的方法并不通用）
 
@@ -464,7 +464,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
         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) {
         (0, _updateShape.updateShape)(this, lastShape, currentShape);
@@ -603,17 +603,15 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     key: "render",
     value: function render() {
-      if (this.tileLayer !== undefined) {
+      if (this.tileLayer) {
         // 瓦片图层执行单独的 render 渲染队列
         this.tileLayer.render();
         return this;
-      } // TODO: this.getEncodedData().length !== 0 这个判断是为了解决在 2.5.x 引入数据纹理后产生的 空数据渲染导致 texture 超出上限问题
-
-
-      if (this.getEncodedData() && this.getEncodedData().length !== 0) {
-        this.renderModels();
       }
 
+      if (this.encodeDataLength <= 0 && !this.forceRender) return this; // Tip: this.getEncodedData().length !== 0 这个判断是为了解决在 2.5.x 引入数据纹理后产生的 空数据渲染导致 texture 超出上限问题
+
+      this.renderModels();
       return this;
     }
     /**
@@ -628,24 +626,27 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                if (!(this.getEncodedData() && this.getEncodedData().length !== 0)) {
-                  _context.next = 7;
+                if (!(this.encodeDataLength <= 0 && !this.forceRender)) {
+                  _context.next = 2;
                   break;
                 }
 
+                return _context.abrupt("return");
+
+              case 2:
                 if (!(this.multiPassRenderer && this.multiPassRenderer.getRenderFlag())) {
-                  _context.next = 6;
+                  _context.next = 7;
                   break;
                 }
 
-                _context.next = 4;
+                _context.next = 5;
                 return this.multiPassRenderer.render();
 
-              case 4:
-                _context.next = 7;
+              case 5:
+                _context.next = 8;
                 break;
 
-              case 6:
+              case 7:
                 if (this.multiPassRenderer) {
                   // renderPass 触发的渲染
                   this.renderModels();
@@ -653,7 +654,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
                   this.renderModels();
                 }
 
-              case 7:
+              case 8:
               case "end":
                 return _context.stop();
             }
@@ -799,11 +800,6 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     key: "hide",
     value: function hide() {
-      if (this.type === 'CanvasLayer' && this.layerModel.clearCanvas) {
-        // 对 canvasLayer 的 hide 操作做特殊处理
-        this.layerModel.clearCanvas();
-      }
-
       this.updateLayerConfig({
         visible: false
       });
@@ -959,7 +955,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     key: "destroy",
     value: function destroy() {
-      var _this$layerModel2;
+      var _this$multiPassRender, _this$layerModel2;
 
       var refresh = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
 
@@ -969,25 +965,24 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
 
 
       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', {
@@ -1068,6 +1063,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     key: "setEncodedData",
     value: function setEncodedData(encodedData) {
       this.encodedData = encodedData;
+      this.encodeDataLength = encodedData.length;
     }
   }, {
     key: "getEncodedData",
@@ -1161,45 +1157,47 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
 
       var createModel = this.rendererService.createModel;
       return new Promise(function (resolve, reject) {
-        // filter supported worker & worker enabled layer
-        if (workerOptions && workerOptions.modelType in _l7Utils.WorkerSourceMap && workerEnabled) {
-          _this9.styleAttributeService.createAttributesAndIndicesAscy(_this9.encodedData, segmentNumber, workerOptions).then(function (_ref7) {
-            var attributes = _ref7.attributes,
-                elements = _ref7.elements;
-            var m = createModel((0, _objectSpread2.default)({
+        setTimeout(function () {
+          // filter supported worker & worker enabled layer
+          if (workerOptions && workerOptions.modelType in _l7Utils.WorkerSourceMap && workerEnabled) {
+            _this9.styleAttributeService.createAttributesAndIndicesAscy(_this9.encodedData, segmentNumber, workerOptions).then(function (_ref7) {
+              var attributes = _ref7.attributes,
+                  elements = _ref7.elements;
+              var m = createModel((0, _objectSpread2.default)({
+                attributes: attributes,
+                uniforms: uniforms,
+                fs: fs,
+                vs: vs,
+                elements: elements,
+                blend: _blend.BlendTypes[_l7Core.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 = (0, _objectSpread2.default)({
               attributes: attributes,
               uniforms: uniforms,
               fs: fs,
               vs: vs,
               elements: elements,
               blend: _blend.BlendTypes[_l7Core.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 = (0, _objectSpread2.default)({
-            attributes: attributes,
-            uniforms: uniforms,
-            fs: fs,
-            vs: vs,
-            elements: elements,
-            blend: _blend.BlendTypes[_l7Core.BlendType.normal]
-          }, rest);
-
-          if (count) {
-            modeloptions.count = count;
           }
-
-          var m = createModel(modeloptions);
-          resolve(m);
-        }
+        });
       });
     }
   }, {
@@ -1243,6 +1241,9 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     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,
@@ -1303,30 +1304,23 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
       var _this10 = this;
 
       // TODO: this.getEncodedData().length > 0 这个判断是为了解决在 2.5.x 引入数据纹理后产生的 空数据渲染导致 texture 超出上限问题
-      if (this.getEncodedData() && this.getEncodedData().length > 0) {
-        var _this$layerModel4;
-
-        if (this.layerModelNeedUpdate && this.layerModel) {
-          this.layerModel.buildModels(function (models) {
-            _this10.models = models;
+      if (this.encodeDataLength <= 0 && !this.forceRender) return this;
 
-            _this10.hooks.beforeRender.call();
-
-            _this10.layerModelNeedUpdate = false;
-          });
-        }
+      if (this.layerModelNeedUpdate && this.layerModel) {
+        this.layerModel.buildModels(function (models) {
+          _this10.models = models;
 
-        if (this !== null && this !== void 0 && (_this$layerModel4 = this.layerModel) !== null && _this$layerModel4 !== void 0 && _this$layerModel4.renderUpdate) {
-          this.layerModel.renderUpdate();
-        }
+          _this10.hooks.beforeRender.call();
 
-        this.models.forEach(function (model) {
-          model.draw({
-            uniforms: _this10.layerModel.getUninforms()
-          }, isPicking);
+          _this10.layerModelNeedUpdate = false;
         });
       }
 
+      this.models.forEach(function (model) {
+        model.draw({
+          uniforms: _this10.layerModel.getUninforms()
+        }, isPicking);
+      });
       return this;
     }
   }, {
@@ -1360,6 +1354,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
      * 继承空方法
      * @param time
      */
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
 
   }, {
     key: "setEarthTime",
@@ -1384,10 +1379,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     key: "reRender",
     value: function reRender() {
-      if (this.inited) {
-        this.layerService.updateLayerRenderList();
-        this.layerService.renderLayers();
-      }
+      this.inited && this.layerService.reRender();
     }
   }, {
     key: "splitValuesAndCallbackInAttribute",

package/lib/core/BaseModel.js

@@ -446,20 +446,24 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     key: "needUpdate",
     value: function needUpdate() {
       return false;
-    }
+    } // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
   }, {
     key: "buildModels",
     value: function buildModels(callbackModel) {
       throw new Error('Method not implemented.');
-    }
+    } // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
   }, {
     key: "initModels",
     value: function initModels(callbackModel) {
       throw new Error('Method not implemented.');
-    }
+    } // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
   }, {
     key: "clearModels",
     value: function clearModels() {
+      var refresh = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
       return;
     }
   }, {

package/lib/core/triangulation.js

@@ -18,6 +18,7 @@ exports.PointImageTriangulation = PointImageTriangulation;
 exports.PolygonExtrudeTriangulation = PolygonExtrudeTriangulation;
 exports.RasterImageTriangulation = RasterImageTriangulation;
 exports.SimpleLineTriangulation = SimpleLineTriangulation;
+exports.TileSimpleLineTriangulation = TileSimpleLineTriangulation;
 exports.earthOuterTriangulation = earthOuterTriangulation;
 exports.earthTriangulation = earthTriangulation;
 exports.polygonTriangulation = polygonTriangulation;
@@ -177,6 +178,16 @@ function SimpleLineTriangulation(feature) {
   var coordinates = feature.coordinates;
   var pos = [];
 
+  if (!Array.isArray(coordinates[0])) {
+    return {
+      vertices: [],
+      indices: [],
+      normals: [],
+      size: 6,
+      count: 0
+    };
+  }
+
   var _getSimpleLineVertice = getSimpleLineVertices(coordinates),
       results = _getSimpleLineVertice.results,
       totalDistance = _getSimpleLineVertice.totalDistance;
@@ -193,6 +204,33 @@ function SimpleLineTriangulation(feature) {
   };
 }
 
+function TileSimpleLineTriangulation(feature) {
+  var coordinates = feature.coordinates;
+  var pos = [];
+
+  if (!Array.isArray(coordinates[0])) {
+    return {
+      vertices: [],
+      indices: [],
+      size: 4,
+      count: 0
+    };
+  }
+
+  var _getTileSimpleLineVer = getTileSimpleLineVertices(coordinates),
+      results = _getTileSimpleLineVer.results;
+
+  results.map(function (point) {
+    pos.push(point[0], point[1], point[2], point[3]);
+  });
+  return {
+    vertices: pos,
+    indices: [],
+    size: 4,
+    count: results.length
+  };
+}
+
 function lineSegmentDistance(b1, a1) {
   var dx = a1[0] - b1[0];
   var dy = a1[1] - b1[1];
@@ -204,7 +242,10 @@ function pushDis(point, n) {
     point.push(0);
   }
 
-  point.push(n);
+  if (n !== undefined) {
+    point.push(n);
+  }
+
   return point;
 }
 
@@ -239,6 +280,29 @@ function getSimpleLineVertices(points) {
   }
 }
 
+function getTileSimpleLineVertices(points) {
+  if (points.length < 2) {
+    return {
+      results: points
+    };
+  } else {
+    var results = [];
+    var point = pushDis(points[0]);
+    results.push(point);
+
+    for (var i = 1; i < points.length - 1; i++) {
+      var mulPoint = pushDis(points[i]);
+      results.push(mulPoint);
+      results.push(mulPoint);
+    }
+
+    results.push(pushDis(points[points.length - 1]));
+    return {
+      results: results
+    };
+  }
+}
+
 function polygonTriangulation(feature) {
   var coordinates = feature.coordinates;
 
@@ -252,7 +316,7 @@ function polygonTriangulation(feature) {
     vertices: vertices,
     size: dimensions
   };
-} // TODO：构建几何图形（带有中心点和大小）
+} // 构建几何图形（带有中心点和大小）
 
 
 function polygonTriangulationWithCenter(feature) {

package/lib/earth/index.js

@@ -56,6 +56,14 @@ var EarthLayer = /*#__PURE__*/function (_BaseLayer) {
 
     _this = _super.call.apply(_super, [this].concat(args));
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "type", 'EarthLayer');
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "defaultSourceConfig", {
+      data: [],
+      options: {
+        parser: {
+          type: 'json'
+        }
+      }
+    });
     return _this;
   }
 
@@ -69,7 +77,9 @@ var EarthLayer = /*#__PURE__*/function (_BaseLayer) {
       this.layerModel.initModels(function (models) {
         _this2.models = models;
 
-        _this2.renderLayers();
+        _this2.emit('modelLoaded', null);
+
+        _this2.layerService.throttleRenderLayers();
       });
     }
     /**

package/lib/earth/models/base.js

@@ -98,7 +98,7 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
       this.sunY = 10;
       this.sunX = Math.cos(this.earthTime) * (this.sunRadius - this.sunY);
       this.sunZ = Math.sin(this.earthTime) * (this.sunRadius - this.sunY);
-      this.layerService.renderLayers();
+      this.layerService.throttleRenderLayers();
     }
   }, {
     key: "initModels",
@@ -125,9 +125,7 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
           height: imageData[0].height
         });
 
-        _this2.layerService.updateLayerRenderList();
-
-        _this2.layerService.renderLayers();
+        _this2.layerService.reRender();
       });
       this.buildModels(callbackModel);
     }

package/lib/earth/shaders/atmosphere_frag.glsl

@@ -10,7 +10,7 @@ void main() {
     
     // float intensity = pow(0.5 + dot(normalize(vVertexNormal), normalize(u_CameraPosition)), 3.0);
     float intensity = pow(v_offset + dot(normalize(vVertexNormal), normalize(u_CameraPosition)), 3.0);
-    // TODO: 去除背面
+    // 去除背面
     if(intensity > 1.0) intensity = 0.0;
 
     gl_FragColor = vec4(v_Color.rgb, v_Color.a * intensity * u_opacity);

package/lib/earth/shaders/bloomsphere_frag.glsl

@@ -8,7 +8,7 @@ void main() {
 
 
     float intensity =  - dot(normalize(vVertexNormal), normalize(u_CameraPosition));
-    // TODO: 去除背面
+    // 去除背面
     if(intensity > 1.0) intensity = 0.0;
 
     gl_FragColor = vec4(v_Color.rgb, v_Color.a * intensity * u_opacity);

package/lib/heatmap/index.js

@@ -58,7 +58,9 @@ var HeatMapLayer = /*#__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 HeatMapLayer = /*#__PURE__*/function (_BaseLayer) {
       var _this3 = this;
 
       this.layerModel.buildModels(function (models) {
-        return _this3.models = models;
+        _this3.models = models;
+
+        _this3.emit('modelLoaded', null);
       });
     }
   }, {

package/lib/heatmap/models/heatmap.js

@@ -110,13 +110,13 @@ var HeatMapModel = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE
       var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(callbackModel) {
         var _shapeAttr$scale;
 
-        var _this$rendererService2, createFramebuffer, clear, getViewportSize, createTexture2D, useFramebuffer, shapeAttr, shapeType, _getViewportSize, width, height;
+        var _this$rendererService2, createFramebuffer, getViewportSize, createTexture2D, shapeAttr, shapeType, _getViewportSize, width, height;
 
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _this$rendererService2 = this.rendererService, createFramebuffer = _this$rendererService2.createFramebuffer, clear = _this$rendererService2.clear, getViewportSize = _this$rendererService2.getViewportSize, createTexture2D = _this$rendererService2.createTexture2D, useFramebuffer = _this$rendererService2.useFramebuffer;
+                _this$rendererService2 = this.rendererService, createFramebuffer = _this$rendererService2.createFramebuffer, getViewportSize = _this$rendererService2.getViewportSize, createTexture2D = _this$rendererService2.createTexture2D;
                 shapeAttr = this.styleAttributeService.getLayerStyleAttribute('shape');
                 shapeType = (shapeAttr === null || shapeAttr === void 0 ? void 0 : (_shapeAttr$scale = shapeAttr.scale) === null || _shapeAttr$scale === void 0 ? void 0 : _shapeAttr$scale.field) || 'heatmap';
                 this.shapeType = shapeType; // 生成热力图密度图
@@ -237,7 +237,8 @@ var HeatMapModel = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE
                       dstRGB: _l7Core.gl.ONE,
                       dstAlpha: 1
                     }
-                  }
+                  },
+                  pick: false
                 });
 
               case 3:
@@ -283,6 +284,7 @@ var HeatMapModel = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE
           createBuffer = _this$rendererService3.createBuffer,
           createModel = _this$rendererService3.createModel;
       return createModel({
+        pick: false,
         vs: vs,
         fs: fs,
         attributes: {

package/lib/image/index.js

@@ -58,7 +58,9 @@ var ImageLayer = /*#__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 ImageLayer = /*#__PURE__*/function (_BaseLayer) {
       var _this3 = this;
 
       this.layerModel.buildModels(function (models) {
-        return _this3.models = models;
+        _this3.models = models;
+
+        _this3.emit('modelLoaded', null);
       });
     }
   }, {

package/lib/image/models/dataImage.js

@@ -126,9 +126,7 @@ var ImageDataModel = /*#__PURE__*/function (_BaseModel) {
             height: img.height
           });
 
-          _this.layerService.updateLayerRenderList();
-
-          _this.layerService.renderLayers();
+          _this.layerService.reRender();
         };
       } else {
         source.data.images.then(function (imageData) {
@@ -138,9 +136,7 @@ var ImageDataModel = /*#__PURE__*/function (_BaseModel) {
             height: imageData[0].height
           });
 
-          _this.layerService.updateLayerRenderList();
-
-          _this.layerService.renderLayers();
+          _this.layerService.reRender();
         });
       }
 
@@ -161,7 +157,8 @@ var ImageDataModel = /*#__PURE__*/function (_BaseModel) {
           enable: false
         },
         blend: this.getBlend(),
-        stencil: (0, _l7Utils.getMask)(mask, maskInside)
+        stencil: (0, _l7Utils.getMask)(mask, maskInside),
+        pick: false
       }).then(function (model) {
         callbackModel([model]);
       }).catch(function (err) {