@antv/l7-layers 2.9.27-alpha.2 → 2.9.27-alpha.4

package/es/plugins/DataMappingPlugin.js

@@ -6,7 +6,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _applyDecoratedDescriptor from "@babel/runtime/helpers/applyDecoratedDescriptor";
 import _initializerWarningHelper from "@babel/runtime/helpers/initializerWarningHelper";
 
-var _dec, _dec2, _dec3, _dec4, _class, _class2, _descriptor, _descriptor2, _descriptor3;
+var _dec, _dec2, _dec3, _class, _class2, _descriptor, _descriptor2;
 
 import { TYPES } from '@antv/l7-core';
 import { Version } from '@antv/l7-maps';
@@ -14,15 +14,13 @@ import { isColor, normalize, rgb2arr } from '@antv/l7-utils';
 import { inject, injectable } from 'inversify';
 import { cloneDeep } from 'lodash';
 import 'reflect-metadata';
-var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfigService), _dec3 = inject(TYPES.IMapService), _dec4 = inject(TYPES.IFontService), _dec(_class = (_class2 = /*#__PURE__*/function () {
+var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService), _dec3 = inject(TYPES.IFontService), _dec(_class = (_class2 = /*#__PURE__*/function () {
   function DataMappingPlugin() {
     _classCallCheck(this, DataMappingPlugin);
 
-    _initializerDefineProperty(this, "configService", _descriptor, this);
+    _initializerDefineProperty(this, "mapService", _descriptor, this);
 
-    _initializerDefineProperty(this, "mapService", _descriptor2, this);
-
-    _initializerDefineProperty(this, "fontService", _descriptor3, this);
+    _initializerDefineProperty(this, "fontService", _descriptor2, this);
   }
 
   _createClass(DataMappingPlugin, [{
@@ -45,8 +43,7 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfig
               styleAttributeService: styleAttributeService
             });
           });
-        } // this.generateMaping(layer, { styleAttributeService });
-
+        }
       });
       layer.hooks.beforeRenderData.tap('DataMappingPlugin', function () {
         layer.dataState.dataMappingNeedUpdate = false;
@@ -62,8 +59,7 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfig
               styleAttributeService: styleAttributeService
             });
           });
-        } // this.generateMaping(layer, { styleAttributeService });
-
+        }
 
         return true;
       }); // remapping before render
@@ -94,10 +90,14 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfig
         if (attributesToRemapping.length) {
           // 过滤数据
           if (filter !== null && filter !== void 0 && filter.needRemapping) {
-            layer.setEncodedData(_this.mapping(layer, attributes, filterData, undefined, bottomColor));
+            var encodeData = _this.mapping(layer, attributes, filterData, undefined, bottomColor);
+
+            layer.setEncodedData(encodeData);
             filter.needRemapping = false;
           } else {
-            layer.setEncodedData(_this.mapping(layer, attributesToRemapping, filterData, layer.getEncodedData(), bottomColor));
+            var _encodeData = _this.mapping(layer, attributesToRemapping, filterData, layer.getEncodedData(), bottomColor);
+
+            layer.setEncodedData(_encodeData);
           } // 处理文本更新
 
 
@@ -123,18 +123,11 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfig
         });
       }
 
-      layer.setEncodedData(this.mapping(layer, attributes, filterData, undefined, bottomColor)); // 对外暴露事件
+      var encodeData = this.mapping(layer, attributes, filterData, undefined, bottomColor);
+      layer.setEncodedData(encodeData); // 对外暴露事件
 
       layer.emit('dataUpdate', null);
     }
-  }, {
-    key: "getArrowPoints",
-    value: function getArrowPoints(p1, p2) {
-      var dir = [p2[0] - p1[0], p2[1] - p1[1]];
-      var normalizeDir = normalize(dir);
-      var arrowPoint = [p1[0] + normalizeDir[0] * 0.0001, p1[1] + normalizeDir[1] * 0.0001];
-      return arrowPoint;
-    }
   }, {
     key: "mapping",
     value: function mapping(layer, attributes, data, predata, minimumColor) {
@@ -144,8 +137,16 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfig
           _ref3$arrow = _ref3.arrow,
           arrow = _ref3$arrow === void 0 ? {
         enable: false
-      } : _ref3$arrow;
+      } : _ref3$arrow,
+          usage = _ref3.usage;
 
+      if (usage === 'basemap') {
+        return this.mapLayerMapping(layer, attributes, data, predata);
+      }
+
+      var usedAttributes = attributes.filter(function (attribute) {
+        return attribute.scale !== undefined;
+      });
       var mappedData = data.map(function (record, i) {
         var preRecord = predata ? predata[i] : {};
 
@@ -154,17 +155,12 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfig
           coordinates: record.coordinates
         }, preRecord);
 
-        attributes.filter(function (attribute) {
-          return attribute.scale !== undefined;
-        }).forEach(function (attribute) {
-          // console.log('record', record)
-          var values = _this3.applyAttributeMapping(attribute, record, minimumColor); // console.log('values', values)
-
+        usedAttributes.forEach(function (attribute) {
+          var values = _this3.applyAttributeMapping(attribute, record, minimumColor);
 
           attribute.needRemapping = false; // TODO: 支持每个属性配置 postprocess
 
           if (attribute.name === 'color') {
-            // console.log('attribute', attribute)
             values = values.map(function (c) {
               return rgb2arr(c);
             });
@@ -180,26 +176,77 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfig
 
         if (arrow.enable && (encodeRecord.shape === 'line' || encodeRecord.shape === 'halfLine')) {
           // 只有在线图层且支持配置箭头的时候进行插入顶点的处理
-          var coords = encodeRecord.coordinates;
+          var coords = encodeRecord.coordinates; // @ts-ignore
+
+          if (layer.arrowInsertCount < layer.encodeDataLength) {
+            // Tip: arrowInsert 的判断用于确保每一条线数据 arrow 的属性点只会被植入一次
+            var arrowPoint = _this3.getArrowPoints(coords[0], coords[1]);
 
-          var arrowPoint = _this3.getArrowPoints(coords[0], coords[1]);
+            encodeRecord.coordinates.splice(1, 0, arrowPoint, arrowPoint); // @ts-ignore
 
-          encodeRecord.coordinates.splice(1, 0, arrowPoint, arrowPoint);
+            layer.arrowInsertCount++;
+          }
         }
 
         return encodeRecord;
-      }); // console.log('mappedData', mappedData)
-      // 调整数据兼容 Amap2.0
+      }); // 调整数据兼容 Amap2.0
 
       this.adjustData2Amap2Coordinates(mappedData, layer); // 调整数据兼容 SimpleCoordinates
 
       this.adjustData2SimpleCoordinates(mappedData);
       return mappedData;
     }
+  }, {
+    key: "mapLayerMapping",
+    value: function mapLayerMapping(layer, attributes, data, predata) {
+      var _this4 = this;
+
+      var usedAttributes = attributes.filter(function (attribute) {
+        return attribute.scale !== undefined;
+      });
+      var mappedData = data.map(function (record, i) {
+        var preRecord = predata ? predata[i] : {};
+
+        var encodeRecord = _objectSpread({
+          id: record._id,
+          coordinates: record.coordinates
+        }, preRecord);
+
+        usedAttributes.forEach(function (attribute) {
+          var _layer$shapeOption;
+
+          if (attribute.name === 'shape' && // @ts-ignore
+          ((_layer$shapeOption = layer.shapeOption) === null || _layer$shapeOption === void 0 ? void 0 : _layer$shapeOption.field) === 'simple') {
+            encodeRecord[attribute.name] = 'simple';
+            attribute.needRemapping = false;
+          } else {
+            var values = _this4.applyMapLayerAttributeMapping(attribute, record);
+
+            attribute.needRemapping = false; // @ts-ignore
+
+            encodeRecord[attribute.name] = Array.isArray(values) && values.length === 1 ? values[0] : values; // 增加对 layer/text/iconfont unicode 映射的解析
+
+            if (attribute.name === 'shape') {
+              encodeRecord.shape = _this4.fontService.getIconFontKey(encodeRecord[attribute.name]);
+            }
+          }
+        });
+
+        if (encodeRecord.size === undefined) {
+          // in case not set size
+          encodeRecord.size = 1;
+        }
+
+        return encodeRecord;
+      }); // 调整数据兼容 Amap2.0
+
+      this.adjustData2Amap2Coordinates(mappedData, layer);
+      return mappedData;
+    }
   }, {
     key: "adjustData2Amap2Coordinates",
     value: function adjustData2Amap2Coordinates(mappedData, layer) {
-      var _this4 = this;
+      var _this5 = this;
 
       // 根据地图的类型判断是否需要对点位数据进行处理, 若是高德2.0则需要对坐标进行相对偏移
       if (mappedData.length > 0 && this.mapService.version === Version['GAODE2.x']) {
@@ -218,7 +265,7 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfig
             // @ts-ignore
             // d.coordinates = this.mapService.lngLatToCoord(d.coordinates);
 
-            d.coordinates = _this4.mapService.lngLatToCoordByLayer(d.coordinates, layerCenter);
+            d.coordinates = _this5.mapService.lngLatToCoordByLayer(d.coordinates, layerCenter);
           });
         } else {
           // 连续的线、面数据
@@ -233,35 +280,35 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfig
             // @ts-ignore
             // d.coordinates = this.mapService.lngLatToCoords(d.coordinates);
 
-            d.coordinates = _this4.mapService.lngLatToCoordsByLayer(d.coordinates, layerCenter);
+            d.coordinates = _this5.mapService.lngLatToCoordsByLayer(d.coordinates, layerCenter);
           });
         }
       }
     }
-  }, {
-    key: "getLayerCenter",
-    value: function getLayerCenter(layer) {
-      var source = layer.getSource();
-      return source.center;
-    }
   }, {
     key: "adjustData2SimpleCoordinates",
     value: function adjustData2SimpleCoordinates(mappedData) {
-      var _this5 = this;
+      var _this6 = this;
 
       if (mappedData.length > 0 && this.mapService.version === Version.SIMPLE) {
         mappedData.map(function (d) {
           if (!d.simpleCoordinate) {
-            d.coordinates = _this5.unProjectCoordinates(d.coordinates);
+            d.coordinates = _this6.unProjectCoordinates(d.coordinates);
             d.simpleCoordinate = true;
           }
         });
       }
     }
+  }, {
+    key: "getLayerCenter",
+    value: function getLayerCenter(layer) {
+      var source = layer.getSource();
+      return source.center;
+    }
   }, {
     key: "unProjectCoordinates",
     value: function unProjectCoordinates(coordinates) {
-      var _this6 = this;
+      var _this7 = this;
 
       if (typeof coordinates[0] === 'number') {
         return this.mapService.simpleMapCoord.unproject(coordinates);
@@ -274,7 +321,7 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfig
           // @ts-ignore
           var c1 = [];
           coord.map(function (co) {
-            c1.push(_this6.mapService.simpleMapCoord.unproject(co));
+            c1.push(_this7.mapService.simpleMapCoord.unproject(co));
           }); // @ts-ignore
 
           coords.push(c1);
@@ -286,7 +333,7 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfig
         var _coords = []; // @ts-ignore
 
         coordinates.map(function (coord) {
-          _coords.push(_this6.mapService.simpleMapCoord.unproject(coord));
+          _coords.push(_this7.mapService.simpleMapCoord.unproject(coord));
         }); // @ts-ignore
 
         return _coords;
@@ -312,9 +359,7 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfig
           // TODO:多字段，常量
           params.push(record[field]);
         }
-      }); // console.log('params', params)
-      // console.log('attribute', attribute)
-
+      });
       var mappingResult = attribute.mapping ? attribute.mapping(params) : [];
 
       if (attribute.name === 'color' && !isColor(mappingResult[0])) {
@@ -323,20 +368,46 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfig
 
       return mappingResult; // return attribute.mapping ? attribute.mapping(params) : [];
     }
+  }, {
+    key: "applyMapLayerAttributeMapping",
+    value: function applyMapLayerAttributeMapping(attribute, record) {
+      var _attribute$scale3;
+
+      if (!attribute.scale) {
+        return [];
+      }
+
+      var scalers = (attribute === null || attribute === void 0 ? void 0 : (_attribute$scale3 = attribute.scale) === null || _attribute$scale3 === void 0 ? void 0 : _attribute$scale3.scalers) || [];
+      var params = [];
+      scalers.forEach(function (_ref5) {
+        var _attribute$scale4;
+
+        var field = _ref5.field;
+
+        if (record.hasOwnProperty(field) || ((_attribute$scale4 = attribute.scale) === null || _attribute$scale4 === void 0 ? void 0 : _attribute$scale4.type) === 'variable') {
+          params.push(record[field]);
+        }
+      });
+      var mappingResult = attribute.mapping ? attribute.mapping(params) : [];
+      return mappingResult;
+    }
+  }, {
+    key: "getArrowPoints",
+    value: function getArrowPoints(p1, p2) {
+      var dir = [p2[0] - p1[0], p2[1] - p1[1]];
+      var normalizeDir = normalize(dir);
+      var arrowPoint = [p1[0] + normalizeDir[0] * 0.0001, p1[1] + normalizeDir[1] * 0.0001];
+      return arrowPoint;
+    }
   }]);
 
   return DataMappingPlugin;
-}(), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "configService", [_dec2], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _descriptor2 = _applyDecoratedDescriptor(_class2.prototype, "mapService", [_dec3], {
+}(), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "mapService", [_dec2], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor3 = _applyDecoratedDescriptor(_class2.prototype, "fontService", [_dec4], {
+}), _descriptor2 = _applyDecoratedDescriptor(_class2.prototype, "fontService", [_dec3], {
   configurable: true,
   enumerable: true,
   writable: true,

package/es/plugins/DataSourcePlugin.js

@@ -37,8 +37,7 @@ var DataSourcePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
           source.once('sourceUpdate', function () {
             _this.updateClusterData(layer);
           });
-        } // this.updateClusterData(layer);
-
+        }
       }); // 检测数据是否需要更新
 
       layer.hooks.beforeRenderData.tap('DataSourcePlugin', function () {
@@ -52,6 +51,8 @@ var DataSourcePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
   }, {
     key: "updateClusterData",
     value: function updateClusterData(layer) {
+      // Tip: 矢量瓦片不需要进行聚合操作
+      if (layer.isTileLayer || layer.tileLayer) return false;
       var source = layer.getSource();
       var cluster = source.cluster;
       var _source$clusterOption = source.clusterOptions.zoom,

package/es/plugins/FeatureScalePlugin.d.ts

@@ -4,8 +4,6 @@ import 'reflect-metadata';
  * 根据 Source 原始数据为指定字段创建 Scale，保存在 StyleAttribute 上，供下游插件使用
  */
 export default class FeatureScalePlugin implements ILayerPlugin {
-    private readonly configService;
-    private scaleCache;
     private scaleOptions;
     private getSourceData;
     apply(layer: ILayer, { styleAttributeService, }: {

package/es/plugins/FeatureScalePlugin.js

@@ -1,18 +1,15 @@
 import _objectSpread from "@babel/runtime/helpers/objectSpread2";
-import _initializerDefineProperty from "@babel/runtime/helpers/initializerDefineProperty";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
-import _applyDecoratedDescriptor from "@babel/runtime/helpers/applyDecoratedDescriptor";
-import _initializerWarningHelper from "@babel/runtime/helpers/initializerWarningHelper";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 
-var _scaleMap, _dec, _dec2, _class, _class2, _descriptor;
+var _scaleMap, _dec, _class;
 
-import { ScaleTypes, StyleScaleType, TYPES } from '@antv/l7-core';
+import { ScaleTypes, StyleScaleType } from '@antv/l7-core';
 import { extent } from 'd3-array';
 import * as d3interpolate from 'd3-interpolate';
 import * as d3 from 'd3-scale';
-import { inject, injectable } from 'inversify';
+import { injectable } from 'inversify';
 import { isNil, isString, uniq } from 'lodash';
 import 'reflect-metadata';
 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]))?$/;
@@ -21,14 +18,10 @@ var scaleMap = (_scaleMap = {}, _defineProperty(_scaleMap, ScaleTypes.LINEAR, d3
  * 根据 Source 原始数据为指定字段创建 Scale，保存在 StyleAttribute 上，供下游插件使用
  */
 
-var FeatureScalePlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfigService), _dec(_class = (_class2 = /*#__PURE__*/function () {
+var FeatureScalePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function () {
   function FeatureScalePlugin() {
     _classCallCheck(this, FeatureScalePlugin);
 
-    _initializerDefineProperty(this, "configService", _descriptor, this);
-
-    _defineProperty(this, "scaleCache", {});
-
     _defineProperty(this, "scaleOptions", {});
   }
 
@@ -63,15 +56,7 @@ var FeatureScalePlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfi
           } else {
             _this.caculateScalesForAttributes(attributes || [], dataArray);
           }
-        }); // const { dataArray } = layer.getSource().data;
-        // if (dataArray.length === 0) {
-        //   return;
-        // }
-        // this.caculateScalesForAttributes(
-        //   attributes || [],
-        //   dataArray as IParseDataItem[],
-        // );
-
+        });
       }); // 检测数据是否需要更新
 
       layer.hooks.beforeRenderData.tap('FeatureScalePlugin', function () {
@@ -88,16 +73,7 @@ var FeatureScalePlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfi
           _this.caculateScalesForAttributes(attributes || [], dataArray);
 
           layer.layerModelNeedUpdate = true;
-        }); // const { dataArray } = layer.getSource().data;
-        // if (dataArray.length === 0) {
-        //   return;
-        // }
-        // this.caculateScalesForAttributes(
-        //   attributes || [],
-        //   dataArray
-        // );
-        // layer.layerModelNeedUpdate = true;
-
+        });
 
         return true;
       });
@@ -124,20 +100,7 @@ var FeatureScalePlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfi
             if (attributesToRescale.length) {
               _this.caculateScalesForAttributes(attributesToRescale, dataArray);
             }
-          }); // const { dataArray } = layer.getSource().data;
-          // if (dataArray.length === 0) {
-          //   return;
-          // }
-          // const attributesToRescale = attributes.filter(
-          //   (attribute) => attribute.needRescale,
-          // );
-          // if (attributesToRescale.length) {
-          //   this.caculateScalesForAttributes(
-          //     attributesToRescale,
-          //     dataArray,
-          //   );
-          // }
-
+          });
         }
       });
     }
@@ -151,7 +114,6 @@ var FeatureScalePlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfi
     value: function caculateScalesForAttributes(attributes, dataArray) {
       var _this2 = this;
 
-      this.scaleCache = {};
       attributes.forEach(function (attribute) {
         if (attribute.scale) {
           // 创建Scale
@@ -371,10 +333,5 @@ var FeatureScalePlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfi
   }]);
 
   return FeatureScalePlugin;
-}(), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "configService", [_dec2], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-})), _class2)) || _class);
+}()) || _class);
 export { FeatureScalePlugin as default };

package/es/plugins/LayerAnimateStylePlugin.d.ts

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

package/es/plugins/LayerAnimateStylePlugin.js

@@ -1,33 +1,23 @@
 import _objectSpread from "@babel/runtime/helpers/objectSpread2";
-import _initializerDefineProperty from "@babel/runtime/helpers/initializerDefineProperty";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import _applyDecoratedDescriptor from "@babel/runtime/helpers/applyDecoratedDescriptor";
-import _initializerWarningHelper from "@babel/runtime/helpers/initializerWarningHelper";
 
-var _dec, _dec2, _dec3, _class, _class2, _descriptor, _descriptor2;
+var _dec, _class;
 
-import { TYPES } from '@antv/l7-core';
-import { inject, injectable } from 'inversify';
+import { injectable } from 'inversify';
 import 'reflect-metadata';
-var LayerAnimateStylePlugin = (_dec = injectable(), _dec2 = inject(TYPES.ICameraService), _dec3 = inject(TYPES.IRendererService), _dec(_class = (_class2 = /*#__PURE__*/function () {
+var LayerAnimateStylePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function () {
   function LayerAnimateStylePlugin() {
     _classCallCheck(this, LayerAnimateStylePlugin);
-
-    _initializerDefineProperty(this, "cameraService", _descriptor, this);
-
-    _initializerDefineProperty(this, "rendererService", _descriptor2, this);
   }
 
   _createClass(LayerAnimateStylePlugin, [{
     key: "apply",
     value: function apply(layer) {
-      // layer.hooks.beforeRender.tap('LayerAnimateStylePlugin', () => {
-      // })
       layer.hooks.beforeRender.tap('LayerAnimateStylePlugin', function () {
-        // 重新计算坐标系参数
-        layer.models.forEach(function (model) {
+        // @ts-ignore
+        var animateStatus = layer.animateStatus;
+        animateStatus && layer.models.forEach(function (model) {
           model.addUniforms(_objectSpread({}, layer.layerModel.getAnimateUniforms()));
         });
       });
@@ -35,15 +25,5 @@ var LayerAnimateStylePlugin = (_dec = injectable(), _dec2 = inject(TYPES.ICamera
   }]);
 
   return LayerAnimateStylePlugin;
-}(), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "cameraService", [_dec2], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _descriptor2 = _applyDecoratedDescriptor(_class2.prototype, "rendererService", [_dec3], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-})), _class2)) || _class);
+}()) || _class);
 export { LayerAnimateStylePlugin as default };

package/es/plugins/LayerModelPlugin.js

@@ -20,9 +20,7 @@ var LayerModelPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
       // 更新Model 配置项
       layer.prepareBuildModel(); // 初始化 Model
 
-      layer.buildModels(); // emit layer model loaded
-
-      layer.emit('modelLoaded', null);
+      layer.buildModels();
       layer.styleNeedUpdate = false;
     }
   }, {
@@ -32,9 +30,7 @@ var LayerModelPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
       layer.prepareBuildModel();
       layer.clearModels(); // 初始化 Model
 
-      layer.buildModels(); // emit layer model loaded
-
-      layer.emit('modelLoaded', null);
+      layer.buildModels();
       layer.layerModelNeedUpdate = false;
     }
   }, {

package/es/plugins/LightingPlugin.js

@@ -44,7 +44,6 @@ var DEFAULT_SPOT_LIGHT = {
   exponent: 40,
   blur: 5
 };
-var COLOR_ATTRIBUTES = ['ambient', 'diffuse', 'specular'];
 export function generateLightingUniforms(lights) {
   var lightsMap = {
     u_DirectionalLights: new Array(3).fill(_objectSpread({}, DEFAULT_DIRECTIONAL_LIGHT)),
@@ -63,12 +62,7 @@ export function generateLightingUniforms(lights) {
         rest = _objectWithoutProperties(_ref, _excluded);
 
     var lightsUniformName = lightTypeUniformMap[type].lights;
-    var lightsNumUniformName = lightTypeUniformMap[type].num; // Object.keys(rest).forEach(key => {
-    //   if (Util.isString(rest[key]) && COLOR_ATTRIBUTES.indexOf(key) > -1) {
-    //     rest[key] = ColorUtil.color2RGBA(rest[key]).slice(0, 3);
-    //   }
-    // });
-    // @ts-ignore
+    var lightsNumUniformName = lightTypeUniformMap[type].num; // @ts-ignore
 
     var num = lightsMap[lightsNumUniformName]; // @ts-ignore
 

package/es/plugins/MultiPassRendererPlugin.d.ts

@@ -14,7 +14,6 @@ import 'reflect-metadata';
  * })
  */
 export default class MultiPassRendererPlugin implements ILayerPlugin {
-    private readonly configService;
     private enabled;
     apply(layer: ILayer, { rendererService, postProcessingPassFactory, normalPassFactory, }: {
         rendererService: IRendererService;

package/es/plugins/MultiPassRendererPlugin.js

@@ -1,14 +1,9 @@
-import _initializerDefineProperty from "@babel/runtime/helpers/initializerDefineProperty";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import _applyDecoratedDescriptor from "@babel/runtime/helpers/applyDecoratedDescriptor";
-import _initializerWarningHelper from "@babel/runtime/helpers/initializerWarningHelper";
 
-var _dec, _dec2, _class, _class2, _descriptor;
+var _dec, _class;
 
-import { TYPES } from '@antv/l7-core';
-import { inject, injectable } from 'inversify';
+import { injectable } from 'inversify';
 import 'reflect-metadata';
 import { createMultiPassRenderer } from "../utils/multiPassRender";
 /**
@@ -25,11 +20,9 @@ import { createMultiPassRenderer } from "../utils/multiPassRender";
  * })
  */
 
-var MultiPassRendererPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfigService), _dec(_class = (_class2 = /*#__PURE__*/function () {
+var MultiPassRendererPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function () {
   function MultiPassRendererPlugin() {
     _classCallCheck(this, MultiPassRendererPlugin);
-
-    _initializerDefineProperty(this, "configService", _descriptor, this);
   }
 
   _createClass(MultiPassRendererPlugin, [{
@@ -68,10 +61,5 @@ var MultiPassRendererPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobal
   }]);
 
   return MultiPassRendererPlugin;
-}(), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "configService", [_dec2], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-})), _class2)) || _class);
+}()) || _class);
 export { MultiPassRendererPlugin as default };

package/es/plugins/PixelPickingPlugin.d.ts

@@ -1,7 +1,7 @@
 import { ILayer, ILayerPlugin, IRendererService, IStyleAttributeService } from '@antv/l7-core';
 import 'reflect-metadata';
 export default class PixelPickingPlugin implements ILayerPlugin {
-    apply(layer: ILayer, { rendererService, styleAttributeService, }: {
+    apply(layer: ILayer, { styleAttributeService, }: {
         rendererService: IRendererService;
         styleAttributeService: IStyleAttributeService;
     }): void;