@antv/l7-layers 2.20.19 → 2.21.0

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();
           }
@@ -523,25 +564,17 @@ var BaseLayer = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
     key: "setData",
     value: function setData(data, options) {
       var _this4 = this;
+      this.log(_l7Core.IDebugLog.SourceInitStart, _l7Core.ILayerStage.UPDATE);
       if (this.inited) {
-        this.log(_l7Core.IDebugLog.SourceInitStart, _l7Core.ILayerStage.UPDATE);
         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.layerSource.setData(data, options);
         });
       }
+      this.layerSource.once('update', function () {
+        _this4.log(_l7Core.IDebugLog.SourceInitEnd, _l7Core.ILayerStage.UPDATE);
+      });
       return this;
     }
   }, {
@@ -1024,8 +1057,6 @@ var BaseLayer = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
       });
       this.removeAllListeners();
       this.isDestroyed = true;
-      // 解绑图层容器中的服务
-      // this.container.unbind(TYPES.IStyleAttributeService);
     }
   }, {
     key: "clear",
@@ -1121,11 +1152,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)
       };
@@ -1200,7 +1231,7 @@ 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),
+                var _this10$styleAttribut = _this10.styleAttributeService.createAttributesAndIndices(_this10.encodedData, triangulation, styleOption, _this10),
                   attributes = _this10$styleAttribut.attributes,
                   elements = _this10$styleAttribut.elements,
                   count = _this10$styleAttribut.count;
@@ -1530,9 +1561,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();
@@ -395,9 +386,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 = {

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",

package/lib/core/shape/arrow.js

@@ -124,14 +124,10 @@ function lineArrowPath(coord) {
   var targetType = (0, _typeof2.default)(symbol['target']) === 'object' ? symbol['target'].type : symbol['target'];
   var _ref = (0, _typeof2.default)(symbol['source']) === 'object' ? symbol['source'] : {},
     _ref$width = _ref.width,
-    sourceWidth = _ref$width === void 0 ? sourceType ? maxArrowWidthMap[sourceType] : 0 : _ref$width,
-    _ref$height = _ref.height,
-    sourceHeight = _ref$height === void 0 ? 2 : _ref$height;
+    sourceWidth = _ref$width === void 0 ? sourceType ? maxArrowWidthMap[sourceType] : 0 : _ref$width;
   var _ref2 = (0, _typeof2.default)(symbol['target']) === 'object' ? symbol['target'] : {},
     _ref2$width = _ref2.width,
-    targetWidth = _ref2$width === void 0 ? targetType ? maxArrowWidthMap[targetType] : 0 : _ref2$width,
-    _ref2$height = _ref2.height,
-    targetHeight = _ref2$height === void 0 ? 2 : _ref2$height;
+    targetWidth = _ref2$width === void 0 ? targetType ? maxArrowWidthMap[targetType] : 0 : _ref2$width;
   return {
     vertices: [0, PathHeight, 1 * sourceWidth].concat((0, _toConsumableArray2.default)(coord), [1, PathHeight, -1 * targetWidth], (0, _toConsumableArray2.default)(coord), [1, -PathHeight, -1 * targetWidth], (0, _toConsumableArray2.default)(coord), [0, -PathHeight, 1 * sourceWidth], (0, _toConsumableArray2.default)(coord), [0, PathHeight, 1 * sourceWidth], (0, _toConsumableArray2.default)(coord), [1, PathHeight, -1 * targetWidth], (0, _toConsumableArray2.default)(coord), [1, -PathHeight, -1 * targetWidth], (0, _toConsumableArray2.default)(coord), [0, -PathHeight, 1 * sourceWidth], (0, _toConsumableArray2.default)(coord)),
     outLineIndices: [0, 1, 2, 0, 2, 3].map(function (t) {

package/lib/heatmap/models/heatmap.js

@@ -19,13 +19,10 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _l7Core = require("@antv/l7-core");
 var _l7Utils = require("@antv/l7-utils");
 var _glMatrix = require("gl-matrix");
-var _inversify = require("inversify");
-require("reflect-metadata");
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
 var _triangulation = require("../../core/triangulation");
 var _CommonStyleAttribute = require("../../core/CommonStyleAttribute");
 var _triangulation2 = require("../triangulation");
-var _dec, _class;
 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; } }
 /* babel-plugin-inline-import '../shaders/heatmap/heatmap_3d_frag.glsl' */
@@ -41,7 +38,7 @@ var heatmap_framebuffer_frag = "layout(std140) uniform commonUniforms {\n  float
 /* babel-plugin-inline-import '../shaders/heatmap/heatmap_framebuffer_vert.glsl' */
 var heatmap_framebuffer_vert = "layout(location = 0) in vec3 a_Position;\nlayout(location = 9) in float a_Size;\nlayout(location = 10) in vec2 a_Dir;\n\n\nlayout(std140) uniform commonUniforms {\n  float u_radius;\n  float u_intensity;\n  float u_common_uniforms_padding1;\n  float u_common_uniforms_padding2;\n};\n\nout vec2 v_extrude;\nout float v_weight;\n\n#define GAUSS_COEF  0.3989422804014327\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nvoid main(){\n    vec3 picking_color_placeholder = u_PickingColor;\n\n    v_weight = a_Size;\n    float ZERO = 1.0 / 255.0 / 16.0;\n    float extrude_x = a_Dir.x * 2.0 -1.0;\n    float extrude_y = a_Dir.y * 2.0 -1.0;\n    vec2 extrude_dir = normalize(vec2(extrude_x,extrude_y));\n    float S = sqrt(-2.0 * log(ZERO / a_Size / u_intensity / GAUSS_COEF)) / 2.5;\n    v_extrude = extrude_dir * S;\n\n    vec2 offset = project_pixel(v_extrude * u_radius);\n    vec4 project_pos = project_position(vec4(a_Position.xy, 0.0, 1.0));\n\n    // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, 0.0, 1.0));\n\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n        gl_Position = u_Mvp * (vec4(project_pos.xy + offset, 0.0, 1.0));\n    } else {\n        gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, 0.0, 1.0));\n    }\n}\n";
 var isEqual = _l7Utils.lodashUtil.isEqual;
-var HeatMapModel = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function (_BaseModel) {
+var HeatMapModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(HeatMapModel, _BaseModel);
   var _super = _createSuper(HeatMapModel);
   function HeatMapModel() {
@@ -498,4 +495,4 @@ var HeatMapModel = exports.default = (_dec = (0, _inversify.injectable)(), _dec(
     }
   }]);
   return HeatMapModel;
-}(_BaseModel2.default)) || _class);
+}(_BaseModel2.default);

package/lib/index.js

@@ -16,6 +16,7 @@ var _exportNames = {
   PointLayer: true,
   PolygonLayer: true,
   RasterLayer: true,
+  TileLayer: true,
   TileDebugLayer: true,
   EarthLayer: true,
   MaskLayer: true,
@@ -105,13 +106,18 @@ Object.defineProperty(exports, "TileDebugLayer", {
     return _TileDebugLayer.default;
   }
 });
+Object.defineProperty(exports, "TileLayer", {
+  enumerable: true,
+  get: function get() {
+    return _BaseLayer2.default;
+  }
+});
 Object.defineProperty(exports, "WindLayer", {
   enumerable: true,
   get: function get() {
     return _wind.default;
   }
 });
-var _l7Core = require("@antv/l7-core");
 var _canvas = _interopRequireDefault(require("./canvas"));
 var _building = _interopRequireDefault(require("./citybuliding/building"));
 var _BaseLayer = _interopRequireDefault(require("./core/BaseLayer"));
@@ -123,24 +129,11 @@ var _index = _interopRequireDefault(require("./line/index"));
 var _point = _interopRequireDefault(require("./point"));
 var _polygon = _interopRequireDefault(require("./polygon"));
 var _raster = _interopRequireDefault(require("./raster"));
+var _BaseLayer2 = _interopRequireDefault(require("./tile/core/BaseLayer"));
 var _TileDebugLayer = _interopRequireDefault(require("./tile/core/TileDebugLayer"));
 var _earth = _interopRequireDefault(require("./earth"));
 var _mask = _interopRequireDefault(require("./mask"));
 var _wind = _interopRequireDefault(require("./wind"));
-var _DataMappingPlugin = _interopRequireDefault(require("./plugins/DataMappingPlugin"));
-var _DataSourcePlugin = _interopRequireDefault(require("./plugins/DataSourcePlugin"));
-var _FeatureScalePlugin = _interopRequireDefault(require("./plugins/FeatureScalePlugin"));
-var _LayerAnimateStylePlugin = _interopRequireDefault(require("./plugins/LayerAnimateStylePlugin"));
-var _LayerMaskPlugin = _interopRequireDefault(require("./plugins/LayerMaskPlugin"));
-var _LayerModelPlugin = _interopRequireDefault(require("./plugins/LayerModelPlugin"));
-var _LayerStylePlugin = _interopRequireDefault(require("./plugins/LayerStylePlugin"));
-var _LightingPlugin = _interopRequireDefault(require("./plugins/LightingPlugin"));
-var _MultiPassRendererPlugin = _interopRequireDefault(require("./plugins/MultiPassRendererPlugin"));
-var _PixelPickingPlugin = _interopRequireDefault(require("./plugins/PixelPickingPlugin"));
-var _RegisterStyleAttributePlugin = _interopRequireDefault(require("./plugins/RegisterStyleAttributePlugin"));
-var _ShaderUniformPlugin = _interopRequireDefault(require("./plugins/ShaderUniformPlugin"));
-var _UpdateModelPlugin = _interopRequireDefault(require("./plugins/UpdateModelPlugin"));
-var _UpdateStyleAttributePlugin = _interopRequireDefault(require("./plugins/UpdateStyleAttributePlugin"));
 var _interface = require("./core/interface");
 Object.keys(_interface).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -152,78 +145,4 @@ Object.keys(_interface).forEach(function (key) {
       return _interface[key];
     }
   });
-});
-// 逐步替换为 Geometry
-
-// import ConfigSchemaValidationPlugin from './plugins/ConfigSchemaValidationPlugin';
-
-/**
- * 校验传入参数配置项的正确性
- * @see /dev-docs/ConfigSchemaValidation.md
- */
-// container
-//   .bind<ILayerPlugin>(TYPES.ILayerPlugin)
-//   .to(ConfigSchemaValidationPlugin)
-//   .inRequestScope();
-/**
- * 获取 Source
- */
-_l7Core.container.bind(_l7Core.TYPES.ILayerPlugin).to(_DataSourcePlugin.default).inRequestScope();
-/**
- * 根据 StyleAttribute 创建 VertexAttribute
- */
-_l7Core.container.bind(_l7Core.TYPES.ILayerPlugin).to(_RegisterStyleAttributePlugin.default).inRequestScope();
-/**
- * 根据 Source 创建 Scale
- */
-_l7Core.container.bind(_l7Core.TYPES.ILayerPlugin).to(_FeatureScalePlugin.default).inRequestScope();
-/**
- * 使用 Scale 进行数据映射
- */
-_l7Core.container.bind(_l7Core.TYPES.ILayerPlugin).to(_DataMappingPlugin.default).inRequestScope();
-
-/**
- * 更新地图样式配置项 如active, show, hide
- */
-_l7Core.container.bind(_l7Core.TYPES.ILayerPlugin).to(_LayerStylePlugin.default).inRequestScope();
-
-/**
- * 初始化地图 Mask
- */
-_l7Core.container.bind(_l7Core.TYPES.ILayerPlugin).to(_LayerMaskPlugin.default).inRequestScope();
-
-/**
- * 负责属性更新
- */
-_l7Core.container.bind(_l7Core.TYPES.ILayerPlugin).to(_UpdateStyleAttributePlugin.default).inRequestScope();
-
-/**
- * 负责Model更新
- */
-_l7Core.container.bind(_l7Core.TYPES.ILayerPlugin).to(_UpdateModelPlugin.default).inRequestScope();
-
-/**
- * Multi Pass 自定义渲染管线
- */
-_l7Core.container.bind(_l7Core.TYPES.ILayerPlugin).to(_MultiPassRendererPlugin.default).inRequestScope();
-/**
- * 传入相机坐标系参数
- */
-_l7Core.container.bind(_l7Core.TYPES.ILayerPlugin).to(_ShaderUniformPlugin.default).inRequestScope();
-
-/**
- * 传入动画参数
- */
-_l7Core.container.bind(_l7Core.TYPES.ILayerPlugin).to(_LayerAnimateStylePlugin.default).inRequestScope();
-/**
- * 传入光照相关参数
- */
-_l7Core.container.bind(_l7Core.TYPES.ILayerPlugin).to(_LightingPlugin.default).inRequestScope();
-/**
- * 负责拾取过程中 Encode 以及 Highlight 阶段及结束后恢复
- */
-_l7Core.container.bind(_l7Core.TYPES.ILayerPlugin).to(_PixelPickingPlugin.default).inRequestScope();
-/**
- * 初始化Model
- */
-_l7Core.container.bind(_l7Core.TYPES.ILayerPlugin).to(_LayerModelPlugin.default).inRequestScope();
+});

package/lib/line/models/arc.js

@@ -29,7 +29,6 @@ var lineStyleObj = {
   solid: 0.0,
   dash: 1.0
 };
-var isNumber = _l7Utils.lodashUtil.isNumber;
 var ArcModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(ArcModel, _BaseModel);
   var _super = _createSuper(ArcModel);
@@ -101,7 +100,8 @@ var ArcModel = exports.default = /*#__PURE__*/function (_BaseModel) {
         useLinearColor = 1;
       }
       if (this.rendererService.getDirty()) {
-        this.texture.bind();
+        var _this$texture;
+        (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.bind();
       }
       var commonOptions = {
         u_animate: this.animateOption2Array(animateOption),
@@ -158,8 +158,8 @@ var ArcModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "clearModels",
     value: function clearModels() {
-      var _this$texture;
-      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
+      var _this$texture2;
+      (_this$texture2 = this.texture) === null || _this$texture2 === void 0 || _this$texture2.destroy();
       this.iconService.off('imageUpdate', this.updateTexture);
     }
   }, {