@antv/l7-layers 2.13.5 → 2.13.7

package/es/Geometry/models/billboard.js

@@ -161,13 +161,9 @@ var BillBoardModel = /*#__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/es/Geometry/models/plane.js

@@ -238,13 +238,9 @@ var PlaneModel = /*#__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/es/Geometry/models/sprite.js

@@ -262,13 +262,9 @@ var SpriteModel = /*#__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/es/citybuliding/models/build.js

@@ -104,13 +104,9 @@ var CityBuildModel = /*#__PURE__*/function (_BaseModel) {
               case 0:
                 this.calCityGeo();
                 this.startModelAnimate();
-                _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/es/core/BaseLayer.d.ts

@@ -1,5 +1,5 @@
 import { AsyncSeriesBailHook, AsyncWaterfallHook, SyncBailHook, SyncHook } from '@antv/async-hook';
-import { BlendType, IActiveOption, IAnimateOption, IAttributeAndElements, ICameraService, ICoordinateSystemService, IDataState, IEncodeFeature, IFontService, IGlobalConfigService, IIconService, IInteractionService, ILayer, ILayerAttributesOption, ILayerConfig, ILayerModel, ILayerModelInitializationOptions, ILayerPickService, ILayerPlugin, ILayerService, ILegend, IMapService, IModel, IModelInitializationOptions, IMultiPassRenderer, IParseDataItem, IPass, IPickingService, IPostProcessingPass, IRendererService, IScale, IScaleOptions, IShaderModuleService, ISourceCFG, IStyleAttributeService, IStyleAttributeUpdateOptions, ITextureService, LayerEventType, LegendItems, StyleAttributeField, StyleAttributeOption, Triangulation } from '@antv/l7-core';
+import { BlendType, IActiveOption, IAnimateOption, IAttributeAndElements, ICameraService, ICoordinateSystemService, IDataState, IDebugService, IEncodeFeature, IFontService, IGlobalConfigService, IIconService, IInteractionService, ILayer, ILayerAttributesOption, ILayerConfig, ILayerModel, ILayerModelInitializationOptions, ILayerPickService, ILayerPlugin, ILayerService, ILegend, IMapService, IModel, IModelInitializationOptions, IMultiPassRenderer, IParseDataItem, IPass, IPickingService, IPostProcessingPass, IRendererService, IScale, IScaleOptions, IShaderModuleService, ISourceCFG, IStyleAttributeService, IStyleAttributeUpdateOptions, ITextureService, LayerEventType, LegendItems, StyleAttributeField, StyleAttributeOption, Triangulation } from '@antv/l7-core';
 import Source from '@antv/l7-source';
 import { EventEmitter } from 'eventemitter3';
 import { Container } from 'inversify';
@@ -71,6 +71,7 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
     protected pickingService: IPickingService;
     protected rendererService: IRendererService;
     protected layerService: ILayerService;
+    protected debugService: IDebugService;
     protected interactionService: IInteractionService;
     protected mapService: IMapService;
     styleAttributeService: IStyleAttributeService;
@@ -116,6 +117,7 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
     getContainer(): Container;
     addPlugin(plugin: ILayerPlugin): ILayer;
     init(): Promise<void>;
+    log(logType: string, step?: string): void;
     updateModelData(data: IAttributeAndElements): void;
     createModelData(data: any, option?: ISourceCFG): any;
     setLayerPickService(layerPickService: ILayerPickService): void;

package/es/core/BaseLayer.js

@@ -30,7 +30,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 // @ts-ignore
 import { AsyncSeriesBailHook, AsyncWaterfallHook, SyncBailHook, SyncHook } from '@antv/async-hook';
-import { BlendType, lazyInject, TYPES } from '@antv/l7-core';
+import { BlendType, IDebugLog, ILayerStage, lazyInject, TYPES } from '@antv/l7-core';
 import Source from '@antv/l7-source';
 import { encodePickingColor, WorkerSourceMap } from '@antv/l7-utils';
 import { EventEmitter } from 'eventemitter3';
@@ -274,6 +274,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
                 this.fontService = this.container.get(TYPES.IFontService);
                 this.rendererService = this.container.get(TYPES.IRendererService);
                 this.layerService = this.container.get(TYPES.ILayerService);
+                this.debugService = this.container.get(TYPES.IDebugService);
                 this.interactionService = this.container.get(TYPES.IInteractionService);
                 this.pickingService = this.container.get(TYPES.IPickingService);
                 this.mapService = this.container.get(TYPES.IMapService);
@@ -343,12 +344,14 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
 
                 this.layerPickService = new LayerPickService(this); // 颜色纹理服务
 
-                this.textureService = new TextureService(this); // 触发 init 生命周期插件
+                this.textureService = new TextureService(this);
+                this.log(IDebugLog.LayerInitStart); // 触发 init 生命周期插件
 
-                _context.next = 29;
+                _context.next = 31;
                 return this.hooks.init.promise();
 
-              case 29:
+              case 31:
+                this.log(IDebugLog.LayerInitEnd);
                 this.inited = true; // 触发初始化完成事件;
 
                 this.emit('inited', {
@@ -361,7 +364,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
                 });
                 this.hooks.afterInit.call();
 
-              case 33:
+              case 36:
               case "end":
                 return _context.stop();
             }
@@ -375,6 +378,23 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
 
       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) {
@@ -534,10 +554,15 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     value: function setData(data, options) {
       var _this4 = this;
 
+      this.log(IDebugLog.SourceInitStart, ILayerStage.UPDATE);
+
       if (this.inited) {
         this.layerSource.setData(data, options);
+        this.log(IDebugLog.SourceInitEnd, ILayerStage.UPDATE);
       } else {
         this.on('inited', function () {
+          _this4.log(IDebugLog.SourceInitStart, ILayerStage.UPDATE);
+
           var currentSource = _this4.getSource();
 
           if (!currentSource) {
@@ -546,6 +571,10 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
           } else {
             _this4.layerSource.setData(data, options);
           }
+
+          _this4.layerSource.once('update', function () {
+            _this4.log(IDebugLog.SourceInitEnd, ILayerStage.UPDATE);
+          });
         });
       }
 
@@ -1008,7 +1037,9 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
 
       (_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/es/earth/models/atmosphere.js

@@ -51,13 +51,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/es/earth/models/base.js

@@ -123,13 +123,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/es/earth/models/bloomsphere.js

@@ -51,13 +51,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/es/heatmap/models/grid.js

@@ -55,13 +55,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/es/heatmap/models/grid3d.js

@@ -55,13 +55,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/es/heatmap/models/heatmap.js

@@ -146,13 +146,9 @@ var HeatMapModel = (_dec = injectable(), _dec(_class = /*#__PURE__*/function (_B
           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/es/heatmap/models/hexagon.js

@@ -55,13 +55,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/es/image/models/image.js

@@ -152,13 +152,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/es/index.d.ts

@@ -13,5 +13,5 @@ import TileDebugLayer from './tile/tileFactory/layers/TileDebugLayer';
 import EarthLayer from './earth';
 import MaskLayer from './mask';
 import WindLayer from './wind';
-export { BaseLayer, BaseModel, PointLayer, PolygonLayer, LineLayer, CityBuildingLayer, GeometryLayer, CanvasLayer, ImageLayer, RasterLayer, HeatmapLayer, EarthLayer, WindLayer, MaskLayer, TileDebugLayer, };
 export * from './core/interface';
+export { BaseLayer, BaseModel, PointLayer, PolygonLayer, LineLayer, CityBuildingLayer, GeometryLayer, CanvasLayer, ImageLayer, RasterLayer, HeatmapLayer, EarthLayer, WindLayer, MaskLayer, TileDebugLayer, };

package/es/index.js

@@ -103,5 +103,5 @@ container.bind(TYPES.ILayerPlugin).to(PixelPickingPlugin).inRequestScope();
  */
 
 container.bind(TYPES.ILayerPlugin).to(LayerModelPlugin).inRequestScope();
-export { BaseLayer, BaseModel, PointLayer, PolygonLayer, LineLayer, CityBuildingLayer, GeometryLayer, CanvasLayer, ImageLayer, RasterLayer, HeatmapLayer, EarthLayer, WindLayer, MaskLayer, TileDebugLayer };
-export * from "./core/interface";
+export * from "./core/interface";
+export { BaseLayer, BaseModel, PointLayer, PolygonLayer, LineLayer, CityBuildingLayer, GeometryLayer, CanvasLayer, ImageLayer, RasterLayer, HeatmapLayer, EarthLayer, WindLayer, MaskLayer, TileDebugLayer };

package/es/line/models/arc.js

@@ -208,13 +208,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/es/line/models/arc_3d.js

@@ -199,13 +199,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/es/line/models/earthArc_3d.js

@@ -199,13 +199,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/es/line/models/great_circle.js

@@ -186,13 +186,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/es/line/models/half.js

@@ -117,13 +117,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/es/line/models/line.d.ts

@@ -1,6 +1,7 @@
 import { IModel, IModelUniform, ITexture2D } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class LineModel extends BaseModel {
+    private textureEventFlag;
     protected texture: ITexture2D;
     getUninforms(): IModelUniform;
     getAnimateUniforms(): IModelUniform;

package/es/line/models/line.js

@@ -54,6 +54,8 @@ var LineModel = /*#__PURE__*/function (_BaseModel) {
 
     _this = _super.call.apply(_super, [this].concat(args));
 
+    _defineProperty(_assertThisInitialized(_this), "textureEventFlag", false);
+
     _defineProperty(_assertThisInitialized(_this), "texture", _this.createTexture2D({
       data: [0, 0, 0, 0],
       mag: gl.NEAREST,
@@ -133,8 +135,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();
       } // 转化渐变色
 
 
@@ -236,13 +238,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/es/line/models/linearline.js

@@ -143,13 +143,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/es/line/models/simpleLine.js

@@ -112,13 +112,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/es/line/models/wall.js

@@ -140,13 +140,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/es/mask/models/fill.js

@@ -55,13 +55,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();
             }
@@ -133,7 +129,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/es/plugins/DataMappingPlugin.js

@@ -10,7 +10,7 @@ import _initializerWarningHelper from "@babel/runtime/helpers/esm/initializerWar
 var _dec, _dec2, _dec3, _class, _class2, _descriptor, _descriptor2;
 
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import { TYPES } from '@antv/l7-core';
+import { IDebugLog, ILayerStage, TYPES } from '@antv/l7-core';
 import { Version } from '@antv/l7-maps';
 import { normalize, rgb2arr } from '@antv/l7-utils';
 import { inject, injectable } from 'inversify';
@@ -36,12 +36,15 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                // 初始化重新生成 map
+                layer.log(IDebugLog.MappingStart, ILayerStage.INIT); // 初始化重新生成 map
+
                 _this.generateMaping(layer, {
                   styleAttributeService: styleAttributeService
                 });
 
-              case 1:
+                layer.log(IDebugLog.MappingEnd, ILayerStage.INIT);
+
+              case 3:
               case "end":
                 return _context.stop();
             }
@@ -50,6 +53,7 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
       })));
       layer.hooks.beforeRenderData.tapPromise('DataMappingPlugin', /*#__PURE__*/function () {
         var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(flag) {
+          var mappingResult;
           return _regeneratorRuntime.wrap(function _callee2$(_context2) {
             while (1) {
               switch (_context2.prev = _context2.next) {
@@ -63,11 +67,14 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
 
                 case 2:
                   layer.dataState.dataMappingNeedUpdate = false;
-                  return _context2.abrupt("return", _this.generateMaping(layer, {
+                  layer.log(IDebugLog.MappingStart, ILayerStage.UPDATE);
+                  mappingResult = _this.generateMaping(layer, {
                     styleAttributeService: styleAttributeService
-                  }));
+                  });
+                  layer.log(IDebugLog.MappingEnd, ILayerStage.UPDATE);
+                  return _context2.abrupt("return", mappingResult);
 
-                case 4:
+                case 7:
                 case "end":
                   return _context2.stop();
               }