@antv/l7-layers 2.16.0 → 2.16.2

package/lib/core/BaseModel.js

@@ -8,7 +8,6 @@ exports.default = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _initializerDefineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/initializerDefineProperty"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -17,29 +16,20 @@ var _applyDecoratedDescriptor2 = _interopRequireDefault(require("@babel/runtime/
 var _initializerWarningHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/initializerWarningHelper"));
 var _l7Core = require("@antv/l7-core");
 var _l7Utils = require("@antv/l7-utils");
-var _d3Color = require("d3-color");
-var _lodash = require("lodash");
 var _blend = require("../utils/blend");
 var _stencil = require("../utils/stencil");
+var _CommonStyleAttribute = require("./CommonStyleAttribute");
 var _dec, _class, _descriptor;
-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; }
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigService), (_class = /*#__PURE__*/function () {
   // style texture data mapping
 
-  // 用于数据传递的数据纹理
-  // 默认有多少列（宽度）
-  // 计算得到的当前数据纹理有多少行（高度）
-
-  // 单个 cell 的长度
-  // 需要进行数据映射的属性集合
-
   // style texture data mapping
 
   function BaseModel(layer) {
     (0, _classCallCheck2.default)(this, BaseModel);
+    (0, _defineProperty2.default)(this, "preStyleAttribute", {});
+    (0, _defineProperty2.default)(this, "encodeStyleAttribute", {});
     (0, _initializerDefineProperty2.default)(this, "configService", _descriptor, this);
     this.layer = layer;
     this.rendererService = layer.getContainer().get(_l7Core.TYPES.IRendererService);
@@ -51,360 +41,19 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     this.fontService = layer.getContainer().get(_l7Core.TYPES.IFontService);
     this.cameraService = layer.getContainer().get(_l7Core.TYPES.ICameraService);
     this.layerService = layer.getContainer().get(_l7Core.TYPES.ILayerService);
+    // 初始化支持数据映射的 Style 属性
 
+    this.registerStyleAttribute();
     // 注册 Attribute
     this.registerBuiltinAttributes();
     // 开启动画
     this.startModelAnimate();
     var createTexture2D = this.rendererService.createTexture2D;
     this.createTexture2D = createTexture2D;
-    this.DATA_TEXTURE_WIDTH = 1024; // 数据纹理固定宽度
-    this.rowCount = 1;
-    this.cellLength = 0;
-    this.cellProperties = [];
-    this.cacheStyleProperties = {
-      thetaOffset: undefined,
-      opacity: undefined,
-      strokeOpacity: undefined,
-      strokeWidth: undefined,
-      stroke: undefined,
-      offsets: undefined
-    };
-    this.stylePropertiesExist = {
-      hasThetaOffset: 0,
-      hasOpacity: 0,
-      hasStrokeOpacity: 0,
-      hasStrokeWidth: 0,
-      hasStroke: 0,
-      hasOffsets: 0
-    };
-    this.dataTextureTest = this.layerService.getOESTextureFloat();
-    // 只有在不支持数据纹理的情况下进行赋值
-    if (!this.dataTextureTest) {
-      this.dataTexture = this.createTexture2D({
-        // data: new Uint8ClampedArray(4),
-        // 使用 Uint8ClampedArray 在 支付宝 环境中可能存在问题 UC 内核对格式有要求 L7 v2.7.18 版本发现
-        // Uint8ClampedArray 和 Uint8Array 没有实质性的区别
-        data: new Uint8Array(4),
-        mag: _l7Core.gl.NEAREST,
-        min: _l7Core.gl.NEAREST,
-        width: 1,
-        height: 1
-      });
-    }
   }
 
   // style datatexture mapping
-
-  /**
-   * 清除上一次的计算结果 - 全量清除
-   */
   (0, _createClass2.default)(BaseModel, [{
-    key: "clearLastCalRes",
-    value: function clearLastCalRes() {
-      this.cellProperties = []; // 清空上一次计算的需要进行数据映射的属性集合
-      this.cellLength = 0; // 清空上一次计算的 cell 的长度
-      this.stylePropertiesExist = {
-        // 全量清空上一次是否需要对 style 属性进行数据映射的判断
-        hasThetaOffset: 0,
-        hasOpacity: 0,
-        hasStrokeOpacity: 0,
-        hasStrokeWidth: 0,
-        hasStroke: 0,
-        hasOffsets: 0
-      };
-    }
-  }, {
-    key: "getCellTypeLayout",
-    value: function getCellTypeLayout() {
-      if (this.dataTextureTest) {
-        return [
-        // 0
-        this.rowCount,
-        // 数据纹理有几行
-        this.DATA_TEXTURE_WIDTH,
-        // 数据纹理有几列
-        0.0, 0.0,
-        // 1
-        this.stylePropertiesExist.hasOpacity,
-        // cell 中是否存在 opacity
-        this.stylePropertiesExist.hasStrokeOpacity,
-        // cell 中是否存在 strokeOpacity
-        this.stylePropertiesExist.hasStrokeWidth,
-        // cell 中是否存在 strokeWidth
-        this.stylePropertiesExist.hasStroke,
-        // cell 中是否存在 stroke
-        // 2
-        this.stylePropertiesExist.hasOffsets,
-        // cell 中是否存在 offsets
-        this.stylePropertiesExist.hasThetaOffset,
-        // cell 中是否存在 thetaOffset
-        0.0, 0.0,
-        // 3
-        0.0, 0.0, 0.0, 1.0];
-      } else {
-        return [1.0,
-        // 数据纹理有几行
-        1.0,
-        // 数据纹理有几列
-        0.0, 0.0, 0.0,
-        // cell 中是否存在 opacity
-        0.0,
-        // cell 中是否存在 strokeOpacity
-        0.0,
-        // cell 中是否存在 strokeWidth
-        0.0,
-        // cell 中是否存在 stroke
-        0.0,
-        // cell 中是否存在 offsets
-        0.0, 0.0, 0.0, 0.0, 0.0, 0.0, -1.0];
-      }
-    }
-
-    /**
-     * 判断数据纹理是否需要重新计算 - 根据传入的值进行判断
-     * @param options
-     * @returns
-     */
-  }, {
-    key: "dataTextureNeedUpdate",
-    value: function dataTextureNeedUpdate(options) {
-      var isUpdate = false;
-      if (!(0, _lodash.isEqual)(options.thetaOffset, this.cacheStyleProperties.thetaOffset)) {
-        isUpdate = true;
-        this.cacheStyleProperties.thetaOffset = options.thetaOffset;
-      }
-      if (!(0, _lodash.isEqual)(options.opacity, this.cacheStyleProperties.opacity)) {
-        isUpdate = true;
-        this.cacheStyleProperties.opacity = options.opacity;
-      }
-      if (!(0, _lodash.isEqual)(options.strokeOpacity, this.cacheStyleProperties.strokeOpacity)) {
-        isUpdate = true;
-        this.cacheStyleProperties.strokeOpacity = options.strokeOpacity;
-      }
-      if (!(0, _lodash.isEqual)(options.strokeWidth, this.cacheStyleProperties.strokeWidth)) {
-        isUpdate = true;
-        this.cacheStyleProperties.strokeWidth = options.strokeWidth;
-      }
-      if (!(0, _lodash.isEqual)(options.stroke, this.cacheStyleProperties.stroke)) {
-        isUpdate = true;
-        this.cacheStyleProperties.stroke = options.stroke;
-      }
-      if (!(0, _lodash.isEqual)(options.offsets, this.cacheStyleProperties.offsets)) {
-        isUpdate = true;
-        this.cacheStyleProperties.offsets = options.offsets;
-      }
-      if (this.dataTexture === undefined) {
-        isUpdate = true;
-      }
-      return isUpdate;
-    }
-    /**
-     * 判断当前的样式中哪些是需要进行数据映射的，哪些是常量，同时计算用于构建数据纹理的一些中间变量
-     * @param options
-     */
-  }, {
-    key: "judgeStyleAttributes",
-    value: function judgeStyleAttributes(options) {
-      this.clearLastCalRes(); // 清除上一次的计算结果 - 全量清除
-
-      if (options.opacity !== undefined && !(0, _lodash.isNumber)(options.opacity)) {
-        // 数据映射
-        this.cellProperties.push({
-          attr: 'opacity',
-          count: 1
-        });
-        this.stylePropertiesExist.hasOpacity = 1;
-        this.cellLength += 1;
-      }
-      if (options.strokeOpacity !== undefined && !(0, _lodash.isNumber)(options.strokeOpacity)) {
-        // 数据映射
-        this.cellProperties.push({
-          attr: 'strokeOpacity',
-          count: 1
-        });
-        this.stylePropertiesExist.hasStrokeOpacity = 1;
-        this.cellLength += 1;
-      }
-      if (options.strokeWidth !== undefined && !(0, _lodash.isNumber)(options.strokeWidth)) {
-        // 数据映射
-        this.cellProperties.push({
-          attr: 'strokeWidth',
-          count: 1
-        });
-        this.stylePropertiesExist.hasStrokeWidth = 1;
-        this.cellLength += 1;
-      }
-      if (options.stroke !== undefined && !this.isStaticColor(options.stroke)) {
-        // 数据映射
-        this.cellProperties.push({
-          attr: 'stroke',
-          count: 4
-        });
-        this.stylePropertiesExist.hasStroke = 1;
-        this.cellLength += 4;
-      }
-      if (options.offsets !== undefined && !this.isOffsetStatic(options.offsets)) {
-        // 数据映射
-        this.cellProperties.push({
-          attr: 'offsets',
-          count: 2
-        });
-        this.stylePropertiesExist.hasOffsets = 1;
-        this.cellLength += 2;
-      }
-      if (options.thetaOffset !== undefined && !(0, _lodash.isNumber)(options.thetaOffset)) {
-        // 数据映射
-        this.cellProperties.push({
-          attr: 'thetaOffset',
-          count: 1
-        });
-        this.stylePropertiesExist.hasThetaOffset = 1;
-        this.cellLength += 1;
-      }
-    }
-
-    /**
-     * 判断变量 stroke 是否是常量值
-     * @param stroke
-     * @returns
-     */
-  }, {
-    key: "isStaticColor",
-    value: function isStaticColor(stroke) {
-      if ((0, _lodash.isString)(stroke)) {
-        if ((0, _d3Color.color)(stroke)) {
-          return true;
-        } else {
-          return false;
-        }
-      }
-      return false;
-    }
-    /**
-     * 获取 stroke 颜色并做兼容处理
-     * @param stroke
-     * @returns
-     */
-  }, {
-    key: "getStrokeColor",
-    value: function getStrokeColor(stroke) {
-      if (this.isStaticColor(stroke)) {
-        var strokeColor = (0, _l7Utils.rgb2arr)(stroke);
-        strokeColor[0] = strokeColor[0] ? strokeColor[0] : 0;
-        strokeColor[1] = strokeColor[1] ? strokeColor[1] : 0;
-        strokeColor[2] = strokeColor[2] ? strokeColor[2] : 0;
-        strokeColor[3] = strokeColor[3] ? strokeColor[3] : 0;
-        return strokeColor;
-      } else {
-        return [0, 0, 0, 0];
-      }
-    }
-
-    /**
-     * 判断 offsets 是否是常量
-     * @param offsets
-     * @returns
-     */
-  }, {
-    key: "isOffsetStatic",
-    value: function isOffsetStatic(offsets) {
-      if (Array.isArray(offsets) && offsets.length === 2 && (0, _lodash.isNumber)(offsets[0]) && (0, _lodash.isNumber)(offsets[1])) {
-        return true;
-      } else {
-        return false;
-      }
-    }
-
-    /**
-     * 补空位
-     * @param d
-     * @param count
-     */
-  }, {
-    key: "patchMod",
-    value: function patchMod(d, count) {
-      for (var i = 0; i < count; i++) {
-        d.push(-1);
-      }
-    }
-
-    /**
-     * 根据映射的数据字段往推入数据
-     * @param d
-     * @param cellData
-     * @param cellPropertiesLayouts
-     */
-  }, {
-    key: "patchData",
-    value: function patchData(d, cellData, cellPropertiesLayouts) {
-      var _iterator = _createForOfIteratorHelper(cellPropertiesLayouts),
-        _step;
-      try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var layout = _step.value;
-          var attr = layout.attr,
-            count = layout.count;
-          var value = cellData[attr];
-          if (value !== undefined) {
-            // 数据中存在该属性
-            if (attr === 'stroke') {
-              d.push.apply(d, (0, _toConsumableArray2.default)((0, _l7Utils.rgb2arr)(value)));
-            } else if (attr === 'offsets') {
-              if (this.isOffsetStatic(value)) {
-                d.push(-value[0], value[1]);
-              } else {
-                d.push(0, 0);
-              }
-            } else {
-              d.push((0, _lodash.isNumber)(value) ? value : 1.0);
-            }
-          } else {
-            // 若不存在时则补位
-            this.patchMod(d, count);
-          }
-        }
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
-      }
-    }
-
-    /**
-     * 计算推入数据纹理的数据
-     * @param cellLength
-     * @param encodeData
-     * @param cellPropertiesLayouts
-     * @returns
-     */
-  }, {
-    key: "calDataFrame",
-    value: function calDataFrame(cellLength, encodeData, cellPropertiesLayouts) {
-      var encodeDatalength = encodeData.length;
-      var rowCount = Math.ceil(encodeDatalength * cellLength / this.DATA_TEXTURE_WIDTH); // 有多少行
-
-      var totalLength = rowCount * this.DATA_TEXTURE_WIDTH;
-      var d = [];
-      for (var i = 0; i < encodeDatalength; i++) {
-        // 根据 encodeData 数据推入数据
-        var cellData = encodeData[i];
-        this.patchData(d, cellData, cellPropertiesLayouts);
-      }
-      for (var _i = d.length; _i < totalLength; _i++) {
-        // 每行不足的部分用 -1 补足（数据纹理时 width * height 的矩形数据集合）
-        d.push(-1);
-      }
-      // console.log('data', d)
-      return {
-        data: d,
-        width: this.DATA_TEXTURE_WIDTH,
-        height: rowCount
-      };
-    }
-
-    // style datatexture mapping
-  }, {
     key: "getBlend",
     value: function getBlend() {
       var _this$layer$getLayerC = this.layer.getLayerConfig(),
@@ -553,6 +202,75 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
         this.layer.setAnimateStartTime();
       }
     }
+  }, {
+    key: "getInject",
+    value: function getInject() {
+      var encodeStyleAttribute = this.layer.encodeStyleAttribute;
+      var str = '';
+      var attrType = {
+        opacity: 'float',
+        stroke: 'vec4',
+        offsets: 'vec2',
+        textOffset: 'vec2'
+      };
+      this.layer.enableEncodeStyles.forEach(function (key) {
+        if (encodeStyleAttribute[key]) {
+          str += "#define USE_ATTRIBUTE_".concat(key.toUpperCase(), " 0.0; \n\n");
+        }
+        str += "\n      #ifdef USE_ATTRIBUTE_".concat(key.toUpperCase(), "\n  attribute ").concat(attrType[key], " a_").concat(key.charAt(0).toUpperCase() + key.slice(1), ";\n#else\n  uniform ").concat(attrType[key], " u_").concat(key, ";\n#endif\n\n");
+      });
+      var innerStr = '';
+      this.layer.enableEncodeStyles.forEach(function (key) {
+        innerStr += "\n\n#ifdef USE_ATTRIBUTE_".concat(key.toUpperCase(), "\n  ").concat(attrType[key], " ").concat(key, "  = a_").concat(key.charAt(0).toUpperCase() + key.slice(1), ";\n#else\n  ").concat(attrType[key], " ").concat(key, " = u_").concat(key, ";\n#endif\n\n");
+      });
+      return {
+        'vs:#decl': str,
+        'vs:#main-start': innerStr
+      };
+    }
+
+    // 获取数据映射样式
+  }, {
+    key: "getStyleAttribute",
+    value: function getStyleAttribute() {
+      var _this = this;
+      var options = {};
+      // TODO: 优化
+
+      var defualtValue = {
+        opacity: 1,
+        stroke: [1, 0, 0, 1],
+        offsets: [0, 0]
+      };
+      this.layer.enableEncodeStyles.forEach(function (key) {
+        if (!_this.layer.encodeStyleAttribute[key]) {
+          // @ts-ignore
+          var value = _this.layer.getLayerConfig()[key] || defualtValue[key];
+          if (key === 'stroke') {
+            value = (0, _l7Utils.rgb2arr)(value);
+          }
+          options['u_' + key] = value;
+        }
+      });
+      return options;
+    }
+    // 注册数据映射样式
+  }, {
+    key: "registerStyleAttribute",
+    value: function registerStyleAttribute() {
+      var _this2 = this;
+      Object.keys(this.layer.encodeStyleAttribute).forEach(function (key) {
+        var options = (0, _CommonStyleAttribute.getCommonStyleAttributeOptions)(key);
+        if (options) {
+          _this2.styleAttributeService.registerStyleAttribute(options);
+        }
+      });
+    }
+  }, {
+    key: "updateEncodeAttribute",
+    value: function updateEncodeAttribute(type, flag) {
+      this.encodeStyleAttribute[type] = flag;
+    }
   }]);
   return BaseModel;
 }(), (_descriptor = (0, _applyDecoratedDescriptor2.default)(_class.prototype, "configService", [_dec], {

package/lib/core/CommonStyleAttribute.js

@@ -0,0 +1,72 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getCommonStyleAttributeOptions = getCommonStyleAttributeOptions;
+var _l7Core = require("@antv/l7-core");
+function getCommonStyleAttributeOptions(name) {
+  switch (name) {
+    case 'stroke':
+      return {
+        name: 'stroke',
+        type: _l7Core.AttributeType.Attribute,
+        descriptor: {
+          name: 'a_Stroke',
+          buffer: {
+            // give the WebGL driver a hint that this buffer may change
+            usage: _l7Core.gl.DYNAMIC_DRAW,
+            data: [],
+            type: _l7Core.gl.FLOAT
+          },
+          size: 4,
+          update: function update(feature) {
+            var _feature$stroke = feature.stroke,
+              stroke = _feature$stroke === void 0 ? [1, 1, 1, 1] : _feature$stroke;
+            return stroke;
+          }
+        }
+      };
+    case 'opacity':
+      return {
+        name: 'opacity',
+        type: _l7Core.AttributeType.Attribute,
+        descriptor: {
+          name: 'a_Opacity',
+          buffer: {
+            // give the WebGL driver a hint that this buffer may change
+            usage: _l7Core.gl.STATIC_DRAW,
+            data: [],
+            type: _l7Core.gl.FLOAT
+          },
+          size: 1,
+          update: function update(feature) {
+            var _feature$opacity = feature.opacity,
+              op = _feature$opacity === void 0 ? 1 : _feature$opacity;
+            return [op];
+          }
+        }
+      };
+    case 'offsets':
+      return {
+        name: 'offsets',
+        type: _l7Core.AttributeType.Attribute,
+        descriptor: {
+          name: 'a_Offsets',
+          buffer: {
+            // give the WebGL driver a hint that this buffer may change
+            usage: _l7Core.gl.STATIC_DRAW,
+            data: [],
+            type: _l7Core.gl.FLOAT
+          },
+          size: 2,
+          update: function update(feature) {
+            var epo = feature.offsets;
+            return epo;
+          }
+        }
+      };
+    default:
+      return undefined;
+  }
+}

package/lib/core/shape/extrude.js

@@ -82,15 +82,22 @@ function extrude_PolygonNormal(path) {
   var normals = [];
   // 设置顶部z值 position uv
   for (var j = 0; j < vertices.length / dimensions; j++) {
-    if (dimensions === 2) {
-      positions.push(vertices[j * 2], vertices[j * 2 + 1], 1, -1, -1);
-    } else {
-      positions.push(vertices[j * 3], vertices[j * 3 + 1], 1, -1, -1);
-    }
+    positions.push(vertices[j * dimensions],
+    // x
+    vertices[j * dimensions + 1],
+    // y
+    1,
+    // z
+    -1,
+    // 顶部uv
+    -1 // 顶部uv
+    );
+
     normals.push(0, 0, 1);
   }
   var triangles = (0, _earcut.default)(flattengeo.vertices, flattengeo.holes, flattengeo.dimensions);
   indexArray.push.apply(indexArray, (0, _toConsumableArray2.default)(triangles));
+  // 设置侧面
   var _loop2 = function _loop2() {
     var prePoint = flattengeo.vertices.slice(i * dimensions, (i + 1) * dimensions);
     var nextPoint = flattengeo.vertices.slice((i + 1) * dimensions, (i + 2) * dimensions);
@@ -98,7 +105,12 @@ function extrude_PolygonNormal(path) {
       nextPoint = flattengeo.vertices.slice(0, dimensions);
     }
     var indexOffset = positions.length / 5;
-    positions.push(prePoint[0], prePoint[1], 1, 0, 0, nextPoint[0], nextPoint[1], 1, 0.1, 0, prePoint[0], prePoint[1], 0, 0, 0.8, nextPoint[0], nextPoint[1], 0, 0.1, 0.8);
+    // 侧面四顶点
+    positions.push(prePoint[0], prePoint[1], 1, 0, 0, nextPoint[0], nextPoint[1], 1, 0.1,
+    // 侧面 低uv
+    0,
+    // 侧面低 uv
+    prePoint[0], prePoint[1], 0, 0, 0.8, nextPoint[0], nextPoint[1], 0, 0.1, 0.8);
     var normal = computeVertexNormals([nextPoint[0], nextPoint[1], 1], [prePoint[0], prePoint[1], 0], [prePoint[0], prePoint[1], 1], needFlat);
     normals.push.apply(normals, (0, _toConsumableArray2.default)(normal).concat((0, _toConsumableArray2.default)(normal), (0, _toConsumableArray2.default)(normal), (0, _toConsumableArray2.default)(normal)));
     indexArray.push.apply(indexArray, (0, _toConsumableArray2.default)([1, 2, 0, 3, 2, 1].map(function (v) {

package/lib/core/triangulation.js

@@ -5,6 +5,8 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.FlowLineFillTriangulation = FlowLineFillTriangulation;
+exports.FlowLineStrokeTriangulation = FlowLineStrokeTriangulation;
 exports.GlobelPointFillTriangulation = GlobelPointFillTriangulation;
 exports.HeatmapGridTriangulation = HeatmapGridTriangulation;
 exports.HeatmapTriangulation = HeatmapTriangulation;
@@ -149,6 +151,76 @@ function LineTriangulation(feature) {
     size: 6
   };
 }
+function FlowLineFillTriangulation(feature) {
+  // @ts-ignore
+  var coord = feature.coordinates.flat();
+  var tin = 1;
+  var tout = 1.0;
+  return {
+    vertices: [1, 0, 0].concat((0, _toConsumableArray2.default)(coord), [
+    // 0
+    1, 2, -3], (0, _toConsumableArray2.default)(coord), [
+    // 1
+    1, 1, -3], (0, _toConsumableArray2.default)(coord), [
+    // 2
+    0, 1, 0], (0, _toConsumableArray2.default)(coord), [
+    // 3
+    0, 0, 0], (0, _toConsumableArray2.default)(coord), [
+    // 4
+    1, 0, 0], (0, _toConsumableArray2.default)(coord), [
+    // 0
+    1, 2, -3], (0, _toConsumableArray2.default)(coord), [
+    // 1
+    1, 1, -3], (0, _toConsumableArray2.default)(coord), [
+    // 2
+    0, 1, 0], (0, _toConsumableArray2.default)(coord), [
+    // 3
+    0, 0, 0], (0, _toConsumableArray2.default)(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
+  };
+}
+function FlowLineStrokeTriangulation(feature) {
+  // @ts-ignore
+  var coord = feature.coordinates.flat();
+  var tin = 1;
+  var tout = 1;
+  return {
+    vertices: [1, 0, 0].concat((0, _toConsumableArray2.default)(coord), [
+    // 0
+    1, 2, -3], (0, _toConsumableArray2.default)(coord), [
+    // 1
+    1, 1, -3], (0, _toConsumableArray2.default)(coord), [
+    // 2
+    0, 1, 0], (0, _toConsumableArray2.default)(coord), [
+    // 3
+    0, 0, 0], (0, _toConsumableArray2.default)(coord)),
+    normals: [-tin, 2 * tout, 1,
+    // 0
+    2 * tout, -tout, 1,
+    // 1
+    tout, -tout, 1,
+    // 2
+    tout, -tout, 1,
+    // 3
+    -tin, -tout, 1 // 4
+    ],
+
+    indices: [0, 1, 1, 2, 2, 3, 3, 4, 4, 0],
+    size: 7
+  };
+}
 function SimpleLineTriangulation(feature) {
   var coordinates = feature.coordinates;
   var pos = [];

package/lib/heatmap/models/grid.js

@@ -18,7 +18,7 @@ var _triangulation = require("../../core/triangulation");
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(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; } }
 /* babel-plugin-inline-import '../shaders/grid_vert.glsl' */
-var heatmapGridVert = "precision highp float;\r\n// \u591A\u8FB9\u5F62\u9876\u70B9\u5750\u6807\r\nattribute vec3 a_Position;\r\n// \u591A\u8FB9\u5F62\u7ECF\u7EAC\u5EA6\u5750\u6807\r\nattribute vec3 a_Pos;\r\nattribute float a_Size;\r\nattribute vec4 a_Color;\r\nuniform vec2 u_radius;\r\nuniform float u_coverage: 0.9;\r\nuniform float u_angle: 0;\r\nuniform mat4 u_ModelMatrix;\r\nuniform mat4 u_Mvp;\r\nvarying vec4 v_color;\r\n\r\nuniform vec2 u_SceneCenterMKT;\r\n\r\n#pragma include \"projection\"\r\n#pragma include \"project\"\r\n#pragma include \"picking\"\r\n\r\nvoid main() {\r\n  v_color = a_Color;\r\n\r\n  mat2 rotationMatrix = mat2(cos(u_angle), sin(u_angle), -sin(u_angle), cos(u_angle));\r\n  vec2 offset = a_Position.xy * u_radius * rotationMatrix * u_coverage ;\r\n  // vec2 lnglat = unProjectFlat(a_Pos.xy + offset);\r\n  // vec4 project_pos = project_position(vec4(lnglat, 0, 1.0));\r\n  // gl_Position = project_common_position_to_clipspace(project_pos);\r\n\r\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\r\n    vec2 lnglat = unProjectFlat(a_Pos.xy + offset);\r\n    vec2 customLnglat = customProject(lnglat) - u_SceneCenterMKT; // \u5C06\u7ECF\u7EAC\u5EA6\u8F6C\u6362\u4E3A\u9AD8\u5FB72.0\u9700\u8981\u7684\u5E73\u9762\u5750\u6807\r\n    vec4 project_pos = project_position(vec4(customLnglat, 0, 1.0));\r\n    gl_Position = u_Mvp * (project_pos);\r\n  } else {\r\n     vec2 lnglat = unProjectFlat(a_Pos.xy + offset);\r\n    vec4 project_pos = project_position(vec4(lnglat, 0, 1.0));\r\n    gl_Position = project_common_position_to_clipspace(project_pos);\r\n  }\r\n\r\n  setPickingColor(a_PickingColor);\r\n}\r\n";
+var heatmapGridVert = "precision highp float;\r\n// \u591A\u8FB9\u5F62\u9876\u70B9\u5750\u6807\r\nattribute vec3 a_Position;\r\n// \u591A\u8FB9\u5F62\u7ECF\u7EAC\u5EA6\u5750\u6807\r\nattribute vec3 a_Pos;\r\nattribute float a_Size;\r\nattribute vec4 a_Color;\r\nuniform vec2 u_radius;\r\nuniform float u_coverage: 0.9;\r\nuniform float u_angle: 0;\r\nuniform mat4 u_ModelMatrix;\r\nuniform mat4 u_Mvp;\r\nvarying vec4 v_color;\r\n\r\nuniform vec2 u_sceneCenterMercator;\r\n\r\n#pragma include \"projection\"\r\n#pragma include \"project\"\r\n#pragma include \"picking\"\r\n\r\nvoid main() {\r\n  v_color = a_Color;\r\n\r\n  mat2 rotationMatrix = mat2(cos(u_angle), sin(u_angle), -sin(u_angle), cos(u_angle));\r\n  vec2 offset = a_Position.xy * u_radius * rotationMatrix * u_coverage ;\r\n  // vec2 lnglat = unProjectFlat(a_Pos.xy + offset);\r\n  // vec4 project_pos = project_position(vec4(lnglat, 0, 1.0));\r\n  // gl_Position = project_common_position_to_clipspace(project_pos);\r\n\r\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\r\n    vec2 lnglat = unProjectFlat(a_Pos.xy + offset);\r\n    vec2 customLnglat = customProject(lnglat) - u_sceneCenterMercator; // \u5C06\u7ECF\u7EAC\u5EA6\u8F6C\u6362\u4E3A\u9AD8\u5FB72.0\u9700\u8981\u7684\u5E73\u9762\u5750\u6807\r\n    vec4 project_pos = project_position(vec4(customLnglat, 0, 1.0));\r\n    gl_Position = u_Mvp * (project_pos);\r\n  } else {\r\n     vec2 lnglat = unProjectFlat(a_Pos.xy + offset);\r\n    vec4 project_pos = project_position(vec4(lnglat, 0, 1.0));\r\n    gl_Position = project_common_position_to_clipspace(project_pos);\r\n  }\r\n\r\n  setPickingColor(a_PickingColor);\r\n}\r\n";
 /* babel-plugin-inline-import '../shaders/hexagon_frag.glsl' */
 var heatmapGridFrag = "precision highp float;\nvarying vec4 v_color;\nuniform float u_opacity: 1;\n\n#pragma include \"picking\"\n\nvoid main() {\n  gl_FragColor = v_color;\n  gl_FragColor.a *= u_opacity;\n\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
 var GridModel = /*#__PURE__*/function (_BaseModel) {