@antv/l7-layers 2.13.5 → 2.13.7

package/lib/core/BaseLayer.js

@@ -276,6 +276,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
                 this.fontService = this.container.get(_l7Core.TYPES.IFontService);
                 this.rendererService = this.container.get(_l7Core.TYPES.IRendererService);
                 this.layerService = this.container.get(_l7Core.TYPES.ILayerService);
+                this.debugService = this.container.get(_l7Core.TYPES.IDebugService);
                 this.interactionService = this.container.get(_l7Core.TYPES.IInteractionService);
                 this.pickingService = this.container.get(_l7Core.TYPES.IPickingService);
                 this.mapService = this.container.get(_l7Core.TYPES.IMapService);
@@ -345,12 +346,14 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
 
                 this.layerPickService = new _LayerPickService.default(this); // 颜色纹理服务
 
-                this.textureService = new _TextureService.default(this); // 触发 init 生命周期插件
+                this.textureService = new _TextureService.default(this);
+                this.log(_l7Core.IDebugLog.LayerInitStart); // 触发 init 生命周期插件
 
-                _context.next = 29;
+                _context.next = 31;
                 return this.hooks.init.promise();
 
-              case 29:
+              case 31:
+                this.log(_l7Core.IDebugLog.LayerInitEnd);
                 this.inited = true; // 触发初始化完成事件;
 
                 this.emit('inited', {
@@ -363,7 +366,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
                 });
                 this.hooks.afterInit.call();
 
-              case 33:
+              case 36:
               case "end":
                 return _context.stop();
             }
@@ -377,6 +380,23 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
 
       return init;
     }()
+  }, {
+    key: "log",
+    value: function log(logType) {
+      var step = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'init';
+
+      // @ts-ignore 瓦片、瓦片图层目前不参与日志
+      if (this.tileLayer || this.isTileLayer) {
+        return;
+      }
+
+      var key = "".concat(this.id, ".").concat(step, ".").concat(logType);
+      var values = {
+        id: this.id,
+        type: this.type
+      };
+      this.debugService.log(key, values);
+    }
   }, {
     key: "updateModelData",
     value: function updateModelData(data) {
@@ -536,10 +556,15 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     value: function setData(data, options) {
       var _this4 = this;
 
+      this.log(_l7Core.IDebugLog.SourceInitStart, _l7Core.ILayerStage.UPDATE);
+
       if (this.inited) {
         this.layerSource.setData(data, options);
+        this.log(_l7Core.IDebugLog.SourceInitEnd, _l7Core.ILayerStage.UPDATE);
       } else {
         this.on('inited', function () {
+          _this4.log(_l7Core.IDebugLog.SourceInitStart, _l7Core.ILayerStage.UPDATE);
+
           var currentSource = _this4.getSource();
 
           if (!currentSource) {
@@ -548,6 +573,10 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
           } else {
             _this4.layerSource.setData(data, options);
           }
+
+          _this4.layerSource.once('update', function () {
+            _this4.log(_l7Core.IDebugLog.SourceInitEnd, _l7Core.ILayerStage.UPDATE);
+          });
         });
       }
 
@@ -1009,7 +1038,9 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
 
       (_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.models = []; // 清除图层日志（如果有的话：非瓦片相关）
+
+      this.debugService.removeLog(this.id);
       this.emit('remove', {
         target: this,
         type: 'remove'

package/lib/earth/models/atmosphere.js

@@ -68,13 +68,9 @@ var EarthAtomSphereModel = /*#__PURE__*/function (_BaseModel) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.next = 2;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 2:
-                return _context.abrupt("return", _context.sent);
-
-              case 3:
+              case 1:
               case "end":
                 return _context.stop();
             }

package/lib/earth/models/base.js

@@ -136,13 +136,9 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
 
                   _this2.layerService.reRender();
                 });
-                _context.next = 8;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 8:
-                return _context.abrupt("return", _context.sent);
-
-              case 9:
+              case 7:
               case "end":
                 return _context.stop();
             }

package/lib/earth/models/bloomsphere.js

@@ -68,13 +68,9 @@ var EarthBloomSphereModel = /*#__PURE__*/function (_BaseModel) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.next = 2;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 2:
-                return _context.abrupt("return", _context.sent);
-
-              case 3:
+              case 1:
               case "end":
                 return _context.stop();
             }

package/lib/heatmap/models/grid.js

@@ -72,13 +72,9 @@ var GridModel = /*#__PURE__*/function (_BaseModel) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.next = 2;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 2:
-                return _context.abrupt("return", _context.sent);
-
-              case 3:
+              case 1:
               case "end":
                 return _context.stop();
             }

package/lib/heatmap/models/grid3d.js

@@ -72,13 +72,9 @@ var Grid3DModel = /*#__PURE__*/function (_BaseModel) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.next = 2;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 2:
-                return _context.abrupt("return", _context.sent);
-
-              case 3:
+              case 1:
               case "end":
                 return _context.stop();
             }

package/lib/heatmap/models/heatmap.js

@@ -168,13 +168,9 @@ var HeatMapModel = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                _context2.next = 2;
-                return this.initModels();
+                return _context2.abrupt("return", this.initModels());
 
-              case 2:
-                return _context2.abrupt("return", _context2.sent);
-
-              case 3:
+              case 1:
               case "end":
                 return _context2.stop();
             }

package/lib/heatmap/models/hexagon.js

@@ -72,13 +72,9 @@ var HexagonModel = /*#__PURE__*/function (_BaseModel) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.next = 2;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 2:
-                return _context.abrupt("return", _context.sent);
-
-              case 3:
+              case 1:
               case "end":
                 return _context.stop();
             }

package/lib/image/models/image.js

@@ -169,13 +169,9 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                _context2.next = 2;
-                return this.initModels();
+                return _context2.abrupt("return", this.initModels());
 
-              case 2:
-                return _context2.abrupt("return", _context2.sent);
-
-              case 3:
+              case 1:
               case "end":
                 return _context2.stop();
             }

package/lib/line/models/arc.js

@@ -228,13 +228,9 @@ var ArcModel = /*#__PURE__*/function (_BaseModel) {
               case 0:
                 this.updateTexture();
                 this.iconService.on('imageUpdate', this.updateTexture);
-                _context.next = 4;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 4:
-                return _context.abrupt("return", _context.sent);
-
-              case 5:
+              case 3:
               case "end":
                 return _context.stop();
             }

package/lib/line/models/arc_3d.js

@@ -220,13 +220,9 @@ var Arc3DModel = /*#__PURE__*/function (_BaseModel) {
               case 0:
                 this.updateTexture();
                 this.iconService.on('imageUpdate', this.updateTexture);
-                _context.next = 4;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 4:
-                return _context.abrupt("return", _context.sent);
-
-              case 5:
+              case 3:
               case "end":
                 return _context.stop();
             }

package/lib/line/models/earthArc_3d.js

@@ -220,13 +220,9 @@ var Arc3DModel = /*#__PURE__*/function (_BaseModel) {
               case 0:
                 this.updateTexture();
                 this.iconService.on('imageUpdate', this.updateTexture);
-                _context.next = 4;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 4:
-                return _context.abrupt("return", _context.sent);
-
-              case 5:
+              case 3:
               case "end":
                 return _context.stop();
             }

package/lib/line/models/great_circle.js

@@ -205,13 +205,9 @@ var GreatCircleModel = /*#__PURE__*/function (_BaseModel) {
               case 0:
                 this.updateTexture();
                 this.iconService.on('imageUpdate', this.updateTexture);
-                _context.next = 4;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 4:
-                return _context.abrupt("return", _context.sent);
-
-              case 5:
+              case 3:
               case "end":
                 return _context.stop();
             }

package/lib/line/models/half.js

@@ -135,13 +135,9 @@ var LineModel = /*#__PURE__*/function (_BaseModel) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.next = 2;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 2:
-                return _context.abrupt("return", _context.sent);
-
-              case 3:
+              case 1:
               case "end":
                 return _context.stop();
             }

package/lib/line/models/line.js

@@ -75,6 +75,7 @@ var LineModel = /*#__PURE__*/function (_BaseModel) {
     }
 
     _this = _super.call.apply(_super, [this].concat(args));
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "textureEventFlag", false);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "texture", _this.createTexture2D({
       data: [0, 0, 0, 0],
       mag: _l7Core.gl.NEAREST,
@@ -152,8 +153,8 @@ var LineModel = /*#__PURE__*/function (_BaseModel) {
         dashArray.push(0, 0);
       }
 
-      if (this.rendererService.getDirty()) {
-        this.texture && this.texture.bind();
+      if (this.rendererService.getDirty() && this.texture) {
+        this.texture.bind();
       } // 转化渐变色
 
 
@@ -255,13 +256,17 @@ var LineModel = /*#__PURE__*/function (_BaseModel) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.next = 2;
-                return this.buildModels();
+                // this.updateTexture();
+                // this.iconService.on('imageUpdate', this.updateTexture);
+                if (!this.textureEventFlag) {
+                  this.textureEventFlag = true;
+                  this.updateTexture();
+                  this.iconService.on('imageUpdate', this.updateTexture);
+                }
 
-              case 2:
-                return _context.abrupt("return", _context.sent);
+                return _context.abrupt("return", this.buildModels());
 
-              case 3:
+              case 2:
               case "end":
                 return _context.stop();
             }

package/lib/line/models/linearline.js

@@ -163,13 +163,9 @@ var LinearLineModel = /*#__PURE__*/function (_BaseModel) {
             switch (_context.prev = _context.next) {
               case 0:
                 this.updateTexture();
-                _context.next = 3;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 3:
-                return _context.abrupt("return", _context.sent);
-
-              case 4:
+              case 2:
               case "end":
                 return _context.stop();
             }

package/lib/line/models/simpleLine.js

@@ -130,13 +130,9 @@ var SimpleLineModel = /*#__PURE__*/function (_BaseModel) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.next = 2;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 2:
-                return _context.abrupt("return", _context.sent);
-
-              case 3:
+              case 1:
               case "end":
                 return _context.stop();
             }

package/lib/line/models/wall.js

@@ -159,13 +159,9 @@ var LineWallModel = /*#__PURE__*/function (_BaseModel) {
               case 0:
                 this.updateTexture();
                 this.iconService.on('imageUpdate', this.updateTexture);
-                _context.next = 4;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 4:
-                return _context.abrupt("return", _context.sent);
-
-              case 5:
+              case 3:
               case "end":
                 return _context.stop();
             }

package/lib/mask/models/fill.js

@@ -73,13 +73,9 @@ var MaskModel = /*#__PURE__*/function (_BaseModel) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.next = 2;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 2:
-                return _context.abrupt("return", _context.sent);
-
-              case 3:
+              case 1:
               case "end":
                 return _context.stop();
             }
@@ -151,7 +147,10 @@ var MaskModel = /*#__PURE__*/function (_BaseModel) {
     key: "clearModels",
     value: function clearModels() {
       var refresh = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
-      refresh && this.layerService.clear();
+
+      if (refresh) {
+        this.layerService.clear();
+      }
     }
   }, {
     key: "registerBuiltinAttributes",

package/lib/plugins/DataMappingPlugin.js

@@ -57,12 +57,15 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                // 初始化重新生成 map
+                layer.log(_l7Core.IDebugLog.MappingStart, _l7Core.ILayerStage.INIT); // 初始化重新生成 map
+
                 _this.generateMaping(layer, {
                   styleAttributeService: styleAttributeService
                 });
 
-              case 1:
+                layer.log(_l7Core.IDebugLog.MappingEnd, _l7Core.ILayerStage.INIT);
+
+              case 3:
               case "end":
                 return _context.stop();
             }
@@ -71,6 +74,7 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
       })));
       layer.hooks.beforeRenderData.tapPromise('DataMappingPlugin', /*#__PURE__*/function () {
         var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(flag) {
+          var mappingResult;
           return _regenerator.default.wrap(function _callee2$(_context2) {
             while (1) {
               switch (_context2.prev = _context2.next) {
@@ -84,11 +88,14 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
 
                 case 2:
                   layer.dataState.dataMappingNeedUpdate = false;
-                  return _context2.abrupt("return", _this.generateMaping(layer, {
+                  layer.log(_l7Core.IDebugLog.MappingStart, _l7Core.ILayerStage.UPDATE);
+                  mappingResult = _this.generateMaping(layer, {
                     styleAttributeService: styleAttributeService
-                  }));
+                  });
+                  layer.log(_l7Core.IDebugLog.MappingEnd, _l7Core.ILayerStage.UPDATE);
+                  return _context2.abrupt("return", mappingResult);
 
-                case 4:
+                case 7:
                 case "end":
                   return _context2.stop();
               }

package/lib/plugins/DataSourcePlugin.js

@@ -43,6 +43,7 @@ var DataSourcePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
+                layer.log(_l7Core.IDebugLog.SourceInitStart, _l7Core.ILayerStage.INIT);
                 source = layer.getSource();
 
                 if (!source) {
@@ -53,28 +54,31 @@ var DataSourcePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__
                 }
 
                 if (!source.inited) {
-                  _context.next = 6;
+                  _context.next = 8;
                   break;
                 }
 
                 _this.updateClusterData(layer);
 
-                _context.next = 8;
+                layer.log(_l7Core.IDebugLog.SourceInitEnd, _l7Core.ILayerStage.INIT);
+                _context.next = 10;
                 break;
 
-              case 6:
-                _context.next = 8;
+              case 8:
+                _context.next = 10;
                 return new Promise(function (resolve) {
                   source.on('update', function (e) {
                     if (e.type === 'inited') {
                       _this.updateClusterData(layer);
+
+                      layer.log(_l7Core.IDebugLog.SourceInitEnd, _l7Core.ILayerStage.INIT);
                     }
 
                     resolve(null);
                   });
                 });
 
-              case 8:
+              case 10:
               case "end":
                 return _context.stop();
             }
@@ -83,7 +87,7 @@ var DataSourcePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__
       }))); // 检测数据是否需要更新
 
       layer.hooks.beforeRenderData.tapPromise('DataSourcePlugin', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var neeUpdateCluster, dataSourceNeedUpdate;
+        var neeUpdateCluster, dataSourceNeedUpdate, needScale;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
@@ -91,9 +95,10 @@ var DataSourcePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__
                 neeUpdateCluster = _this.updateClusterData(layer);
                 dataSourceNeedUpdate = layer.dataState.dataSourceNeedUpdate;
                 layer.dataState.dataSourceNeedUpdate = false;
-                return _context2.abrupt("return", neeUpdateCluster || dataSourceNeedUpdate);
+                needScale = neeUpdateCluster || dataSourceNeedUpdate;
+                return _context2.abrupt("return", needScale);
 
-              case 4:
+              case 5:
               case "end":
                 return _context2.stop();
             }

package/lib/plugins/FeatureScalePlugin.js

@@ -69,21 +69,25 @@ var FeatureScalePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
+                layer.log(_l7Core.IDebugLog.ScaleInitStart, _l7Core.ILayerStage.INIT);
                 _this.scaleOptions = layer.getScaleOptions();
                 attributes = styleAttributeService.getLayerStyleAttributes();
                 dataArray = (_layer$getSource = layer.getSource()) === null || _layer$getSource === void 0 ? void 0 : _layer$getSource.data.dataArray;
 
                 if (!(Array.isArray(dataArray) && dataArray.length === 0)) {
-                  _context.next = 7;
+                  _context.next = 8;
                   break;
                 }
 
                 return _context.abrupt("return");
 
-              case 7:
+              case 8:
                 _this.caculateScalesForAttributes(attributes || [], dataArray);
 
-              case 8:
+              case 9:
+                layer.log(_l7Core.IDebugLog.ScaleInitEnd, _l7Core.ILayerStage.INIT);
+
+              case 10:
               case "end":
                 return _context.stop();
             }
@@ -106,24 +110,26 @@ var FeatureScalePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#
                   return _context2.abrupt("return", flag);
 
                 case 2:
+                  layer.log(_l7Core.IDebugLog.ScaleInitStart, _l7Core.ILayerStage.UPDATE);
                   _this.scaleOptions = layer.getScaleOptions();
                   attributes = styleAttributeService.getLayerStyleAttributes();
                   dataArray = layer.getSource().data.dataArray;
 
                   if (!(Array.isArray(dataArray) && dataArray.length === 0)) {
-                    _context2.next = 7;
+                    _context2.next = 8;
                     break;
                   }
 
                   return _context2.abrupt("return", true);
 
-                case 7:
+                case 8:
                   _this.caculateScalesForAttributes(attributes || [], dataArray);
 
+                  layer.log(_l7Core.IDebugLog.ScaleInitEnd, _l7Core.ILayerStage.UPDATE);
                   layer.layerModelNeedUpdate = true;
                   return _context2.abrupt("return", true);
 
-                case 10:
+                case 12:
                 case "end":
                   return _context2.stop();
               }