@antv/l7-layers 2.20.20 → 2.21.1

package/lib/core/BaseLayer.js

@@ -10,7 +10,6 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _initializerDefineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/initializerDefineProperty"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
@@ -18,25 +17,22 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _applyDecoratedDescriptor2 = _interopRequireDefault(require("@babel/runtime/helpers/applyDecoratedDescriptor"));
-var _initializerWarningHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/initializerWarningHelper"));
 var _asyncHook = require("@antv/async-hook");
 var _l7Core = require("@antv/l7-core");
-var _l7Source = _interopRequireDefault(require("@antv/l7-source"));
 var _l7Utils = require("@antv/l7-utils");
 var _eventemitter = require("eventemitter3");
+var _plugins = require("../plugins");
 var _blend = require("../utils/blend");
 var _multiPassRender = require("../utils/multiPassRender");
 var _LayerPickService = _interopRequireDefault(require("./LayerPickService"));
 var _TextureService = _interopRequireDefault(require("./TextureService"));
 var _excluded = ["passes"],
   _excluded2 = ["moduleName", "vertexShader", "fragmentShader", "inject", "triangulation", "styleOption", "pickingEnabled"];
-var _dec, _class, _descriptor; // @ts-ignore
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } // @ts-ignore
 var isEqual = _l7Utils.lodashUtil.isEqual,
   isFunction = _l7Utils.lodashUtil.isFunction,
   isNumber = _l7Utils.lodashUtil.isNumber,
@@ -47,7 +43,7 @@ var isEqual = _l7Utils.lodashUtil.isEqual,
  * 分配 layer id
  */
 var layerIdCounter = 0;
-var BaseLayer = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigService), (_class = /*#__PURE__*/function (_ref) {
+var BaseLayer = exports.default = /*#__PURE__*/function (_ref) {
   (0, _inherits2.default)(BaseLayer, _ref);
   var _super = _createSuper(BaseLayer);
   function BaseLayer() {
@@ -103,7 +99,7 @@ var BaseLayer = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
     // 用于保存子图层对象
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "layerChildren", []);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "masks", []);
-    (0, _initializerDefineProperty2.default)((0, _assertThisInitialized2.default)(_this), "configService", _descriptor, (0, _assertThisInitialized2.default)(_this));
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "configService", _l7Core.globalConfigService);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "animateOptions", {
       enable: false
     });
@@ -139,9 +135,70 @@ var BaseLayer = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
     _this.name = config.name || _this.id;
     _this.zIndex = config.zIndex || 0;
     _this.rawConfig = config;
+    _this.masks = config.maskLayers || [];
     return _this;
   }
   (0, _createClass2.default)(BaseLayer, [{
+    key: "shaderModuleService",
+    get: function get() {
+      return this.container.shaderModuleService;
+    }
+  }, {
+    key: "cameraService",
+    get: function get() {
+      return this.container.cameraService;
+    }
+  }, {
+    key: "coordinateService",
+    get: function get() {
+      return this.container.coordinateSystemService;
+    }
+  }, {
+    key: "iconService",
+    get: function get() {
+      return this.container.iconService;
+    }
+  }, {
+    key: "fontService",
+    get: function get() {
+      return this.container.fontService;
+    }
+  }, {
+    key: "pickingService",
+    get: function get() {
+      return this.container.pickingService;
+    }
+  }, {
+    key: "rendererService",
+    get: function get() {
+      return this.container.rendererService;
+    }
+  }, {
+    key: "layerService",
+    get: function get() {
+      return this.container.layerService;
+    }
+  }, {
+    key: "debugService",
+    get: function get() {
+      return this.container.debugService;
+    }
+  }, {
+    key: "interactionService",
+    get: function get() {
+      return this.container.interactionService;
+    }
+  }, {
+    key: "mapService",
+    get: function get() {
+      return this.container.mapService;
+    }
+  }, {
+    key: "normalPassFactory",
+    get: function get() {
+      return this.container.normalPassFactory;
+    }
+  }, {
     key: "addMask",
     value: function addMask(layer) {
       this.masks.push(layer);
@@ -223,7 +280,7 @@ var BaseLayer = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
       if (!this.startInit) {
         this.needUpdateConfig = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, this.needUpdateConfig), configToUpdate);
       } else {
-        var sceneId = this.container.get(_l7Core.TYPES.SceneID);
+        var sceneId = this.container.id;
         // @ts-ignore
         // styleDataMapping(configToUpdate, this); // 处理 style 中进行数据映射的属性字段
         this.configService.setLayerConfig(sceneId, this.id, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, this.configService.getLayerConfig(this.id)), this.needUpdateConfig), configToUpdate));
@@ -239,9 +296,8 @@ var BaseLayer = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
      */
   }, {
     key: "setContainer",
-    value: function setContainer(container, sceneContainer) {
+    value: function setContainer(container) {
       this.container = container;
-      this.sceneContainer = sceneContainer;
     }
   }, {
     key: "getContainer",
@@ -264,7 +320,7 @@ var BaseLayer = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
           while (1) switch (_context.prev = _context.next) {
             case 0:
               // 设置配置项
-              sceneId = this.container.get(_l7Core.TYPES.SceneID);
+              sceneId = this.container.id;
               this.startInit = true;
               // 初始化图层配置项
               // const { enableMultiPassRenderer = false } = this.rawConfig;
@@ -277,14 +333,6 @@ var BaseLayer = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
               // 全局容器服务
 
               // 场景容器服务
-              this.iconService = this.container.get(_l7Core.TYPES.IIconService);
-              this.fontService = this.container.get(_l7Core.TYPES.IFontService);
-              this.rendererService = this.container.get(_l7Core.TYPES.IRendererService);
-              this.layerService = this.container.get(_l7Core.TYPES.ILayerService);
-              this.debugService = this.container.get(_l7Core.TYPES.IDebugService);
-              this.interactionService = this.container.get(_l7Core.TYPES.IInteractionService);
-              this.pickingService = this.container.get(_l7Core.TYPES.IPickingService);
-              this.mapService = this.container.get(_l7Core.TYPES.IMapService);
               _this$getLayerConfig = this.getLayerConfig(), enableMultiPassRenderer = _this$getLayerConfig.enableMultiPassRenderer, passes = _this$getLayerConfig.passes;
               if (enableMultiPassRenderer && passes !== null && passes !== void 0 && passes.length && passes.length > 0) {
                 // Tip: 兼容 multiPassRender 在 amap1 时存在的图层不同步问题 zoom
@@ -292,17 +340,13 @@ var BaseLayer = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
                   _this3.renderLayers();
                 });
               }
-              this.cameraService = this.container.get(_l7Core.TYPES.ICameraService);
-              this.coordinateService = this.container.get(_l7Core.TYPES.ICoordinateSystemService);
-              this.shaderModuleService = this.container.get(_l7Core.TYPES.IShaderModuleService);
-              this.postProcessingPassFactory = this.container.get(_l7Core.TYPES.IFactoryPostProcessingPass);
-              this.normalPassFactory = this.container.get(_l7Core.TYPES.IFactoryNormalPass);
+              this.postProcessingPassFactory = this.container.postProcessingPassFactory;
 
               // 图层容器服务
-              this.styleAttributeService = this.container.get(_l7Core.TYPES.IStyleAttributeService);
+              this.styleAttributeService = this.container.styleAttributeService;
               if (enableMultiPassRenderer) {
                 // 按需初始化 瓦片频繁报错
-                this.multiPassRenderer = this.container.get(_l7Core.TYPES.IMultiPassRenderer);
+                this.multiPassRenderer = this.container.multiPassRenderer;
                 this.multiPassRenderer.setLayer(this);
               }
               // 完成样式服务注册完成前添加的属性
@@ -328,20 +372,17 @@ var BaseLayer = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
               this.pendingStyleAttributes = [];
 
               // 获取插件集
-              this.plugins = this.container.getAll(_l7Core.TYPES.ILayerPlugin);
+              this.plugins = (0, _plugins.createPlugins)();
               // 完成插件注册，传入场景和图层容器内的服务
               _iterator = _createForOfIteratorHelper(this.plugins);
               try {
                 for (_iterator.s(); !(_step = _iterator.n()).done;) {
                   plugin = _step.value;
-                  plugin.apply(this, {
-                    rendererService: this.rendererService,
-                    mapService: this.mapService,
-                    styleAttributeService: this.styleAttributeService,
-                    normalPassFactory: this.normalPassFactory,
-                    postProcessingPassFactory: this.postProcessingPassFactory
-                  });
+                  plugin.apply(this, this.container);
                 }
+                // if (this.getSource().isTile) {
+                //   this.tileLayer = new TileLayer(this);
+                // }
 
                 // 初始化其他服务
               } catch (err) {
@@ -355,9 +396,9 @@ var BaseLayer = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
               this.textureService = new _TextureService.default(this);
               this.log(_l7Core.IDebugLog.LayerInitStart);
               // 触发 init 生命周期插件
-              _context.next = 31;
+              _context.next = 19;
               return this.hooks.init.promise();
-            case 31:
+            case 19:
               this.log(_l7Core.IDebugLog.LayerInitEnd);
               this.inited = true;
               // add mask layer
@@ -371,7 +412,7 @@ var BaseLayer = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
                 type: 'add'
               });
               this.hooks.afterInit.call();
-            case 36:
+            case 24:
             case "end":
               return _context.stop();
           }
@@ -524,36 +565,35 @@ var BaseLayer = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
     value: function setData(data, options) {
       var _this4 = this;
       if (this.inited) {
-        this.log(_l7Core.IDebugLog.SourceInitStart, _l7Core.ILayerStage.UPDATE);
+        this.dataUpdatelog();
         this.layerSource.setData(data, options);
-        this.log(_l7Core.IDebugLog.SourceInitEnd, _l7Core.ILayerStage.UPDATE);
       } else {
         this.on('inited', function () {
-          _this4.log(_l7Core.IDebugLog.SourceInitStart, _l7Core.ILayerStage.UPDATE);
-          var currentSource = _this4.getSource();
-          if (!currentSource) {
-            // 执行 setData 的时候 source 还不存在（还未执行 addLayer）
-            _this4.source(new _l7Source.default(data, options));
-          } else {
-            _this4.layerSource.setData(data, options);
-          }
-          _this4.layerSource.once('update', function () {
-            _this4.log(_l7Core.IDebugLog.SourceInitEnd, _l7Core.ILayerStage.UPDATE);
-          });
+          _this4.dataUpdatelog();
+          _this4.layerSource.setData(data, options);
         });
       }
       return this;
     }
+  }, {
+    key: "dataUpdatelog",
+    value: function dataUpdatelog() {
+      var _this5 = this;
+      this.log(_l7Core.IDebugLog.SourceInitStart, _l7Core.ILayerStage.UPDATE);
+      this.layerSource.once('update', function () {
+        _this5.log(_l7Core.IDebugLog.SourceInitEnd, _l7Core.ILayerStage.UPDATE);
+      });
+    }
   }, {
     key: "style",
     value: function style(options) {
-      var _this5 = this;
+      var _this6 = this;
       var passes = options.passes,
         rest = (0, _objectWithoutProperties2.default)(options, _excluded);
       // passes 特殊处理
       if (passes) {
         (0, _multiPassRender.normalizePasses)(passes).forEach(function (pass) {
-          var postProcessingPass = _this5.multiPassRenderer.getPostProcessor().getPostProcessingPassByName(pass[0]);
+          var postProcessingPass = _this6.multiPassRenderer.getPostProcessor().getPostProcessingPassByName(pass[0]);
           if (postProcessingPass) {
             postProcessingPass.updateOptions(pass[1]);
           }
@@ -592,22 +632,22 @@ var BaseLayer = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
   }, {
     key: "encodeStyle",
     value: function encodeStyle(options) {
-      var _this6 = this;
+      var _this7 = this;
       Object.keys(options).forEach(function (key) {
         if (
         // 需要数据映射
-        [].concat((0, _toConsumableArray2.default)(_this6.enableShaderEncodeStyles), (0, _toConsumableArray2.default)(_this6.enableDataEncodeStyles)).includes(key) && isPlainObject(options[key]) && (options[key].field || options[key].value) && !isEqual(_this6.encodeStyleAttribute[key], options[key]) // 防止计算属性重复计算
+        [].concat((0, _toConsumableArray2.default)(_this7.enableShaderEncodeStyles), (0, _toConsumableArray2.default)(_this7.enableDataEncodeStyles)).includes(key) && isPlainObject(options[key]) && (options[key].field || options[key].value) && !isEqual(_this7.encodeStyleAttribute[key], options[key]) // 防止计算属性重复计算
         ) {
-          _this6.encodeStyleAttribute[key] = options[key];
-          _this6.updateStyleAttribute(key, options[key].field, options[key].value);
-          if (_this6.inited) {
-            _this6.dataState.dataMappingNeedUpdate = true;
+          _this7.encodeStyleAttribute[key] = options[key];
+          _this7.updateStyleAttribute(key, options[key].field, options[key].value);
+          if (_this7.inited) {
+            _this7.dataState.dataMappingNeedUpdate = true;
           }
         } else {
           // 不需要数据映射
-          if (_this6.encodeStyleAttribute[key]) {
-            delete _this6.encodeStyleAttribute[key]; // 删除已经存在的属性
-            _this6.dataState.dataSourceNeedUpdate = true;
+          if (_this7.encodeStyleAttribute[key]) {
+            delete _this7.encodeStyleAttribute[key]; // 删除已经存在的属性
+            _this7.dataState.dataSourceNeedUpdate = true;
           }
         }
       });
@@ -664,7 +704,7 @@ var BaseLayer = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
      */
   }, {
     key: "renderMultiPass",
-    value: function () {
+    value: (function () {
       var _renderMultiPass = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
@@ -701,7 +741,7 @@ var BaseLayer = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
         return _renderMultiPass.apply(this, arguments);
       }
       return renderMultiPass;
-    }()
+    }())
   }, {
     key: "active",
     value: function active(options) {
@@ -724,7 +764,7 @@ var BaseLayer = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
   }, {
     key: "setActive",
     value: function setActive(id, options) {
-      var _this7 = this;
+      var _this8 = this;
       if (isObject(id)) {
         var _id$x = id.x,
           x = _id$x === void 0 ? 0 : _id$x,
@@ -748,7 +788,7 @@ var BaseLayer = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
         // @ts-ignore
         .then(function () {
           setTimeout(function () {
-            _this7.reRender();
+            _this8.reRender();
           }, 1);
         });
       }
@@ -775,7 +815,7 @@ var BaseLayer = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
   }, {
     key: "setSelect",
     value: function setSelect(id, options) {
-      var _this8 = this;
+      var _this9 = this;
       if (isObject(id)) {
         var _id$x2 = id.x,
           x = _id$x2 === void 0 ? 0 : _id$x2,
@@ -799,7 +839,7 @@ var BaseLayer = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
         // @ts-ignore
         .then(function () {
           setTimeout(function () {
-            _this8.reRender();
+            _this9.reRender();
           }, 1);
         });
       }
@@ -1024,8 +1064,6 @@ var BaseLayer = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
       });
       this.removeAllListeners();
       this.isDestroyed = true;
-      // 解绑图层容器中的服务
-      // this.container.unbind(TYPES.IStyleAttributeService);
     }
   }, {
     key: "clear",
@@ -1054,7 +1092,7 @@ var BaseLayer = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
   }, {
     key: "setSource",
     value: function setSource(source) {
-      var _this9 = this;
+      var _this10 = this;
       // 解除原 sources 事件
       if (this.layerSource) {
         this.layerSource.off('update', this.sourceEvent);
@@ -1073,22 +1111,22 @@ var BaseLayer = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
       // this.layerSource.inited 为 true update 事件不会再触发
       this.layerSource.on('update', function (_ref4) {
         var type = _ref4.type;
-        if (_this9.coordCenter === undefined) {
-          var _this9$mapService;
-          var layerCenter = _this9.layerSource.center;
-          _this9.coordCenter = layerCenter;
-          if ((_this9$mapService = _this9.mapService) !== null && _this9$mapService !== void 0 && _this9$mapService.setCoordCenter) {
-            _this9.mapService.setCoordCenter(layerCenter);
+        if (_this10.coordCenter === undefined) {
+          var _this10$mapService;
+          var layerCenter = _this10.layerSource.center;
+          _this10.coordCenter = layerCenter;
+          if ((_this10$mapService = _this10.mapService) !== null && _this10$mapService !== void 0 && _this10$mapService.setCoordCenter) {
+            _this10.mapService.setCoordCenter(layerCenter);
           }
         }
         if (type === 'update') {
-          if (_this9.tileLayer) {
+          if (_this10.tileLayer) {
             // 瓦片图层独立更新
-            _this9.tileLayer.reload();
+            _this10.tileLayer.reload();
             return;
           }
           // source 初始化不需要处理
-          _this9.sourceEvent();
+          _this10.sourceEvent();
         }
       });
     }
@@ -1121,11 +1159,11 @@ var BaseLayer = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
   }, {
     key: "getLegend",
     value: function getLegend(name) {
-      var _attribute$scale, _scales$0$option, _attribute$scale2;
+      var _attribute$scale, _scales$, _attribute$scale2;
       var attribute = this.styleAttributeService.getLayerStyleAttribute(name);
       var scales = (attribute === null || attribute === void 0 || (_attribute$scale = attribute.scale) === null || _attribute$scale === void 0 ? void 0 : _attribute$scale.scalers) || [];
       return {
-        type: (_scales$0$option = scales[0].option) === null || _scales$0$option === void 0 ? void 0 : _scales$0$option.type,
+        type: (_scales$ = scales[0]) === null || _scales$ === void 0 || (_scales$ = _scales$.option) === null || _scales$ === void 0 ? void 0 : _scales$.type,
         field: attribute === null || attribute === void 0 || (_attribute$scale2 = attribute.scale) === null || _attribute$scale2 === void 0 ? void 0 : _attribute$scale2.field,
         items: this.getLegendItems(name)
       };
@@ -1186,7 +1224,7 @@ var BaseLayer = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
     key: "buildLayerModel",
     value: function () {
       var _buildLayerModel = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(options) {
-        var _this10 = this;
+        var _this11 = this;
         var moduleName, vertexShader, fragmentShader, inject, triangulation, styleOption, _options$pickingEnabl, pickingEnabled, rest, _this$shaderModuleSer, vs, fs, uniforms, createModel;
         return _regenerator.default.wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
@@ -1200,13 +1238,13 @@ var BaseLayer = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
               _this$shaderModuleSer = this.shaderModuleService.getModule(moduleName), vs = _this$shaderModuleSer.vs, fs = _this$shaderModuleSer.fs, uniforms = _this$shaderModuleSer.uniforms;
               createModel = this.rendererService.createModel;
               return _context3.abrupt("return", new Promise(function (resolve) {
-                var _this10$styleAttribut = _this10.styleAttributeService.createAttributesAndIndices(_this10.encodedData, triangulation, styleOption),
-                  attributes = _this10$styleAttribut.attributes,
-                  elements = _this10$styleAttribut.elements,
-                  count = _this10$styleAttribut.count;
-                var uniformBuffers = [].concat((0, _toConsumableArray2.default)(_this10.layerModel.uniformBuffers), (0, _toConsumableArray2.default)(_this10.rendererService.uniformBuffers), [_this10.getLayerUniformBuffer()]);
+                var _this11$styleAttribut = _this11.styleAttributeService.createAttributesAndIndices(_this11.encodedData, triangulation, styleOption, _this11),
+                  attributes = _this11$styleAttribut.attributes,
+                  elements = _this11$styleAttribut.elements,
+                  count = _this11$styleAttribut.count;
+                var uniformBuffers = [].concat((0, _toConsumableArray2.default)(_this11.layerModel.uniformBuffers), (0, _toConsumableArray2.default)(_this11.rendererService.uniformBuffers), [_this11.getLayerUniformBuffer()]);
                 if (pickingEnabled) {
-                  uniformBuffers.push(_this10.getPickingUniformBuffer());
+                  uniformBuffers.push(_this11.getPickingUniformBuffer());
                 }
                 var modelOptions = (0, _objectSpread2.default)({
                   attributes: attributes,
@@ -1216,7 +1254,7 @@ var BaseLayer = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
                   elements: elements,
                   blend: _blend.BlendTypes[_l7Core.BlendType.normal],
                   uniformBuffers: uniformBuffers,
-                  textures: _this10.layerModel.textures
+                  textures: _this11.layerModel.textures
                 }, rest);
                 if (count) {
                   modelOptions.count = count;
@@ -1352,7 +1390,7 @@ var BaseLayer = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
   }, {
     key: "renderModels",
     value: function renderModels() {
-      var _this11 = this;
+      var _this12 = this;
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       // TODO: this.getEncodedData().length > 0 这个判断是为了解决在 2.5.x 引入数据纹理后产生的 空数据渲染导致 texture 超出上限问题
       if (this.encodeDataLength <= 0 && !this.forceRender) {
@@ -1363,10 +1401,10 @@ var BaseLayer = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
       this.hooks.beforeRender.call();
       this.models.forEach(function (model) {
         model.draw({
-          uniforms: _this11.layerModel.getUninforms(),
-          blend: _this11.layerModel.getBlend(),
-          stencil: _this11.layerModel.getStencil(options),
-          textures: _this11.layerModel.textures
+          uniforms: _this12.layerModel.getUninforms(),
+          blend: _this12.layerModel.getBlend(),
+          stencil: _this12.layerModel.getStencil(options),
+          textures: _this12.layerModel.textures
         }, (options === null || options === void 0 ? void 0 : options.ispick) || false);
       });
       this.hooks.afterRender.call();
@@ -1530,9 +1568,4 @@ var BaseLayer = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
     }
   }]);
   return BaseLayer;
-}(_eventemitter.EventEmitter), (_descriptor = (0, _applyDecoratedDescriptor2.default)(_class.prototype, "configService", [_dec], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-})), _class));
+}(_eventemitter.EventEmitter);

package/lib/core/BaseModel.js

@@ -9,12 +9,9 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _initializerDefineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/initializerDefineProperty"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _applyDecoratedDescriptor2 = _interopRequireDefault(require("@babel/runtime/helpers/applyDecoratedDescriptor"));
-var _initializerWarningHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/initializerWarningHelper"));
 var _l7Core = require("@antv/l7-core");
 var _l7Utils = require("@antv/l7-utils");
 var _blend = require("../utils/blend");
@@ -22,7 +19,6 @@ var _stencil = require("../utils/stencil");
 var _CommonStyleAttribute = require("./CommonStyleAttribute");
 var _constant = require("./constant");
 var _utils = require("./utils");
-var _dec, _class, _descriptor;
 var shaderLocationMap = {
   opacity: _CommonStyleAttribute.ShaderLocation.OPACITY,
   stroke: _CommonStyleAttribute.ShaderLocation.STROKE,
@@ -33,14 +29,9 @@ var shaderLocationMap = {
 };
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-var BaseModel = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigService), (_class = /*#__PURE__*/function () {
-  // @lazyInject(TYPES.IIconService)
-  // protected readonly iconService: IIconService;
-
-  // @lazyInject(TYPES.IFontService)
-  // protected readonly fontService: IFontService;
-
-  // @lazyInject(TYPES.IShaderModuleService)
+var BaseModel = exports.default = /*#__PURE__*/function () {
+  // 用于数据传递的数据纹理
+  // 默认有多少列（宽度）
 
   // 支持数据映射的buffer
   // 不支持数据映射的buffer
@@ -53,17 +44,17 @@ var BaseModel = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
     (0, _defineProperty2.default)(this, "textures", []);
     (0, _defineProperty2.default)(this, "preStyleAttribute", {});
     (0, _defineProperty2.default)(this, "encodeStyleAttribute", {});
-    (0, _initializerDefineProperty2.default)(this, "configService", _descriptor, this);
     this.layer = layer;
-    this.rendererService = layer.getContainer().get(_l7Core.TYPES.IRendererService);
-    this.pickingService = layer.getContainer().get(_l7Core.TYPES.IPickingService);
-    this.shaderModuleService = layer.getContainer().get(_l7Core.TYPES.IShaderModuleService);
-    this.styleAttributeService = layer.getContainer().get(_l7Core.TYPES.IStyleAttributeService);
-    this.mapService = layer.getContainer().get(_l7Core.TYPES.IMapService);
-    this.iconService = layer.getContainer().get(_l7Core.TYPES.IIconService);
-    this.fontService = layer.getContainer().get(_l7Core.TYPES.IFontService);
-    this.cameraService = layer.getContainer().get(_l7Core.TYPES.ICameraService);
-    this.layerService = layer.getContainer().get(_l7Core.TYPES.ILayerService);
+    this.configService = layer.getContainer().globalConfigService;
+    this.rendererService = layer.getContainer().rendererService;
+    this.pickingService = layer.getContainer().pickingService;
+    this.shaderModuleService = layer.getContainer().shaderModuleService;
+    this.styleAttributeService = layer.getContainer().styleAttributeService;
+    this.mapService = layer.getContainer().mapService;
+    this.iconService = layer.getContainer().iconService;
+    this.fontService = layer.getContainer().fontService;
+    this.cameraService = layer.getContainer().cameraService;
+    this.layerService = layer.getContainer().layerService;
     // 初始化支持数据映射的 Style 属性
 
     this.registerStyleAttribute();
@@ -102,13 +93,11 @@ var BaseModel = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
           stencilType: _l7Core.StencilType.SINGLE
         }); // 用于遮罩的stencil 参数
       }
-
       if (option.isStencil) {
         return (0, _stencil.getStencilMask)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, option), {}, {
           maskOperation: maskOperation
         })); // 用于遮罩的stencil 参数
       }
-
       var maskflag = mask ||
       //  mask 兼容历史写法
       enableMask && this.layer.masks.length !== 0 ||
@@ -395,9 +384,4 @@ var BaseModel = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
     }
   }]);
   return BaseModel;
-}(), (_descriptor = (0, _applyDecoratedDescriptor2.default)(_class.prototype, "configService", [_dec], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-})), _class));
+}();

package/lib/core/LayerPickService.js

@@ -11,7 +11,6 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _l7Core = require("@antv/l7-core");
 var _l7Utils = require("@antv/l7-utils");
 var BaseLayerPickService = exports.default = /*#__PURE__*/function () {
   function BaseLayerPickService(layer) {
@@ -22,7 +21,7 @@ var BaseLayerPickService = exports.default = /*#__PURE__*/function () {
     key: "pickRender",
     value: function pickRender(target) {
       var container = this.layer.getContainer();
-      var layerService = container.get(_l7Core.TYPES.ILayerService);
+      var layerService = container.layerService;
       var layer = this.layer;
       // 瓦片图层的拾取绘制
       if (layer.tileLayer) {
@@ -45,7 +44,7 @@ var BaseLayerPickService = exports.default = /*#__PURE__*/function () {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               container = this.layer.getContainer();
-              pickingService = container.get(_l7Core.TYPES.IPickingService);
+              pickingService = container.pickingService;
               if (!(layer.type === 'RasterLayer')) {
                 _context.next = 4;
                 break;
@@ -69,8 +68,8 @@ var BaseLayerPickService = exports.default = /*#__PURE__*/function () {
     key: "pickRasterLayer",
     value: function pickRasterLayer(layer, target, parent) {
       var container = this.layer.getContainer();
-      var pickingService = container.get(_l7Core.TYPES.IPickingService);
-      var mapService = container.get(_l7Core.TYPES.IMapService);
+      var pickingService = container.pickingService;
+      var mapService = container.mapService;
       var extent = this.layer.getSource().extent;
       var isPick = (0, _l7Utils.lngLatInExtent)(target.lngLat, extent);
       var layerTarget = {
@@ -117,7 +116,6 @@ var BaseLayerPickService = exports.default = /*#__PURE__*/function () {
       // x
       (y - tileMaxXY.y) / tilePixelHeight // y
       ];
-
       var tileWidth = rasterData.width || 1;
       var tileHeight = rasterData.height || 1;
       var indexX = Math.floor(pos[0] * tileWidth);

package/lib/core/TextureService.js

@@ -7,14 +7,13 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _l7Core = require("@antv/l7-core");
 var _l7Utils = require("@antv/l7-utils");
 var TextureService = exports.default = /*#__PURE__*/function () {
   function TextureService(layer) {
     (0, _classCallCheck2.default)(this, TextureService);
     this.layer = layer;
     var container = this.layer.getContainer();
-    this.rendererService = container.get(_l7Core.TYPES.IRendererService);
+    this.rendererService = container.rendererService;
   }
   (0, _createClass2.default)(TextureService, [{
     key: "getColorTexture",