@antv/l7-layers 2.19.11 → 2.20.1

package/es/canvas/models/canvas.js

@@ -104,7 +104,7 @@ var CanvaModel = /*#__PURE__*/function (_BaseModel) {
     value: function clearModels() {
       if (this.canvas) {
         var _this$mapService$getC;
-        (_this$mapService$getC = this.mapService.getContainer()) === null || _this$mapService$getC === void 0 ? void 0 : _this$mapService$getC.removeChild(this.canvas);
+        (_this$mapService$getC = this.mapService.getContainer()) === null || _this$mapService$getC === void 0 || _this$mapService$getC.removeChild(this.canvas);
         // @ts-ignore
         this.canvas = null;
       }
@@ -161,7 +161,7 @@ var CanvaModel = /*#__PURE__*/function (_BaseModel) {
       canvas.style.top = '0';
       canvas.style.left = '0';
       canvas.style.zIndex = zIndex + '';
-      (_this$mapService$getC2 = this.mapService.getContainer()) === null || _this$mapService$getC2 === void 0 ? void 0 : _this$mapService$getC2.appendChild(canvas);
+      (_this$mapService$getC2 = this.mapService.getContainer()) === null || _this$mapService$getC2 === void 0 || _this$mapService$getC2.appendChild(canvas);
       var ctx = canvas.getContext('2d');
       this.ctx = ctx;
     }

package/es/core/BaseLayer.d.ts

@@ -1,5 +1,5 @@
 import { AsyncSeriesBailHook, AsyncWaterfallHook, SyncBailHook, SyncHook } from '@antv/async-hook';
-import { BlendType, IActiveOption, IAnimateOption, IAttributeAndElements, ICameraService, ICoordinateSystemService, IDataState, IDebugService, IEncodeFeature, IFontService, IGlobalConfigService, IIconService, IInteractionService, ILayer, ILayerAttributesOption, ILayerConfig, ILayerModel, ILayerModelInitializationOptions, ILayerPickService, ILayerPlugin, ILayerService, ILegend, IMapService, IModel, IModelInitializationOptions, IMultiPassRenderer, IParseDataItem, IPass, IPickingService, IPostProcessingPass, IRendererService, IRenderOptions, IScale, IScaleOptions, IShaderModuleService, ISourceCFG, IStyleAttributeService, IStyleAttributeUpdateOptions, ITextureService, LayerEventType, LegendItems, StyleAttributeField, StyleAttributeOption, Triangulation } from '@antv/l7-core';
+import { BlendType, IActiveOption, IAnimateOption, IAttributeAndElements, ICameraService, ICoordinateSystemService, IDataState, IDebugService, IEncodeFeature, IFontService, IGlobalConfigService, IIconService, IInteractionService, ILayer, ILayerAttributesOption, ILayerConfig, ILayerModel, ILayerModelInitializationOptions, ILayerPickService, ILayerPlugin, ILayerService, ILegend, IMapService, IModel, IModelInitializationOptions, IMultiPassRenderer, IParseDataItem, IPass, IPickingService, IPostProcessingPass, IRenderOptions, IRendererService, IScale, IScaleOptions, IShaderModuleService, ISourceCFG, IStyleAttributeService, IStyleAttributeUpdateOptions, ITextureService, LayerEventType, LegendItems, StyleAttributeField, StyleAttributeOption, Triangulation } from '@antv/l7-core';
 import Source from '@antv/l7-source';
 import { EventEmitter } from 'eventemitter3';
 import { Container } from 'inversify';

package/es/core/BaseLayer.js

@@ -23,7 +23,7 @@ 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; } }
 // @ts-ignore
 import { AsyncSeriesBailHook, AsyncWaterfallHook, SyncBailHook, SyncHook } from '@antv/async-hook';
-import { BlendType, IDebugLog, ILayerStage, lazyInject, TYPES } from '@antv/l7-core';
+import { BlendType, IDebugLog, ILayerStage, TYPES, lazyInject } from '@antv/l7-core';
 import Source from '@antv/l7-source';
 import { encodePickingColor, lodashUtil } from '@antv/l7-utils';
 import { EventEmitter } from 'eventemitter3';
@@ -375,7 +375,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
         id: this.id,
         type: this.type
       };
-      (_this$debugService = this.debugService) === null || _this$debugService === void 0 ? void 0 : _this$debugService.log(key, values);
+      (_this$debugService = this.debugService) === null || _this$debugService === void 0 || _this$debugService.log(key, values);
     }
   }, {
     key: "updateModelData",
@@ -951,6 +951,12 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
       if (this.isDestroyed) {
         return;
       }
+
+      // destroy all UBOs
+      this.layerModel.uniformBuffers.forEach(function (buffer) {
+        buffer.destroy();
+      });
+
       // remove child layer
       this.layerChildren.map(function (child) {
         return child.destroy(false);
@@ -969,7 +975,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
       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$multiPassRender = this.multiPassRenderer) === null || _this$multiPassRender === void 0 || _this$multiPassRender.destroy();
       this.textureService.destroy();
 
       // 清除所有属性以及关联的 vao == 销毁所有 => model this.models.forEach((model) => model.destroy());
@@ -979,11 +985,11 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
 
       this.hooks.afterDestroy.call();
       // Tip: 清除各个图层自定义的 models 资源
-      (_this$layerModel = this.layerModel) === null || _this$layerModel === void 0 ? void 0 : _this$layerModel.clearModels(refresh);
-      (_this$tileLayer = this.tileLayer) === null || _this$tileLayer === void 0 ? void 0 : _this$tileLayer.destroy();
+      (_this$layerModel = this.layerModel) === null || _this$layerModel === void 0 || _this$layerModel.clearModels(refresh);
+      (_this$tileLayer = this.tileLayer) === null || _this$tileLayer === void 0 || _this$tileLayer.destroy();
       this.models = [];
       // 清除图层日志（如果有的话：非瓦片相关）
-      (_this$debugService2 = this.debugService) === null || _this$debugService2 === void 0 ? void 0 : _this$debugService2.removeLog(this.id);
+      (_this$debugService2 = this.debugService) === null || _this$debugService2 === void 0 || _this$debugService2.removeLog(this.id);
       this.emit('remove', {
         target: this,
         type: 'remove'
@@ -1010,7 +1016,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
       this.models.forEach(function (model) {
         return model.destroy();
       });
-      (_this$layerModel2 = this.layerModel) === null || _this$layerModel2 === void 0 ? void 0 : _this$layerModel2.clearModels();
+      (_this$layerModel2 = this.layerModel) === null || _this$layerModel2 === void 0 || _this$layerModel2.clearModels();
       this.models = [];
     }
   }, {
@@ -1093,10 +1099,10 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     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) || [];
+      var scales = (attribute === null || attribute === void 0 || (_attribute$scale = attribute.scale) === null || _attribute$scale === void 0 ? void 0 : _attribute$scale.scalers) || [];
       return {
         type: (_scales$0$option = scales[0].option) === null || _scales$0$option === void 0 ? void 0 : _scales$0$option.type,
-        field: attribute === null || attribute === void 0 ? void 0 : (_attribute$scale2 = attribute.scale) === null || _attribute$scale2 === void 0 ? void 0 : _attribute$scale2.field,
+        field: attribute === null || attribute === void 0 || (_attribute$scale2 = attribute.scale) === null || _attribute$scale2 === void 0 ? void 0 : _attribute$scale2.field,
         items: this.getLegendItems(name)
       };
     }
@@ -1170,7 +1176,6 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
               _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, styleOption),
                   attributes = _this10$styleAttribut.attributes,
                   elements = _this10$styleAttribut.elements,
@@ -1181,7 +1186,9 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
                   fs: fs,
                   vs: vs,
                   elements: elements,
-                  blend: BlendTypes[BlendType.normal]
+                  blend: BlendTypes[BlendType.normal],
+                  uniformBuffers: [].concat(_toConsumableArray(_this10.layerModel.uniformBuffers), _toConsumableArray(_this10.rendererService.uniformBuffers)),
+                  textures: _this10.layerModel.textures
                 }, rest);
                 if (count) {
                   modelOptions.count = count;

package/es/core/BaseModel.d.ts

@@ -1,4 +1,4 @@
-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';
+import { IAnimateOption, IAttribute, IBlendOptions, IBuffer, 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]];
@@ -13,6 +13,8 @@ export interface ICellProperty {
 }
 export default class BaseModel<ChildLayerStyleOptions = {}> implements ILayerModel {
     triangulation: Triangulation;
+    uniformBuffers: IBuffer[];
+    textures: ITexture2D[];
     createTexture2D: (options: ITexture2DInitializationOptions) => ITexture2D;
     preStyleAttribute: Record<string, any>;
     protected encodeStyleAttribute: Record<string, boolean>;

package/es/core/BaseModel.js

@@ -12,8 +12,16 @@ import { BlendType, lazyInject, MaskOperation, StencilType, TYPES } from '@antv/
 import { rgb2arr } from '@antv/l7-utils';
 import { BlendTypes } from "../utils/blend";
 import { getStencil as _getStencil, getStencilMask } from "../utils/stencil";
-import { getCommonStyleAttributeOptions } from "./CommonStyleAttribute";
 import { DefaultUniformStyleType, DefaultUniformStyleValue } from "./constant";
+import { getCommonStyleAttributeOptions, ShaderLocation } from "./CommonStyleAttribute";
+var shaderLocationMap = {
+  opacity: ShaderLocation.OPACITY,
+  stroke: ShaderLocation.STROKE,
+  offsets: ShaderLocation.OFFSETS,
+  rotation: ShaderLocation.ROTATION,
+  extrusionBase: ShaderLocation.EXTRUSION_BASE
+};
+
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__PURE__*/function () {
   // @lazyInject(TYPES.IIconService)
@@ -28,7 +36,8 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
 
   function BaseModel(layer) {
     _classCallCheck(this, BaseModel);
-    // style texture data mapping
+    _defineProperty(this, "uniformBuffers", []);
+    _defineProperty(this, "textures", []);
     _defineProperty(this, "preStyleAttribute", {});
     _defineProperty(this, "encodeStyleAttribute", {});
     _initializerDefineProperty(this, "configService", _descriptor, this);
@@ -208,18 +217,30 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     value: function getInject() {
       var encodeStyleAttribute = this.layer.encodeStyleAttribute;
       var str = '';
+      // a_Position = 0
+      // a_Color = 1
+      // a_PickingColor = 2
+
+      var uniforms = [];
+      // 支持数据映射的类型
       this.layer.enableShaderEncodeStyles.forEach(function (key) {
         if (encodeStyleAttribute[key]) {
+          // 配置了数据映射的类型
           str += "#define USE_ATTRIBUTE_".concat(key.toUpperCase(), " 0.0; \n\n");
+        } else {
+          uniforms.push("  ".concat(DefaultUniformStyleType[key], " u_").concat(key, ";"));
         }
-        str += "\n          #ifdef USE_ATTRIBUTE_".concat(key.toUpperCase(), "\n      attribute ").concat(DefaultUniformStyleType[key], " a_").concat(key.charAt(0).toUpperCase() + key.slice(1), ";\n    #else\n      uniform ").concat(DefaultUniformStyleType[key], " u_").concat(key, ";\n    #endif\n\n    ");
+        str += "\n          #ifdef USE_ATTRIBUTE_".concat(key.toUpperCase(), "\n          layout(location = ").concat(shaderLocationMap[key], ") in ").concat(DefaultUniformStyleType[key], " a_").concat(key.charAt(0).toUpperCase() + key.slice(1), ";\n        #endif\n\n        ");
       });
+      var attributeUniforms = uniforms.length ? "\nlayout(std140) uniform AttributeUniforms {\n".concat(uniforms.join('\n'), "\n};\n    ") : '';
+      str += attributeUniforms;
       var innerStr = '';
       this.layer.enableShaderEncodeStyles.forEach(function (key) {
-        innerStr += "\n\n#ifdef USE_ATTRIBUTE_".concat(key.toUpperCase(), "\n  ").concat(DefaultUniformStyleType[key], " ").concat(key, "  = a_").concat(key.charAt(0).toUpperCase() + key.slice(1), ";\n#else\n  ").concat(DefaultUniformStyleType[key], " ").concat(key, " = u_").concat(key, ";\n#endif\n\n");
+        innerStr += "\n\n    #ifdef USE_ATTRIBUTE_".concat(key.toUpperCase(), "\n      ").concat(DefaultUniformStyleType[key], " ").concat(key, "  = a_").concat(key.charAt(0).toUpperCase() + key.slice(1), ";\n    #else\n      ").concat(DefaultUniformStyleType[key], " ").concat(key, " = u_").concat(key, ";\n    #endif\n\n    ");
       });
       return {
         'vs:#decl': str,
+        'fs:#decl': attributeUniforms,
         'vs:#main-start': innerStr
       };
     }
@@ -254,6 +275,9 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
         var options = getCommonStyleAttributeOptions(key);
         if (options) {
           _this2.styleAttributeService.registerStyleAttribute(options);
+          if (options.descriptor) {
+            options.descriptor.shaderLocation = shaderLocationMap[key];
+          }
         }
       });
     }

package/es/core/CommonStyleAttribute.d.ts

@@ -1,2 +1,17 @@
 import { IStyleAttribute } from '@antv/l7-core';
+export declare enum ShaderLocation {
+    POSITION = 0,
+    COLOR = 1,
+    VERTEX_ID = 2,
+    PICKING_COLOR = 3,
+    STROKE = 4,
+    OPACITY = 5,
+    OFFSETS = 6,
+    ROTATION = 7,
+    EXTRUSION_BASE = 8,
+    SIZE = 9,
+    SHAPE = 10,
+    EXTRUDE = 11,
+    MAX = 12
+}
 export declare function getCommonStyleAttributeOptions(name: string): Partial<IStyleAttribute> | undefined;

package/es/core/CommonStyleAttribute.js

@@ -1,4 +1,20 @@
 import { AttributeType, gl } from '@antv/l7-core';
+export var ShaderLocation = /*#__PURE__*/function (ShaderLocation) {
+  ShaderLocation[ShaderLocation["POSITION"] = 0] = "POSITION";
+  ShaderLocation[ShaderLocation["COLOR"] = 1] = "COLOR";
+  ShaderLocation[ShaderLocation["VERTEX_ID"] = 2] = "VERTEX_ID";
+  ShaderLocation[ShaderLocation["PICKING_COLOR"] = 3] = "PICKING_COLOR";
+  ShaderLocation[ShaderLocation["STROKE"] = 4] = "STROKE";
+  ShaderLocation[ShaderLocation["OPACITY"] = 5] = "OPACITY";
+  ShaderLocation[ShaderLocation["OFFSETS"] = 6] = "OFFSETS";
+  ShaderLocation[ShaderLocation["ROTATION"] = 7] = "ROTATION";
+  ShaderLocation[ShaderLocation["EXTRUSION_BASE"] = 8] = "EXTRUSION_BASE";
+  ShaderLocation[ShaderLocation["SIZE"] = 9] = "SIZE";
+  ShaderLocation[ShaderLocation["SHAPE"] = 10] = "SHAPE";
+  ShaderLocation[ShaderLocation["EXTRUDE"] = 11] = "EXTRUDE";
+  ShaderLocation[ShaderLocation["MAX"] = 12] = "MAX";
+  return ShaderLocation;
+}({});
 export function getCommonStyleAttributeOptions(name) {
   switch (name) {
     // // roate
@@ -8,6 +24,7 @@ export function getCommonStyleAttributeOptions(name) {
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_Rotation',
+          shaderLocation: ShaderLocation.ROTATION,
           buffer: {
             usage: gl.DYNAMIC_DRAW,
             data: [],
@@ -27,6 +44,7 @@ export function getCommonStyleAttributeOptions(name) {
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_Stroke',
+          shaderLocation: ShaderLocation.STROKE,
           buffer: {
             // give the WebGL driver a hint that this buffer may change
             usage: gl.DYNAMIC_DRAW,
@@ -47,6 +65,7 @@ export function getCommonStyleAttributeOptions(name) {
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_Opacity',
+          shaderLocation: ShaderLocation.OPACITY,
           buffer: {
             // give the WebGL driver a hint that this buffer may change
             usage: gl.STATIC_DRAW,
@@ -67,6 +86,7 @@ export function getCommonStyleAttributeOptions(name) {
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_ExtrusionBase',
+          shaderLocation: ShaderLocation.EXTRUSION_BASE,
           buffer: {
             // give the WebGL driver a hint that this buffer may change
             usage: gl.STATIC_DRAW,
@@ -87,6 +107,7 @@ export function getCommonStyleAttributeOptions(name) {
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_Offsets',
+          shaderLocation: ShaderLocation.OFFSETS,
           buffer: {
             // give the WebGL driver a hint that this buffer may change
             usage: gl.STATIC_DRAW,

package/es/core/TextureService.js

@@ -46,7 +46,7 @@ var TextureService = /*#__PURE__*/function () {
     key: "destroy",
     value: function destroy() {
       var _this$colorTexture;
-      (_this$colorTexture = this.colorTexture) === null || _this$colorTexture === void 0 ? void 0 : _this$colorTexture.destroy();
+      (_this$colorTexture = this.colorTexture) === null || _this$colorTexture === void 0 || _this$colorTexture.destroy();
     }
   }, {
     key: "getColorRampBar",
@@ -68,7 +68,7 @@ var TextureService = /*#__PURE__*/function () {
     key: "getTextureKey",
     value: function getTextureKey(colorRamp, domain) {
       var _colorRamp$positions;
-      return "".concat(colorRamp.colors.join('_'), "_").concat(colorRamp === null || colorRamp === void 0 ? void 0 : (_colorRamp$positions = colorRamp.positions) === null || _colorRamp$positions === void 0 ? void 0 : _colorRamp$positions.join('_'), "_").concat(colorRamp.type, "_").concat(domain === null || domain === void 0 ? void 0 : domain.join('_'));
+      return "".concat(colorRamp.colors.join('_'), "_").concat(colorRamp === null || colorRamp === void 0 || (_colorRamp$positions = colorRamp.positions) === null || _colorRamp$positions === void 0 ? void 0 : _colorRamp$positions.join('_'), "_").concat(colorRamp.type, "_").concat(domain === null || domain === void 0 ? void 0 : domain.join('_'));
     }
   }]);
   return TextureService;

package/es/earth/index.js

@@ -81,7 +81,7 @@ var EarthLayer = /*#__PURE__*/function (_BaseLayer) {
     value: function getModelType() {
       var _shapeAttribute$scale;
       var shapeAttribute = this.styleAttributeService.getLayerStyleAttribute('shape');
-      var shape = (shapeAttribute === null || shapeAttribute === void 0 ? void 0 : (_shapeAttribute$scale = shapeAttribute.scale) === null || _shapeAttribute$scale === void 0 ? void 0 : _shapeAttribute$scale.field) || 'base';
+      var shape = (shapeAttribute === null || shapeAttribute === void 0 || (_shapeAttribute$scale = shapeAttribute.scale) === null || _shapeAttribute$scale === void 0 ? void 0 : _shapeAttribute$scale.field) || 'base';
       if (earthLayerTypes.indexOf(shape) < 0) {
         shape = 'base';
       }

package/es/geometry/index.js

@@ -76,7 +76,7 @@ var GeometryLayer = /*#__PURE__*/function (_BaseLayer) {
     value: function getModelType() {
       var _shapeAttribute$scale;
       var shapeAttribute = this.styleAttributeService.getLayerStyleAttribute('shape');
-      var shape = shapeAttribute === null || shapeAttribute === void 0 ? void 0 : (_shapeAttribute$scale = shapeAttribute.scale) === null || _shapeAttribute$scale === void 0 ? void 0 : _shapeAttribute$scale.field;
+      var shape = shapeAttribute === null || shapeAttribute === void 0 || (_shapeAttribute$scale = shapeAttribute.scale) === null || _shapeAttribute$scale === void 0 ? void 0 : _shapeAttribute$scale.field;
       if (shape === 'plane') {
         return 'plane';
       } else if (shape === 'sprite') {

package/es/geometry/models/billboard.js

@@ -79,7 +79,7 @@ var BillBoardModel = /*#__PURE__*/function (_BaseModel) {
     key: "clearModels",
     value: function clearModels() {
       var _this$texture;
-      (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
+      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
     }
   }, {
     key: "initModels",

package/es/geometry/models/plane.js

@@ -123,7 +123,7 @@ var PlaneModel = /*#__PURE__*/function (_BaseModel) {
       if (this.mapTexture !== mapTexture) {
         var _this$texture;
         this.mapTexture = mapTexture;
-        (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
+        (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
         this.updateTexture(mapTexture);
       }
       return {
@@ -139,7 +139,7 @@ var PlaneModel = /*#__PURE__*/function (_BaseModel) {
       var _this$texture2;
       // @ts-ignore
       this.terrainImage = null;
-      (_this$texture2 = this.texture) === null || _this$texture2 === void 0 ? void 0 : _this$texture2.destroy();
+      (_this$texture2 = this.texture) === null || _this$texture2 === void 0 || _this$texture2.destroy();
     }
   }, {
     key: "initModels",

package/es/geometry/models/sprite.js

@@ -141,7 +141,7 @@ var SpriteModel = /*#__PURE__*/function (_BaseModel) {
       if (this.mapTexture !== mapTexture) {
         var _this$texture;
         this.mapTexture = mapTexture;
-        (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
+        (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
         this.updateTexture(mapTexture);
       }
       return {
@@ -156,7 +156,7 @@ var SpriteModel = /*#__PURE__*/function (_BaseModel) {
     value: function clearModels() {
       var _this$texture2;
       cancelAnimationFrame(this.timer);
-      (_this$texture2 = this.texture) === null || _this$texture2 === void 0 ? void 0 : _this$texture2.destroy();
+      (_this$texture2 = this.texture) === null || _this$texture2 === void 0 || _this$texture2.destroy();
     }
   }, {
     key: "initModels",

package/es/heatmap/index.js

@@ -92,7 +92,7 @@ var HeatMapLayer = /*#__PURE__*/function (_BaseLayer) {
         shape3d = _this$getLayerConfig.shape3d;
       var source = this.getSource();
       var sourceType = source.data.type;
-      var shape = (shapeAttribute === null || shapeAttribute === void 0 ? void 0 : (_shapeAttribute$scale = shapeAttribute.scale) === null || _shapeAttribute$scale === void 0 ? void 0 : _shapeAttribute$scale.field) || 'heatmap';
+      var shape = (shapeAttribute === null || shapeAttribute === void 0 || (_shapeAttribute$scale = shapeAttribute.scale) === null || _shapeAttribute$scale === void 0 ? void 0 : _shapeAttribute$scale.field) || 'heatmap';
       if (shape === 'heatmap' || shape === 'heatmap3d') {
         return 'heatmap';
       }

package/es/heatmap/models/heatmap.js

@@ -77,7 +77,7 @@ var HeatMapModel = (_dec = injectable(), _dec(_class = /*#__PURE__*/function (_B
             case 0:
               _this$rendererService2 = this.rendererService, createFramebuffer = _this$rendererService2.createFramebuffer, getViewportSize = _this$rendererService2.getViewportSize, createTexture2D = _this$rendererService2.createTexture2D;
               shapeAttr = this.styleAttributeService.getLayerStyleAttribute('shape');
-              shapeType = (shapeAttr === null || shapeAttr === void 0 ? void 0 : (_shapeAttr$scale = shapeAttr.scale) === null || _shapeAttr$scale === void 0 ? void 0 : _shapeAttr$scale.field) || 'heatmap';
+              shapeType = (shapeAttr === null || shapeAttr === void 0 || (_shapeAttr$scale = shapeAttr.scale) === null || _shapeAttr$scale === void 0 ? void 0 : _shapeAttr$scale.field) || 'heatmap';
               this.shapeType = shapeType;
               // 生成热力图密度图
               _context.next = 6;
@@ -266,7 +266,7 @@ var HeatMapModel = (_dec = injectable(), _dec(_class = /*#__PURE__*/function (_B
       this.layerService.beforeRenderData(this.layer);
       this.layer.hooks.beforeRender.call();
       // 绘制密度图
-      (_this$intensityModel = this.intensityModel) === null || _this$intensityModel === void 0 ? void 0 : _this$intensityModel.draw({
+      (_this$intensityModel = this.intensityModel) === null || _this$intensityModel === void 0 || _this$intensityModel.draw({
         uniforms: {
           u_opacity: opacity || 1.0,
           u_radius: radius,
@@ -300,7 +300,7 @@ var HeatMapModel = (_dec = injectable(), _dec(_class = /*#__PURE__*/function (_B
       var _this$colorModel;
       var _ref3 = this.layer.getLayerConfig(),
         opacity = _ref3.opacity;
-      (_this$colorModel = this.colorModel) === null || _this$colorModel === void 0 ? void 0 : _this$colorModel.draw({
+      (_this$colorModel = this.colorModel) === null || _this$colorModel === void 0 || _this$colorModel.draw({
         uniforms: {
           u_opacity: opacity || 1.0,
           u_colorTexture: this.colorTexture,
@@ -326,7 +326,7 @@ var HeatMapModel = (_dec = injectable(), _dec(_class = /*#__PURE__*/function (_B
       // ) as mat4;
       var invert = mat4.create();
       mat4.invert(invert, this.cameraService.getViewProjectionMatrixUncentered());
-      (_this$colorModel2 = this.colorModel) === null || _this$colorModel2 === void 0 ? void 0 : _this$colorModel2.draw({
+      (_this$colorModel2 = this.colorModel) === null || _this$colorModel2 === void 0 || _this$colorModel2.draw({
         uniforms: {
           u_opacity: opacity || 1.0,
           u_colorTexture: this.colorTexture,

package/es/image/models/image.js

@@ -89,7 +89,7 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
     key: "clearModels",
     value: function clearModels() {
       var _this$texture;
-      (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
+      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
     }
   }, {
     key: "buildModels",

package/es/line/index.js

@@ -100,7 +100,7 @@ var LineLayer = /*#__PURE__*/function (_BaseLayer) {
         return this.layerType;
       }
       var shapeAttribute = this.styleAttributeService.getLayerStyleAttribute('shape');
-      var shape = shapeAttribute === null || shapeAttribute === void 0 ? void 0 : (_shapeAttribute$scale = shapeAttribute.scale) === null || _shapeAttribute$scale === void 0 ? void 0 : _shapeAttribute$scale.field;
+      var shape = shapeAttribute === null || shapeAttribute === void 0 || (_shapeAttribute$scale = shapeAttribute.scale) === null || _shapeAttribute$scale === void 0 ? void 0 : _shapeAttribute$scale.field;
       return shape || 'line';
     }
   }, {

package/es/line/models/arc.js

@@ -155,7 +155,7 @@ var ArcModel = /*#__PURE__*/function (_BaseModel) {
     key: "clearModels",
     value: function clearModels() {
       var _this$texture;
-      (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
+      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
       this.iconService.off('imageUpdate', this.updateTexture);
     }
   }, {

package/es/line/models/arc_3d.js

@@ -153,7 +153,7 @@ var Arc3DModel = /*#__PURE__*/function (_BaseModel) {
     key: "clearModels",
     value: function clearModels() {
       var _this$texture;
-      (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
+      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
       this.iconService.off('imageUpdate', this.updateTexture);
     }
   }, {

package/es/line/models/earthArc_3d.js

@@ -153,7 +153,7 @@ var Arc3DModel = /*#__PURE__*/function (_BaseModel) {
     key: "clearModels",
     value: function clearModels() {
       var _this$texture;
-      (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
+      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
       this.iconService.off('imageUpdate', this.updateTexture);
     }
   }, {

package/es/line/models/great_circle.js

@@ -139,7 +139,7 @@ var GreatCircleModel = /*#__PURE__*/function (_BaseModel) {
     key: "clearModels",
     value: function clearModels() {
       var _this$texture;
-      (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
+      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
       this.iconService.off('imageUpdate', this.updateTexture);
     }
   }, {

package/es/line/models/line.js

@@ -180,7 +180,7 @@ var LineModel = /*#__PURE__*/function (_BaseModel) {
     key: "clearModels",
     value: function clearModels() {
       var _this$texture;
-      (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
+      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
       this.iconService.off('imageUpdate', this.updateTexture);
     }
   }, {

package/es/line/models/linearline.js

@@ -105,7 +105,7 @@ var LinearLineModel = /*#__PURE__*/function (_BaseModel) {
     key: "clearModels",
     value: function clearModels() {
       var _this$colorTexture;
-      (_this$colorTexture = this.colorTexture) === null || _this$colorTexture === void 0 ? void 0 : _this$colorTexture.destroy();
+      (_this$colorTexture = this.colorTexture) === null || _this$colorTexture === void 0 || _this$colorTexture.destroy();
     }
   }, {
     key: "buildModels",

package/es/line/models/wall.js

@@ -130,7 +130,7 @@ var LineWallModel = /*#__PURE__*/function (_BaseModel) {
     key: "clearModels",
     value: function clearModels() {
       var _this$texture;
-      (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
+      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
       this.iconService.off('imageUpdate', this.updateTexture);
     }
   }, {

package/es/plugins/DataMappingPlugin.js

@@ -254,7 +254,7 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
       if (!attribute.scale) {
         return [];
       }
-      var scalers = (attribute === null || attribute === void 0 ? void 0 : (_attribute$scale = attribute.scale) === null || _attribute$scale === void 0 ? void 0 : _attribute$scale.scalers) || [];
+      var scalers = (attribute === null || attribute === void 0 || (_attribute$scale = attribute.scale) === null || _attribute$scale === void 0 ? void 0 : _attribute$scale.scalers) || [];
       var params = [];
       scalers.forEach(function (_ref5) {
         var _attribute$scale2;

package/es/plugins/PixelPickingPlugin.d.ts

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