@antv/l7-layers 2.16.1 → 2.16.2

package/es/core/BaseLayer.js

@@ -12,31 +12,22 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _applyDecoratedDescriptor from "@babel/runtime/helpers/esm/applyDecoratedDescriptor";
 import _initializerWarningHelper from "@babel/runtime/helpers/esm/initializerWarningHelper";
 var _excluded = ["passes"],
-    _excluded2 = ["moduleName", "vertexShader", "fragmentShader", "triangulation", "segmentNumber", "workerEnabled", "workerOptions"];
-
+  _excluded2 = ["moduleName", "vertexShader", "fragmentShader", "inject", "triangulation", "segmentNumber"];
 var _dec, _class, _descriptor;
-
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
 // @ts-ignore
 import { AsyncSeriesBailHook, AsyncWaterfallHook, SyncBailHook, SyncHook } from '@antv/async-hook';
 import { BlendType, IDebugLog, ILayerStage, lazyInject, TYPES } from '@antv/l7-core';
 import Source from '@antv/l7-source';
-import { encodePickingColor, WorkerSourceMap } from '@antv/l7-utils';
+import { encodePickingColor } from '@antv/l7-utils';
 import { EventEmitter } from 'eventemitter3';
-import { isEqual, isFunction, isObject, isUndefined } from 'lodash';
+import { isEqual, isFunction, isObject, isPlainObject, isUndefined } from 'lodash';
 import { BlendTypes } from "../utils/blend";
-import { styleDataMapping } from "../utils/dataMappingStyle";
 import { calculateData } from "../utils/layerData";
 import { createMultiPassRenderer, normalizePasses } from "../utils/multiPassRender";
 import LayerPickService from "./LayerPickService";
@@ -44,52 +35,38 @@ import TextureService from "./TextureService";
 /**
  * 分配 layer id
  */
-
 var layerIdCounter = 0;
 var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__PURE__*/function (_ref) {
   _inherits(BaseLayer, _ref);
-
   var _super = _createSuper(BaseLayer);
-
   // 生命周期钩子
+
   // 待渲染 model 列表
+
   // 用于保存子图层对象
 
   /**
    * 待更新样式属性，在初始化阶段完成注册
    */
+
   // private pickingPassRender: IPass<'pixelPicking'>;
+
   function BaseLayer() {
     var _this;
-
     var config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-
     _classCallCheck(this, BaseLayer);
-
     _this = _super.call(this);
-
     _defineProperty(_assertThisInitialized(_this), "id", "".concat(layerIdCounter++));
-
     _defineProperty(_assertThisInitialized(_this), "name", "".concat(layerIdCounter));
-
     _defineProperty(_assertThisInitialized(_this), "visible", true);
-
     _defineProperty(_assertThisInitialized(_this), "zIndex", 0);
-
     _defineProperty(_assertThisInitialized(_this), "inited", false);
-
     _defineProperty(_assertThisInitialized(_this), "layerModelNeedUpdate", false);
-
     _defineProperty(_assertThisInitialized(_this), "pickedFeatureID", null);
-
     _defineProperty(_assertThisInitialized(_this), "selectedFeatureID", null);
-
     _defineProperty(_assertThisInitialized(_this), "styleNeedUpdate", false);
-
     _defineProperty(_assertThisInitialized(_this), "forceRender", false);
-
     _defineProperty(_assertThisInitialized(_this), "clusterZoom", 0);
-
     _defineProperty(_assertThisInitialized(_this), "defaultSourceConfig", {
       data: [],
       options: {
@@ -98,7 +75,6 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
         }
       }
     });
-
     _defineProperty(_assertThisInitialized(_this), "dataState", {
       dataSourceNeedUpdate: false,
       dataMappingNeedUpdate: false,
@@ -106,7 +82,6 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
       featureScaleNeedUpdate: false,
       StyleAttrNeedUpdate: false
     });
-
     _defineProperty(_assertThisInitialized(_this), "hooks", {
       init: new AsyncSeriesBailHook(),
       afterInit: new SyncBailHook(),
@@ -122,56 +97,38 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
       beforeDestroy: new SyncHook(),
       afterDestroy: new SyncHook()
     });
-
     _defineProperty(_assertThisInitialized(_this), "models", []);
-
     _defineProperty(_assertThisInitialized(_this), "startInit", false);
-
     _defineProperty(_assertThisInitialized(_this), "layerChildren", []);
-
     _defineProperty(_assertThisInitialized(_this), "masks", []);
-
     _initializerDefineProperty(_assertThisInitialized(_this), "configService", _descriptor, _assertThisInitialized(_this));
-
     _defineProperty(_assertThisInitialized(_this), "animateOptions", {
       enable: false
     });
-
     _defineProperty(_assertThisInitialized(_this), "currentPickId", null);
-
+    _defineProperty(_assertThisInitialized(_this), "encodeStyleAttribute", {});
+    _defineProperty(_assertThisInitialized(_this), "enableEncodeStyles", []);
     _defineProperty(_assertThisInitialized(_this), "pendingStyleAttributes", []);
-
     _defineProperty(_assertThisInitialized(_this), "scaleOptions", {});
-
     _defineProperty(_assertThisInitialized(_this), "animateStatus", false);
-
     _defineProperty(_assertThisInitialized(_this), "isDestroyed", false);
-
     _defineProperty(_assertThisInitialized(_this), "encodeDataLength", 0);
-
     _defineProperty(_assertThisInitialized(_this), "sourceEvent", function () {
       _this.dataState.dataSourceNeedUpdate = true;
-
       var layerConfig = _this.getLayerConfig();
-
       if (layerConfig && layerConfig.autoFit) {
         _this.fitBounds(layerConfig.fitBoundsOptions);
       }
-
       var autoRender = _this.layerSource.getSourceCfg().autoRender;
-
       if (autoRender) {
         _this.reRender();
       }
     });
-
     _this.name = config.name || _this.id;
     _this.zIndex = config.zIndex || 0;
-    _this.rawConfig = config; // this.parent = this;
-
+    _this.rawConfig = config;
     return _this;
   }
-
   _createClass(BaseLayer, [{
     key: "addMask",
     value: function addMask(layer) {
@@ -182,7 +139,6 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     key: "removeMask",
     value: function removeMask(layer) {
       var layerIndex = this.masks.indexOf(layer);
-
       if (layerIndex > -1) {
         this.masks.splice(layerIndex, 1);
       }
@@ -200,23 +156,21 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
       this.updateLayerConfig({
         enableMask: true
       });
-    } // 将废弃
-
+    }
+    // 将废弃
   }, {
     key: "addMaskLayer",
     value: function addMaskLayer(maskLayer) {
       this.masks.push(maskLayer);
-    } // 将废弃
-
+    }
+    // 将废弃
   }, {
     key: "removeMaskLayer",
     value: function removeMaskLayer(maskLayer) {
       var layerIndex = this.masks.indexOf(maskLayer);
-
       if (layerIndex > -1) {
         this.masks.splice(layerIndex, 1);
       }
-
       maskLayer.destroy();
     }
   }, {
@@ -233,7 +187,6 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     key: "updateLayerConfig",
     value: function updateLayerConfig(configToUpdate) {
       var _this2 = this;
-
       // 同步 rawConfig
       Object.keys(configToUpdate).map(function (key) {
         if (key in _this2.rawConfig) {
@@ -241,25 +194,23 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
           _this2.rawConfig[key] = configToUpdate[key];
         }
       });
-
       if (!this.startInit) {
         this.needUpdateConfig = _objectSpread(_objectSpread({}, this.needUpdateConfig), configToUpdate);
       } else {
-        var sceneId = this.container.get(TYPES.SceneID); // @ts-ignore
-
-        styleDataMapping(configToUpdate, this); // 处理 style 中进行数据映射的属性字段
-
+        var sceneId = this.container.get(TYPES.SceneID);
+        // @ts-ignore
+        // styleDataMapping(configToUpdate, this); // 处理 style 中进行数据映射的属性字段
         this.configService.setLayerConfig(sceneId, this.id, _objectSpread(_objectSpread(_objectSpread({}, this.configService.getLayerConfig(this.id)), this.needUpdateConfig), configToUpdate));
         this.needUpdateConfig = {};
       }
     }
+
     /**
      * 注入图层容器，父容器为场景容器
      * RootContainer 1
      *  -> SceneContainer 1.*
      *   -> LayerContainer 1.*
      */
-
   }, {
     key: "setContainer",
     value: function setContainer(container, sceneContainer) {
@@ -282,146 +233,137 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     value: function () {
       var _init = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         var _this3 = this;
-
         var sceneId, _this$getLayerConfig, enableMultiPassRenderer, passes, _iterator, _step, plugin;
-
         return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                // 设置配置项
-                sceneId = this.container.get(TYPES.SceneID);
-                this.startInit = true; // 初始化图层配置项
-                // const { enableMultiPassRenderer = false } = this.rawConfig;
-                // this.configService.setLayerConfig(sceneId, this.id, {
-                //   enableMultiPassRenderer,
-                // });
-
-                this.configService.setLayerConfig(sceneId, this.id, this.rawConfig);
-                this.layerType = this.rawConfig.layerType; // 全局容器服务
-                // 场景容器服务
-
-                this.iconService = this.container.get(TYPES.IIconService);
-                this.fontService = this.container.get(TYPES.IFontService);
-                this.rendererService = this.container.get(TYPES.IRendererService);
-                this.layerService = this.container.get(TYPES.ILayerService);
-                this.debugService = this.container.get(TYPES.IDebugService);
-                this.interactionService = this.container.get(TYPES.IInteractionService);
-                this.pickingService = this.container.get(TYPES.IPickingService);
-                this.mapService = this.container.get(TYPES.IMapService);
-                _this$getLayerConfig = this.getLayerConfig(), enableMultiPassRenderer = _this$getLayerConfig.enableMultiPassRenderer, passes = _this$getLayerConfig.passes;
-
-                if (enableMultiPassRenderer && passes !== null && passes !== void 0 && passes.length && passes.length > 0) {
-                  // Tip: 兼容 multiPassRender 在 amap1 时存在的图层不同步问题 zoom
-                  this.mapService.on('mapAfterFrameChange', function () {
-                    _this3.renderLayers();
-                  });
-                }
-
-                this.cameraService = this.container.get(TYPES.ICameraService);
-                this.coordinateService = this.container.get(TYPES.ICoordinateSystemService);
-                this.shaderModuleService = this.container.get(TYPES.IShaderModuleService);
-                this.postProcessingPassFactory = this.container.get(TYPES.IFactoryPostProcessingPass);
-                this.normalPassFactory = this.container.get(TYPES.IFactoryNormalPass); // 图层容器服务
-
-                this.styleAttributeService = this.container.get(TYPES.IStyleAttributeService);
-
-                if (enableMultiPassRenderer) {
-                  // 按需初始化 瓦片频繁报错
-                  this.multiPassRenderer = this.container.get(TYPES.IMultiPassRenderer);
-                  this.multiPassRenderer.setLayer(this);
-                } // 完成样式服务注册完成前添加的属性
-
-
-                this.pendingStyleAttributes.forEach(function (_ref2) {
-                  var attributeName = _ref2.attributeName,
-                      attributeField = _ref2.attributeField,
-                      attributeValues = _ref2.attributeValues,
-                      updateOptions = _ref2.updateOptions;
-
-                  _this3.styleAttributeService.updateStyleAttribute(attributeName, {
-                    // @ts-ignore
-                    scale: _objectSpread({
-                      field: attributeField
-                    }, _this3.splitValuesAndCallbackInAttribute( // @ts-ignore
-                    attributeValues, // @ts-ignore
-                    _this3.getLayerConfig()[attributeName]))
-                  }, // @ts-ignore
-                  updateOptions);
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              // 设置配置项
+              sceneId = this.container.get(TYPES.SceneID);
+              this.startInit = true;
+              // 初始化图层配置项
+              // const { enableMultiPassRenderer = false } = this.rawConfig;
+              // this.configService.setLayerConfig(sceneId, this.id, {
+              //   enableMultiPassRenderer,
+              // });
+              this.configService.setLayerConfig(sceneId, this.id, this.rawConfig);
+              this.layerType = this.rawConfig.layerType;
+
+              // 全局容器服务
+
+              // 场景容器服务
+              this.iconService = this.container.get(TYPES.IIconService);
+              this.fontService = this.container.get(TYPES.IFontService);
+              this.rendererService = this.container.get(TYPES.IRendererService);
+              this.layerService = this.container.get(TYPES.ILayerService);
+              this.debugService = this.container.get(TYPES.IDebugService);
+              this.interactionService = this.container.get(TYPES.IInteractionService);
+              this.pickingService = this.container.get(TYPES.IPickingService);
+              this.mapService = this.container.get(TYPES.IMapService);
+              _this$getLayerConfig = this.getLayerConfig(), enableMultiPassRenderer = _this$getLayerConfig.enableMultiPassRenderer, passes = _this$getLayerConfig.passes;
+              if (enableMultiPassRenderer && passes !== null && passes !== void 0 && passes.length && passes.length > 0) {
+                // Tip: 兼容 multiPassRender 在 amap1 时存在的图层不同步问题 zoom
+                this.mapService.on('mapAfterFrameChange', function () {
+                  _this3.renderLayers();
                 });
-                this.pendingStyleAttributes = []; // 获取插件集
-
-                this.plugins = this.container.getAll(TYPES.ILayerPlugin); // 完成插件注册，传入场景和图层容器内的服务
-
-                _iterator = _createForOfIteratorHelper(this.plugins);
-
-                try {
-                  for (_iterator.s(); !(_step = _iterator.n()).done;) {
-                    plugin = _step.value;
-                    plugin.apply(this, {
-                      rendererService: this.rendererService,
-                      mapService: this.mapService,
-                      styleAttributeService: this.styleAttributeService,
-                      normalPassFactory: this.normalPassFactory,
-                      postProcessingPassFactory: this.postProcessingPassFactory
-                    });
-                  } // 初始化其他服务
-
-                } catch (err) {
-                  _iterator.e(err);
-                } finally {
-                  _iterator.f();
+              }
+              this.cameraService = this.container.get(TYPES.ICameraService);
+              this.coordinateService = this.container.get(TYPES.ICoordinateSystemService);
+              this.shaderModuleService = this.container.get(TYPES.IShaderModuleService);
+              this.postProcessingPassFactory = this.container.get(TYPES.IFactoryPostProcessingPass);
+              this.normalPassFactory = this.container.get(TYPES.IFactoryNormalPass);
+
+              // 图层容器服务
+              this.styleAttributeService = this.container.get(TYPES.IStyleAttributeService);
+              if (enableMultiPassRenderer) {
+                // 按需初始化 瓦片频繁报错
+                this.multiPassRenderer = this.container.get(TYPES.IMultiPassRenderer);
+                this.multiPassRenderer.setLayer(this);
+              }
+              // 完成样式服务注册完成前添加的属性
+              this.pendingStyleAttributes.forEach(function (_ref2) {
+                var attributeName = _ref2.attributeName,
+                  attributeField = _ref2.attributeField,
+                  attributeValues = _ref2.attributeValues,
+                  updateOptions = _ref2.updateOptions;
+                _this3.styleAttributeService.updateStyleAttribute(attributeName, {
+                  // @ts-ignore
+                  scale: _objectSpread({
+                    field: attributeField
+                  }, _this3.splitValuesAndCallbackInAttribute(
+                  // @ts-ignore
+                  attributeValues,
+                  // @ts-ignore
+                  _this3.getLayerConfig()[attributeName]))
+                },
+                // @ts-ignore
+                updateOptions);
+              });
+              this.pendingStyleAttributes = [];
+
+              // 获取插件集
+              this.plugins = this.container.getAll(TYPES.ILayerPlugin);
+              // 完成插件注册，传入场景和图层容器内的服务
+              _iterator = _createForOfIteratorHelper(this.plugins);
+              try {
+                for (_iterator.s(); !(_step = _iterator.n()).done;) {
+                  plugin = _step.value;
+                  plugin.apply(this, {
+                    rendererService: this.rendererService,
+                    mapService: this.mapService,
+                    styleAttributeService: this.styleAttributeService,
+                    normalPassFactory: this.normalPassFactory,
+                    postProcessingPassFactory: this.postProcessingPassFactory
+                  });
                 }
 
-                this.layerPickService = new LayerPickService(this); // 颜色纹理服务
-
-                this.textureService = new TextureService(this);
-                this.log(IDebugLog.LayerInitStart); // 触发 init 生命周期插件
-
-                _context.next = 31;
-                return this.hooks.init.promise();
-
-              case 31:
-                this.log(IDebugLog.LayerInitEnd);
-                this.inited = true; // add mask layer
-                // 触发初始化完成事件;
-
-                this.emit('inited', {
-                  target: this,
-                  type: 'inited'
-                });
-                this.emit('add', {
-                  target: this,
-                  type: 'add'
-                });
-                this.hooks.afterInit.call();
-
-              case 36:
-              case "end":
-                return _context.stop();
-            }
+                // 初始化其他服务
+              } catch (err) {
+                _iterator.e(err);
+              } finally {
+                _iterator.f();
+              }
+              this.layerPickService = new LayerPickService(this);
+
+              // 颜色纹理服务
+              this.textureService = new TextureService(this);
+              this.log(IDebugLog.LayerInitStart);
+              // 触发 init 生命周期插件
+              _context.next = 31;
+              return this.hooks.init.promise();
+            case 31:
+              this.log(IDebugLog.LayerInitEnd);
+              this.inited = true;
+              // add mask layer
+              // 触发初始化完成事件;
+              this.emit('inited', {
+                target: this,
+                type: 'inited'
+              });
+              this.emit('add', {
+                target: this,
+                type: 'add'
+              });
+              this.hooks.afterInit.call();
+            case 36:
+            case "end":
+              return _context.stop();
           }
         }, _callee, this);
       }));
-
       function init() {
         return _init.apply(this, arguments);
       }
-
       return init;
     }()
   }, {
     key: "log",
     value: function log(logType) {
       var _this$debugService;
-
       var step = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'init';
-
       // @ts-ignore 瓦片、瓦片图层目前不参与日志
       if (this.tileLayer || this.isTileLayer) {
         return;
       }
-
       var key = "".concat(this.id, ".").concat(step, ".").concat(logType);
       var values = {
         id: this.id,
@@ -444,15 +386,12 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     key: "createModelData",
     value: function createModelData(data, option) {
       var _this$layerModel;
-
       if ((_this$layerModel = this.layerModel) !== null && _this$layerModel !== void 0 && _this$layerModel.createModelData) {
         // 在某些特殊图层中单独构建 attribute & elements
         return this.layerModel.createModelData(option);
       }
-
       var calEncodeData = this.calculateEncodeData(data, option);
       var triangulation = this.triangulation;
-
       if (calEncodeData && triangulation) {
         return this.styleAttributeService.createAttributesAndIndices(calEncodeData, triangulation);
       } else {
@@ -480,15 +419,16 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     /**
      * Model初始化前需要更新Model样式
      */
-
   }, {
     key: "prepareBuildModel",
     value: function prepareBuildModel() {
-      this.updateLayerConfig(_objectSpread(_objectSpread(_objectSpread({}, this.getDefaultConfig()), this.rawConfig), this.needUpdateConfig)); // 启动动画
+      if (Object.keys(this.needUpdateConfig || {}).length !== 0) {
+        this.updateLayerConfig({});
+      }
 
+      // 启动动画
       var _this$getLayerConfig2 = this.getLayerConfig(),
-          animateOption = _this$getLayerConfig2.animateOption;
-
+        animateOption = _this$getLayerConfig2.animateOption;
       if (animateOption !== null && animateOption !== void 0 && animateOption.enable) {
         this.layerService.startAnimate();
         this.animateStatus = true;
@@ -499,8 +439,9 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     value: function color(field, values, updateOptions) {
       this.updateStyleAttribute('color', field, values, updateOptions);
       return this;
-    } // 为对应的图层传入纹理的编号名称（point/image 在 shape 方法中传入纹理名称的方法并不通用）
+    }
 
+    // 为对应的图层传入纹理的编号名称（point/image 在 shape 方法中传入纹理名称的方法并不通用）
   }, {
     key: "texture",
     value: function texture(field, values, updateOptions) {
@@ -518,8 +459,8 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     value: function size(field, values, updateOptions) {
       this.updateStyleAttribute('size', field, values, updateOptions);
       return this;
-    } // 对mapping后的数据过滤，scale保持不变
-
+    }
+    // 对mapping后的数据过滤，scale保持不变
   }, {
     key: "filter",
     value: function filter(field, values, updateOptions) {
@@ -553,14 +494,12 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     key: "animate",
     value: function animate(options) {
       var rawAnimate = {};
-
       if (isObject(options)) {
         rawAnimate.enable = true;
         rawAnimate = _objectSpread(_objectSpread({}, rawAnimate), options);
       } else {
         rawAnimate.enable = options;
       }
-
       this.updateLayerConfig({
         animateOption: rawAnimate
       });
@@ -573,9 +512,8 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
         // 判断是否为source
         this.setSource(data);
         return this;
-      } // 设置source 配置
-
-
+      }
+      // 设置source 配置
       this.sourceOption = {
         data: data,
         options: options
@@ -587,7 +525,6 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     key: "setData",
     value: function setData(data, options) {
       var _this4 = this;
-
       if (this.inited) {
         this.log(IDebugLog.SourceInitStart, ILayerStage.UPDATE);
         this.layerSource.setData(data, options);
@@ -595,82 +532,80 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
       } else {
         this.on('inited', function () {
           _this4.log(IDebugLog.SourceInitStart, ILayerStage.UPDATE);
-
           var currentSource = _this4.getSource();
-
           if (!currentSource) {
             // 执行 setData 的时候 source 还不存在（还未执行 addLayer）
             _this4.source(new Source(data, options));
           } else {
             _this4.layerSource.setData(data, options);
           }
-
           _this4.layerSource.once('update', function () {
             _this4.log(IDebugLog.SourceInitEnd, ILayerStage.UPDATE);
           });
         });
       }
-
       return this;
     }
   }, {
     key: "style",
     value: function style(options) {
       var _this5 = this;
-
       var passes = options.passes,
-          rest = _objectWithoutProperties(options, _excluded); // passes 特殊处理
-
-
+        rest = _objectWithoutProperties(options, _excluded);
+      // passes 特殊处理
       if (passes) {
         normalizePasses(passes).forEach(function (pass) {
           var postProcessingPass = _this5.multiPassRenderer.getPostProcessor().getPostProcessingPassByName(pass[0]);
-
           if (postProcessingPass) {
             postProcessingPass.updateOptions(pass[1]);
           }
         });
       }
-
-      this.rawConfig = _objectSpread(_objectSpread({}, this.rawConfig), rest);
-
-      if (this.container) {
-        this.updateLayerConfig(this.rawConfig);
-        this.styleNeedUpdate = true;
-      } // TODO style model 更新
-      // @ts-ignore
-      // if (lastConfig && lastConfig.mask === true && options.mask === false) {
-      //   this.clearModels();
-      //   this.layerModel.buildModels((models) => {
-      //     this.models = models;
-      //   });
-      // }
-
-
+      this.encodeStyle(rest);
+      this.updateLayerConfig(rest);
       return this;
     }
+
+    // 参与数据映射的字段 encodeing
+  }, {
+    key: "encodeStyle",
+    value: function encodeStyle(options) {
+      var _this6 = this;
+      Object.keys(options).forEach(function (key) {
+        if (
+        // 需要数据映射
+        _this6.enableEncodeStyles.includes(key) && isPlainObject(options[key]) && (options[key].field || options[key].values) && !isEqual(_this6.encodeStyleAttribute[key], options[key]) // 防止计算属性重复计算
+        ) {
+          _this6.encodeStyleAttribute[key] = options[key];
+          _this6.updateStyleAttribute(key, options[key].field, options[key].values);
+          _this6.styleNeedUpdate = true;
+        } else {
+          // 不需要数据映射
+          if (_this6.encodeStyleAttribute[key]) {
+            delete _this6.encodeStyleAttribute[key]; // 删除已经存在的属性
+          }
+        }
+      });
+    }
   }, {
     key: "scale",
     value: function scale(field, cfg) {
       var preOption = _objectSpread({}, this.scaleOptions);
-
       if (isObject(field)) {
         this.scaleOptions = _objectSpread(_objectSpread({}, this.scaleOptions), field);
       } else {
         this.scaleOptions[field] = cfg;
       }
-
       if (this.styleAttributeService && !isEqual(preOption, this.scaleOptions)) {
         var scaleOptions = isObject(field) ? field : _defineProperty({}, field, cfg);
         this.styleAttributeService.updateScaleAttribute(scaleOptions);
       }
-
       return this;
     }
+
     /**
      * 渲染所有的图层
      */
-
   }, {
     key: "renderLayers",
     value: function renderLayers() {
@@ -682,75 +617,61 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     key: "render",
     value: function render() {
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-
       if (this.tileLayer) {
         // 瓦片图层执行单独的 render 渲染队列
         this.tileLayer.render();
         return this;
       }
-
       this.layerService.beforeRenderData(this);
-
       if (this.encodeDataLength <= 0 && !this.forceRender) {
         return this;
-      } // Tip: this.getEncodedData().length !== 0 这个判断是为了解决在 2.5.x 引入数据纹理后产生的 空数据渲染导致 texture 超出上限问题
-
-
+      }
+      // Tip: this.getEncodedData().length !== 0 这个判断是为了解决在 2.5.x 引入数据纹理后产生的 空数据渲染导致 texture 超出上限问题
       this.renderModels(options);
       return this;
     }
+
     /**
      * renderMultiPass 专门用于渲染支持 multipass 的 layer
      */
-
   }, {
     key: "renderMultiPass",
     value: function () {
       var _renderMultiPass = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                if (!(this.encodeDataLength <= 0 && !this.forceRender)) {
-                  _context2.next = 2;
-                  break;
-                }
-
-                return _context2.abrupt("return");
-
-              case 2:
-                if (!(this.multiPassRenderer && this.multiPassRenderer.getRenderFlag())) {
-                  _context2.next = 7;
-                  break;
-                }
-
-                _context2.next = 5;
-                return this.multiPassRenderer.render();
-
-              case 5:
-                _context2.next = 8;
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              if (!(this.encodeDataLength <= 0 && !this.forceRender)) {
+                _context2.next = 2;
                 break;
-
-              case 7:
-                if (this.multiPassRenderer) {
-                  // renderPass 触发的渲染
-                  this.renderModels();
-                } else {
-                  this.renderModels();
-                }
-
-              case 8:
-              case "end":
-                return _context2.stop();
-            }
+              }
+              return _context2.abrupt("return");
+            case 2:
+              if (!(this.multiPassRenderer && this.multiPassRenderer.getRenderFlag())) {
+                _context2.next = 7;
+                break;
+              }
+              _context2.next = 5;
+              return this.multiPassRenderer.render();
+            case 5:
+              _context2.next = 8;
+              break;
+            case 7:
+              if (this.multiPassRenderer) {
+                // renderPass 触发的渲染
+                this.renderModels();
+              } else {
+                this.renderModels();
+              }
+            case 8:
+            case "end":
+              return _context2.stop();
           }
         }, _callee2, this);
       }));
-
       function renderMultiPass() {
         return _renderMultiPass.apply(this, arguments);
       }
-
       return renderMultiPass;
     }()
   }, {
@@ -758,34 +679,29 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     value: function active(options) {
       var activeOption = {};
       activeOption.enableHighlight = isObject(options) ? true : options;
-
       if (isObject(options)) {
         activeOption.enableHighlight = true;
-
         if (options.color) {
           activeOption.highlightColor = options.color;
         }
-
         if (options.mix) {
           activeOption.activeMix = options.mix;
         }
       } else {
         activeOption.enableHighlight = !!options;
       }
-
       this.updateLayerConfig(activeOption);
       return this;
     }
   }, {
     key: "setActive",
     value: function setActive(id, options) {
-      var _this6 = this;
-
+      var _this7 = this;
       if (isObject(id)) {
         var _id$x = id.x,
-            x = _id$x === void 0 ? 0 : _id$x,
-            _id$y = id.y,
-            y = _id$y === void 0 ? 0 : _id$y;
+          x = _id$x === void 0 ? 0 : _id$x,
+          _id$y = id.y,
+          y = _id$y === void 0 ? 0 : _id$y;
         this.updateLayerConfig({
           highlightColor: isObject(options) ? options.color : this.getLayerConfig().highlightColor,
           activeMix: isObject(options) ? options.mix : this.getLayerConfig().activeMix
@@ -800,10 +716,11 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
           highlightColor: isObject(options) ? options.color : this.getLayerConfig().highlightColor,
           activeMix: isObject(options) ? options.mix : this.getLayerConfig().activeMix
         });
-        this.hooks.beforeHighlight.call(encodePickingColor(id)) // @ts-ignore
+        this.hooks.beforeHighlight.call(encodePickingColor(id))
+        // @ts-ignore
         .then(function () {
           setTimeout(function () {
-            _this6.reRender();
+            _this7.reRender();
           }, 1);
         });
       }
@@ -813,34 +730,29 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     value: function select(option) {
       var activeOption = {};
       activeOption.enableSelect = isObject(option) ? true : option;
-
       if (isObject(option)) {
         activeOption.enableSelect = true;
-
         if (option.color) {
           activeOption.selectColor = option.color;
         }
-
         if (option.mix) {
           activeOption.selectMix = option.mix;
         }
       } else {
         activeOption.enableSelect = !!option;
       }
-
       this.updateLayerConfig(activeOption);
       return this;
     }
   }, {
     key: "setSelect",
     value: function setSelect(id, options) {
-      var _this7 = this;
-
+      var _this8 = this;
       if (isObject(id)) {
         var _id$x2 = id.x,
-            x = _id$x2 === void 0 ? 0 : _id$x2,
-            _id$y2 = id.y,
-            y = _id$y2 === void 0 ? 0 : _id$y2;
+          x = _id$x2 === void 0 ? 0 : _id$x2,
+          _id$y2 = id.y,
+          y = _id$y2 === void 0 ? 0 : _id$y2;
         this.updateLayerConfig({
           selectColor: isObject(options) ? options.color : this.getLayerConfig().selectColor,
           selectMix: isObject(options) ? options.mix : this.getLayerConfig().selectMix
@@ -855,10 +767,11 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
           selectColor: isObject(options) ? options.color : this.getLayerConfig().selectColor,
           selectMix: isObject(options) ? options.mix : this.getLayerConfig().selectMix
         });
-        this.hooks.beforeSelect.call(encodePickingColor(id)) // @ts-ignore
+        this.hooks.beforeSelect.call(encodePickingColor(id))
+        // @ts-ignore
         .then(function () {
           setTimeout(function () {
-            _this7.reRender();
+            _this8.reRender();
           }, 1);
         });
       }
@@ -868,8 +781,8 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     value: function setBlend(type) {
       this.updateLayerConfig({
         blend: type
-      }); // this.layerModelNeedUpdate = true;
-
+      });
+      // this.layerModelNeedUpdate = true;
       this.reRender();
       return this;
     }
@@ -925,14 +838,12 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     key: "isVisible",
     value: function isVisible() {
       var zoom = this.mapService.getZoom();
-
       var _this$getLayerConfig3 = this.getLayerConfig(),
-          visible = _this$getLayerConfig3.visible,
-          _this$getLayerConfig4 = _this$getLayerConfig3.minZoom,
-          minZoom = _this$getLayerConfig4 === void 0 ? -Infinity : _this$getLayerConfig4,
-          _this$getLayerConfig5 = _this$getLayerConfig3.maxZoom,
-          maxZoom = _this$getLayerConfig5 === void 0 ? Infinity : _this$getLayerConfig5;
-
+        visible = _this$getLayerConfig3.visible,
+        _this$getLayerConfig4 = _this$getLayerConfig3.minZoom,
+        minZoom = _this$getLayerConfig4 === void 0 ? -Infinity : _this$getLayerConfig4,
+        _this$getLayerConfig5 = _this$getLayerConfig3.maxZoom,
+        maxZoom = _this$getLayerConfig5 === void 0 ? Infinity : _this$getLayerConfig5;
       return !!visible && zoom >= minZoom && zoom < maxZoom;
     }
   }, {
@@ -941,28 +852,22 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
       this.updateLayerConfig({
         enableMultiPassRenderer: enableMultiPass
       });
-
       if (currentPasses) {
         this.updateLayerConfig({
           passes: currentPasses
         });
       }
-
       if (enableMultiPass) {
         var _this$getLayerConfig6 = this.getLayerConfig(),
-            _this$getLayerConfig7 = _this$getLayerConfig6.passes,
-            passes = _this$getLayerConfig7 === void 0 ? [] : _this$getLayerConfig7;
-
+          _this$getLayerConfig7 = _this$getLayerConfig6.passes,
+          passes = _this$getLayerConfig7 === void 0 ? [] : _this$getLayerConfig7;
         this.multiPassRenderer = createMultiPassRenderer(this, passes, this.postProcessingPassFactory, this.normalPassFactory);
         this.multiPassRenderer.setRenderFlag(true);
-
         var _this$rendererService = this.rendererService.getViewportSize(),
-            width = _this$rendererService.width,
-            height = _this$rendererService.height;
-
+          width = _this$rendererService.width,
+          height = _this$rendererService.height;
         this.multiPassRenderer.resize(width, height);
       }
-
       return this;
     }
   }, {
@@ -977,23 +882,21 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     key: "getMinZoom",
     value: function getMinZoom() {
       var _this$getLayerConfig8 = this.getLayerConfig(),
-          minZoom = _this$getLayerConfig8.minZoom;
-
+        minZoom = _this$getLayerConfig8.minZoom;
       return minZoom;
     }
   }, {
     key: "getMaxZoom",
     value: function getMaxZoom() {
       var _this$getLayerConfig9 = this.getLayerConfig(),
-          maxZoom = _this$getLayerConfig9.maxZoom;
-
+        maxZoom = _this$getLayerConfig9.maxZoom;
       return maxZoom;
     }
   }, {
     key: "get",
     value: function get(name) {
-      var cfg = this.getLayerConfig(); // @ts-ignore
-
+      var cfg = this.getLayerConfig();
+      // @ts-ignore
       return cfg[name];
     }
   }, {
@@ -1012,10 +915,10 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
       });
       return this;
     }
+
     /**
      * zoom to layer Bounds
      */
-
   }, {
     key: "fitBounds",
     value: function fitBounds(fitBoundsOptions) {
@@ -1025,17 +928,14 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
         });
         return this;
       }
-
       var source = this.getSource();
       var extent = source.extent;
       var isValid = extent.some(function (v) {
         return Math.abs(v) === Infinity;
       });
-
       if (isValid) {
         return this;
       }
-
       this.mapService.fitBounds([[extent[0], extent[1]], [extent[2], extent[3]]], fitBoundsOptions);
       return this;
     }
@@ -1043,43 +943,43 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     key: "destroy",
     value: function destroy() {
       var _this$multiPassRender, _this$layerModel2, _this$tileLayer, _this$debugService2;
-
       var refresh = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
-
       if (this.isDestroyed) {
         return;
-      } // remove child layer
-
+      }
 
+      // remove child layer
       this.layerChildren.map(function (child) {
         return child.destroy(false);
       });
-      this.layerChildren = []; // remove mask list maskfence 掩膜需要销毁
+      this.layerChildren = [];
 
+      // remove mask list maskfence 掩膜需要销毁
       var _this$getLayerConfig10 = this.getLayerConfig(),
-          maskfence = _this$getLayerConfig10.maskfence;
-
+        maskfence = _this$getLayerConfig10.maskfence;
       if (maskfence) {
         this.masks.map(function (mask) {
           return mask.destroy(false);
         });
         this.masks = [];
       }
-
-      this.hooks.beforeDestroy.call(); // 清除sources事件
-
+      this.hooks.beforeDestroy.call();
+      // 清除sources事件
       this.layerSource.off('update', this.sourceEvent);
       (_this$multiPassRender = this.multiPassRenderer) === null || _this$multiPassRender === void 0 ? void 0 : _this$multiPassRender.destroy();
-      this.textureService.destroy(); // 清除所有属性以及关联的 vao == 销毁所有 => model this.models.forEach((model) => model.destroy());
+      this.textureService.destroy();
 
-      this.styleAttributeService.clearAllAttributes(); // 执行每个图层单独的 clearModels 方法 （清除一些额外的 texture、program、buffer 等）
+      // 清除所有属性以及关联的 vao == 销毁所有 => model this.models.forEach((model) => model.destroy());
+      this.styleAttributeService.clearAllAttributes();
 
-      this.hooks.afterDestroy.call(); // Tip: 清除各个图层自定义的 models 资源
+      // 执行每个图层单独的 clearModels 方法 （清除一些额外的 texture、program、buffer 等）
 
+      this.hooks.afterDestroy.call();
+      // Tip: 清除各个图层自定义的 models 资源
       (_this$layerModel2 = this.layerModel) === null || _this$layerModel2 === void 0 ? void 0 : _this$layerModel2.clearModels(refresh);
       (_this$tileLayer = this.tileLayer) === null || _this$tileLayer === void 0 ? void 0 : _this$tileLayer.destroy();
-      this.models = []; // 清除图层日志（如果有的话：非瓦片相关）
-
+      this.models = [];
+      // 清除图层日志（如果有的话：非瓦片相关）
       (_this$debugService2 = this.debugService) === null || _this$debugService2 === void 0 ? void 0 : _this$debugService2.removeLog(this.id);
       this.emit('remove', {
         target: this,
@@ -1089,7 +989,8 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
         target: this,
         type: 'destroy'
       });
-      this.removeAllListeners(); // 解绑图层容器中的服务
+      this.removeAllListeners();
+      // 解绑图层容器中的服务
       // this.container.unbind(TYPES.IStyleAttributeService);
 
       this.isDestroyed = true;
@@ -1097,13 +998,13 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
   }, {
     key: "clear",
     value: function clear() {
-      this.styleAttributeService.clearAllAttributes(); // 销毁所有 model
+      this.styleAttributeService.clearAllAttributes();
+      // 销毁所有 model
     }
   }, {
     key: "clearModels",
     value: function clearModels() {
       var _this$layerModel3;
-
       this.models.forEach(function (model) {
         return model.destroy();
       });
@@ -1116,55 +1017,46 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
       return !!(this.styleAttributeService.getLayerStyleAttributes() || []).filter(function (attribute) {
         return attribute.needRescale || attribute.needRemapping || attribute.needRegenerateVertices;
       }).length;
-    } // 外部初始化Source
-
+    }
+    // 外部初始化Source
   }, {
     key: "setSource",
     value: function setSource(source) {
-      var _this8 = this;
-
+      var _this9 = this;
       // 解除原 sources 事件
       if (this.layerSource) {
         this.layerSource.off('update', this.sourceEvent);
       }
-
       this.layerSource = source;
-      this.clusterZoom = 0; // 已 inited 且启用聚合进行更新聚合数据
+      this.clusterZoom = 0;
 
+      // 已 inited 且启用聚合进行更新聚合数据
       if (this.inited && this.layerSource.cluster) {
         var zoom = this.mapService.getZoom();
         this.layerSource.updateClusterData(zoom);
       }
-
       if (this.layerSource.inited) {
         this.sourceEvent();
-      } // this.layerSource.inited 为 true update 事件不会再触发
-
-
+      }
+      // this.layerSource.inited 为 true update 事件不会再触发
       this.layerSource.on('update', function (_ref4) {
         var type = _ref4.type;
-
-        if (_this8.coordCenter === undefined) {
-          var _this8$mapService;
-
-          var layerCenter = _this8.layerSource.center;
-          _this8.coordCenter = layerCenter;
-
-          if ((_this8$mapService = _this8.mapService) !== null && _this8$mapService !== void 0 && _this8$mapService.setCoordCenter) {
-            _this8.mapService.setCoordCenter(layerCenter);
+        if (_this9.coordCenter === undefined) {
+          var _this9$mapService;
+          var layerCenter = _this9.layerSource.center;
+          _this9.coordCenter = layerCenter;
+          if ((_this9$mapService = _this9.mapService) !== null && _this9$mapService !== void 0 && _this9$mapService.setCoordCenter) {
+            _this9.mapService.setCoordCenter(layerCenter);
           }
         }
-
         if (type === 'update') {
-          if (_this8.tileLayer) {
+          if (_this9.tileLayer) {
             // 瓦片图层独立更新
-            _this8.tileLayer.reload();
-
+            _this9.tileLayer.reload();
             return;
-          } // source 初始化不需要处理
-
-
-          _this8.sourceEvent();
+          }
+          // source 初始化不需要处理
+          _this9.sourceEvent();
         }
       });
     }
@@ -1198,7 +1090,6 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     key: "getLegend",
     value: function getLegend(name) {
       var _attribute$scale, _scales$0$option, _attribute$scale2;
-
       var attribute = this.styleAttributeService.getLayerStyleAttribute(name);
       var scales = (attribute === null || attribute === void 0 ? void 0 : (_attribute$scale = attribute.scale) === null || _attribute$scale === void 0 ? void 0 : _attribute$scale.scalers) || [];
       return {
@@ -1210,12 +1101,11 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
   }, {
     key: "getLegendItems",
     value: function getLegendItems(name) {
-      var scale = this.styleAttributeService.getLayerAttributeScale(name); // 函数自定义映射，没有 scale 返回为空数组
-
+      var scale = this.styleAttributeService.getLayerAttributeScale(name);
+      // 函数自定义映射，没有 scale 返回为空数组
       if (!scale) {
         return [];
       }
-
       if (scale.invertExtent) {
         // 分段类型  Quantize、Quantile、Threshold
         var items = scale.range().map(function (item) {
@@ -1231,7 +1121,6 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
             value: item
           }, name, scale(item));
         });
-
         return _items;
       } else if (scale !== null && scale !== void 0 && scale.domain) {
         // 枚举类型 Cat
@@ -1242,17 +1131,15 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
             value: item
           }, name, scale(item));
         });
-
         return _items2;
       }
-
       return [];
     }
   }, {
     key: "pick",
     value: function pick(_ref8) {
       var x = _ref8.x,
-          y = _ref8.y;
+        y = _ref8.y;
       this.interactionService.triggerHover({
         x: x,
         y: y
@@ -1267,86 +1154,57 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     key: "buildLayerModel",
     value: function () {
       var _buildLayerModel = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(options) {
-        var _this9 = this;
-
-        var moduleName, vertexShader, fragmentShader, triangulation, segmentNumber, _options$workerEnable, workerEnabled, workerOptions, rest, _this$shaderModuleSer, vs, fs, uniforms, createModel;
-
+        var _this10 = this;
+        var moduleName, vertexShader, fragmentShader, inject, triangulation, segmentNumber, rest, _this$shaderModuleSer, vs, fs, uniforms, createModel;
         return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-          while (1) {
-            switch (_context3.prev = _context3.next) {
-              case 0:
-                moduleName = options.moduleName, vertexShader = options.vertexShader, fragmentShader = options.fragmentShader, triangulation = options.triangulation, segmentNumber = options.segmentNumber, _options$workerEnable = options.workerEnabled, workerEnabled = _options$workerEnable === void 0 ? false : _options$workerEnable, workerOptions = options.workerOptions, rest = _objectWithoutProperties(options, _excluded2);
-                this.shaderModuleService.registerModule(moduleName, {
-                  vs: vertexShader,
-                  fs: fragmentShader
-                });
-                _this$shaderModuleSer = this.shaderModuleService.getModule(moduleName), vs = _this$shaderModuleSer.vs, fs = _this$shaderModuleSer.fs, uniforms = _this$shaderModuleSer.uniforms;
-                createModel = this.rendererService.createModel;
-                return _context3.abrupt("return", new Promise(function (resolve, reject) {
-                  // filter supported worker & worker enabled layer
-                  if (workerOptions && workerOptions.modelType in WorkerSourceMap && workerEnabled) {
-                    _this9.styleAttributeService.createAttributesAndIndicesAscy(_this9.encodedData, segmentNumber, workerOptions).then(function (_ref9) {
-                      var attributes = _ref9.attributes,
-                          elements = _ref9.elements;
-                      var m = createModel(_objectSpread({
-                        attributes: attributes,
-                        uniforms: uniforms,
-                        fs: fs,
-                        vs: vs,
-                        elements: elements,
-                        blend: BlendTypes[BlendType.normal]
-                      }, rest));
-                      resolve(m);
-                    }).catch(function (err) {
-                      return reject(err);
-                    });
-                  } else {
-                    // console.log(this.encodedData)
-                    var _this9$styleAttribute = _this9.styleAttributeService.createAttributesAndIndices(_this9.encodedData, triangulation, segmentNumber),
-                        attributes = _this9$styleAttribute.attributes,
-                        elements = _this9$styleAttribute.elements,
-                        count = _this9$styleAttribute.count;
-
-                    var modelOptions = _objectSpread({
-                      attributes: attributes,
-                      uniforms: uniforms,
-                      fs: fs,
-                      vs: vs,
-                      elements: elements,
-                      blend: BlendTypes[BlendType.normal]
-                    }, rest);
-
-                    if (count) {
-                      modelOptions.count = count;
-                    }
-
-                    var m = createModel(modelOptions);
-                    resolve(m);
-                  }
-                }));
-
-              case 5:
-              case "end":
-                return _context3.stop();
-            }
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              moduleName = options.moduleName, vertexShader = options.vertexShader, fragmentShader = options.fragmentShader, inject = options.inject, triangulation = options.triangulation, segmentNumber = options.segmentNumber, rest = _objectWithoutProperties(options, _excluded2);
+              this.shaderModuleService.registerModule(moduleName, {
+                vs: vertexShader,
+                fs: fragmentShader,
+                inject: inject
+              });
+              _this$shaderModuleSer = this.shaderModuleService.getModule(moduleName), vs = _this$shaderModuleSer.vs, fs = _this$shaderModuleSer.fs, uniforms = _this$shaderModuleSer.uniforms;
+              createModel = this.rendererService.createModel;
+              return _context3.abrupt("return", new Promise(function (resolve) {
+                // console.log(this.encodedData)
+                var _this10$styleAttribut = _this10.styleAttributeService.createAttributesAndIndices(_this10.encodedData, triangulation, segmentNumber),
+                  attributes = _this10$styleAttribut.attributes,
+                  elements = _this10$styleAttribut.elements,
+                  count = _this10$styleAttribut.count;
+                var modelOptions = _objectSpread({
+                  attributes: attributes,
+                  uniforms: uniforms,
+                  fs: fs,
+                  vs: vs,
+                  elements: elements,
+                  blend: BlendTypes[BlendType.normal]
+                }, rest);
+                if (count) {
+                  modelOptions.count = count;
+                }
+                var m = createModel(modelOptions);
+                resolve(m);
+              }));
+            case 5:
+            case "end":
+              return _context3.stop();
           }
         }, _callee3, this);
       }));
-
       function buildLayerModel(_x) {
         return _buildLayerModel.apply(this, arguments);
       }
-
       return buildLayerModel;
     }()
   }, {
     key: "createAttributes",
     value: function createAttributes(options) {
-      var triangulation = options.triangulation; // @ts-ignore
-
+      var triangulation = options.triangulation;
+      // @ts-ignore
       var _this$styleAttributeS = this.styleAttributeService.createAttributes(this.encodedData, triangulation),
-          attributes = _this$styleAttributeS.attributes;
-
+        attributes = _this$styleAttributeS.attributes;
       return attributes;
     }
   }, {
@@ -1381,22 +1239,18 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     key: "needPick",
     value: function needPick(type) {
       var _this$getLayerConfig11 = this.getLayerConfig(),
-          _this$getLayerConfig12 = _this$getLayerConfig11.enableHighlight,
-          enableHighlight = _this$getLayerConfig12 === void 0 ? true : _this$getLayerConfig12,
-          _this$getLayerConfig13 = _this$getLayerConfig11.enableSelect,
-          enableSelect = _this$getLayerConfig13 === void 0 ? true : _this$getLayerConfig13; // 判断layer是否监听事件;
-
-
+        _this$getLayerConfig12 = _this$getLayerConfig11.enableHighlight,
+        enableHighlight = _this$getLayerConfig12 === void 0 ? true : _this$getLayerConfig12,
+        _this$getLayerConfig13 = _this$getLayerConfig11.enableSelect,
+        enableSelect = _this$getLayerConfig13 === void 0 ? true : _this$getLayerConfig13;
+      // 判断layer是否监听事件;
       var isPick = this.eventNames().indexOf(type) !== -1 || this.eventNames().indexOf('un' + type) !== -1;
-
       if ((type === 'click' || type === 'dblclick') && enableSelect) {
         isPick = true;
       }
-
       if (type === 'mousemove' && (enableHighlight || this.eventNames().indexOf('mouseenter') !== -1 || this.eventNames().indexOf('unmousemove') !== -1 || this.eventNames().indexOf('mouseout') !== -1)) {
         isPick = true;
       }
-
       return this.isVisible() && isPick;
     }
   }, {
@@ -1404,23 +1258,18 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     value: function () {
       var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
         return _regeneratorRuntime.wrap(function _callee4$(_context4) {
-          while (1) {
-            switch (_context4.prev = _context4.next) {
-              case 0:
-                throw new Error('Method not implemented.');
-
-              case 1:
-              case "end":
-                return _context4.stop();
-            }
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              throw new Error('Method not implemented.');
+            case 1:
+            case "end":
+              return _context4.stop();
           }
         }, _callee4);
       }));
-
       function buildModels() {
         return _buildModels.apply(this, arguments);
       }
-
       return buildModels;
     }()
   }, {
@@ -1428,24 +1277,19 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     value: function () {
       var _rebuildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
         return _regeneratorRuntime.wrap(function _callee5$(_context5) {
-          while (1) {
-            switch (_context5.prev = _context5.next) {
-              case 0:
-                _context5.next = 2;
-                return this.buildModels();
-
-              case 2:
-              case "end":
-                return _context5.stop();
-            }
+          while (1) switch (_context5.prev = _context5.next) {
+            case 0:
+              _context5.next = 2;
+              return this.buildModels();
+            case 2:
+            case "end":
+              return _context5.stop();
           }
         }, _callee5, this);
       }));
-
       function rebuildModels() {
         return _rebuildModels.apply(this, arguments);
       }
-
       return rebuildModels;
     }()
   }, {
@@ -1453,46 +1297,38 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     value: function () {
       var _renderMulPass = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(multiPassRenderer) {
         return _regeneratorRuntime.wrap(function _callee6$(_context6) {
-          while (1) {
-            switch (_context6.prev = _context6.next) {
-              case 0:
-                _context6.next = 2;
-                return multiPassRenderer.render();
-
-              case 2:
-              case "end":
-                return _context6.stop();
-            }
+          while (1) switch (_context6.prev = _context6.next) {
+            case 0:
+              _context6.next = 2;
+              return multiPassRenderer.render();
+            case 2:
+            case "end":
+              return _context6.stop();
           }
         }, _callee6);
       }));
-
       function renderMulPass(_x2) {
         return _renderMulPass.apply(this, arguments);
       }
-
       return renderMulPass;
     }()
   }, {
     key: "renderModels",
     value: function renderModels() {
-      var _this10 = this;
-
+      var _this11 = this;
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-
       // TODO: this.getEncodedData().length > 0 这个判断是为了解决在 2.5.x 引入数据纹理后产生的 空数据渲染导致 texture 超出上限问题
       if (this.encodeDataLength <= 0 && !this.forceRender) {
         // 数据为空销毁model
         this.clearModels();
         return this;
       }
-
       this.hooks.beforeRender.call();
       this.models.forEach(function (model) {
         model.draw({
-          uniforms: _this10.layerModel.getUninforms(),
-          blend: _this10.layerModel.getBlend(),
-          stencil: _this10.layerModel.getStencil(options)
+          uniforms: _this11.layerModel.getUninforms(),
+          blend: _this11.layerModel.getBlend(),
+          stencil: _this11.layerModel.getStencil(options)
         }, (options === null || options === void 0 ? void 0 : options.ispick) || false);
       });
       this.hooks.afterRender.call();
@@ -1502,23 +1338,23 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     key: "updateStyleAttribute",
     value: function updateStyleAttribute(type, field, values, updateOptions) {
       // encode diff
-      var preAttribute = this.configService.getAttributeConfig(this.id) || {}; // @ts-ignore
-
+      var preAttribute = this.configService.getAttributeConfig(this.id) || {};
+      // @ts-ignore
       if (isEqual(preAttribute[type], {
         field: field,
         values: values
       })) {
+        // 检测是否发生更新
         return false;
-      } // 存储 Attribute
-
+      }
 
+      // 存储 Attribute 瓦片图层使用
       if (['color', 'size', 'texture', 'rotate', 'filter', 'label', 'shape'].indexOf(type) !== -1) {
         this.configService.setAttributeConfig(this.id, _defineProperty({}, type, {
           field: field,
           values: values
         }));
       }
-
       if (!this.startInit) {
         // 开始初始化执行
         this.pendingStyleAttributes.push({
@@ -1532,13 +1368,15 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
           // @ts-ignore
           scale: _objectSpread({
             field: field
-          }, this.splitValuesAndCallbackInAttribute( // @ts-ignore
-          values, // @ts-ignore
+          }, this.splitValuesAndCallbackInAttribute(
+          // @ts-ignore
+          values,
+          // @ts-ignore
           this.getLayerConfig()[field]))
-        }, // @ts-ignore
+        },
+        // @ts-ignore
         updateOptions);
       }
-
       return true;
     }
   }, {
@@ -1551,19 +1389,20 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     value: function getShaderPickStat() {
       return this.layerService.getShaderPickStat();
     }
+
     /**
      * 继承空方法
      * @param time
      */
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-
   }, {
     key: "setEarthTime",
     value: function setEarthTime(time) {
       console.warn('empty fn');
-    } // 数据处理 在数据进行 mapping 生成 encodeData 之前对数据进行处理
-    // 在各个 layer 中继承
+    }
 
+    // 数据处理 在数据进行 mapping 生成 encodeData 之前对数据进行处理
+    // 在各个 layer 中继承
   }, {
     key: "processData",
     value: function processData(filterData) {
@@ -1584,31 +1423,25 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     value: function () {
       var _initLayerModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7() {
         return _regeneratorRuntime.wrap(function _callee7$(_context7) {
-          while (1) {
-            switch (_context7.prev = _context7.next) {
-              case 0:
-                this.models.forEach(function (model) {
-                  return model.destroy();
-                });
-                this.models = [];
-                _context7.next = 4;
-                return this.layerModel.initModels();
-
-              case 4:
-                this.models = _context7.sent;
-
-              case 5:
-              case "end":
-                return _context7.stop();
-            }
+          while (1) switch (_context7.prev = _context7.next) {
+            case 0:
+              this.models.forEach(function (model) {
+                return model.destroy();
+              });
+              this.models = [];
+              _context7.next = 4;
+              return this.layerModel.initModels();
+            case 4:
+              this.models = _context7.sent;
+            case 5:
+            case "end":
+              return _context7.stop();
           }
         }, _callee7, this);
       }));
-
       function initLayerModels() {
         return _initLayerModels.apply(this, arguments);
       }
-
       return initLayerModels;
     }()
   }, {
@@ -1627,7 +1460,6 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
       };
     }
   }]);
-
   return BaseLayer;
 }(EventEmitter), (_descriptor = _applyDecoratedDescriptor(_class.prototype, "configService", [_dec], {
   configurable: true,