@antv/l7-core - npm Package Compare versions

Comparing version 2.13.6 to 2.13.7

es/index.d.ts

@@ -5,35 +5,19 @@ import container, { createLayerContainer, createSceneContainer, lazyInject, lazyMultiInject } from './inversify.config';
 import { packCircleVertex } from './utils/vertex-compression';
-export { 
-/**
- * IoC 容器
- */
-container, createSceneContainer, createLayerContainer, 
-/**
- * lazy inject，供各个 Layer 使用
- */
-lazyInject, lazyMultiInject, 
-/**
- * 各个 Service 接口标识符
- */
-TYPES, packCircleVertex, BasePostProcessingPass, };
-/** 暴露服务接口供其他 packages 实现 */
-export * from './services/layer/ILayerService';
-export * from './services/debug/IDebugService';
-export * from './services/layer/IStyleAttributeService';
-export * from './services/source/ISourceService';
-export * from './services/map/IMapService';
-export * from './services/coordinate/ICoordinateSystemService';
-export * from './services/renderer/IRendererService';
-export * from './services/camera/ICameraService';
-export * from './services/config/IConfigService';
-export * from './services/scene/ISceneService';
-export * from './services/shader/IShaderModuleService';
+export * from './services/asset/IFontService';
 export * from './services/asset/IIconService';
-export * from './services/asset/IFontService';
 export * from './services/asset/ITextureService';
+export * from './services/camera/ICameraService';
 export * from './services/component/IControlService';
 export * from './services/component/IMarkerService';
 export * from './services/component/IPopupService';
+export * from './services/config/IConfigService';
+export * from './services/coordinate/ICoordinateSystemService';
+export * from './services/debug/IDebugService';
 export * from './services/interaction/IInteractionService';
 export * from './services/interaction/IPickingService';
+/** 暴露服务接口供其他 packages 实现 */
+export * from './services/layer/ILayerService';
+export * from './services/layer/IStyleAttributeService';
+export * from './services/map/IMapService';
+export * from './services/renderer/gl';
 /** 全部渲染服务接口 */
@@ -47,4 +31,16 @@ export * from './services/renderer/IAttribute';
 export * from './services/renderer/IRenderbuffer';
+export * from './services/renderer/IRendererService';
 export * from './services/renderer/ITexture2D';
 export * from './services/renderer/IUniform';
-export * from './services/renderer/gl';
+export * from './services/scene/ISceneService';
+export * from './services/shader/IShaderModuleService';
+export * from './services/source/ISourceService';
+export { container, createSceneContainer, createLayerContainer, 
+/**
+ * lazy inject，供各个 Layer 使用
+ */
+lazyInject, lazyMultiInject, 
+/**
+ * 各个 Service 接口标识符
+ */
+TYPES, packCircleVertex, BasePostProcessingPass, };

es/index.js

@@ -5,36 +5,20 @@ import container, { createLayerContainer, createSceneContainer, lazyInject, lazyMultiInject } from "./inversify.config";
 import { packCircleVertex } from "./utils/vertex-compression";
-export {
-/**
- * IoC 容器
- */
-container, createSceneContainer, createLayerContainer,
-/**
- * lazy inject，供各个 Layer 使用
- */
-lazyInject, lazyMultiInject,
-/**
- * 各个 Service 接口标识符
- */
-TYPES, packCircleVertex, BasePostProcessingPass };
-/** 暴露服务接口供其他 packages 实现 */
-
-export * from "./services/layer/ILayerService";
-export * from "./services/debug/IDebugService";
-export * from "./services/layer/IStyleAttributeService";
-export * from "./services/source/ISourceService";
-export * from "./services/map/IMapService";
-export * from "./services/coordinate/ICoordinateSystemService";
-export * from "./services/renderer/IRendererService";
-export * from "./services/camera/ICameraService";
-export * from "./services/config/IConfigService";
-export * from "./services/scene/ISceneService";
-export * from "./services/shader/IShaderModuleService";
+export * from "./services/asset/IFontService";
 export * from "./services/asset/IIconService";
-export * from "./services/asset/IFontService";
 export * from "./services/asset/ITextureService";
+export * from "./services/camera/ICameraService";
 export * from "./services/component/IControlService";
 export * from "./services/component/IMarkerService";
 export * from "./services/component/IPopupService";
+export * from "./services/config/IConfigService";
+export * from "./services/coordinate/ICoordinateSystemService";
+export * from "./services/debug/IDebugService";
 export * from "./services/interaction/IInteractionService";
 export * from "./services/interaction/IPickingService";
+/** 暴露服务接口供其他 packages 实现 */
+
+export * from "./services/layer/ILayerService";
+export * from "./services/layer/IStyleAttributeService";
+export * from "./services/map/IMapService";
+export * from "./services/renderer/gl";
 /** 全部渲染服务接口 */
@@ -49,4 +33,16 @@
 export * from "./services/renderer/IRenderbuffer";
+export * from "./services/renderer/IRendererService";
 export * from "./services/renderer/ITexture2D";
 export * from "./services/renderer/IUniform";
-export * from "./services/renderer/gl";
+export * from "./services/scene/ISceneService";
+export * from "./services/shader/IShaderModuleService";
+export * from "./services/source/ISourceService";
+export { container, createSceneContainer, createLayerContainer,
+/**
+ * lazy inject，供各个 Layer 使用
+ */
+lazyInject, lazyMultiInject,
+/**
+ * 各个 Service 接口标识符
+ */
+TYPES, packCircleVertex, BasePostProcessingPass };

es/inversify.config.js

@@ -21,6 +21,6 @@ /**
 import CoordinateSystemService from "./services/coordinate/CoordinateSystemService";
+import DebugService from "./services/debug/DebugService";
 import InteractionService from "./services/interaction/InteractionService";
 import PickingService from "./services/interaction/PickingService";
 import LayerService from "./services/layer/LayerService";
-import DebugService from "./services/debug/DebugService";
 import StyleAttributeService from "./services/layer/StyleAttributeService";
@@ -27,0 +27,0 @@ import SceneService from "./services/scene/SceneService";

es/services/asset/FontService.js

@@ -23,4 +23,4 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { $window, LRUCache } from '@antv/l7-utils';
+import { EventEmitter } from 'eventemitter3';
 import { injectable } from 'inversify';
-import { EventEmitter } from 'eventemitter3';
 import TinySDF from 'l7-tiny-sdf';
@@ -27,0 +27,0 @@ import 'reflect-metadata';

es/services/config/ConfigService.d.ts

 import 'reflect-metadata';
-import { ILayerConfig, ILayerAttributesOption } from '../layer/ILayerService';
+import { ILayerAttributesOption, ILayerConfig } from '../layer/ILayerService';
 import { IGlobalConfigService, ISceneConfig } from './IConfigService';
@@ -4,0 +4,0 @@ export default class GlobalConfigService implements IGlobalConfigService {

es/services/config/IConfigService.d.ts

 import { PositionName } from '../component/IControlService';
-import { ILayerConfig, ILayerAttributesOption } from '../layer/ILayerService';
+import { ILayerAttributesOption, ILayerConfig } from '../layer/ILayerService';
 import { IMapWrapper } from '../map/IMapService';
@@ -53,4 +53,4 @@ import { IRenderConfig } from '../renderer/IRendererService';
     /**
-   * 获取数据映射
-   */
+     * 获取数据映射
+     */
     getAttributeConfig(layerId: string): Partial<ILayerAttributesOption>;
@@ -57,0 +57,0 @@ /**

es/services/debug/DebugService.d.ts

 import { EventEmitter } from 'eventemitter3';
 import { IDebugService, ILog } from './IDebugService';
 export default class DebugService extends EventEmitter implements IDebugService {
-    private logMap;
     private renderMap;
@@ -9,4 +8,5 @@ private enable;
     setEnable(flag: boolean): void;
+    private cacheLogs;
     log(key: string, values: ILog): void;
-    getLog(key: string | string[] | undefined): ILog | undefined;
+    getLog(key?: string | string[]): any;
     /**
@@ -19,5 +19,5 @@ * 删除日志
     renderDebug(enable: boolean): void;
-    renderStart(guid: string): void;
-    renderEnd(guid: string): void;
+    renderStart(id: string): void;
+    renderEnd(id: string): void;
     destroy(): void;
 }

es/services/debug/DebugService.js

 import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
@@ -37,4 +36,2 @@ import _createClass from "@babel/runtime/helpers/esm/createClass";
 
-    _defineProperty(_assertThisInitialized(_this), "logMap", new Map());
-
     _defineProperty(_assertThisInitialized(_this), "renderMap", new Map());
@@ -46,2 +43,4 @@
 
+    _defineProperty(_assertThisInitialized(_this), "cacheLogs", {});
+
     return _this;
@@ -58,2 +57,4 @@ }
     value: function log(key, values) {
+      var _this2 = this;
+
       if (!this.enable) {
@@ -63,27 +64,30 @@ return;
 
-      var _key$split = key.split('.'),
-          _key$split2 = _slicedToArray(_key$split, 2),
-          k1 = _key$split2[0],
-          k2 = _key$split2[1];
+      var keys = key.split('.'); // [12, init, layerInitStart]
 
-      var logType = k2;
-      /**
-       * map: {
-       *  mapInitStart: { time, ... }
-       * },
-       * 12: {
-       *  layerInitStart: { time, id, ... },
-       *  layerInitEnd: { time, id, ... },
-       * }
-       */
+      var parent = null;
+      keys.forEach(function (k, i) {
+        if (parent !== null) {
+          if (!parent[k]) {
+            parent[k] = {};
+          }
 
-      var cacheLog = this.logMap.get(k1) || {}; // 一级存储对象
+          if (i !== keys.length - 1) {
+            parent = parent[k];
+          }
+        } else {
+          if (!_this2.cacheLogs[k]) {
+            _this2.cacheLogs[k] = {};
+          }
 
-      var cacheLogValues = cacheLog[logType] || {}; // 二级存储对象
+          if (i !== keys.length - 1) {
+            parent = _this2.cacheLogs[k];
+          }
+        }
 
-      var logValues = _objectSpread(_objectSpread({
-        time: Date.now()
-      }, cacheLogValues), values);
-
-      this.logMap.set(k1, _objectSpread(_objectSpread({}, cacheLog), {}, _defineProperty({}, logType, logValues)));
+        if (i === keys.length - 1) {
+          parent[k] = _objectSpread(_objectSpread({
+            time: Date.now()
+          }, parent[k]), values);
+        }
+      });
     }
@@ -93,11 +97,11 @@ }, {
     value: function getLog(key) {
-      var _this2 = this;
+      var _this3 = this;
 
       switch (_typeof(key)) {
         case 'string':
-          return this.logMap.get(key);
+          return this.cacheLogs[key];
 
         case 'object':
           return key.map(function (k) {
-            return _this2.logMap.get(k);
+            return _this3.cacheLogs[k];
           }).filter(function (o) {
@@ -108,5 +112,3 @@ return o !== undefined;
         case 'undefined':
-          return Array.from(this.logMap.keys()).map(function (k) {
-            return _this2.logMap.get(k);
-          });
+          return this.cacheLogs;
       }
@@ -122,3 +124,3 @@ }
     value: function removeLog(key) {
-      this.logMap.delete(key);
+      delete this.cacheLogs[key];
     }
@@ -141,3 +143,3 @@ }, {
     key: "renderStart",
-    value: function renderStart(guid) {
+    value: function renderStart(id) {
       if (!this.renderEnable || !this.enable) {
@@ -147,5 +149,5 @@ return;
 
-      var cacheRenderInfo = this.renderMap.get(guid) || {};
-      this.renderMap.set(guid, _objectSpread(_objectSpread({}, cacheRenderInfo), {}, {
-        renderUid: guid,
+      var cacheRenderInfo = this.renderMap.get(id) || {};
+      this.renderMap.set(id, _objectSpread(_objectSpread({}, cacheRenderInfo), {}, {
+        renderUid: id,
         renderStart: Date.now()
@@ -156,3 +158,3 @@ }));
     key: "renderEnd",
-    value: function renderEnd(guid) {
+    value: function renderEnd(id) {
       if (!this.renderEnable || !this.enable) {
@@ -162,3 +164,3 @@ return;
 
-      var cacheRenderInfo = this.renderMap.get(guid);
+      var cacheRenderInfo = this.renderMap.get(id);
 
@@ -172,3 +174,3 @@ if (cacheRenderInfo) {
         }));
-        this.renderMap.delete(guid);
+        this.renderMap.delete(id);
       }
@@ -179,3 +181,3 @@ }
     value: function destroy() {
-      this.logMap.clear();
+      this.cacheLogs = null;
       this.renderMap.clear();
@@ -182,0 +184,0 @@ }

es/services/debug/IDebugService.d.ts

@@ -28,3 +28,3 @@ export type ILayerId = string;
     log(key: string, values: ILog): void;
-    getLog(key: string | string[] | undefined): ILog[] | ILog | undefined;
+    getLog(key?: string | string[]): ILog[] | ILog | undefined;
     removeLog(key: string): void;
@@ -31,0 +31,0 @@ generateRenderUid(): string;

es/services/layer/ILayerService.d.ts

@@ -1,2 +0,2 @@
-import { SyncBailHook, SyncHook, AsyncSeriesBailHook, AsyncWaterfallHook } from '@antv/async-hook';
+import { AsyncSeriesBailHook, AsyncWaterfallHook, SyncBailHook, SyncHook } from '@antv/async-hook';
 import { IColorRamp, SourceTile, TilesetManager } from '@antv/l7-utils';
@@ -16,3 +16,3 @@ import { Container } from 'inversify';
 import { IUniform } from '../renderer/IUniform';
-import { ISource, ISourceCFG, ITransform, IParseDataItem } from '../source/ISourceService';
+import { IParseDataItem, ISource, ISourceCFG, ITransform } from '../source/ISourceService';
 import { IAnimateOption, IEncodeFeature, IScale, IScaleOptions, IScaleValue, IStyleAttribute, IStyleAttributeService, IStyleAttributeUpdateOptions, ScaleTypeName, StyleAttrField, StyleAttributeField, StyleAttributeOption, Triangulation } from './IStyleAttributeService';
@@ -223,2 +223,6 @@ export declare enum BlendType {
 export type LayerEventType = 'inited' | 'legend' | 'legend:color' | 'legend:size' | 'add' | 'remove' | 'destroy' | 'contextmenu' | 'uncontextmenu' | 'unpick' | 'mousedown' | 'unmousedown' | 'unclick' | 'undblclick' | 'unmouseenter' | 'unmousemove' | 'mouseout' | 'click' | 'dblclick' | 'mouseenter' | 'unmousemove' | 'mouseout' | 'show' | 'hide' | any;
+export declare enum ILayerStage {
+    INIT = "init",
+    UPDATE = "update"
+}
 export interface ILayer {
@@ -347,3 +351,3 @@ styleAttributeService: IStyleAttributeService;
     get(name: string): number;
-    log(type: string, time?: number): void;
+    log(type: string, step: string): void;
     setBlend(type: keyof typeof BlendType): ILayer;
@@ -350,0 +354,0 @@ setMultiPass(multipass: boolean, passes?: Array<string | [string, {

es/services/layer/ILayerService.js

@@ -11,2 +11,9 @@ // @ts-ignore
   BlendType["none"] = "none";
-})(BlendType || (BlendType = {}));
+})(BlendType || (BlendType = {}));
+
+export var ILayerStage;
+
+(function (ILayerStage) {
+  ILayerStage["INIT"] = "init";
+  ILayerStage["UPDATE"] = "update";
+})(ILayerStage || (ILayerStage = {}));

es/services/layer/StyleAttributeService.d.ts

@@ -5,3 +5,3 @@ import 'reflect-metadata';
 import { ILayer, IWorkerOption } from './ILayerService';
-import { IScaleOptions, IEncodeFeature, IStyleAttribute, IStyleAttributeInitializationOptions, IStyleAttributeService, IStyleAttributeUpdateOptions, Triangulation } from './IStyleAttributeService';
+import { IEncodeFeature, IScaleOptions, IStyleAttribute, IStyleAttributeInitializationOptions, IStyleAttributeService, IStyleAttributeUpdateOptions, Triangulation } from './IStyleAttributeService';
 /**
@@ -8,0 +8,0 @@ * 每个 Layer 都拥有一个，用于管理样式属性的注册和更新

es/services/layer/StyleAttributeService.js

@@ -169,4 +169,4 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
             for (var vertexIdx = 0; vertexIdx < verticesNumForCurrentFeature; vertexIdx++) {
-              var normal = normals // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-              ? normals.slice(vertexIdx * 3, vertexIdx * 3 + 3) : [];
+              var normal = normals ? // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+              normals.slice(vertexIdx * 3, vertexIdx * 3 + 3) : [];
               featureData.push.apply(featureData, _toConsumableArray(update(features[featureIdx], featureIdx, vertices.slice(vertexIdx * sizePerElement, vertexIdx * sizePerElement + sizePerElement), attributeIdx, normal)));
@@ -173,0 +173,0 @@ }

es/services/scene/ISceneService.d.ts

@@ -0,4 +1,4 @@
+import EventEmitter from 'eventemitter3';
 import { ISceneConfig } from '../config/IConfigService';
 import { ILayer } from '../layer/ILayerService';
-import EventEmitter from 'eventemitter3';
 export interface ISceneService extends EventEmitter {
@@ -5,0 +5,0 @@ destroyed: boolean;

es/services/source/ISourceService.d.ts

@@ -51,3 +51,3 @@ import { RequestParameters, TilesetManager } from '@antv/l7-utils';
     }) => string;
-    transformResponse?: (response: Object) => any;
+    transformResponse?: (response: object) => any;
 }
@@ -54,0 +54,0 @@ export interface IWMTSServiceOption {

lib/index.js

@@ -77,12 +77,12 @@ "use strict";
 
-var _ILayerService = require("./services/layer/ILayerService");
+var _IFontService = require("./services/asset/IFontService");
 
-Object.keys(_ILayerService).forEach(function (key) {
+Object.keys(_IFontService).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _ILayerService[key]) return;
+  if (key in exports && exports[key] === _IFontService[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _ILayerService[key];
+      return _IFontService[key];
     }
@@ -92,12 +92,12 @@ });
 
-var _IDebugService = require("./services/debug/IDebugService");
+var _IIconService = require("./services/asset/IIconService");
 
-Object.keys(_IDebugService).forEach(function (key) {
+Object.keys(_IIconService).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _IDebugService[key]) return;
+  if (key in exports && exports[key] === _IIconService[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _IDebugService[key];
+      return _IIconService[key];
     }
@@ -107,12 +107,12 @@ });
 
-var _IStyleAttributeService = require("./services/layer/IStyleAttributeService");
+var _ITextureService = require("./services/asset/ITextureService");
 
-Object.keys(_IStyleAttributeService).forEach(function (key) {
+Object.keys(_ITextureService).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _IStyleAttributeService[key]) return;
+  if (key in exports && exports[key] === _ITextureService[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _IStyleAttributeService[key];
+      return _ITextureService[key];
     }
@@ -122,12 +122,12 @@ });
 
-var _ISourceService = require("./services/source/ISourceService");
+var _ICameraService = require("./services/camera/ICameraService");
 
-Object.keys(_ISourceService).forEach(function (key) {
+Object.keys(_ICameraService).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _ISourceService[key]) return;
+  if (key in exports && exports[key] === _ICameraService[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _ISourceService[key];
+      return _ICameraService[key];
     }
@@ -137,12 +137,12 @@ });
 
-var _IMapService = require("./services/map/IMapService");
+var _IControlService = require("./services/component/IControlService");
 
-Object.keys(_IMapService).forEach(function (key) {
+Object.keys(_IControlService).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _IMapService[key]) return;
+  if (key in exports && exports[key] === _IControlService[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _IMapService[key];
+      return _IControlService[key];
     }
@@ -152,12 +152,12 @@ });
 
-var _ICoordinateSystemService = require("./services/coordinate/ICoordinateSystemService");
+var _IMarkerService = require("./services/component/IMarkerService");
 
-Object.keys(_ICoordinateSystemService).forEach(function (key) {
+Object.keys(_IMarkerService).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _ICoordinateSystemService[key]) return;
+  if (key in exports && exports[key] === _IMarkerService[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _ICoordinateSystemService[key];
+      return _IMarkerService[key];
     }
@@ -167,12 +167,12 @@ });
 
-var _IRendererService = require("./services/renderer/IRendererService");
+var _IPopupService = require("./services/component/IPopupService");
 
-Object.keys(_IRendererService).forEach(function (key) {
+Object.keys(_IPopupService).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _IRendererService[key]) return;
+  if (key in exports && exports[key] === _IPopupService[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _IRendererService[key];
+      return _IPopupService[key];
     }
@@ -182,16 +182,2 @@ });
 
-var _ICameraService = require("./services/camera/ICameraService");
-
-Object.keys(_ICameraService).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _ICameraService[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _ICameraService[key];
-    }
-  });
-});
-
 var _IConfigService = require("./services/config/IConfigService");
@@ -211,12 +197,12 @@
 
-var _ISceneService = require("./services/scene/ISceneService");
+var _ICoordinateSystemService = require("./services/coordinate/ICoordinateSystemService");
 
-Object.keys(_ISceneService).forEach(function (key) {
+Object.keys(_ICoordinateSystemService).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _ISceneService[key]) return;
+  if (key in exports && exports[key] === _ICoordinateSystemService[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _ISceneService[key];
+      return _ICoordinateSystemService[key];
     }
@@ -226,12 +212,12 @@ });
 
-var _IShaderModuleService = require("./services/shader/IShaderModuleService");
+var _IDebugService = require("./services/debug/IDebugService");
 
-Object.keys(_IShaderModuleService).forEach(function (key) {
+Object.keys(_IDebugService).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _IShaderModuleService[key]) return;
+  if (key in exports && exports[key] === _IDebugService[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _IShaderModuleService[key];
+      return _IDebugService[key];
     }
@@ -241,12 +227,12 @@ });
 
-var _IIconService = require("./services/asset/IIconService");
+var _IInteractionService = require("./services/interaction/IInteractionService");
 
-Object.keys(_IIconService).forEach(function (key) {
+Object.keys(_IInteractionService).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _IIconService[key]) return;
+  if (key in exports && exports[key] === _IInteractionService[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _IIconService[key];
+      return _IInteractionService[key];
     }
@@ -256,12 +242,12 @@ });
 
-var _IFontService = require("./services/asset/IFontService");
+var _IPickingService = require("./services/interaction/IPickingService");
 
-Object.keys(_IFontService).forEach(function (key) {
+Object.keys(_IPickingService).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _IFontService[key]) return;
+  if (key in exports && exports[key] === _IPickingService[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _IFontService[key];
+      return _IPickingService[key];
     }
@@ -271,12 +257,12 @@ });
 
-var _ITextureService = require("./services/asset/ITextureService");
+var _ILayerService = require("./services/layer/ILayerService");
 
-Object.keys(_ITextureService).forEach(function (key) {
+Object.keys(_ILayerService).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _ITextureService[key]) return;
+  if (key in exports && exports[key] === _ILayerService[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _ITextureService[key];
+      return _ILayerService[key];
     }
@@ -286,12 +272,12 @@ });
 
-var _IControlService = require("./services/component/IControlService");
+var _IStyleAttributeService = require("./services/layer/IStyleAttributeService");
 
-Object.keys(_IControlService).forEach(function (key) {
+Object.keys(_IStyleAttributeService).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _IControlService[key]) return;
+  if (key in exports && exports[key] === _IStyleAttributeService[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _IControlService[key];
+      return _IStyleAttributeService[key];
     }
@@ -301,12 +287,12 @@ });
 
-var _IMarkerService = require("./services/component/IMarkerService");
+var _IMapService = require("./services/map/IMapService");
 
-Object.keys(_IMarkerService).forEach(function (key) {
+Object.keys(_IMapService).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _IMarkerService[key]) return;
+  if (key in exports && exports[key] === _IMapService[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _IMarkerService[key];
+      return _IMapService[key];
     }
@@ -316,12 +302,12 @@ });
 
-var _IPopupService = require("./services/component/IPopupService");
+var _gl = require("./services/renderer/gl");
 
-Object.keys(_IPopupService).forEach(function (key) {
+Object.keys(_gl).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _IPopupService[key]) return;
+  if (key in exports && exports[key] === _gl[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _IPopupService[key];
+      return _gl[key];
     }
@@ -331,30 +317,2 @@ });
 
-var _IInteractionService = require("./services/interaction/IInteractionService");
-
-Object.keys(_IInteractionService).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _IInteractionService[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _IInteractionService[key];
-    }
-  });
-});
-
-var _IPickingService = require("./services/interaction/IPickingService");
-
-Object.keys(_IPickingService).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _IPickingService[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _IPickingService[key];
-    }
-  });
-});
-
 var _IAttribute = require("./services/renderer/IAttribute");
@@ -458,2 +416,16 @@
 
+var _IRendererService = require("./services/renderer/IRendererService");
+
+Object.keys(_IRendererService).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _IRendererService[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _IRendererService[key];
+    }
+  });
+});
+
 var _ITexture2D = require("./services/renderer/ITexture2D");
@@ -487,12 +459,12 @@
 
-var _gl = require("./services/renderer/gl");
+var _ISceneService = require("./services/scene/ISceneService");
 
-Object.keys(_gl).forEach(function (key) {
+Object.keys(_ISceneService).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _gl[key]) return;
+  if (key in exports && exports[key] === _ISceneService[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _gl[key];
+      return _ISceneService[key];
     }
@@ -502,4 +474,32 @@ });
 
+var _IShaderModuleService = require("./services/shader/IShaderModuleService");
+
+Object.keys(_IShaderModuleService).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _IShaderModuleService[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _IShaderModuleService[key];
+    }
+  });
+});
+
+var _ISourceService = require("./services/source/ISourceService");
+
+Object.keys(_ISourceService).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _ISourceService[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _ISourceService[key];
+    }
+  });
+});
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }

lib/inversify.config.js

@@ -38,2 +38,4 @@ "use strict";
 
+var _DebugService = _interopRequireDefault(require("./services/debug/DebugService"));
+
 var _InteractionService = _interopRequireDefault(require("./services/interaction/InteractionService"));
@@ -45,4 +47,2 @@
 
-var _DebugService = _interopRequireDefault(require("./services/debug/DebugService"));
-
 var _StyleAttributeService = _interopRequireDefault(require("./services/layer/StyleAttributeService"));
@@ -49,0 +49,0 @@

lib/services/asset/FontService.js

@@ -28,6 +28,6 @@ "use strict";
 
+var _eventemitter = require("eventemitter3");
+
 var _inversify = require("inversify");
 
-var _eventemitter = require("eventemitter3");
-
 var _l7TinySdf = _interopRequireDefault(require("l7-tiny-sdf"));
@@ -34,0 +34,0 @@

lib/services/debug/DebugService.js

@@ -12,6 +12,4 @@ "use strict";
 
-var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -58,6 +56,6 @@
     _this = _super.call.apply(_super, [this].concat(args));
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "logMap", new Map());
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "renderMap", new Map());
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "enable", false);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "renderEnable", false);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "cacheLogs", {});
     return _this;
@@ -74,2 +72,4 @@ }
     value: function log(key, values) {
+      var _this2 = this;
+
       if (!this.enable) {
@@ -79,26 +79,30 @@ return;
 
-      var _key$split = key.split('.'),
-          _key$split2 = (0, _slicedToArray2.default)(_key$split, 2),
-          k1 = _key$split2[0],
-          k2 = _key$split2[1];
+      var keys = key.split('.'); // [12, init, layerInitStart]
 
-      var logType = k2;
-      /**
-       * map: {
-       *  mapInitStart: { time, ... }
-       * },
-       * 12: {
-       *  layerInitStart: { time, id, ... },
-       *  layerInitEnd: { time, id, ... },
-       * }
-       */
+      var parent = null;
+      keys.forEach(function (k, i) {
+        if (parent !== null) {
+          if (!parent[k]) {
+            parent[k] = {};
+          }
 
-      var cacheLog = this.logMap.get(k1) || {}; // 一级存储对象
+          if (i !== keys.length - 1) {
+            parent = parent[k];
+          }
+        } else {
+          if (!_this2.cacheLogs[k]) {
+            _this2.cacheLogs[k] = {};
+          }
 
-      var cacheLogValues = cacheLog[logType] || {}; // 二级存储对象
+          if (i !== keys.length - 1) {
+            parent = _this2.cacheLogs[k];
+          }
+        }
 
-      var logValues = (0, _objectSpread3.default)((0, _objectSpread3.default)({
-        time: Date.now()
-      }, cacheLogValues), values);
-      this.logMap.set(k1, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, cacheLog), {}, (0, _defineProperty2.default)({}, logType, logValues)));
+        if (i === keys.length - 1) {
+          parent[k] = (0, _objectSpread2.default)((0, _objectSpread2.default)({
+            time: Date.now()
+          }, parent[k]), values);
+        }
+      });
     }
@@ -108,11 +112,11 @@ }, {
     value: function getLog(key) {
-      var _this2 = this;
+      var _this3 = this;
 
       switch ((0, _typeof2.default)(key)) {
         case 'string':
-          return this.logMap.get(key);
+          return this.cacheLogs[key];
 
         case 'object':
           return key.map(function (k) {
-            return _this2.logMap.get(k);
+            return _this3.cacheLogs[k];
           }).filter(function (o) {
@@ -123,5 +127,3 @@ return o !== undefined;
         case 'undefined':
-          return Array.from(this.logMap.keys()).map(function (k) {
-            return _this2.logMap.get(k);
-          });
+          return this.cacheLogs;
       }
@@ -137,3 +139,3 @@ }
     value: function removeLog(key) {
-      this.logMap.delete(key);
+      delete this.cacheLogs[key];
     }
@@ -156,3 +158,3 @@ }, {
     key: "renderStart",
-    value: function renderStart(guid) {
+    value: function renderStart(id) {
       if (!this.renderEnable || !this.enable) {
@@ -162,5 +164,5 @@ return;
 
-      var cacheRenderInfo = this.renderMap.get(guid) || {};
-      this.renderMap.set(guid, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, cacheRenderInfo), {}, {
-        renderUid: guid,
+      var cacheRenderInfo = this.renderMap.get(id) || {};
+      this.renderMap.set(id, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, cacheRenderInfo), {}, {
+        renderUid: id,
         renderStart: Date.now()
@@ -171,3 +173,3 @@ }));
     key: "renderEnd",
-    value: function renderEnd(guid) {
+    value: function renderEnd(id) {
       if (!this.renderEnable || !this.enable) {
@@ -177,3 +179,3 @@ return;
 
-      var cacheRenderInfo = this.renderMap.get(guid);
+      var cacheRenderInfo = this.renderMap.get(id);
 
@@ -183,7 +185,7 @@ if (cacheRenderInfo) {
         var renderEnd = Date.now();
-        this.emit('renderEnd', (0, _objectSpread3.default)((0, _objectSpread3.default)({}, cacheRenderInfo), {}, {
+        this.emit('renderEnd', (0, _objectSpread2.default)((0, _objectSpread2.default)({}, cacheRenderInfo), {}, {
           renderEnd: renderEnd,
           renderDuration: renderEnd - renderStart
         }));
-        this.renderMap.delete(guid);
+        this.renderMap.delete(id);
       }
@@ -194,3 +196,3 @@ }
     value: function destroy() {
-      this.logMap.clear();
+      this.cacheLogs = null;
       this.renderMap.clear();
@@ -197,0 +199,0 @@ }

lib/services/layer/ILayerService.js

@@ -6,3 +6,3 @@ "use strict";
 });
-exports.BlendType = void 0;
+exports.ILayerStage = exports.BlendType = void 0;
 // @ts-ignore
@@ -19,2 +19,10 @@ var BlendType;
   BlendType["none"] = "none";
-})(BlendType || (exports.BlendType = BlendType = {}));
+})(BlendType || (exports.BlendType = BlendType = {}));
+
+var ILayerStage;
+exports.ILayerStage = ILayerStage;
+
+(function (ILayerStage) {
+  ILayerStage["INIT"] = "init";
+  ILayerStage["UPDATE"] = "update";
+})(ILayerStage || (exports.ILayerStage = ILayerStage = {}));

lib/services/layer/StyleAttributeService.js

@@ -188,4 +188,4 @@ "use strict";
             for (var vertexIdx = 0; vertexIdx < verticesNumForCurrentFeature; vertexIdx++) {
-              var normal = normals // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-              ? normals.slice(vertexIdx * 3, vertexIdx * 3 + 3) : [];
+              var normal = normals ? // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+              normals.slice(vertexIdx * 3, vertexIdx * 3 + 3) : [];
               featureData.push.apply(featureData, (0, _toConsumableArray2.default)(update(features[featureIdx], featureIdx, vertices.slice(vertexIdx * sizePerElement, vertexIdx * sizePerElement + sizePerElement), attributeIdx, normal)));
@@ -192,0 +192,0 @@ }

package.json

 {
   "name": "@antv/l7-core",
-  "version": "2.13.6",
+  "version": "2.13.7",
   "description": "",
@@ -28,3 +28,3 @@ "main": "lib/index.js",
     "@antv/async-hook": "^2.2.9",
-    "@antv/l7-utils": "2.13.6",
+    "@antv/l7-utils": "2.13.7",
     "@babel/runtime": "^7.7.7",
@@ -52,3 +52,3 @@ "@turf/helpers": "^6.1.4",
   },
-  "gitHead": "dc11ec312f2078704e548ba540d3289e1f752441",
+  "gitHead": "322cff4a31491437a1409ec3f7d3a313ba8a3a2c",
   "publishConfig": {
@@ -55,0 +55,0 @@ "access": "public"

No alert changes

Improved metrics

Lines of code

20104

increased by0.05%

Worsened metrics

Total package byte prevSize

992241

decreased by-0.01%

Dependency changes

• + Added@antv/l7-utils@2.13.7(transitive)

• - Removed@antv/l7-utils@2.13.6(transitive)

• Updated@antv/l7-utils@2.13.7