@antv/l7-layers 2.20.20 → 2.21.1

package/lib/plugins/FeatureScalePlugin.js

@@ -17,21 +17,19 @@ var _l7Utils = require("@antv/l7-utils");
 var _d3Array = require("d3-array");
 var d3interpolate = _interopRequireWildcard(require("d3-interpolate"));
 var d3 = _interopRequireWildcard(require("d3-scale"));
-var _inversify = require("inversify");
-require("reflect-metadata");
 var _identityScale = _interopRequireDefault(require("../utils/identityScale"));
-var _scaleMap, _dec, _class;
+var _scaleMap;
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 var isNil = _l7Utils.lodashUtil.isNil,
   isString = _l7Utils.lodashUtil.isString,
   uniq = _l7Utils.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 = {}, (0, _defineProperty2.default)(_scaleMap, _l7Core.ScaleTypes.LINEAR, d3.scaleLinear), (0, _defineProperty2.default)(_scaleMap, _l7Core.ScaleTypes.POWER, d3.scalePow), (0, _defineProperty2.default)(_scaleMap, _l7Core.ScaleTypes.LOG, d3.scaleLog), (0, _defineProperty2.default)(_scaleMap, _l7Core.ScaleTypes.IDENTITY, _identityScale.default), (0, _defineProperty2.default)(_scaleMap, _l7Core.ScaleTypes.SEQUENTIAL, d3.scaleSequential), (0, _defineProperty2.default)(_scaleMap, _l7Core.ScaleTypes.TIME, d3.scaleTime), (0, _defineProperty2.default)(_scaleMap, _l7Core.ScaleTypes.QUANTILE, d3.scaleQuantile), (0, _defineProperty2.default)(_scaleMap, _l7Core.ScaleTypes.QUANTIZE, d3.scaleQuantize), (0, _defineProperty2.default)(_scaleMap, _l7Core.ScaleTypes.THRESHOLD, d3.scaleThreshold), (0, _defineProperty2.default)(_scaleMap, _l7Core.ScaleTypes.CAT, d3.scaleOrdinal), (0, _defineProperty2.default)(_scaleMap, _l7Core.ScaleTypes.DIVERGING, d3.scaleDiverging), _scaleMap);
+var scaleMap = (_scaleMap = {}, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)(_scaleMap, _l7Core.ScaleTypes.LINEAR, d3.scaleLinear), _l7Core.ScaleTypes.POWER, d3.scalePow), _l7Core.ScaleTypes.LOG, d3.scaleLog), _l7Core.ScaleTypes.IDENTITY, _identityScale.default), _l7Core.ScaleTypes.SEQUENTIAL, d3.scaleSequential), _l7Core.ScaleTypes.TIME, d3.scaleTime), _l7Core.ScaleTypes.QUANTILE, d3.scaleQuantile), _l7Core.ScaleTypes.QUANTIZE, d3.scaleQuantize), _l7Core.ScaleTypes.THRESHOLD, d3.scaleThreshold), _l7Core.ScaleTypes.CAT, d3.scaleOrdinal), (0, _defineProperty2.default)(_scaleMap, _l7Core.ScaleTypes.DIVERGING, d3.scaleDiverging));
 /**
  * 根据 Source 原始数据为指定字段创建 Scale，保存在 StyleAttribute 上，供下游插件使用
  */
-var FeatureScalePlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
+var FeatureScalePlugin = exports.default = /*#__PURE__*/function () {
   function FeatureScalePlugin() {
     (0, _classCallCheck2.default)(this, FeatureScalePlugin);
     (0, _defineProperty2.default)(this, "scaleOptions", {});
@@ -290,7 +288,7 @@ var FeatureScalePlugin = exports.default = (_dec = (0, _inversify.injectable)(),
       // quantile domain 需要根据ID 进行去重
       var values = [];
       if (type === _l7Core.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]);
@@ -346,4 +344,4 @@ var FeatureScalePlugin = exports.default = (_dec = (0, _inversify.injectable)(),
     }
   }]);
   return FeatureScalePlugin;
-}()) || _class);
+}();

package/lib/plugins/LayerAnimateStylePlugin.js

@@ -8,10 +8,7 @@ exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _inversify = require("inversify");
-require("reflect-metadata");
-var _dec, _class;
-var LayerAnimateStylePlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
+var LayerAnimateStylePlugin = exports.default = /*#__PURE__*/function () {
   function LayerAnimateStylePlugin() {
     (0, _classCallCheck2.default)(this, LayerAnimateStylePlugin);
   }
@@ -30,4 +27,4 @@ var LayerAnimateStylePlugin = exports.default = (_dec = (0, _inversify.injectabl
     }
   }]);
   return LayerAnimateStylePlugin;
-}()) || _class);
+}();

package/lib/plugins/LayerMaskPlugin.js

@@ -5,16 +5,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _inversify = require("inversify");
-require("reflect-metadata");
-var _dec, _class;
 /**
  * 更新图层样式，初始图层相关配置
  */
-var LayerStylePlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
+var LayerStylePlugin = exports.default = /*#__PURE__*/function () {
   function LayerStylePlugin() {
     (0, _classCallCheck2.default)(this, LayerStylePlugin);
   }
@@ -27,8 +23,6 @@ var LayerStylePlugin = exports.default = (_dec = (0, _inversify.injectable)(), _
           enableMask = _layer$getLayerConfig.enableMask;
         // mask 初始化
         if (!layer.tileLayer && maskLayers && maskLayers.length > 0) {
-          var _layer$masks;
-          (_layer$masks = layer.masks).push.apply(_layer$masks, (0, _toConsumableArray2.default)(maskLayers));
           layer.updateLayerConfig({
             mask: true && enableMask
           });
@@ -37,4 +31,4 @@ var LayerStylePlugin = exports.default = (_dec = (0, _inversify.injectable)(), _
     }
   }]);
   return LayerStylePlugin;
-}()) || _class);
+}();

package/lib/plugins/LayerModelPlugin.js

@@ -10,14 +10,11 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _l7Core = require("@antv/l7-core");
-var _inversify = require("inversify");
-require("reflect-metadata");
-var _BaseLayer = _interopRequireDefault(require("../tile/core/BaseLayer"));
-var _dec, _class;
+// import TileLayer from '../tile/core/BaseLayer';
 /**
  * Layer Model 初始化，更新，销毁
  */
-var LayerModelPlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
+var LayerModelPlugin = exports.default = /*#__PURE__*/function () {
   function LayerModelPlugin() {
     (0, _classCallCheck2.default)(this, LayerModelPlugin);
   }
@@ -97,19 +94,18 @@ var LayerModelPlugin = exports.default = (_dec = (0, _inversify.injectable)(), _
           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 _BaseLayer.default(layer);
               return _context4.abrupt("return");
-            case 4:
+            case 3:
               layer.log(_l7Core.IDebugLog.BuildModelStart, _l7Core.ILayerStage.INIT);
-              _context4.next = 7;
+              _context4.next = 6;
               return _this.initLayerModel(layer);
-            case 7:
+            case 6:
               layer.log(_l7Core.IDebugLog.BuildModelEnd, _l7Core.ILayerStage.INIT);
-            case 8:
+            case 7:
             case "end":
               return _context4.stop();
           }
@@ -127,19 +123,18 @@ var LayerModelPlugin = exports.default = (_dec = (0, _inversify.injectable)(), _
                 return _context5.abrupt("return", false);
               case 2:
                 if (!layer.getSource().isTile) {
-                  _context5.next = 5;
+                  _context5.next = 4;
                   break;
                 }
-                layer.tileLayer = new _BaseLayer.default(layer);
                 return _context5.abrupt("return", false);
-              case 5:
+              case 4:
                 layer.log(_l7Core.IDebugLog.BuildModelStart, _l7Core.ILayerStage.UPDATE);
-                _context5.next = 8;
+                _context5.next = 7;
                 return _this.prepareLayerModel(layer);
-              case 8:
+              case 7:
                 layer.log(_l7Core.IDebugLog.BuildModelEnd, _l7Core.ILayerStage.UPDATE);
                 return _context5.abrupt("return", true);
-              case 10:
+              case 9:
               case "end":
                 return _context5.stop();
             }
@@ -152,4 +147,4 @@ var LayerModelPlugin = exports.default = (_dec = (0, _inversify.injectable)(), _
     }
   }]);
   return LayerModelPlugin;
-}()) || _class);
+}();

package/lib/plugins/LayerStylePlugin.js

@@ -7,13 +7,10 @@ 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 _inversify = require("inversify");
-require("reflect-metadata");
-var _dec, _class;
 /**
  * 更新图层样式，初始图层相关配置
  */
-var LayerStylePlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
+var LayerStylePlugin = exports.default = /*#__PURE__*/function () {
   function LayerStylePlugin() {
     (0, _classCallCheck2.default)(this, LayerStylePlugin);
   }
@@ -33,4 +30,4 @@ var LayerStylePlugin = exports.default = (_dec = (0, _inversify.injectable)(), _
     }
   }]);
   return LayerStylePlugin;
-}()) || _class);
+}();

package/lib/plugins/LightingPlugin.js

@@ -10,9 +10,6 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _inversify = require("inversify");
-require("reflect-metadata");
-var _dec, _class;
 var _excluded = ["type"];
 var lightTypeUniformMap = {
   directional: {
@@ -80,7 +77,7 @@ function generateLightingUniforms(lights) {
 /**
  * 光照 & Shadow
  */
-var LightingPlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
+var LightingPlugin = exports.default = /*#__PURE__*/function () {
   function LightingPlugin() {
     (0, _classCallCheck2.default)(this, LightingPlugin);
   }
@@ -102,4 +99,4 @@ var LightingPlugin = exports.default = (_dec = (0, _inversify.injectable)(), _de
     }
   }]);
   return LightingPlugin;
-}()) || _class);
+}();

package/lib/plugins/MultiPassRendererPlugin.js

@@ -7,10 +7,7 @@ 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 _inversify = require("inversify");
-require("reflect-metadata");
 var _multiPassRender = require("../utils/multiPassRender");
-var _dec, _class;
 /**
  * 自定义渲染管线：
  * ClearPass -> PixelPickingPass(可选) -> RenderPass/TAAPass -> PostProcessing -> CopyPass
@@ -24,7 +21,7 @@ var _dec, _class;
  *   ],
  * })
  */
-var MultiPassRendererPlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
+var MultiPassRendererPlugin = exports.default = /*#__PURE__*/function () {
   function MultiPassRendererPlugin() {
     (0, _classCallCheck2.default)(this, MultiPassRendererPlugin);
   }
@@ -62,4 +59,4 @@ var MultiPassRendererPlugin = exports.default = (_dec = (0, _inversify.injectabl
     }
   }]);
   return MultiPassRendererPlugin;
-}()) || _class);
+}();

package/lib/plugins/PixelPickingPlugin.js

@@ -10,17 +10,14 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _l7Core = require("@antv/l7-core");
 var _l7Utils = require("@antv/l7-utils");
-var _inversify = require("inversify");
-require("reflect-metadata");
 var _CommonStyleAttribute = require("../core/CommonStyleAttribute");
-var _dec, _class;
 var isNumber = _l7Utils.lodashUtil.isNumber;
 var PickingStage = {
   NONE: 0.0,
   ENCODE: 1.0,
   HIGHLIGHT: 2.0
 };
-var PixelPickingPlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
+var PixelPickingPlugin = exports.default = /*#__PURE__*/function () {
   function PixelPickingPlugin() {
     (0, _classCallCheck2.default)(this, PixelPickingPlugin);
   }
@@ -34,7 +31,7 @@ var PixelPickingPlugin = exports.default = (_dec = (0, _inversify.injectable)(),
 
     function pickOption2Array() {
       var array = [];
-      this.pickingUniformMap.forEach(function (value, key) {
+      this.pickingUniformMap.forEach(function (value) {
         if (isNumber(value)) {
           array.push(value);
         } else {
@@ -65,10 +62,8 @@ var PixelPickingPlugin = exports.default = (_dec = (0, _inversify.injectable)(),
     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 () {
@@ -165,8 +160,7 @@ var PixelPickingPlugin = exports.default = (_dec = (0, _inversify.injectable)(),
           u_CurrentSelectedId: pickedColor,
           u_SelectColor: highlightColorInArray.map(function (c) {
             return c * 255;
-          }),
-          u_EnableSelect: 1
+          })
         };
         _this2.updatePickOption(option, layer);
         layer.models.forEach(function (model) {
@@ -176,4 +170,4 @@ var PixelPickingPlugin = exports.default = (_dec = (0, _inversify.injectable)(),
     }
   }]);
   return PixelPickingPlugin;
-}()) || _class);
+}();

package/lib/plugins/RegisterStyleAttributePlugin.js

@@ -8,15 +8,12 @@ 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 _inversify = require("inversify");
-require("reflect-metadata");
 var _CommonStyleAttribute = require("../core/CommonStyleAttribute");
 var _utils = require("../tile/utils/utils");
-var _dec, _class;
 /**
  * 在初始化阶段完成属性的注册，以及首次根据 Layer 指定的三角化方法完成 indices 和 attribute 的创建
  */
-var RegisterStyleAttributePlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
+var RegisterStyleAttributePlugin = exports.default = /*#__PURE__*/function () {
   function RegisterStyleAttributePlugin() {
     (0, _classCallCheck2.default)(this, RegisterStyleAttributePlugin);
   }
@@ -115,4 +112,4 @@ var RegisterStyleAttributePlugin = exports.default = (_dec = (0, _inversify.inje
     }
   }]);
   return RegisterStyleAttributePlugin;
-}()) || _class);
+}();

package/lib/plugins/ShaderUniformPlugin.js

@@ -5,18 +5,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-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 _inversify = require("inversify");
-require("reflect-metadata");
-var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5;
 /**
  * 在渲染之前需要获取当前 Shader 所需 Uniform，例如：
  * 1. 从相机服务中获取 View & ProjectionMatrix，当前缩放等级等等
@@ -24,19 +18,24 @@ var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _class, _class2, _descriptor, _desc
  *    @see https://yuque.antfin-inc.com/yuqi.pyq/fgetpa/doml91
  * 3. 当前 Layer 本身的样式属性
  */
-var ShaderUniformPlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inversify.inject)(_l7Core.TYPES.ICameraService), _dec3 = (0, _inversify.inject)(_l7Core.TYPES.ICoordinateSystemService), _dec4 = (0, _inversify.inject)(_l7Core.TYPES.IRendererService), _dec5 = (0, _inversify.inject)(_l7Core.TYPES.IMapService), _dec6 = (0, _inversify.inject)(_l7Core.TYPES.ILayerService), _dec(_class = (_class2 = /*#__PURE__*/function () {
+var ShaderUniformPlugin = exports.default = /*#__PURE__*/function () {
   function ShaderUniformPlugin() {
     (0, _classCallCheck2.default)(this, ShaderUniformPlugin);
-    (0, _initializerDefineProperty2.default)(this, "cameraService", _descriptor, this);
-    (0, _initializerDefineProperty2.default)(this, "coordinateSystemService", _descriptor2, this);
-    (0, _initializerDefineProperty2.default)(this, "rendererService", _descriptor3, this);
-    (0, _initializerDefineProperty2.default)(this, "mapService", _descriptor4, this);
-    (0, _initializerDefineProperty2.default)(this, "layerService", _descriptor5, this);
   }
   (0, _createClass2.default)(ShaderUniformPlugin, [{
     key: "apply",
-    value: function apply(layer) {
+    value: function apply(layer, _ref) {
       var _this = this;
+      var rendererService = _ref.rendererService,
+        mapService = _ref.mapService,
+        layerService = _ref.layerService,
+        coordinateSystemService = _ref.coordinateSystemService,
+        cameraService = _ref.cameraService;
+      this.rendererService = rendererService;
+      this.mapService = mapService;
+      this.layerService = layerService;
+      this.coordinateSystemService = coordinateSystemService;
+      this.cameraService = cameraService;
       var version = this.mapService.version;
       var mvp = [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]; // default matrix (for gaode2.x)
       var sceneCenterMercator = [0, 0];
@@ -82,7 +81,7 @@ var ShaderUniformPlugin = exports.default = (_dec = (0, _inversify.injectable)()
           });
         }
 
-        // For WebGL1. regl 
+        // For WebGL1. regl
         var platformString = _this.rendererService.queryVerdorInfo();
         if (platformString === 'WebGL1') {
           layer.models.forEach(function (model) {
@@ -146,34 +145,9 @@ var ShaderUniformPlugin = exports.default = (_dec = (0, _inversify.injectable)()
       0, 0, 0]);
       return {
         data: data,
-        uniforms: (_uniforms = {}, (0, _defineProperty2.default)(_uniforms, _l7Core.CameraUniform.ProjectionMatrix, u_ProjectionMatrix), (0, _defineProperty2.default)(_uniforms, _l7Core.CameraUniform.ViewMatrix, u_ViewMatrix), (0, _defineProperty2.default)(_uniforms, _l7Core.CameraUniform.ViewProjectionMatrix, u_ViewProjectionMatrix), (0, _defineProperty2.default)(_uniforms, _l7Core.CameraUniform.Zoom, u_Zoom), (0, _defineProperty2.default)(_uniforms, _l7Core.CameraUniform.ZoomScale, u_ZoomScale), (0, _defineProperty2.default)(_uniforms, _l7Core.CameraUniform.FocalDistance, u_FocalDistance), (0, _defineProperty2.default)(_uniforms, _l7Core.CameraUniform.CameraPosition, u_CameraPosition), (0, _defineProperty2.default)(_uniforms, _l7Core.CoordinateUniform.CoordinateSystem, u_CoordinateSystem), (0, _defineProperty2.default)(_uniforms, _l7Core.CoordinateUniform.ViewportCenter, u_ViewportCenter), (0, _defineProperty2.default)(_uniforms, _l7Core.CoordinateUniform.ViewportCenterProjection, u_ViewportCenterProjection), (0, _defineProperty2.default)(_uniforms, _l7Core.CoordinateUniform.PixelsPerDegree, u_PixelsPerDegree), (0, _defineProperty2.default)(_uniforms, _l7Core.CoordinateUniform.PixelsPerDegree2, u_PixelsPerDegree2), (0, _defineProperty2.default)(_uniforms, _l7Core.CoordinateUniform.PixelsPerMeter, u_PixelsPerMeter), (0, _defineProperty2.default)(_uniforms, _l7Core.CoordinateUniform.Mvp, u_Mvp), (0, _defineProperty2.default)(_uniforms, "u_sceneCenterMercator", sceneCenterMercator), (0, _defineProperty2.default)(_uniforms, "u_ViewportSize", u_ViewportSize), (0, _defineProperty2.default)(_uniforms, "u_ModelMatrix", u_ModelMatrix), (0, _defineProperty2.default)(_uniforms, "u_DevicePixelRatio", u_DevicePixelRatio), _uniforms)
+        uniforms: (_uniforms = {}, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)(_uniforms, _l7Core.CameraUniform.ProjectionMatrix, u_ProjectionMatrix), _l7Core.CameraUniform.ViewMatrix, u_ViewMatrix), _l7Core.CameraUniform.ViewProjectionMatrix, u_ViewProjectionMatrix), _l7Core.CameraUniform.Zoom, u_Zoom), _l7Core.CameraUniform.ZoomScale, u_ZoomScale), _l7Core.CameraUniform.FocalDistance, u_FocalDistance), _l7Core.CameraUniform.CameraPosition, u_CameraPosition), _l7Core.CoordinateUniform.CoordinateSystem, u_CoordinateSystem), _l7Core.CoordinateUniform.ViewportCenter, u_ViewportCenter), _l7Core.CoordinateUniform.ViewportCenterProjection, u_ViewportCenterProjection), (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)(_uniforms, _l7Core.CoordinateUniform.PixelsPerDegree, u_PixelsPerDegree), _l7Core.CoordinateUniform.PixelsPerDegree2, u_PixelsPerDegree2), _l7Core.CoordinateUniform.PixelsPerMeter, u_PixelsPerMeter), _l7Core.CoordinateUniform.Mvp, u_Mvp), "u_sceneCenterMercator", sceneCenterMercator), "u_ViewportSize", u_ViewportSize), "u_ModelMatrix", u_ModelMatrix), "u_DevicePixelRatio", u_DevicePixelRatio))
       };
     }
   }]);
   return ShaderUniformPlugin;
-}(), (_descriptor = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "cameraService", [_dec2], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _descriptor2 = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "coordinateSystemService", [_dec3], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _descriptor3 = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "rendererService", [_dec4], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _descriptor4 = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "mapService", [_dec5], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _descriptor5 = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "layerService", [_dec6], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-})), _class2)) || _class);
+}();

package/lib/plugins/UpdateModelPlugin.js

@@ -7,13 +7,10 @@ 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 _inversify = require("inversify");
-require("reflect-metadata");
-var _dec, _class;
 /**
  * Model 更新
  */
-var UpdateModelPlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
+var UpdateModelPlugin = exports.default = /*#__PURE__*/function () {
   function UpdateModelPlugin() {
     (0, _classCallCheck2.default)(this, UpdateModelPlugin);
   }
@@ -36,4 +33,4 @@ var UpdateModelPlugin = exports.default = (_dec = (0, _inversify.injectable)(),
     }
   }]);
   return UpdateModelPlugin;
-}()) || _class);
+}();

package/lib/plugins/UpdateStyleAttributePlugin.js

@@ -7,13 +7,10 @@ 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 _inversify = require("inversify");
-require("reflect-metadata");
-var _dec, _class;
 /**
  * 在初始化阶段完成属性的注册，以及首次根据 Layer 指定的三角化方法完成 indices 和 attribute 的创建
  */
-var UpdateStyleAttributePlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
+var UpdateStyleAttributePlugin = exports.default = /*#__PURE__*/function () {
   function UpdateStyleAttributePlugin() {
     (0, _classCallCheck2.default)(this, UpdateStyleAttributePlugin);
   }
@@ -78,4 +75,4 @@ var UpdateStyleAttributePlugin = exports.default = (_dec = (0, _inversify.inject
     }
   }]);
   return UpdateStyleAttributePlugin;
-}()) || _class);
+}();

package/lib/plugins/index.js

@@ -0,0 +1,26 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createPlugins = createPlugins;
+var _DataMappingPlugin = _interopRequireDefault(require("./DataMappingPlugin"));
+var _DataSourcePlugin = _interopRequireDefault(require("./DataSourcePlugin"));
+var _FeatureScalePlugin = _interopRequireDefault(require("./FeatureScalePlugin"));
+var _LayerAnimateStylePlugin = _interopRequireDefault(require("./LayerAnimateStylePlugin"));
+var _LayerMaskPlugin = _interopRequireDefault(require("./LayerMaskPlugin"));
+var _LayerModelPlugin = _interopRequireDefault(require("./LayerModelPlugin"));
+var _LayerStylePlugin = _interopRequireDefault(require("./LayerStylePlugin"));
+var _LightingPlugin = _interopRequireDefault(require("./LightingPlugin"));
+var _MultiPassRendererPlugin = _interopRequireDefault(require("./MultiPassRendererPlugin"));
+var _PixelPickingPlugin = _interopRequireDefault(require("./PixelPickingPlugin"));
+var _RegisterStyleAttributePlugin = _interopRequireDefault(require("./RegisterStyleAttributePlugin"));
+var _ShaderUniformPlugin = _interopRequireDefault(require("./ShaderUniformPlugin"));
+var _UpdateModelPlugin = _interopRequireDefault(require("./UpdateModelPlugin"));
+var _UpdateStyleAttributePlugin = _interopRequireDefault(require("./UpdateStyleAttributePlugin"));
+// import ConfigSchemaValidationPlugin from './ConfigSchemaValidationPlugin';
+
+function createPlugins() {
+  return [new _DataSourcePlugin.default(), new _RegisterStyleAttributePlugin.default(), new _FeatureScalePlugin.default(), new _DataMappingPlugin.default(), new _LayerStylePlugin.default(), new _LayerMaskPlugin.default(), new _UpdateStyleAttributePlugin.default(), new _UpdateModelPlugin.default(), new _MultiPassRendererPlugin.default(), new _ShaderUniformPlugin.default(), new _LayerAnimateStylePlugin.default(), new _LightingPlugin.default(), new _PixelPickingPlugin.default(), new _LayerModelPlugin.default()];
+}

package/lib/point/models/fill.js

@@ -13,7 +13,7 @@ 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 _l7Core = require("@antv/l7-core");
-var _l7Utils = require("@antv/l7-utils");
+var _triangulation = require("../../core/triangulation");
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
 var _CommonStyleAttribute = require("../../core/CommonStyleAttribute");
 var _interface = require("../../core/interface");
@@ -79,7 +79,7 @@ var FillModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "getAttribute",
     value: function getAttribute() {
-      return this.styleAttributeService.createAttributesAndIndices(this.layer.getEncodedData(), _l7Utils.PointFillTriangulation);
+      return this.styleAttributeService.createAttributesAndIndices(this.layer.getEncodedData(), _triangulation.PointFillTriangulation);
     }
   }, {
     key: "initModels",
@@ -104,31 +104,28 @@ var FillModel = exports.default = /*#__PURE__*/function (_BaseModel) {
     key: "buildModels",
     value: function () {
       var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var _ref3, _ref3$animateOption, animateOption, _this$getShaders, frag, vert, type, model;
+        var _this$getShaders, frag, vert, type, model;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              _ref3 = this.layer.getLayerConfig(), _ref3$animateOption = _ref3.animateOption, animateOption = _ref3$animateOption === void 0 ? {
-                enable: false
-              } : _ref3$animateOption;
-              _this$getShaders = this.getShaders(animateOption), frag = _this$getShaders.frag, vert = _this$getShaders.vert, type = _this$getShaders.type;
-              this.layer.triangulation = _l7Utils.PointFillTriangulation;
+              _this$getShaders = this.getShaders(), frag = _this$getShaders.frag, vert = _this$getShaders.vert, type = _this$getShaders.type;
+              this.layer.triangulation = _triangulation.PointFillTriangulation;
               this.initUniformsBuffer();
-              _context2.next = 6;
+              _context2.next = 5;
               return this.layer.buildLayerModel({
                 moduleName: type,
                 vertexShader: vert,
                 fragmentShader: frag,
                 inject: this.getInject(),
-                triangulation: _l7Utils.PointFillTriangulation,
+                triangulation: _triangulation.PointFillTriangulation,
                 depth: {
                   enable: false
                 }
               });
-            case 6:
+            case 5:
               model = _context2.sent;
               return _context2.abrupt("return", [model]);
-            case 8:
+            case 7:
             case "end":
               return _context2.stop();
           }
@@ -145,7 +142,7 @@ var FillModel = exports.default = /*#__PURE__*/function (_BaseModel) {
      */
   }, {
     key: "getShaders",
-    value: function getShaders(animateOption) {
+    value: function getShaders() {
       return {
         frag: pointFillFrag,
         vert: pointFillVert,

package/lib/point/models/fillImage.js

@@ -78,7 +78,8 @@ var FillImageModel = exports.default = /*#__PURE__*/function (_BaseModel) {
         _ref$unit = _ref.unit,
         unit = _ref$unit === void 0 ? 'pixel' : _ref$unit;
       if (this.rendererService.getDirty()) {
-        this.texture.bind();
+        var _this$texture;
+        (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.bind();
       }
       /**
        *               rotateFlag
@@ -164,9 +165,9 @@ var FillImageModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "clearModels",
     value: function clearModels() {
-      var _this$texture;
+      var _this$texture2;
       this.iconService.off('imageUpdate', this.updateTexture);
-      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
+      (_this$texture2 = this.texture) === null || _this$texture2 === void 0 || _this$texture2.destroy();
     }
 
     // overwrite baseModel func

package/lib/point/models/image.js

@@ -69,7 +69,8 @@ var ImageModel = exports.default = /*#__PURE__*/function (_BaseModel) {
     value: function getUninforms() {
       // ThreeJS 图层兼容
       if (this.rendererService.getDirty()) {
-        this.texture.bind();
+        var _this$texture;
+        (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.bind();
       }
       var commonInfo = this.getCommonUniformsInfo();
       var attributeInfo = this.getUniformsBufferInfo(this.getStyleAttribute());
@@ -118,8 +119,8 @@ var ImageModel = 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);
     }
   }, {

package/lib/polygon/models/extrude.js

@@ -222,7 +222,6 @@ var ExtrudeModel = exports.default = /*#__PURE__*/function (_BaseModel) {
           update: function update(feature, featureIdx, vertex) {
             var lng = vertex[0];
             var lat = vertex[1];
-            // console.log((lng - bounds[0]) / lngLen, (lat - bounds[1]) / latLen, vertex[4])
             // 临时 兼容高德V2
             return [(lng - bounds[0]) / lngLen, (lat - bounds[1]) / latLen, vertex[4]];
           }

package/lib/polygon/models/fill.js

@@ -14,7 +14,6 @@ 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 _l7Core = require("@antv/l7-core");
-var _l7Utils = require("@antv/l7-utils");
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
 var _triangulation = require("../../core/triangulation");
 var _CommonStyleAttribute = require("../../core/CommonStyleAttribute");
@@ -168,7 +167,7 @@ var FillModel = exports.default = /*#__PURE__*/function (_BaseModel) {
           frag: polygon_frag,
           vert: polygon_vert,
           type: 'polygonFill',
-          triangulation: _l7Utils.polygonFillTriangulation
+          triangulation: _triangulation.polygonTriangulation
         };
       }
     }