@antv/l7-layers 2.9.27-alpha.1 → 2.9.27-alpha.3

package/lib/mask/models/fill.js

@@ -23,6 +23,8 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 
 var _l7Core = require("@antv/l7-core");
 
+var _l7Utils = require("@antv/l7-utils");
+
 var _lodash = require("lodash");
 
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
@@ -33,11 +35,11 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 
 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/mask_frag.glsl' */
-var mask_frag = "uniform float u_opacity;\nvarying vec4 v_Color;\n\nvoid main() {\n  gl_FragColor = v_Color;\n  gl_FragColor.a *= u_opacity;\n}\n";
+/* babel-plugin-inline-import '../../shader/minify_frag.glsl' */
+var mask_frag = "uniform float u_opacity : 1.0;\nuniform vec4 u_color;\n\nvoid main() {\n  gl_FragColor = u_color;\n  gl_FragColor.a *= u_opacity;\n}\n";
 
 /* babel-plugin-inline-import '../shaders/mask_vert.glsl' */
-var mask_vert = "attribute vec4 a_Color;\nattribute vec3 a_Position;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\n\nvarying vec4 v_Color;\n\n#pragma include \"projection\"\n\nvoid main() {\n\n  v_Color = a_Color;\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));\n  } else {\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n  }\n}\n\n";
+var mask_vert = "attribute vec3 a_Position;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\n\n#pragma include \"projection\"\n\nvoid main() {\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));\n  } else {\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n  }\n}\n\n";
 
 var MaskModel = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(MaskModel, _BaseModel);
@@ -54,10 +56,13 @@ var MaskModel = /*#__PURE__*/function (_BaseModel) {
     value: function getUninforms() {
       var _ref = this.layer.getLayerConfig(),
           _ref$opacity = _ref.opacity,
-          opacity = _ref$opacity === void 0 ? 0 : _ref$opacity;
+          opacity = _ref$opacity === void 0 ? 0 : _ref$opacity,
+          _ref$color = _ref.color,
+          color = _ref$color === void 0 ? '#000' : _ref$color;
 
       return {
-        u_opacity: (0, _lodash.isNumber)(opacity) ? opacity : 0.0
+        u_opacity: (0, _lodash.isNumber)(opacity) ? opacity : 0.0,
+        u_color: (0, _l7Utils.rgb2arr)(color)
       };
     }
   }, {
@@ -95,7 +100,8 @@ var MaskModel = /*#__PURE__*/function (_BaseModel) {
                       zfail: _l7Core.gl.REPLACE,
                       zpass: _l7Core.gl.REPLACE
                     }
-                  }
+                  },
+                  pick: false
                 }).then(function (model) {
                   callbackModel([model]);
                 }).catch(function (err) {
@@ -120,10 +126,8 @@ var MaskModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "clearModels",
     value: function clearModels() {
-      var _this$dataTexture;
-
-      (_this$dataTexture = this.dataTexture) === null || _this$dataTexture === void 0 ? void 0 : _this$dataTexture.destroy();
-      this.layerService.clear();
+      var refresh = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+      refresh && this.layerService.clear();
     }
   }, {
     key: "registerBuiltinAttributes",

package/lib/mask/shaders/mask_vert.glsl

@@ -1,17 +1,11 @@
-attribute vec4 a_Color;
 attribute vec3 a_Position;
 uniform mat4 u_ModelMatrix;
 uniform mat4 u_Mvp;
 
-varying vec4 v_Color;
-
 #pragma include "projection"
 
 void main() {
-
-  v_Color = a_Color;
   vec4 project_pos = project_position(vec4(a_Position, 1.0));
-  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
 
   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
     gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));

package/lib/plugins/DataMappingPlugin.js

@@ -33,14 +33,13 @@ var _lodash = require("lodash");
 
 require("reflect-metadata");
 
-var _dec, _dec2, _dec3, _dec4, _class, _class2, _descriptor, _descriptor2, _descriptor3;
+var _dec, _dec2, _dec3, _class, _class2, _descriptor, _descriptor2;
 
-var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inversify.inject)(_l7Core.TYPES.IGlobalConfigService), _dec3 = (0, _inversify.inject)(_l7Core.TYPES.IMapService), _dec4 = (0, _inversify.inject)(_l7Core.TYPES.IFontService), _dec(_class = (_class2 = /*#__PURE__*/function () {
+var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inversify.inject)(_l7Core.TYPES.IMapService), _dec3 = (0, _inversify.inject)(_l7Core.TYPES.IFontService), _dec(_class = (_class2 = /*#__PURE__*/function () {
   function DataMappingPlugin() {
     (0, _classCallCheck2.default)(this, DataMappingPlugin);
-    (0, _initializerDefineProperty2.default)(this, "configService", _descriptor, this);
-    (0, _initializerDefineProperty2.default)(this, "mapService", _descriptor2, this);
-    (0, _initializerDefineProperty2.default)(this, "fontService", _descriptor3, this);
+    (0, _initializerDefineProperty2.default)(this, "mapService", _descriptor, this);
+    (0, _initializerDefineProperty2.default)(this, "fontService", _descriptor2, this);
   }
 
   (0, _createClass2.default)(DataMappingPlugin, [{
@@ -63,8 +62,7 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
               styleAttributeService: styleAttributeService
             });
           });
-        } // this.generateMaping(layer, { styleAttributeService });
-
+        }
       });
       layer.hooks.beforeRenderData.tap('DataMappingPlugin', function () {
         layer.dataState.dataMappingNeedUpdate = false;
@@ -80,8 +78,7 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
               styleAttributeService: styleAttributeService
             });
           });
-        } // this.generateMaping(layer, { styleAttributeService });
-
+        }
 
         return true;
       }); // remapping before render
@@ -112,10 +109,14 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
         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);
           } // 处理文本更新
 
 
@@ -141,18 +142,11 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
         });
       }
 
-      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 = (0, _l7Utils.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) {
@@ -162,25 +156,28 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
           _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] : {};
         var encodeRecord = (0, _objectSpread2.default)({
           id: record._id,
           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 (0, _l7Utils.rgb2arr)(c);
             });
@@ -196,26 +193,75 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
 
         if (arrow.enable && (encodeRecord.shape === 'line' || encodeRecord.shape === 'halfLine')) {
           // 只有在线图层且支持配置箭头的时候进行插入顶点的处理
-          var coords = encodeRecord.coordinates;
+          var coords = encodeRecord.coordinates; // @ts-ignore
 
-          var arrowPoint = _this3.getArrowPoints(coords[0], coords[1]);
+          if (layer.arrowInsertCount < layer.encodeDataLength) {
+            // Tip: arrowInsert 的判断用于确保每一条线数据 arrow 的属性点只会被植入一次
+            var arrowPoint = _this3.getArrowPoints(coords[0], coords[1]);
 
-          encodeRecord.coordinates.splice(1, 0, arrowPoint, arrowPoint);
+            encodeRecord.coordinates.splice(1, 0, arrowPoint, arrowPoint); // @ts-ignore
+
+            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 = (0, _objectSpread2.default)({
+          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 === _l7Maps.Version['GAODE2.x']) {
@@ -234,7 +280,7 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
             // @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 {
           // 连续的线、面数据
@@ -249,35 +295,35 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
             // @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 === _l7Maps.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);
@@ -290,7 +336,7 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
           // @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);
@@ -302,7 +348,7 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
         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;
@@ -328,9 +374,7 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
           // TODO:多字段，常量
           params.push(record[field]);
         }
-      }); // console.log('params', params)
-      // console.log('attribute', attribute)
-
+      });
       var mappingResult = attribute.mapping ? attribute.mapping(params) : [];
 
       if (attribute.name === 'color' && !(0, _l7Utils.isColor)(mappingResult[0])) {
@@ -339,19 +383,45 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
 
       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 = (0, _l7Utils.normalize)(dir);
+      var arrowPoint = [p1[0] + normalizeDir[0] * 0.0001, p1[1] + normalizeDir[1] * 0.0001];
+      return arrowPoint;
+    }
   }]);
   return DataMappingPlugin;
-}(), (_descriptor = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "configService", [_dec2], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _descriptor2 = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "mapService", [_dec3], {
+}(), (_descriptor = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "mapService", [_dec2], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor3 = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "fontService", [_dec4], {
+}), _descriptor2 = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "fontService", [_dec3], {
   configurable: true,
   enumerable: true,
   writable: true,

package/lib/plugins/DataSourcePlugin.js

@@ -51,8 +51,7 @@ var DataSourcePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__
           source.once('sourceUpdate', function () {
             _this.updateClusterData(layer);
           });
-        } // this.updateClusterData(layer);
-
+        }
       }); // 检测数据是否需要更新
 
       layer.hooks.beforeRenderData.tap('DataSourcePlugin', function () {
@@ -66,6 +65,8 @@ var DataSourcePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__
   }, {
     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/lib/plugins/FeatureScalePlugin.js

@@ -11,16 +11,10 @@ exports.default = void 0;
 
 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 _applyDecoratedDescriptor2 = _interopRequireDefault(require("@babel/runtime/helpers/applyDecoratedDescriptor"));
-
-var _initializerWarningHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/initializerWarningHelper"));
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var _l7Core = require("@antv/l7-core");
@@ -37,7 +31,7 @@ var _lodash = require("lodash");
 
 require("reflect-metadata");
 
-var _scaleMap, _dec, _dec2, _class, _class2, _descriptor;
+var _scaleMap, _dec, _class;
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -49,11 +43,9 @@ var scaleMap = (_scaleMap = {}, (0, _defineProperty2.default)(_scaleMap, _l7Core
  * 根据 Source 原始数据为指定字段创建 Scale，保存在 StyleAttribute 上，供下游插件使用
  */
 
-var FeatureScalePlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inversify.inject)(_l7Core.TYPES.IGlobalConfigService), _dec(_class = (_class2 = /*#__PURE__*/function () {
+var FeatureScalePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
   function FeatureScalePlugin() {
     (0, _classCallCheck2.default)(this, FeatureScalePlugin);
-    (0, _initializerDefineProperty2.default)(this, "configService", _descriptor, this);
-    (0, _defineProperty2.default)(this, "scaleCache", {});
     (0, _defineProperty2.default)(this, "scaleOptions", {});
   }
 
@@ -88,15 +80,7 @@ var FeatureScalePlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inve
           } 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 () {
@@ -113,16 +97,7 @@ var FeatureScalePlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inve
           _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;
       });
@@ -149,20 +124,7 @@ var FeatureScalePlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inve
             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,
-          //   );
-          // }
-
+          });
         }
       });
     }
@@ -176,7 +138,6 @@ var FeatureScalePlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inve
     value: function caculateScalesForAttributes(attributes, dataArray) {
       var _this2 = this;
 
-      this.scaleCache = {};
       attributes.forEach(function (attribute) {
         if (attribute.scale) {
           // 创建Scale
@@ -395,10 +356,5 @@ var FeatureScalePlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inve
     }
   }]);
   return FeatureScalePlugin;
-}(), (_descriptor = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "configService", [_dec2], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-})), _class2)) || _class);
+}()) || _class);
 exports.default = FeatureScalePlugin;

package/lib/plugins/LayerAnimateStylePlugin.js

@@ -9,56 +9,33 @@ exports.default = void 0;
 
 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 _inversify = require("inversify");
 
 require("reflect-metadata");
 
-var _dec, _dec2, _dec3, _class, _class2, _descriptor, _descriptor2;
+var _dec, _class;
 
-var LayerAnimateStylePlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inversify.inject)(_l7Core.TYPES.ICameraService), _dec3 = (0, _inversify.inject)(_l7Core.TYPES.IRendererService), _dec(_class = (_class2 = /*#__PURE__*/function () {
+var LayerAnimateStylePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
   function LayerAnimateStylePlugin() {
     (0, _classCallCheck2.default)(this, LayerAnimateStylePlugin);
-    (0, _initializerDefineProperty2.default)(this, "cameraService", _descriptor, this);
-    (0, _initializerDefineProperty2.default)(this, "rendererService", _descriptor2, this);
   }
 
   (0, _createClass2.default)(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 aniamateStatus = layer.aniamateStatus;
+        aniamateStatus && layer.models.forEach(function (model) {
           model.addUniforms((0, _objectSpread2.default)({}, layer.layerModel.getAnimateUniforms()));
         });
       });
     }
   }]);
   return LayerAnimateStylePlugin;
-}(), (_descriptor = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "cameraService", [_dec2], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _descriptor2 = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "rendererService", [_dec3], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-})), _class2)) || _class);
+}()) || _class);
 exports.default = LayerAnimateStylePlugin;

package/lib/plugins/LayerModelPlugin.js

@@ -32,9 +32,7 @@ _dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
       // 更新Model 配置项
       layer.prepareBuildModel(); // 初始化 Model
 
-      layer.buildModels(); // emit layer model loaded
-
-      layer.emit('modelLoaded', null);
+      layer.buildModels();
       layer.styleNeedUpdate = false;
     }
   }, {
@@ -44,9 +42,7 @@ _dec = (0, _inversify.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/lib/plugins/LightingPlugin.js

@@ -59,7 +59,6 @@ var DEFAULT_SPOT_LIGHT = {
   exponent: 40,
   blur: 5
 };
-var COLOR_ATTRIBUTES = ['ambient', 'diffuse', 'specular'];
 
 function generateLightingUniforms(lights) {
   var lightsMap = {
@@ -78,12 +77,7 @@ function generateLightingUniforms(lights) {
         type = _ref$type === void 0 ? 'directional' : _ref$type,
         rest = (0, _objectWithoutProperties2.default)(_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