@antv/l7-layers 2.21.1 → 2.21.2

package/lib/core/shape/arrow.js

@@ -12,11 +12,9 @@ exports.halfTriangleArrow = halfTriangleArrow;
 exports.lineArrowPath = lineArrowPath;
 exports.rectArrow = rectArrow;
 exports.triangleArrow = triangleArrow;
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _Path = require("./Path");
 var _earcut = _interopRequireDefault(require("earcut"));
-var maxArrowWidthMap = {
+const maxArrowWidthMap = {
   circle: 2,
   triangle: 2,
   diamond: 4,
@@ -25,12 +23,12 @@ var maxArrowWidthMap = {
   halfTriangle: 2,
   'none': 0
 };
-var PathHeight = 1 / 2;
+const PathHeight = 1 / 2;
 function halfTriangleArrow(dir, options) {
-  var _options$width = options.width,
-    width = _options$width === void 0 ? 2 : _options$width,
-    _options$height = options.height,
-    height = _options$height === void 0 ? 1 : _options$height;
+  const {
+    width = 2,
+    height = 1
+  } = options;
   return {
     vertices: [0, PathHeight * dir, 1 * dir * width, -(height + PathHeight) * dir, 1 * dir * width, (height - PathHeight) * dir, 0, PathHeight * dir, 1 * dir * width, -(height + PathHeight) * dir, 1 * dir * width, (height - PathHeight) * dir],
     indices: [3, 4, 5],
@@ -42,10 +40,10 @@ function halfTriangleArrow(dir, options) {
   };
 }
 function triangleArrow(dir, options) {
-  var _options$width2 = options.width,
-    width = _options$width2 === void 0 ? 2 : _options$width2,
-    _options$height2 = options.height,
-    height = _options$height2 === void 0 ? 3 : _options$height2;
+  const {
+    width = 2,
+    height = 3
+  } = options;
   return {
     vertices: [0, 0, 1 * dir * width, 1 * height, 1 * dir * width, -1 * height, 0, 0, 1 * dir * width, 1 * height, 1 * dir * width, -1 * height],
     outLineIndices: [0, 1, 2],
@@ -55,10 +53,10 @@ function triangleArrow(dir, options) {
   };
 }
 function rectArrow(dir, options) {
-  var _options$width3 = options.width,
-    width = _options$width3 === void 0 ? 2 : _options$width3,
-    _options$height3 = options.height,
-    height = _options$height3 === void 0 ? 2 : _options$height3;
+  const {
+    width = 2,
+    height = 2
+  } = options;
   return {
     vertices: [0, height / 2, dir * width * 1, height / 2, dir * width * 1, -height / 2, 0, -height / 2, 0, height / 2, dir * width * 1, height / 2, dir * width * 1, -height / 2, 0, -height / 2],
     dimensions: 2,
@@ -68,10 +66,10 @@ function rectArrow(dir, options) {
   };
 }
 function diamondArrow(dir, options) {
-  var _options$width4 = options.width,
-    width = _options$width4 === void 0 ? 2 : _options$width4,
-    _options$height4 = options.height,
-    height = _options$height4 === void 0 ? 3 : _options$height4;
+  const {
+    width = 2,
+    height = 3
+  } = options;
   return {
     vertices: [0, 0, 1 * width * dir, 0.5 * height, 2 * width * dir, 0, 1 * width * dir, -0.5 * height, 0, 0, 1 * width * dir, 0.5 * height, 2 * width * dir, 0, 1 * width * dir, -0.5 * height],
     dimensions: 2,
@@ -81,10 +79,10 @@ function diamondArrow(dir, options) {
   };
 }
 function classicArrow(dir, options) {
-  var _options$width5 = options.width,
-    width = _options$width5 === void 0 ? 2 : _options$width5,
-    _options$height5 = options.height,
-    height = _options$height5 === void 0 ? 3 : _options$height5;
+  const {
+    width = 2,
+    height = 3
+  } = options;
   return {
     vertices: [0, 0, 2 * dir * width, 1 * height, 1.5 * dir * width, 0, 2 * dir * width, -1 * height, 0, 0, 2 * dir * width, 1 * height, 1.5 * dir * width, 0, 2 * dir * width, -1 * height],
     dimensions: 2,
@@ -94,56 +92,46 @@ function classicArrow(dir, options) {
   };
 }
 function circleArraw(dir, options) {
-  var _options$width6 = options.width,
-    width = _options$width6 === void 0 ? 2 : _options$width6,
-    _options$height6 = options.height,
-    height = _options$height6 === void 0 ? 2 : _options$height6;
-  var path = (0, _Path.circle)();
-  var flattengeo = _earcut.default.flatten([path]);
-  var triangles = (0, _earcut.default)(flattengeo.vertices, flattengeo.holes, flattengeo.dimensions);
+  const {
+    width = 2,
+    height = 2
+  } = options;
+  const path = (0, _Path.circle)();
+  const flattengeo = _earcut.default.flatten([path]);
+  const triangles = (0, _earcut.default)(flattengeo.vertices, flattengeo.holes, flattengeo.dimensions);
   // @ts-ignore
-  var vertice = path.map(function (t) {
-    return [t[0] * width * dir, t[1] * height];
-  }).flat();
+  const vertice = path.map(t => [t[0] * width * dir, t[1] * height]).flat();
   return {
-    vertices: [].concat((0, _toConsumableArray2.default)(vertice), (0, _toConsumableArray2.default)(vertice)),
+    vertices: [...vertice, ...vertice],
     dimensions: 2,
-    indices: triangles.map(function (v) {
-      return v + path.length;
-    }),
+    indices: triangles.map(v => v + path.length),
     outLineIndices: triangles,
-    normals: [].concat((0, _toConsumableArray2.default)(path.map(function (t) {
-      return [t[1] * height, t[0] * width * dir, 1];
-    }).flat()), (0, _toConsumableArray2.default)(new Array(path.length * 3).fill(0)))
+    normals: [
+    // @ts-ignore
+    ...path.map(t => [t[1] * height, t[0] * width * dir, 1]).flat(), ...new Array(path.length * 3).fill(0)]
   };
 }
-function lineArrowPath(coord) {
-  var indexOffset = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
-  var symbol = arguments.length > 2 ? arguments[2] : undefined;
-  var sourceType = (0, _typeof2.default)(symbol['source']) === 'object' ? symbol['source'].type : symbol['source'];
-  var targetType = (0, _typeof2.default)(symbol['target']) === 'object' ? symbol['target'].type : symbol['target'];
-  var _ref = (0, _typeof2.default)(symbol['source']) === 'object' ? symbol['source'] : {},
-    _ref$width = _ref.width,
-    sourceWidth = _ref$width === void 0 ? sourceType ? maxArrowWidthMap[sourceType] : 0 : _ref$width;
-  var _ref2 = (0, _typeof2.default)(symbol['target']) === 'object' ? symbol['target'] : {},
-    _ref2$width = _ref2.width,
-    targetWidth = _ref2$width === void 0 ? targetType ? maxArrowWidthMap[targetType] : 0 : _ref2$width;
+function lineArrowPath(coord, indexOffset = 0, symbol) {
+  const sourceType = typeof symbol['source'] === 'object' ? symbol['source'].type : symbol['source'];
+  const targetType = typeof symbol['target'] === 'object' ? symbol['target'].type : symbol['target'];
+  const {
+    width: sourceWidth = sourceType ? maxArrowWidthMap[sourceType] : 0
+  } = typeof symbol['source'] === 'object' ? symbol['source'] : {};
+  const {
+    width: targetWidth = targetType ? maxArrowWidthMap[targetType] : 0
+  } = typeof symbol['target'] === 'object' ? symbol['target'] : {};
   return {
-    vertices: [0, PathHeight, 1 * sourceWidth].concat((0, _toConsumableArray2.default)(coord), [1, PathHeight, -1 * targetWidth], (0, _toConsumableArray2.default)(coord), [1, -PathHeight, -1 * targetWidth], (0, _toConsumableArray2.default)(coord), [0, -PathHeight, 1 * sourceWidth], (0, _toConsumableArray2.default)(coord), [0, PathHeight, 1 * sourceWidth], (0, _toConsumableArray2.default)(coord), [1, PathHeight, -1 * targetWidth], (0, _toConsumableArray2.default)(coord), [1, -PathHeight, -1 * targetWidth], (0, _toConsumableArray2.default)(coord), [0, -PathHeight, 1 * sourceWidth], (0, _toConsumableArray2.default)(coord)),
-    outLineIndices: [0, 1, 2, 0, 2, 3].map(function (t) {
-      return t + indexOffset;
-    }),
-    indices: [4, 5, 6, 4, 6, 7].map(function (t) {
-      return t + indexOffset;
-    }),
+    vertices: [0, PathHeight, 1 * sourceWidth, ...coord, 1, PathHeight, -1 * targetWidth, ...coord, 1, -PathHeight, -1 * targetWidth, ...coord, 0, -PathHeight, 1 * sourceWidth, ...coord, 0, PathHeight, 1 * sourceWidth, ...coord, 1, PathHeight, -1 * targetWidth, ...coord, 1, -PathHeight, -1 * targetWidth, ...coord, 0, -PathHeight, 1 * sourceWidth, ...coord],
+    outLineIndices: [0, 1, 2, 0, 2, 3].map(t => t + indexOffset),
+    indices: [4, 5, 6, 4, 6, 7].map(t => t + indexOffset),
     normals: [1, -1, 1, 1, 1, 1, -1, 0, 1, -1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
     dimensions: 2
   };
 }
 function getSymbol(type, position) {
-  var shape = (0, _typeof2.default)(type) === 'object' ? type.type : type;
-  var dir = position === 'source' ? 1 : -1;
-  var option = (0, _typeof2.default)(type) === 'object' ? type : {};
+  const shape = typeof type === 'object' ? type.type : type;
+  const dir = position === 'source' ? 1 : -1;
+  const option = typeof type === 'object' ? type : {};
   switch (shape) {
     case 'circle':
       return circleArraw(dir, option);

package/lib/core/shape/extrude.d.ts

@@ -0,0 +1,17 @@
+import type { IPath } from './Path';
+export interface IExtrudeGeomety {
+    positions: number[];
+    index: number[];
+    normals?: number[];
+}
+/**
+ * 拉伸多边形顶点，返回拉伸后的顶点信息
+ * @param paths 路径数据组
+ * @param extrude 是否拉伸
+ */
+export default function extrudePolygon(path: IPath[]): IExtrudeGeomety;
+export declare function fillPolygon(points: IPath[]): {
+    positions: number[];
+    index: number[];
+};
+export declare function extrude_PolygonNormal(path: IPath[], needFlat?: boolean): IExtrudeGeomety;

package/lib/core/shape/extrude.js

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = extrudePolygon;
 exports.extrude_PolygonNormal = extrude_PolygonNormal;
 exports.fillPolygon = fillPolygon;
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _l7Utils = require("@antv/l7-utils");
 var _earcut = _interopRequireDefault(require("earcut"));
 var _glMatrix = require("gl-matrix");
@@ -17,71 +16,70 @@ var _glMatrix = require("gl-matrix");
  * @param extrude 是否拉伸
  */
 function extrudePolygon(path) {
-  var p1 = path[0][0];
-  var p2 = path[0][path[0].length - 1];
+  const p1 = path[0][0];
+  const p2 = path[0][path[0].length - 1];
   if (p1[0] === p2[0] && p1[1] === p2[1]) {
     path[0] = path[0].slice(0, path[0].length - 1);
   }
-  var n = path[0].length;
-  var flattengeo = _earcut.default.flatten(path);
-  var vertices = flattengeo.vertices,
-    dimensions = flattengeo.dimensions;
-  var positions = [];
-  var indexArray = [];
+  const n = path[0].length;
+  const flattengeo = _earcut.default.flatten(path);
+  const {
+    vertices,
+    dimensions
+  } = flattengeo;
+  const positions = [];
+  const indexArray = [];
   // 设置顶部z值
-  for (var j = 0; j < vertices.length / dimensions; j++) {
+  for (let j = 0; j < vertices.length / dimensions; j++) {
     if (dimensions === 2) {
       positions.push(vertices[j * 2], vertices[j * 2 + 1], 1);
     } else {
       positions.push(vertices[j * 3], vertices[j * 3 + 1], 1);
     }
   }
-  var triangles = (0, _earcut.default)(flattengeo.vertices, flattengeo.holes, flattengeo.dimensions);
-  indexArray.push.apply(indexArray, (0, _toConsumableArray2.default)(triangles));
-  var _loop = function _loop() {
-    var prePoint = flattengeo.vertices.slice(i * dimensions, (i + 1) * dimensions);
-    var nextPoint = flattengeo.vertices.slice((i + 1) * dimensions, (i + 2) * dimensions);
+  const triangles = (0, _earcut.default)(flattengeo.vertices, flattengeo.holes, flattengeo.dimensions);
+  indexArray.push(...triangles);
+  for (let i = 0; i < n; i++) {
+    const prePoint = flattengeo.vertices.slice(i * dimensions, (i + 1) * dimensions);
+    let nextPoint = flattengeo.vertices.slice((i + 1) * dimensions, (i + 2) * dimensions);
     if (nextPoint.length === 0) {
       nextPoint = flattengeo.vertices.slice(0, dimensions);
     }
-    var indexOffset = positions.length / 3;
+    const indexOffset = positions.length / 3;
     positions.push(prePoint[0], prePoint[1], 1, nextPoint[0], nextPoint[1], 1, prePoint[0], prePoint[1], 0, nextPoint[0], nextPoint[1], 0);
-    indexArray.push.apply(indexArray, (0, _toConsumableArray2.default)([0, 2, 1, 2, 3, 1].map(function (v) {
-      return v + indexOffset;
-    })));
-  };
-  for (var i = 0; i < n; i++) {
-    _loop();
+    indexArray.push(...[0, 2, 1, 2, 3, 1].map(v => v + indexOffset));
   }
   return {
-    positions: positions,
+    positions,
     index: indexArray
   };
 }
 function fillPolygon(points) {
-  var flattengeo = _earcut.default.flatten(points);
-  var triangles = (0, _earcut.default)(flattengeo.vertices, flattengeo.holes, flattengeo.dimensions);
+  const flattengeo = _earcut.default.flatten(points);
+  const triangles = (0, _earcut.default)(flattengeo.vertices, flattengeo.holes, flattengeo.dimensions);
   return {
     positions: flattengeo.vertices,
     index: triangles
   };
 }
-function extrude_PolygonNormal(path) {
-  var needFlat = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-  var p1 = path[0][0];
-  var p2 = path[0][path[0].length - 1];
+function extrude_PolygonNormal(path, needFlat = false // 是否需要转成平面坐标
+) {
+  const p1 = path[0][0];
+  const p2 = path[0][path[0].length - 1];
   if (p1[0] === p2[0] && p1[1] === p2[1]) {
     path[0] = path[0].slice(0, path[0].length - 1);
   }
-  var n = path[0].length;
-  var flattengeo = _earcut.default.flatten(path);
-  var vertices = flattengeo.vertices,
-    dimensions = flattengeo.dimensions;
-  var positions = [];
-  var indexArray = [];
-  var normals = [];
+  const n = path[0].length;
+  const flattengeo = _earcut.default.flatten(path);
+  const {
+    vertices,
+    dimensions
+  } = flattengeo;
+  const positions = [];
+  const indexArray = [];
+  const normals = [];
   // 设置顶部z值 position uv
-  for (var j = 0; j < vertices.length / dimensions; j++) {
+  for (let j = 0; j < vertices.length / dimensions; j++) {
     positions.push(vertices[j * dimensions],
     // x
     vertices[j * dimensions + 1],
@@ -94,54 +92,48 @@ function extrude_PolygonNormal(path) {
     );
     normals.push(0, 0, 1);
   }
-  var triangles = (0, _earcut.default)(flattengeo.vertices, flattengeo.holes, flattengeo.dimensions);
-  indexArray.push.apply(indexArray, (0, _toConsumableArray2.default)(triangles));
+  const triangles = (0, _earcut.default)(flattengeo.vertices, flattengeo.holes, flattengeo.dimensions);
+  indexArray.push(...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);
+  for (let i = 0; i < n; i++) {
+    const prePoint = flattengeo.vertices.slice(i * dimensions, (i + 1) * dimensions);
+    let nextPoint = flattengeo.vertices.slice((i + 1) * dimensions, (i + 2) * dimensions);
     if (nextPoint.length === 0) {
       nextPoint = flattengeo.vertices.slice(0, dimensions);
     }
-    var indexOffset = positions.length / 5;
+    const indexOffset = positions.length / 5;
     // 侧面四顶点
     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) {
-      return v + indexOffset;
-    })));
-  };
-  for (var i = 0; i < n; i++) {
-    _loop2();
+    const normal = computeVertexNormals([nextPoint[0], nextPoint[1], 1], [prePoint[0], prePoint[1], 0], [prePoint[0], prePoint[1], 1], needFlat);
+    normals.push(...normal, ...normal, ...normal, ...normal);
+    indexArray.push(...[1, 2, 0, 3, 2, 1].map(v => v + indexOffset));
   }
   return {
-    positions: positions,
+    positions,
     index: indexArray,
-    normals: normals
+    normals
   };
 }
-function computeVertexNormals(p1, p2, p3) {
-  var needFlat = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-  var cb = _glMatrix.vec3.create();
-  var ab = _glMatrix.vec3.create();
-  var normal = _glMatrix.vec3.create();
+function computeVertexNormals(p1, p2, p3, needFlat = false) {
+  const cb = _glMatrix.vec3.create();
+  const ab = _glMatrix.vec3.create();
+  const normal = _glMatrix.vec3.create();
   if (needFlat) {
     p1 = (0, _l7Utils.lngLatToMeters)(p1);
     p2 = (0, _l7Utils.lngLatToMeters)(p2);
     p3 = (0, _l7Utils.lngLatToMeters)(p3);
   }
-  var pA = _glMatrix.vec3.fromValues.apply(_glMatrix.vec3, (0, _toConsumableArray2.default)(p1));
-  var pB = _glMatrix.vec3.fromValues.apply(_glMatrix.vec3, (0, _toConsumableArray2.default)(p2));
-  var pC = _glMatrix.vec3.fromValues.apply(_glMatrix.vec3, (0, _toConsumableArray2.default)(p3));
+  const pA = _glMatrix.vec3.fromValues(...p1);
+  const pB = _glMatrix.vec3.fromValues(...p2);
+  const pC = _glMatrix.vec3.fromValues(...p3);
   _glMatrix.vec3.sub(cb, pC, pB);
   _glMatrix.vec3.sub(ab, pA, pB);
   _glMatrix.vec3.cross(normal, cb, ab);
-  var newNormal = _glMatrix.vec3.create();
+  const newNormal = _glMatrix.vec3.create();
   _glMatrix.vec3.normalize(newNormal, normal);
   return newNormal;
 }

package/lib/core/triangulation.d.ts

@@ -0,0 +1,136 @@
+import type { IEncodeFeature } from '@antv/l7-core';
+/**
+ * 计算2D 填充点图顶点
+ * @param feature 映射feature
+ */
+export declare function PointFillTriangulation(feature: IEncodeFeature): {
+    vertices: number[];
+    indices: number[];
+    size: number;
+};
+/**
+ * 计算2D 填充点图顶点 (地球模式)
+ * @param feature 映射feature
+ */
+export declare function GlobelPointFillTriangulation(feature: IEncodeFeature): {
+    vertices: number[];
+    indices: number[];
+    size: number;
+};
+/**
+ * 计算3D 拉伸点图
+ * @param feature 映射feature
+ */
+export declare function PointExtrudeTriangulation(feature: IEncodeFeature): {
+    vertices: number[];
+    indices: number[];
+    normals: number[] | undefined;
+    size: number;
+};
+/**
+ * 计算图片标注
+ * @param feature 映射feature
+ */
+export declare function PointImageTriangulation(feature: IEncodeFeature): {
+    vertices: number[];
+    indices: number[];
+    size: number;
+};
+/**
+ * 线三角化
+ * @param feature 映射feature
+ */
+export declare function LineTriangulation(feature: IEncodeFeature): {
+    vertices: number[];
+    indices: number[];
+    normals: number[];
+    indexes: number[];
+    size: number;
+};
+export declare function FlowLineFillTriangulation(feature: IEncodeFeature): {
+    vertices: number[];
+    normals: number[];
+    indices: number[];
+    size: number;
+};
+export declare function SimpleLineTriangulation(feature: IEncodeFeature): {
+    vertices: any[];
+    indices: never[];
+    normals: never[];
+    size: number;
+    count: number;
+};
+export declare function TileSimpleLineTriangulation(feature: IEncodeFeature): {
+    vertices: any[];
+    indices: never[];
+    size: number;
+    count: number;
+};
+export declare function polygonTriangulation(feature: IEncodeFeature): {
+    indices: number[];
+    vertices: number[];
+    size: number;
+};
+export declare function polygonTriangulationWithCenter(feature: IEncodeFeature): {
+    indices: number[];
+    vertices: number[];
+    size: number;
+};
+export declare function PolygonExtrudeTriangulation(feature: IEncodeFeature): {
+    vertices: number[];
+    indices: number[];
+    normals: number[] | undefined;
+    size: number;
+};
+export declare function HeatmapGridTriangulation(feature: IEncodeFeature): {
+    vertices: number[];
+    indices: number[];
+    size: number;
+};
+/**
+ * 图片图层顶点构造
+ * @param feature 数据
+ */
+export declare function RasterImageTriangulation(feature: IEncodeFeature): {
+    vertices: number[];
+    indices: number[];
+    size: number;
+};
+/**
+ *  计算3D弧线顶点
+ * @param feature 映射数据
+ * @param segNum 弧线线段数
+ */
+export declare function LineArcTriangulation(feature: IEncodeFeature, styleOption?: unknown): {
+    vertices: number[];
+    indices: number[];
+    size: number;
+};
+/**
+ * 构建热力图密度图的顶点
+ * @param feature
+ * @returns
+ */
+export declare function HeatmapTriangulation(feature: IEncodeFeature): {
+    vertices: number[];
+    indices: number[];
+    size: number;
+};
+export declare function computeVertexNormals(positions: number[], indexArray: number[], dim?: number, needFlat?: boolean): Float32Array;
+export declare function checkIsClosed(points: number[][][]): boolean;
+/**
+ * 构建地球三角网格
+ * @returns
+ */
+export declare function earthTriangulation(): {
+    vertices: number[];
+    indices: number[];
+    size: number;
+    normals: number[];
+};
+export declare function earthOuterTriangulation(): {
+    vertices: number[];
+    indices: number[];
+    size: number;
+    normals: number[];
+};