@antv/l7-layers 2.20.20 → 2.21.1

package/es/plugins/DataMappingPlugin.js

@@ -1,29 +1,24 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _initializerDefineProperty from "@babel/runtime/helpers/esm/initializerDefineProperty";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import _applyDecoratedDescriptor from "@babel/runtime/helpers/esm/applyDecoratedDescriptor";
-import _initializerWarningHelper from "@babel/runtime/helpers/esm/initializerWarningHelper";
-var _dec, _dec2, _dec3, _class, _class2, _descriptor, _descriptor2;
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import { IDebugLog, ILayerStage, TYPES } from '@antv/l7-core';
+import { IDebugLog, ILayerStage } from '@antv/l7-core';
 import { lodashUtil, normalize, rgb2arr } from '@antv/l7-utils';
-import { inject, injectable } from 'inversify';
-import 'reflect-metadata';
 var cloneDeep = lodashUtil.cloneDeep;
-var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService), _dec3 = inject(TYPES.IFontService), _dec(_class = (_class2 = /*#__PURE__*/function () {
+var DataMappingPlugin = /*#__PURE__*/function () {
   function DataMappingPlugin() {
     _classCallCheck(this, DataMappingPlugin);
-    _initializerDefineProperty(this, "mapService", _descriptor, this);
-    _initializerDefineProperty(this, "fontService", _descriptor2, this);
   }
   _createClass(DataMappingPlugin, [{
     key: "apply",
     value: function apply(layer, _ref) {
       var _this = this;
-      var styleAttributeService = _ref.styleAttributeService;
+      var styleAttributeService = _ref.styleAttributeService,
+        mapService = _ref.mapService,
+        fontService = _ref.fontService;
+      this.mapService = mapService;
+      this.fontService = fontService;
       layer.hooks.init.tapPromise('DataMappingPlugin', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -87,7 +82,6 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
           return attribute.needRemapping;
         } // 如果filter变化
         );
-
         var filterData = dataArray;
         // 数据过滤完 再执行数据映射
         if (filter !== null && filter !== void 0 && filter.needRemapping && filter !== null && filter !== void 0 && filter.scale) {
@@ -99,7 +93,6 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
           // 过滤数据
           var encodeData = _this.mapping(layer, attributesToRemapping, filterData, layer.getEncodedData() // TODO 优化
           );
-
           layer.setEncodedData(encodeData);
         }
 
@@ -276,15 +269,5 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
     }
   }]);
   return DataMappingPlugin;
-}(), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "mapService", [_dec2], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _descriptor2 = _applyDecoratedDescriptor(_class2.prototype, "fontService", [_dec3], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-})), _class2)) || _class);
+}();
 export { DataMappingPlugin as default };

package/es/plugins/DataSourcePlugin.d.ts

@@ -1,5 +1,4 @@
 import type { ILayer, ILayerPlugin, IMapService } from '@antv/l7-core';
-import 'reflect-metadata';
 export default class DataSourcePlugin implements ILayerPlugin {
     protected mapService: IMapService;
     apply(layer: ILayer): void;

package/es/plugins/DataSourcePlugin.js

@@ -1,13 +1,10 @@
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
-var _dec, _class;
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import { IDebugLog, ILayerStage, TYPES } from '@antv/l7-core';
+import { IDebugLog, ILayerStage } from '@antv/l7-core';
 import Source from '@antv/l7-source';
-import { injectable } from 'inversify';
-import 'reflect-metadata';
-var DataSourcePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function () {
+var DataSourcePlugin = /*#__PURE__*/function () {
   function DataSourcePlugin() {
     _classCallCheck(this, DataSourcePlugin);
   }
@@ -15,7 +12,7 @@ var DataSourcePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
     key: "apply",
     value: function apply(layer) {
       var _this = this;
-      this.mapService = layer.getContainer().get(TYPES.IMapService);
+      this.mapService = layer.getContainer().mapService;
       layer.hooks.init.tapPromise('DataSourcePlugin', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         var source, _ref2, data, options;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
@@ -102,5 +99,5 @@ var DataSourcePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
     }
   }]);
   return DataSourcePlugin;
-}()) || _class);
+}();
 export { DataSourcePlugin as default };

package/es/plugins/FeatureScalePlugin.d.ts

@@ -1,13 +1,10 @@
-import type { ILayer, ILayerPlugin, IStyleAttributeService } from '@antv/l7-core';
-import 'reflect-metadata';
+import type { ILayer, ILayerPlugin, L7Container } from '@antv/l7-core';
 /**
  * 根据 Source 原始数据为指定字段创建 Scale，保存在 StyleAttribute 上，供下游插件使用
  */
 export default class FeatureScalePlugin implements ILayerPlugin {
     private scaleOptions;
-    apply(layer: ILayer, { styleAttributeService, }: {
-        styleAttributeService: IStyleAttributeService;
-    }): void;
+    apply(layer: ILayer, { styleAttributeService }: L7Container): void;
     private isNumber;
     private caculateScalesForAttributes;
     /**

package/es/plugins/FeatureScalePlugin.js

@@ -3,25 +3,23 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-var _scaleMap, _dec, _class;
+var _scaleMap;
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { IDebugLog, ILayerStage, ScaleTypes, StyleScaleType } from '@antv/l7-core';
 import { lodashUtil } from '@antv/l7-utils';
 import { extent } from 'd3-array';
 import * as d3interpolate from 'd3-interpolate';
 import * as d3 from 'd3-scale';
-import { injectable } from 'inversify';
-import 'reflect-metadata';
 import identity from "../utils/identityScale";
 var isNil = lodashUtil.isNil,
   isString = lodashUtil.isString,
   uniq = lodashUtil.uniq;
 var dateRegex = /^(?:(?!0000)[0-9]{4}([-/.]+)(?:(?:0?[1-9]|1[0-2])\1(?:0?[1-9]|1[0-9]|2[0-8])|(?:0?[13-9]|1[0-2])\1(?:29|30)|(?:0?[13578]|1[02])\1(?:31))|(?:[0-9]{2}(?:0[48]|[2468][048]|[13579][26])|(?:0[48]|[2468][048]|[13579][26])00)([-/.]?)0?2\2(?:29))(\s+([01]|([01][0-9]|2[0-3])):([0-9]|[0-5][0-9]):([0-9]|[0-5][0-9]))?$/;
-var scaleMap = (_scaleMap = {}, _defineProperty(_scaleMap, ScaleTypes.LINEAR, d3.scaleLinear), _defineProperty(_scaleMap, ScaleTypes.POWER, d3.scalePow), _defineProperty(_scaleMap, ScaleTypes.LOG, d3.scaleLog), _defineProperty(_scaleMap, ScaleTypes.IDENTITY, identity), _defineProperty(_scaleMap, ScaleTypes.SEQUENTIAL, d3.scaleSequential), _defineProperty(_scaleMap, ScaleTypes.TIME, d3.scaleTime), _defineProperty(_scaleMap, ScaleTypes.QUANTILE, d3.scaleQuantile), _defineProperty(_scaleMap, ScaleTypes.QUANTIZE, d3.scaleQuantize), _defineProperty(_scaleMap, ScaleTypes.THRESHOLD, d3.scaleThreshold), _defineProperty(_scaleMap, ScaleTypes.CAT, d3.scaleOrdinal), _defineProperty(_scaleMap, ScaleTypes.DIVERGING, d3.scaleDiverging), _scaleMap);
+var scaleMap = (_scaleMap = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_scaleMap, ScaleTypes.LINEAR, d3.scaleLinear), ScaleTypes.POWER, d3.scalePow), ScaleTypes.LOG, d3.scaleLog), ScaleTypes.IDENTITY, identity), ScaleTypes.SEQUENTIAL, d3.scaleSequential), ScaleTypes.TIME, d3.scaleTime), ScaleTypes.QUANTILE, d3.scaleQuantile), ScaleTypes.QUANTIZE, d3.scaleQuantize), ScaleTypes.THRESHOLD, d3.scaleThreshold), ScaleTypes.CAT, d3.scaleOrdinal), _defineProperty(_scaleMap, ScaleTypes.DIVERGING, d3.scaleDiverging));
 /**
  * 根据 Source 原始数据为指定字段创建 Scale，保存在 StyleAttribute 上，供下游插件使用
  */
-var FeatureScalePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function () {
+var FeatureScalePlugin = /*#__PURE__*/function () {
   function FeatureScalePlugin() {
     _classCallCheck(this, FeatureScalePlugin);
     _defineProperty(this, "scaleOptions", {});
@@ -280,7 +278,7 @@ var FeatureScalePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
       // quantile domain 需要根据ID 进行去重
       var values = [];
       if (type === ScaleTypes.QUANTILE) {
-        // 根据 obejct 属性 _id 进行去重 
+        // 根据 obejct 属性 _id 进行去重
         var idMap = new Map();
         data === null || data === void 0 || data.forEach(function (obj) {
           idMap.set(obj._id, obj[field]);
@@ -336,5 +334,5 @@ var FeatureScalePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
     }
   }]);
   return FeatureScalePlugin;
-}()) || _class);
+}();
 export { FeatureScalePlugin as default };

package/es/plugins/LayerAnimateStylePlugin.d.ts

@@ -1,5 +1,4 @@
 import type { ILayer, ILayerPlugin } from '@antv/l7-core';
-import 'reflect-metadata';
 export default class LayerAnimateStylePlugin implements ILayerPlugin {
     apply(layer: ILayer): void;
 }

package/es/plugins/LayerAnimateStylePlugin.js

@@ -1,10 +1,7 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
-var _dec, _class;
-import { injectable } from 'inversify';
-import 'reflect-metadata';
-var LayerAnimateStylePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function () {
+var LayerAnimateStylePlugin = /*#__PURE__*/function () {
   function LayerAnimateStylePlugin() {
     _classCallCheck(this, LayerAnimateStylePlugin);
   }
@@ -23,5 +20,5 @@ var LayerAnimateStylePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/f
     }
   }]);
   return LayerAnimateStylePlugin;
-}()) || _class);
+}();
 export { LayerAnimateStylePlugin as default };

package/es/plugins/LayerMaskPlugin.d.ts

@@ -1,5 +1,4 @@
 import type { ILayer, ILayerPlugin } from '@antv/l7-core';
-import 'reflect-metadata';
 /**
  * 更新图层样式，初始图层相关配置
  */

package/es/plugins/LayerMaskPlugin.js

@@ -1,13 +1,9 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
-var _dec, _class;
-import { injectable } from 'inversify';
-import 'reflect-metadata';
 /**
  * 更新图层样式，初始图层相关配置
  */
-var LayerStylePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function () {
+var LayerStylePlugin = /*#__PURE__*/function () {
   function LayerStylePlugin() {
     _classCallCheck(this, LayerStylePlugin);
   }
@@ -20,8 +16,6 @@ var LayerStylePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
           enableMask = _layer$getLayerConfig.enableMask;
         // mask 初始化
         if (!layer.tileLayer && maskLayers && maskLayers.length > 0) {
-          var _layer$masks;
-          (_layer$masks = layer.masks).push.apply(_layer$masks, _toConsumableArray(maskLayers));
           layer.updateLayerConfig({
             mask: true && enableMask
           });
@@ -30,5 +24,5 @@ var LayerStylePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
     }
   }]);
   return LayerStylePlugin;
-}()) || _class);
+}();
 export { LayerStylePlugin as default };

package/es/plugins/LayerModelPlugin.d.ts

@@ -1,5 +1,4 @@
 import type { ILayer, ILayerPlugin } from '@antv/l7-core';
-import 'reflect-metadata';
 /**
  * Layer Model 初始化，更新，销毁
  */

package/es/plugins/LayerModelPlugin.js

@@ -1,16 +1,13 @@
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
-var _dec, _class;
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { IDebugLog, ILayerStage } from '@antv/l7-core';
-import { injectable } from 'inversify';
-import 'reflect-metadata';
-import TileLayer from "../tile/core/BaseLayer";
+// import TileLayer from '../tile/core/BaseLayer';
 /**
  * Layer Model 初始化，更新，销毁
  */
-var LayerModelPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function () {
+var LayerModelPlugin = /*#__PURE__*/function () {
   function LayerModelPlugin() {
     _classCallCheck(this, LayerModelPlugin);
   }
@@ -90,19 +87,18 @@ var LayerModelPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               if (!layer.getSource().isTile) {
-                _context4.next = 4;
+                _context4.next = 3;
                 break;
               }
               layer.prepareBuildModel();
-              layer.tileLayer = new TileLayer(layer);
               return _context4.abrupt("return");
-            case 4:
+            case 3:
               layer.log(IDebugLog.BuildModelStart, ILayerStage.INIT);
-              _context4.next = 7;
+              _context4.next = 6;
               return _this.initLayerModel(layer);
-            case 7:
+            case 6:
               layer.log(IDebugLog.BuildModelEnd, ILayerStage.INIT);
-            case 8:
+            case 7:
             case "end":
               return _context4.stop();
           }
@@ -120,19 +116,18 @@ var LayerModelPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
                 return _context5.abrupt("return", false);
               case 2:
                 if (!layer.getSource().isTile) {
-                  _context5.next = 5;
+                  _context5.next = 4;
                   break;
                 }
-                layer.tileLayer = new TileLayer(layer);
                 return _context5.abrupt("return", false);
-              case 5:
+              case 4:
                 layer.log(IDebugLog.BuildModelStart, ILayerStage.UPDATE);
-                _context5.next = 8;
+                _context5.next = 7;
                 return _this.prepareLayerModel(layer);
-              case 8:
+              case 7:
                 layer.log(IDebugLog.BuildModelEnd, ILayerStage.UPDATE);
                 return _context5.abrupt("return", true);
-              case 10:
+              case 9:
               case "end":
                 return _context5.stop();
             }
@@ -145,5 +140,5 @@ var LayerModelPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
     }
   }]);
   return LayerModelPlugin;
-}()) || _class);
+}();
 export { LayerModelPlugin as default };

package/es/plugins/LayerStylePlugin.d.ts

@@ -1,5 +1,4 @@
 import type { ILayer, ILayerPlugin } from '@antv/l7-core';
-import 'reflect-metadata';
 /**
  * 更新图层样式，初始图层相关配置
  */

package/es/plugins/LayerStylePlugin.js

@@ -1,12 +1,9 @@
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
-var _dec, _class;
-import { injectable } from 'inversify';
-import 'reflect-metadata';
 /**
  * 更新图层样式，初始图层相关配置
  */
-var LayerStylePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function () {
+var LayerStylePlugin = /*#__PURE__*/function () {
   function LayerStylePlugin() {
     _classCallCheck(this, LayerStylePlugin);
   }
@@ -26,5 +23,5 @@ var LayerStylePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
     }
   }]);
   return LayerStylePlugin;
-}()) || _class);
+}();
 export { LayerStylePlugin as default };

package/es/plugins/LightingPlugin.d.ts

@@ -1,5 +1,4 @@
 import type { ILayer, ILayerPlugin } from '@antv/l7-core';
-import 'reflect-metadata';
 interface IDirectionalLight {
     type: 'directional';
     direction: [number, number, number];

package/es/plugins/LightingPlugin.js

@@ -2,10 +2,7 @@ import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-var _dec, _class;
 var _excluded = ["type"];
-import { injectable } from 'inversify';
-import 'reflect-metadata';
 var lightTypeUniformMap = {
   directional: {
     lights: 'u_DirectionalLights',
@@ -72,7 +69,7 @@ export function generateLightingUniforms(lights) {
 /**
  * 光照 & Shadow
  */
-var LightingPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function () {
+var LightingPlugin = /*#__PURE__*/function () {
   function LightingPlugin() {
     _classCallCheck(this, LightingPlugin);
   }
@@ -94,5 +91,5 @@ var LightingPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function (
     }
   }]);
   return LightingPlugin;
-}()) || _class);
+}();
 export { LightingPlugin as default };

package/es/plugins/MultiPassRendererPlugin.d.ts

@@ -1,5 +1,4 @@
 import type { ILayer, ILayerPlugin, IPass, IPostProcessingPass, IRendererService } from '@antv/l7-core';
-import 'reflect-metadata';
 /**
  * 自定义渲染管线：
  * ClearPass -> PixelPickingPass(可选) -> RenderPass/TAAPass -> PostProcessing -> CopyPass

package/es/plugins/MultiPassRendererPlugin.js

@@ -1,8 +1,5 @@
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
-var _dec, _class;
-import { injectable } from 'inversify';
-import 'reflect-metadata';
 import { createMultiPassRenderer } from "../utils/multiPassRender";
 
 /**
@@ -18,7 +15,7 @@ import { createMultiPassRenderer } from "../utils/multiPassRender";
  *   ],
  * })
  */
-var MultiPassRendererPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function () {
+var MultiPassRendererPlugin = /*#__PURE__*/function () {
   function MultiPassRendererPlugin() {
     _classCallCheck(this, MultiPassRendererPlugin);
   }
@@ -56,5 +53,5 @@ var MultiPassRendererPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/f
     }
   }]);
   return MultiPassRendererPlugin;
-}()) || _class);
+}();
 export { MultiPassRendererPlugin as default };

package/es/plugins/PixelPickingPlugin.d.ts

@@ -1,5 +1,4 @@
-import type { ILayer, ILayerPlugin, IRendererService, IStyleAttributeService } from '@antv/l7-core';
-import 'reflect-metadata';
+import type { ILayer, ILayerPlugin, L7Container } from '@antv/l7-core';
 export default class PixelPickingPlugin implements ILayerPlugin {
     /**
      * Use map to keep order of insertion.
@@ -8,8 +7,5 @@ export default class PixelPickingPlugin implements ILayerPlugin {
     private pickingUniformMap;
     private pickOption2Array;
     private updatePickOption;
-    apply(layer: ILayer, { rendererService, styleAttributeService, }: {
-        rendererService: IRendererService;
-        styleAttributeService: IStyleAttributeService;
-    }): void;
+    apply(layer: ILayer, { styleAttributeService }: L7Container): void;
 }

package/es/plugins/PixelPickingPlugin.js

@@ -1,11 +1,8 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
-var _dec, _class;
 import { AttributeType, gl } from '@antv/l7-core';
 import { decodePickingColor, encodePickingColor, lodashUtil, rgb2arr } from '@antv/l7-utils';
-import { injectable } from 'inversify';
-import 'reflect-metadata';
 import { ShaderLocation } from "../core/CommonStyleAttribute";
 var isNumber = lodashUtil.isNumber;
 var PickingStage = {
@@ -13,7 +10,7 @@ var PickingStage = {
   ENCODE: 1.0,
   HIGHLIGHT: 2.0
 };
-var PixelPickingPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function () {
+var PixelPickingPlugin = /*#__PURE__*/function () {
   function PixelPickingPlugin() {
     _classCallCheck(this, PixelPickingPlugin);
   }
@@ -27,7 +24,7 @@ var PixelPickingPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
 
     function pickOption2Array() {
       var array = [];
-      this.pickingUniformMap.forEach(function (value, key) {
+      this.pickingUniformMap.forEach(function (value) {
         if (isNumber(value)) {
           array.push(value);
         } else {
@@ -58,10 +55,8 @@ var PixelPickingPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
     key: "apply",
     value: function apply(layer, _ref) {
       var _this2 = this;
-      var rendererService = _ref.rendererService,
-        styleAttributeService = _ref.styleAttributeService;
-      var uniformBuffer;
-      this.pickingUniformMap = new Map([['u_HighlightColor', [1, 0, 0, 1]], ['u_SelectColor', [1, 0, 0, 1]], ['u_PickingColor', [0, 0, 0]], ['u_PickingStage', 0], ['u_CurrentSelectedId', [0, 0, 0]], ['u_PickingThreshold', 10], ['u_PickingBuffer', 0], ['u_shaderPick', 0], ['u_EnableSelect', 0], ['u_activeMix', 0]]);
+      var styleAttributeService = _ref.styleAttributeService;
+      this.pickingUniformMap = new Map([['u_HighlightColor', [1, 0, 0, 1]], ['u_SelectColor', [1, 0, 0, 1]], ['u_PickingColor', [0, 0, 0]], ['u_PickingStage', 0], ['u_CurrentSelectedId', [0, 0, 0]], ['u_PickingThreshold', 10], ['u_PickingBuffer', 0], ['u_shaderPick', 0], ['u_activeMix', 0]]);
 
       // TODO: 由于 Shader 目前无法根据是否开启拾取进行内容修改，因此即使不开启也需要生成 a_PickingColor
       layer.hooks.init.tapPromise('PixelPickingPlugin', function () {
@@ -158,8 +153,7 @@ var PixelPickingPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
           u_CurrentSelectedId: pickedColor,
           u_SelectColor: highlightColorInArray.map(function (c) {
             return c * 255;
-          }),
-          u_EnableSelect: 1
+          })
         };
         _this2.updatePickOption(option, layer);
         layer.models.forEach(function (model) {
@@ -169,5 +163,5 @@ var PixelPickingPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
     }
   }]);
   return PixelPickingPlugin;
-}()) || _class);
+}();
 export { PixelPickingPlugin as default };

package/es/plugins/RegisterStyleAttributePlugin.d.ts

@@ -1,12 +1,9 @@
-import type { ILayer, ILayerPlugin, IStyleAttributeService } from '@antv/l7-core';
-import 'reflect-metadata';
+import type { ILayer, ILayerPlugin, L7Container } from '@antv/l7-core';
 /**
  * 在初始化阶段完成属性的注册，以及首次根据 Layer 指定的三角化方法完成 indices 和 attribute 的创建
  */
 export default class RegisterStyleAttributePlugin implements ILayerPlugin {
-    apply(layer: ILayer, { styleAttributeService, }: {
-        styleAttributeService: IStyleAttributeService;
-    }): void;
+    apply(layer: ILayer, { styleAttributeService }: L7Container): void;
     private registerBuiltinAttributes;
     private registerPositionAttribute;
     private registerColorAttribute;

package/es/plugins/RegisterStyleAttributePlugin.js

@@ -1,16 +1,13 @@
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
-var _dec, _class;
 import { AttributeType, gl } from '@antv/l7-core';
-import { injectable } from 'inversify';
-import 'reflect-metadata';
 import { ShaderLocation } from "../core/CommonStyleAttribute";
 import { isTileGroup } from "../tile/utils/utils";
 
 /**
  * 在初始化阶段完成属性的注册，以及首次根据 Layer 指定的三角化方法完成 indices 和 attribute 的创建
  */
-var RegisterStyleAttributePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function () {
+var RegisterStyleAttributePlugin = /*#__PURE__*/function () {
   function RegisterStyleAttributePlugin() {
     _classCallCheck(this, RegisterStyleAttributePlugin);
   }
@@ -109,5 +106,5 @@ var RegisterStyleAttributePlugin = (_dec = injectable(), _dec(_class = /*#__PURE
     }
   }]);
   return RegisterStyleAttributePlugin;
-}()) || _class);
+}();
 export { RegisterStyleAttributePlugin as default };

package/es/plugins/ShaderUniformPlugin.d.ts

@@ -1,5 +1,4 @@
-import type { ILayer, ILayerPlugin } from '@antv/l7-core';
-import 'reflect-metadata';
+import type { ILayer, ILayerPlugin, L7Container } from '@antv/l7-core';
 /**
  * 在渲染之前需要获取当前 Shader 所需 Uniform，例如：
  * 1. 从相机服务中获取 View & ProjectionMatrix，当前缩放等级等等
@@ -8,12 +7,12 @@ import 'reflect-metadata';
  * 3. 当前 Layer 本身的样式属性
  */
 export default class ShaderUniformPlugin implements ILayerPlugin {
-    private readonly cameraService;
-    private readonly coordinateSystemService;
-    private readonly rendererService;
-    private readonly mapService;
-    private readonly layerService;
-    apply(layer: ILayer): void;
+    private cameraService;
+    private coordinateSystemService;
+    private rendererService;
+    private mapService;
+    private layerService;
+    apply(layer: ILayer, { rendererService, mapService, layerService, coordinateSystemService, cameraService, }: L7Container): void;
     /**
      * 对于每个 layer 都有不同的几何中心点，因此在绘制每个 layer 的时候都需要重新设置
      * @param layer