@antv/l7-layers 2.16.0 → 2.16.2

package/es/core/BaseLayer.d.ts

@@ -87,6 +87,8 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
     private currentPickId;
     protected rawConfig: Partial<ILayerConfig & ChildLayerStyleOptions>;
     private needUpdateConfig;
+    encodeStyleAttribute: Record<string, any>;
+    enableEncodeStyles: string[];
     /**
      * 待更新样式属性，在初始化阶段完成注册
      */
@@ -141,6 +143,7 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
     source(data: any, options?: ISourceCFG): ILayer;
     setData(data: any, options?: ISourceCFG): this;
     style(options: Partial<ChildLayerStyleOptions> & Partial<ILayerConfig>): ILayer;
+    private encodeStyle;
     scale(field: string | number | IScaleOptions, cfg?: IScale): this;
     /**
      * 渲染所有的图层

package/es/core/BaseLayer.js

@@ -12,7 +12,7 @@ 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; } } }; }
@@ -24,11 +24,10 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 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";
@@ -107,6 +106,8 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
       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);
@@ -126,7 +127,6 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     _this.name = config.name || _this.id;
     _this.zIndex = config.zIndex || 0;
     _this.rawConfig = config;
-    // this.parent = this;
     return _this;
   }
   _createClass(BaseLayer, [{
@@ -199,7 +199,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
       } else {
         var sceneId = this.container.get(TYPES.SceneID);
         // @ts-ignore
-        styleDataMapping(configToUpdate, this); // 处理 style 中进行数据映射的属性字段
+        // styleDataMapping(configToUpdate, this); // 处理 style 中进行数据映射的属性字段
         this.configService.setLayerConfig(sceneId, this.id, _objectSpread(_objectSpread(_objectSpread({}, this.configService.getLayerConfig(this.id)), this.needUpdateConfig), configToUpdate));
         this.needUpdateConfig = {};
       }
@@ -422,7 +422,9 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
   }, {
     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(),
@@ -559,21 +561,32 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
           }
         });
       }
-      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) {
@@ -683,7 +696,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
   }, {
     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,
@@ -707,7 +720,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
         // @ts-ignore
         .then(function () {
           setTimeout(function () {
-            _this6.reRender();
+            _this7.reRender();
           }, 1);
         });
       }
@@ -734,7 +747,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
   }, {
     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,
@@ -758,7 +771,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
         // @ts-ignore
         .then(function () {
           setTimeout(function () {
-            _this7.reRender();
+            _this8.reRender();
           }, 1);
         });
       }
@@ -1009,7 +1022,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
   }, {
     key: "setSource",
     value: function setSource(source) {
-      var _this8 = this;
+      var _this9 = this;
       // 解除原 sources 事件
       if (this.layerSource) {
         this.layerSource.off('update', this.sourceEvent);
@@ -1028,22 +1041,22 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
       // 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();
+          _this9.sourceEvent();
         }
       });
     }
@@ -1141,56 +1154,38 @@ 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);
+              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
+                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, 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);
+              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":
@@ -1320,7 +1315,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
   }, {
     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) {
@@ -1331,9 +1326,9 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
       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();
@@ -1349,10 +1344,11 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
         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,

package/es/core/BaseModel.d.ts

@@ -1,4 +1,4 @@
-import { IAnimateOption, IAttribute, IBlendOptions, ICameraService, IElements, IEncodeFeature, IFontService, IGlobalConfigService, IIconService, ILayer, ILayerModel, ILayerService, IMapService, IModel, IModelUniform, IPickingService, IRendererService, IRenderOptions, IShaderModuleService, IStencilOptions, IStyleAttributeService, ITexture2D, ITexture2DInitializationOptions, Triangulation } from '@antv/l7-core';
+import { IAnimateOption, IAttribute, IBlendOptions, ICameraService, IElements, IFontService, IGlobalConfigService, IIconService, IInject, ILayer, ILayerModel, ILayerService, IMapService, IModel, IModelUniform, IPickingService, IRendererService, IRenderOptions, IShaderModuleService, IStencilOptions, IStyleAttributeService, ITexture2D, ITexture2DInitializationOptions, Triangulation } from '@antv/l7-core';
 export type styleSingle = number | string | [string, (single: any) => number] | [string, [number, number]];
 export type styleOffset = string | [number, number] | [string, (single: any) => number];
 export type styleColor = string | [string, (single: any) => string] | [string, [string, string]];
@@ -14,6 +14,8 @@ export interface ICellProperty {
 export default class BaseModel<ChildLayerStyleOptions = {}> implements ILayerModel {
     triangulation: Triangulation;
     createTexture2D: (options: ITexture2DInitializationOptions) => ITexture2D;
+    preStyleAttribute: Record<string, any>;
+    protected encodeStyleAttribute: Record<string, boolean>;
     protected layer: ILayer;
     protected dataTexture: ITexture2D;
     protected DATA_TEXTURE_WIDTH: number;
@@ -49,76 +51,6 @@ export default class BaseModel<ChildLayerStyleOptions = {}> implements ILayerMod
     protected layerService: ILayerService;
     protected pickingService: IPickingService;
     constructor(layer: ILayer);
-    /**
-     * 清除上一次的计算结果 - 全量清除
-     */
-    clearLastCalRes(): void;
-    getCellTypeLayout(): number[];
-    /**
-     * 判断数据纹理是否需要重新计算 - 根据传入的值进行判断
-     * @param options
-     * @returns
-     */
-    dataTextureNeedUpdate(options: {
-        thetaOffset?: styleSingle;
-        opacity?: styleSingle;
-        strokeOpacity?: styleSingle;
-        strokeWidth?: styleSingle;
-        stroke?: styleColor;
-        offsets?: styleOffset;
-        textOffset?: styleOffset;
-    }): boolean;
-    /**
-     * 判断当前的样式中哪些是需要进行数据映射的，哪些是常量，同时计算用于构建数据纹理的一些中间变量
-     * @param options
-     */
-    judgeStyleAttributes(options: {
-        thetaOffset?: styleSingle;
-        opacity?: styleSingle;
-        strokeOpacity?: styleSingle;
-        strokeWidth?: styleSingle;
-        stroke?: styleColor;
-        offsets?: styleOffset;
-    }): void;
-    /**
-     * 判断变量 stroke 是否是常量值
-     * @param stroke
-     * @returns
-     */
-    isStaticColor(stroke: styleColor): boolean;
-    /**
-     * 获取 stroke 颜色并做兼容处理
-     * @param stroke
-     * @returns
-     */
-    getStrokeColor(stroke: styleColor): number[];
-    /**
-     * 判断 offsets 是否是常量
-     * @param offsets
-     * @returns
-     */
-    isOffsetStatic(offsets: styleOffset): boolean;
-    /**
-     * 补空位
-     * @param d
-     * @param count
-     */
-    patchMod(d: number[], count: number): void;
-    /**
-     * 根据映射的数据字段往推入数据
-     * @param d
-     * @param cellData
-     * @param cellPropertiesLayouts
-     */
-    patchData(d: number[], cellData: IEncodeFeature, cellPropertiesLayouts: ICellProperty[]): void;
-    /**
-     * 计算推入数据纹理的数据
-     * @param cellLength
-     * @param encodeData
-     * @param cellPropertiesLayouts
-     * @returns
-     */
-    calDataFrame(cellLength: number, encodeData: IEncodeFeature[], cellPropertiesLayouts: ICellProperty[]): IDataTextureFrame;
     getBlend(): IBlendOptions;
     getStencil(option: Partial<IRenderOptions>): Partial<IStencilOptions>;
     getDefaultStyle(): unknown;
@@ -138,4 +70,10 @@ export default class BaseModel<ChildLayerStyleOptions = {}> implements ILayerMod
     protected registerBuiltinAttributes(): void;
     protected animateOption2Array(option: IAnimateOption): number[];
     protected startModelAnimate(): void;
+    protected getInject(): IInject;
+    protected getStyleAttribute(): {
+        [key: string]: any;
+    };
+    protected registerStyleAttribute(): void;
+    updateEncodeAttribute(type: string, flag: boolean): void;
 }