@antv/l7-layers 2.19.10 → 2.20.0

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

@@ -13,7 +13,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", "inject", "triangulation", "segmentNumber"];
+  _excluded2 = ["moduleName", "vertexShader", "fragmentShader", "inject", "triangulation", "styleOption"];
 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; } } }; }
@@ -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)
       };
     }
@@ -1157,11 +1163,11 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     value: function () {
       var _buildLayerModel = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(options) {
         var _this10 = this;
-        var moduleName, vertexShader, fragmentShader, inject, triangulation, segmentNumber, rest, _this$shaderModuleSer, vs, fs, uniforms, createModel;
+        var moduleName, vertexShader, fragmentShader, inject, triangulation, styleOption, 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, inject = options.inject, triangulation = options.triangulation, segmentNumber = options.segmentNumber, rest = _objectWithoutProperties(options, _excluded2);
+              moduleName = options.moduleName, vertexShader = options.vertexShader, fragmentShader = options.fragmentShader, inject = options.inject, triangulation = options.triangulation, styleOption = options.styleOption, rest = _objectWithoutProperties(options, _excluded2);
               this.shaderModuleService.registerModule(moduleName, {
                 vs: vertexShader,
                 fs: fragmentShader,
@@ -1170,8 +1176,7 @@ 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, segmentNumber),
+                var _this10$styleAttribut = _this10.styleAttributeService.createAttributesAndIndices(_this10.encodedData, triangulation, styleOption),
                   attributes = _this10$styleAttribut.attributes,
                   elements = _this10$styleAttribut.elements,
                   count = _this10$styleAttribut.count;
@@ -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/core/interface.d.ts

@@ -5,12 +5,6 @@ export declare enum lineStyleType {
     'solid' = 0,
     'dash' = 1
 }
-interface ILineArrow {
-    enable: boolean;
-    arrowWidth: number;
-    arrowHeight: number;
-    tailWidth: number;
-}
 export declare enum LinearDir {
     VERTICAL = "vertical",
     HORIZONTAL = "horizontal"
@@ -31,7 +25,6 @@ export interface IBaseLayerStyleOptions {
     zIndex?: number;
     mask?: boolean;
     maskInside?: boolean;
-    usage?: string;
     color?: string;
     size?: number;
 }
@@ -57,7 +50,7 @@ export interface ILineLayerStyleOptions extends IBaseLayerStyleOptions {
     strokeWidth?: number;
     storke?: string;
     blur?: [number, number, number];
-    arrow?: ILineArrow;
+    symbol?: ILineSymbol;
     rampColors?: IColorRamp;
     featureId?: string;
     sourceLayer?: string;
@@ -233,15 +226,26 @@ export interface IRasterTerrainLayerStyleOptions extends IBaseRasterLayerStyleOp
     bScaler?: number;
     offset?: number;
 }
+export type ArrowType = 'circle' | 'triangle' | 'rect' | 'diamond' | 'classic' | 'halfTriangle' | 'none';
+export interface IArrowOptions {
+    type: ArrowType;
+    width?: number;
+    height?: number;
+    radius?: number;
+}
+export interface ILineSymbol {
+    source: ArrowType | IArrowOptions;
+    target: ArrowType | IArrowOptions;
+}
 export interface IFlowLineStyleOptions extends IBaseLayerStyleOptions {
     gapWidth?: number;
     offsets?: [number, number];
     stroke?: string;
     strokeOpacity?: number;
     strokeWidth?: number;
+    symbol?: ILineSymbol;
 }
 export interface IStyleEncodeAttributeOptions {
     field: StyleAttributeField;
     values?: StyleAttributeOption;
 }
-export {};

package/es/core/line_trangluation.d.ts

@@ -0,0 +1,19 @@
+import { IEncodeFeature } from '@antv/l7-core';
+export declare function FlowHalfArrowFillTriangulation(feature: IEncodeFeature): {
+    vertices: number[];
+    normals: number[];
+    indices: number[];
+    size: number;
+};
+export declare function FlowLineTriangulation(feature: IEncodeFeature, symbolOption?: unknown): {
+    vertices: number[];
+    normals: number[];
+    indices: number[];
+    size: number;
+};
+export declare function ArrowLineTriangulation(feature: IEncodeFeature, symbolOption?: unknown): {
+    vertices: number[];
+    indices: number[];
+    normals: number[];
+    size: number;
+};

package/es/core/line_trangluation.js

@@ -0,0 +1,91 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import { getSymbol, lineArrowPath } from "./shape/arrow";
+
+// list all arrow shape
+
+// Half Edge
+export function FlowHalfArrowFillTriangulation(feature) {
+  // @ts-ignore
+  var coord = feature.coordinates.flat();
+  var tin = 1;
+  var tout = 1.0;
+  return {
+    vertices: [1, 0, 0].concat(_toConsumableArray(coord), [
+    // 0
+    1, 2, -3], _toConsumableArray(coord), [
+    // 1
+    1, 1, -3], _toConsumableArray(coord), [
+    // 2
+    0, 1, 0], _toConsumableArray(coord), [
+    // 3
+    0, 0, 0], _toConsumableArray(coord), [
+    // 4
+    1, 0, 0], _toConsumableArray(coord), [
+    // 0
+    1, 2, -3], _toConsumableArray(coord), [
+    // 1
+    1, 1, -3], _toConsumableArray(coord), [
+    // 2
+    0, 1, 0], _toConsumableArray(coord), [
+    // 3
+    0, 0, 0], _toConsumableArray(coord)),
+    normals: [-tin, 2 * tout, 1,
+    // 0
+    2 * tout, -tout, 1,
+    // 1
+    tout, -tout, 1,
+    // 2
+    tout, -tout, 1,
+    // 3
+    -tin, -tout, 1,
+    // 4
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    indices: [0, 1, 2, 0, 2, 3, 0, 3, 4, 5, 6, 7, 5, 7, 8, 5, 8, 9],
+    size: 7
+  };
+}
+export function FlowLineTriangulation(feature, symbolOption) {
+  return symbolOption ? ArrowLineTriangulation(feature, symbolOption) : FlowHalfArrowFillTriangulation(feature);
+}
+export function ArrowLineTriangulation(feature, symbolOption) {
+  // @ts-ignore
+  var coord = feature.coordinates.flat();
+  var _ref = symbolOption,
+    _ref$target = _ref.target,
+    target = _ref$target === void 0 ? 'classic' : _ref$target,
+    _ref$source = _ref.source,
+    source = _ref$source === void 0 ? 'circle' : _ref$source;
+  var startSymbol = shape2Vertices(getSymbol(source, 'source'), coord, 0, 0);
+  var linePath = lineArrowPath(coord, startSymbol.vertices.length / 7, symbolOption);
+  var endSymbol = shape2Vertices(getSymbol(target, 'target'), coord, 1, startSymbol.vertices.length / 7 + linePath.vertices.length / 7);
+  var data = {
+    vertices: [].concat(_toConsumableArray(startSymbol.vertices), _toConsumableArray(linePath.vertices), _toConsumableArray(endSymbol.vertices)),
+    indices: [].concat(_toConsumableArray(startSymbol.outLineIndices), _toConsumableArray(linePath.outLineIndices), _toConsumableArray(endSymbol.outLineIndices), _toConsumableArray(startSymbol.indices), _toConsumableArray(linePath.indices), _toConsumableArray(endSymbol.indices)),
+    normals: [].concat(_toConsumableArray(startSymbol.normals), _toConsumableArray(linePath.normals), _toConsumableArray(endSymbol.normals)),
+    size: 7
+  };
+  return data;
+}
+// start 0,end 1;
+function shape2Vertices(shape, coord) {
+  var type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+  var indexOffset = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
+  var shapeVertices = [];
+  var vertices = shape.vertices,
+    indices = shape.indices,
+    dimensions = shape.dimensions,
+    outLineIndices = shape.outLineIndices;
+  for (var i = 0; i < vertices.length; i += dimensions) {
+    shapeVertices.push.apply(shapeVertices, [type, vertices[i + 1], vertices[i]].concat(_toConsumableArray(coord)));
+  }
+  return _objectSpread(_objectSpread({}, shape), {}, {
+    vertices: shapeVertices,
+    indices: indices.map(function (i) {
+      return i + indexOffset;
+    }),
+    outLineIndices: outLineIndices.map(function (i) {
+      return i + indexOffset;
+    })
+  });
+}

package/es/core/shape/arrow.d.ts

@@ -0,0 +1,25 @@
+import { ArrowType, IArrowOptions, ILineSymbol } from '../interface';
+export interface IArrowData {
+    vertices: number[];
+    indices: number[];
+    outLineIndices: number[];
+    dimensions: number;
+    offset?: number[];
+    normals: number[];
+}
+export type arrowPosition = -1 | 1;
+export declare function halfTriangleArrow(dir: arrowPosition, options: IArrowOptions): IArrowData;
+export declare function triangleArrow(dir: arrowPosition, options: IArrowOptions): IArrowData;
+export declare function rectArrow(dir: arrowPosition, options: IArrowOptions): IArrowData;
+export declare function diamondArrow(dir: arrowPosition, options: IArrowOptions): IArrowData;
+export declare function classicArrow(dir: arrowPosition, options: IArrowOptions): IArrowData;
+export declare function circleArraw(dir: arrowPosition, options: IArrowOptions): IArrowData;
+export declare function lineArrowPath(coord: number[], indexOffset: number | undefined, symbol: ILineSymbol): IArrowData;
+export declare function getSymbol(type: ArrowType | IArrowOptions, position: 'source' | 'target'): IArrowData | {
+    vertices: never[];
+    indices: never[];
+    normals: never[];
+    dimensions: number;
+    outLineIndices: never[];
+    outLineNormals: never[];
+};