@antv/l7-layers 2.21.1 → 2.21.3

package/lib/core/triangulation.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -24,8 +23,6 @@ exports.earthOuterTriangulation = earthOuterTriangulation;
 exports.earthTriangulation = earthTriangulation;
 exports.polygonTriangulation = polygonTriangulation;
 exports.polygonTriangulationWithCenter = polygonTriangulationWithCenter;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _l7Utils = require("@antv/l7-utils");
 var _earcut = _interopRequireDefault(require("earcut"));
 var _glMatrix = require("gl-matrix");
@@ -33,11 +30,11 @@ var _utils = require("../earth/utils");
 var _extrude_polyline = _interopRequireDefault(require("../utils/extrude_polyline"));
 var _extrude = _interopRequireWildcard(require("./shape/extrude"));
 var _Path = require("./shape/Path");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 // @ts-ignore
 
-var GeometryCache = {};
+const GeometryCache = {};
 
 /**
  * 计算2D 填充点图顶点
@@ -45,9 +42,9 @@ var GeometryCache = {};
  */
 
 function PointFillTriangulation(feature) {
-  var coordinates = (0, _l7Utils.calculateCentroid)(feature.coordinates);
+  const coordinates = (0, _l7Utils.calculateCentroid)(feature.coordinates);
   return {
-    vertices: [].concat((0, _toConsumableArray2.default)(coordinates), (0, _toConsumableArray2.default)(coordinates), (0, _toConsumableArray2.default)(coordinates), (0, _toConsumableArray2.default)(coordinates)),
+    vertices: [...coordinates, ...coordinates, ...coordinates, ...coordinates],
     indices: [0, 1, 2, 2, 3, 0],
     size: coordinates.length
   };
@@ -57,10 +54,10 @@ function PointFillTriangulation(feature) {
  * @param feature 映射feature
  */
 function GlobelPointFillTriangulation(feature) {
-  var coordinates = (0, _l7Utils.calculateCentroid)(feature.coordinates);
-  var xyz = (0, _utils.lglt2xyz)(coordinates);
+  const coordinates = (0, _l7Utils.calculateCentroid)(feature.coordinates);
+  const xyz = (0, _utils.lglt2xyz)(coordinates);
   return {
-    vertices: [].concat((0, _toConsumableArray2.default)(xyz), (0, _toConsumableArray2.default)(xyz), (0, _toConsumableArray2.default)(xyz), (0, _toConsumableArray2.default)(xyz)),
+    vertices: [...xyz, ...xyz, ...xyz, ...xyz],
     indices: [0, 1, 2, 2, 3, 0],
     size: xyz.length
   };
@@ -71,15 +68,18 @@ function GlobelPointFillTriangulation(feature) {
  * @param feature 映射feature
  */
 function PointExtrudeTriangulation(feature) {
-  var shape = feature.shape;
-  var _getGeometry = getGeometry(shape, false),
-    positions = _getGeometry.positions,
-    index = _getGeometry.index,
-    normals = _getGeometry.normals;
+  const {
+    shape
+  } = feature;
+  const {
+    positions,
+    index,
+    normals
+  } = getGeometry(shape, false);
   return {
     vertices: positions,
     indices: index,
-    normals: normals,
+    normals,
     size: 5
   };
 }
@@ -89,9 +89,9 @@ function PointExtrudeTriangulation(feature) {
  * @param feature 映射feature
  */
 function PointImageTriangulation(feature) {
-  var coordinates = (0, _l7Utils.calculateCentroid)(feature.coordinates);
+  const coordinates = (0, _l7Utils.calculateCentroid)(feature.coordinates);
   return {
-    vertices: (0, _toConsumableArray2.default)(coordinates),
+    vertices: [...coordinates],
     indices: [0],
     size: coordinates.length
   };
@@ -102,45 +102,47 @@ function PointImageTriangulation(feature) {
  * @param feature 映射feature
  */
 function LineTriangulation(feature) {
-  var coordinates = feature.coordinates,
-    originCoordinates = feature.originCoordinates,
-    version = feature.version;
+  const {
+    coordinates,
+    originCoordinates,
+    version
+  } = feature;
   // let path = coordinates as number[][][] | number[][];
   // if (!Array.isArray(path[0][0])) {
   //   path = [coordinates] as number[][][];
   // }
 
-  var line = new _extrude_polyline.default({
+  const line = new _extrude_polyline.default({
     dash: true,
     join: 'bevel'
   });
   if (version === 'GAODE2.x') {
     // 处理高德2.0几何体构建
-    var path1 = coordinates; // 计算位置
+    let path1 = coordinates; // 计算位置
     if (!Array.isArray(path1[0][0])) {
       path1 = [coordinates];
     }
-    var path2 = originCoordinates; // 计算法线
+    let path2 = originCoordinates; // 计算法线
     if (!Array.isArray(path2[0][0])) {
       path2 = [originCoordinates];
     }
-    for (var i = 0; i < path1.length; i++) {
+    for (let i = 0; i < path1.length; i++) {
       // 高德2.0在计算线时，需要使用经纬度计算发现，使用 customCoords.lnglatToCoords 计算的数据来计算顶点的位置
-      var item1 = path1[i];
-      var item2 = path2[i];
+      const item1 = path1[i];
+      const item2 = path2[i];
       line.extrude_gaode2(item1, item2);
     }
   } else {
     // 处理非高德2.0的几何体构建
-    var path = coordinates;
+    let path = coordinates;
     if (path[0] && !Array.isArray(path[0][0])) {
       path = [coordinates];
     }
-    path.forEach(function (item) {
+    path.forEach(item => {
       line.extrude(item);
     });
   }
-  var linebuffer = line.complex;
+  const linebuffer = line.complex;
   return {
     vertices: linebuffer.positions,
     // [ x,y,z, distance, miter,total ]
@@ -152,29 +154,38 @@ function LineTriangulation(feature) {
 }
 function FlowLineFillTriangulation(feature) {
   // @ts-ignore
-  var coord = feature.coordinates.flat();
-  var tin = 1;
-  var tout = 1.0;
+  const coord = feature.coordinates.flat();
+  const tin = 1;
+  const tout = 1.0;
   return {
-    vertices: [1, 0, 0].concat((0, _toConsumableArray2.default)(coord), [
+    vertices: [1, 0, 0, ...coord,
     // 0
-    1, 2, -3], (0, _toConsumableArray2.default)(coord), [
+    1, 2, -3,
+    // mapbox 为正
+    ...coord,
     // 1
-    1, 1, -3], (0, _toConsumableArray2.default)(coord), [
+    1, 1, -3,
+    // mapbox 为正
+    ...coord,
     // 2
-    0, 1, 0], (0, _toConsumableArray2.default)(coord), [
+    0, 1, 0, ...coord,
     // 3
-    0, 0, 0], (0, _toConsumableArray2.default)(coord), [
+    0, 0, 0, ...coord,
     // 4
-    1, 0, 0], (0, _toConsumableArray2.default)(coord), [
+    1, 0, 0, ...coord,
     // 0
-    1, 2, -3], (0, _toConsumableArray2.default)(coord), [
+    1, 2, -3,
+    // mapbox 为正
+    ...coord,
     // 1
-    1, 1, -3], (0, _toConsumableArray2.default)(coord), [
+    1, 1, -3,
+    // // mapbox 为正
+    ...coord,
     // 2
-    0, 1, 0], (0, _toConsumableArray2.default)(coord), [
+    0, 1, 0, ...coord,
     // 3
-    0, 0, 0], (0, _toConsumableArray2.default)(coord)),
+    0, 0, 0, ...coord // 4
+    ],
     normals: [-tin, 2 * tout, 1,
     // 0
     2 * tout, -tout, 1,
@@ -191,9 +202,11 @@ function FlowLineFillTriangulation(feature) {
   };
 }
 function SimpleLineTriangulation(feature) {
-  var coordinates = feature.coordinates,
-    originCoordinates = feature.originCoordinates;
-  var pos = [];
+  const {
+    coordinates,
+    originCoordinates
+  } = feature;
+  const pos = [];
   if (!Array.isArray(coordinates[0])) {
     return {
       vertices: [],
@@ -203,10 +216,11 @@ function SimpleLineTriangulation(feature) {
       count: 0
     };
   }
-  var _getSimpleLineVertice = getSimpleLineVertices(coordinates, originCoordinates),
-    results = _getSimpleLineVertice.results,
-    totalDistance = _getSimpleLineVertice.totalDistance;
-  results.map(function (point) {
+  const {
+    results,
+    totalDistance
+  } = getSimpleLineVertices(coordinates, originCoordinates);
+  results.map(point => {
     pos.push(point[0], point[1], point[2], point[3], 0, totalDistance);
   });
   return {
@@ -218,8 +232,10 @@ function SimpleLineTriangulation(feature) {
   };
 }
 function TileSimpleLineTriangulation(feature) {
-  var coordinates = feature.coordinates;
-  var pos = [];
+  const {
+    coordinates
+  } = feature;
+  const pos = [];
   if (!Array.isArray(coordinates[0])) {
     return {
       vertices: [],
@@ -228,9 +244,10 @@ function TileSimpleLineTriangulation(feature) {
       count: 0
     };
   }
-  var _getTileSimpleLineVer = getTileSimpleLineVertices(coordinates),
-    results = _getTileSimpleLineVer.results;
-  results.map(function (point) {
+  const {
+    results
+  } = getTileSimpleLineVertices(coordinates);
+  results.map(point => {
     pos.push(point[0], point[1], point[2], point[3]);
   });
   return {
@@ -241,8 +258,8 @@ function TileSimpleLineTriangulation(feature) {
   };
 }
 function lineSegmentDistance(b1, a1) {
-  var dx = a1[0] - b1[0];
-  var dy = a1[1] - b1[1];
+  const dx = a1[0] - b1[0];
+  const dy = a1[1] - b1[1];
   return Math.sqrt(dx * dx + dy * dy);
 }
 function pushDis(point, n) {
@@ -255,9 +272,9 @@ function pushDis(point, n) {
   return point;
 }
 function getSimpleLineVertices(coordinates, originCoordinates) {
-  var points = coordinates;
+  let points = coordinates;
   //除了amap2.0以外 coordinates就是经纬度数据
-  var originPoints = originCoordinates || coordinates;
+  let originPoints = originCoordinates || coordinates;
   if (Array.isArray(points) && Array.isArray(points[0]) && Array.isArray(points[0][0])) {
     // @ts-ignore
     points = originCoordinates.flat();
@@ -265,28 +282,28 @@ function getSimpleLineVertices(coordinates, originCoordinates) {
     originPoints = originCoordinates.flat();
   }
   //修改计算距离的方式,与普通线的计算方式保持一致 edit by huyang 20231214
-  var distance = 0;
+  let distance = 0;
   if (points.length < 2) {
     return {
       results: points,
       totalDistance: 0
     };
   } else {
-    var results = [];
-    var point = pushDis(points[0], distance);
+    const results = [];
+    const point = pushDis(points[0], distance);
     results.push(point);
-    for (var i = 1; i < points.length - 1; i++) {
-      var subDistance = lineSegmentDistance((0, _l7Utils.aProjectFlat)(originPoints[i - 1]), (0, _l7Utils.aProjectFlat)(originPoints[i]));
+    for (let i = 1; i < points.length - 1; i++) {
+      const subDistance = lineSegmentDistance((0, _l7Utils.aProjectFlat)(originPoints[i - 1]), (0, _l7Utils.aProjectFlat)(originPoints[i]));
       distance += subDistance;
-      var mulPoint = pushDis(points[i], distance);
+      const mulPoint = pushDis(points[i], distance);
       results.push(mulPoint);
       results.push(mulPoint);
     }
-    var pointDistance = lineSegmentDistance((0, _l7Utils.aProjectFlat)(originPoints[originPoints.length - 2]), (0, _l7Utils.aProjectFlat)(originPoints[originPoints.length - 1]));
+    const pointDistance = lineSegmentDistance((0, _l7Utils.aProjectFlat)(originPoints[originPoints.length - 2]), (0, _l7Utils.aProjectFlat)(originPoints[originPoints.length - 1]));
     distance += pointDistance;
     results.push(pushDis(points[points.length - 1], distance));
     return {
-      results: results,
+      results,
       totalDistance: distance
     };
   }
@@ -297,40 +314,48 @@ function getTileSimpleLineVertices(points) {
       results: points
     };
   } else {
-    var results = [];
-    var point = pushDis(points[0]);
+    const results = [];
+    const point = pushDis(points[0]);
     results.push(point);
-    for (var i = 1; i < points.length - 1; i++) {
-      var mulPoint = pushDis(points[i]);
+    for (let i = 1; i < points.length - 1; i++) {
+      const mulPoint = pushDis(points[i]);
       results.push(mulPoint);
       results.push(mulPoint);
     }
     results.push(pushDis(points[points.length - 1]));
     return {
-      results: results
+      results
     };
   }
 }
 function polygonTriangulation(feature) {
-  var coordinates = feature.coordinates;
-  var flattengeo = _earcut.default.flatten(coordinates);
-  var vertices = flattengeo.vertices,
-    dimensions = flattengeo.dimensions,
-    holes = flattengeo.holes;
+  const {
+    coordinates
+  } = feature;
+  const flattengeo = _earcut.default.flatten(coordinates);
+  const {
+    vertices,
+    dimensions,
+    holes
+  } = flattengeo;
   return {
     indices: (0, _earcut.default)(vertices, holes, dimensions),
-    vertices: vertices,
+    vertices,
     size: dimensions
   };
 }
 
 // 构建几何图形（带有中心点和大小）
 function polygonTriangulationWithCenter(feature) {
-  var coordinates = feature.coordinates;
-  var flattengeo = _earcut.default.flatten(coordinates);
-  var vertices = flattengeo.vertices,
-    dimensions = flattengeo.dimensions,
-    holes = flattengeo.holes;
+  const {
+    coordinates
+  } = feature;
+  const flattengeo = _earcut.default.flatten(coordinates);
+  const {
+    vertices,
+    dimensions,
+    holes
+  } = flattengeo;
   return {
     indices: (0, _earcut.default)(vertices, holes, dimensions),
     vertices: getVerticesWithCenter(vertices),
@@ -338,36 +363,41 @@ function polygonTriangulationWithCenter(feature) {
   };
 }
 function getVerticesWithCenter(vertices) {
-  var verticesWithCenter = [];
-  var _calculatePointsCente = (0, _l7Utils.calculatePointsCenterAndRadius)(vertices),
-    center = _calculatePointsCente.center,
-    radius = _calculatePointsCente.radius;
-  for (var i = 0; i < vertices.length; i += 2) {
-    var lng = vertices[i];
-    var lat = vertices[i + 1];
-    verticesWithCenter.push.apply(verticesWithCenter, [lng, lat, 0].concat((0, _toConsumableArray2.default)(center), [radius]));
+  const verticesWithCenter = [];
+  const {
+    center,
+    radius
+  } = (0, _l7Utils.calculatePointsCenterAndRadius)(vertices);
+  for (let i = 0; i < vertices.length; i += 2) {
+    const lng = vertices[i];
+    const lat = vertices[i + 1];
+    verticesWithCenter.push(lng, lat, 0, ...center, radius);
   }
   return verticesWithCenter;
 }
 function PolygonExtrudeTriangulation(feature) {
-  var coordinates = feature.coordinates;
-  var _extrude_PolygonNorma = (0, _extrude.extrude_PolygonNormal)(coordinates, true),
-    positions = _extrude_PolygonNorma.positions,
-    index = _extrude_PolygonNorma.index,
-    normals = _extrude_PolygonNorma.normals;
+  const coordinates = feature.coordinates;
+  const {
+    positions,
+    index,
+    normals
+  } = (0, _extrude.extrude_PolygonNormal)(coordinates, true);
   return {
     vertices: positions,
     // [ x, y, z, uv.x,uv.y ]
     indices: index,
-    normals: normals,
+    normals,
     size: 5
   };
 }
 function HeatmapGridTriangulation(feature) {
-  var shape = feature.shape;
-  var _getHeatmapGeometry = getHeatmapGeometry(shape),
-    positions = _getHeatmapGeometry.positions,
-    index = _getHeatmapGeometry.index;
+  const {
+    shape
+  } = feature;
+  const {
+    positions,
+    index
+  } = getHeatmapGeometry(shape);
   return {
     vertices: positions,
     // [ x, y, z ] 多边形顶点
@@ -381,10 +411,10 @@ function HeatmapGridTriangulation(feature) {
  * @param feature 数据
  */
 function RasterImageTriangulation(feature) {
-  var coordinates = feature.coordinates;
+  const coordinates = feature.coordinates;
   // [ x, y, z. uv.x, uv.y]
-  var positions = [].concat((0, _toConsumableArray2.default)(coordinates[0]), [0, 0, 0], (0, _toConsumableArray2.default)(coordinates[1]), [0, 1, 0], (0, _toConsumableArray2.default)(coordinates[2]), [0, 1, 1], (0, _toConsumableArray2.default)(coordinates[3]), [0, 0, 1]);
-  var indexs = [0, 1, 2, 0, 2, 3];
+  const positions = [...coordinates[0], 0, 0, 0, ...coordinates[1], 0, 1, 0, ...coordinates[2], 0, 1, 1, ...coordinates[3], 0, 0, 1];
+  const indexs = [0, 1, 2, 0, 2, 3];
   return {
     vertices: positions,
     indices: indexs,
@@ -399,23 +429,21 @@ function RasterImageTriangulation(feature) {
  */
 function LineArcTriangulation(feature, styleOption) {
   // @ts-ignore
-  var _styleOption$segmentN = styleOption.segmentNumber,
-    segmentNumber = _styleOption$segmentN === void 0 ? 30 : _styleOption$segmentN;
-  var coordinates = feature.coordinates;
-  var positions = [];
-  var indexArray = [];
-  var _loop = function _loop(i) {
+  const {
+    segmentNumber = 30
+  } = styleOption;
+  const coordinates = feature.coordinates;
+  const positions = [];
+  const indexArray = [];
+  for (let i = 0; i < segmentNumber; i++) {
     // 上线两个顶点
     // [ x, y, z, sx,sy, tx,ty]
     positions.push(i, 1, i, coordinates[0][0], coordinates[0][1], coordinates[1][0], coordinates[1][1], i, -1, i, coordinates[0][0], coordinates[0][1], coordinates[1][0], coordinates[1][1]);
     if (i !== segmentNumber - 1) {
-      indexArray.push.apply(indexArray, (0, _toConsumableArray2.default)([0, 1, 2, 1, 3, 2].map(function (v) {
+      indexArray.push(...[0, 1, 2, 1, 3, 2].map(v => {
         return i * 2 + v;
-      })));
+      }));
     }
-  };
-  for (var i = 0; i < segmentNumber; i++) {
-    _loop(i);
   }
   return {
     vertices: positions,
@@ -430,17 +458,17 @@ function LineArcTriangulation(feature, styleOption) {
  * @returns
  */
 function HeatmapTriangulation(feature) {
-  var coordinates = feature.coordinates;
+  const coordinates = feature.coordinates;
   if (coordinates.length === 2) {
     coordinates.push(0);
   }
-  var dir = addDir(-1, 1);
-  var dir1 = addDir(1, 1);
-  var dir2 = addDir(-1, -1);
-  var dir3 = addDir(1, -1);
+  const dir = addDir(-1, 1);
+  const dir1 = addDir(1, 1);
+  const dir2 = addDir(-1, -1);
+  const dir3 = addDir(1, -1);
   // [x,y,z, dirx ,diry, weight]
-  var positions = [].concat((0, _toConsumableArray2.default)(coordinates), (0, _toConsumableArray2.default)(dir), (0, _toConsumableArray2.default)(coordinates), (0, _toConsumableArray2.default)(dir2), (0, _toConsumableArray2.default)(coordinates), (0, _toConsumableArray2.default)(dir3), (0, _toConsumableArray2.default)(coordinates), (0, _toConsumableArray2.default)(dir1));
-  var indexArray = [0, 1, 2, 3, 0, 2];
+  const positions = [...coordinates, ...dir, ...coordinates, ...dir2, ...coordinates, ...dir3, ...coordinates, ...dir1];
+  const indexArray = [0, 1, 2, 3, 0, 2];
   return {
     vertices: positions,
     indices: indexArray,
@@ -452,53 +480,41 @@ function HeatmapTriangulation(feature) {
  * 点图层3d geomerty
  * @param shape 3D形状
  */
-function getGeometry(shape) {
-  var needFlat = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+function getGeometry(shape, needFlat = false) {
   if (GeometryCache && GeometryCache[shape]) {
     return GeometryCache[shape];
   }
-  var path = _Path.geometryShape[shape] ? _Path.geometryShape[shape]() : _Path.geometryShape.cylinder();
-  var geometry = (0, _extrude.extrude_PolygonNormal)([path], needFlat);
+  const path = _Path.geometryShape[shape] ? _Path.geometryShape[shape]() : _Path.geometryShape.cylinder();
+  const geometry = (0, _extrude.extrude_PolygonNormal)([path], needFlat);
   GeometryCache[shape] = geometry;
   return geometry;
 }
-function computeVertexNormals(positions, indexArray) {
-  var dim = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 3;
-  var needFlat = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-  var normals = new Float32Array(positions.length / dim * 3);
-  var vA;
-  var vB;
-  var vC;
-  var cb = _glMatrix.vec3.create();
-  var ab = _glMatrix.vec3.create();
-  var normal = _glMatrix.vec3.create();
-  for (var i = 0, li = indexArray.length; i < li; i += 3) {
+function computeVertexNormals(positions, indexArray, dim = 3, needFlat = false) {
+  const normals = new Float32Array(positions.length / dim * 3);
+  let vA;
+  let vB;
+  let vC;
+  const cb = _glMatrix.vec3.create();
+  const ab = _glMatrix.vec3.create();
+  const normal = _glMatrix.vec3.create();
+  for (let i = 0, li = indexArray.length; i < li; i += 3) {
     vA = indexArray[i + 0] * 3;
     vB = indexArray[i + 1] * 3;
     vC = indexArray[i + 2] * 3;
-    var p1 = [positions[vA], positions[vA + 1]];
-    var p2 = [positions[vB], positions[vB + 1]];
-    var p3 = [positions[vC], positions[vC + 1]];
+    let p1 = [positions[vA], positions[vA + 1]];
+    let p2 = [positions[vB], positions[vB + 1]];
+    let p3 = [positions[vC], positions[vC + 1]];
     if (needFlat) {
       p1 = (0, _l7Utils.lngLatToMeters)(p1);
       p2 = (0, _l7Utils.lngLatToMeters)(p2);
       p3 = (0, _l7Utils.lngLatToMeters)(p3);
     }
-    var _p = p1,
-      _p2 = (0, _slicedToArray2.default)(_p, 2),
-      ax = _p2[0],
-      ay = _p2[1];
-    var pA = _glMatrix.vec3.fromValues(ax, ay, positions[vA + 2]);
-    var _p3 = p2,
-      _p4 = (0, _slicedToArray2.default)(_p3, 2),
-      bx = _p4[0],
-      by = _p4[1];
-    var pB = _glMatrix.vec3.fromValues(bx, by, positions[vB + 2]);
-    var _p5 = p3,
-      _p6 = (0, _slicedToArray2.default)(_p5, 2),
-      cx = _p6[0],
-      cy = _p6[1];
-    var pC = _glMatrix.vec3.fromValues(cx, cy, positions[vC + 2]);
+    const [ax, ay] = p1;
+    const pA = _glMatrix.vec3.fromValues(ax, ay, positions[vA + 2]);
+    const [bx, by] = p2;
+    const pB = _glMatrix.vec3.fromValues(bx, by, positions[vB + 2]);
+    const [cx, cy] = p3;
+    const pC = _glMatrix.vec3.fromValues(cx, cy, positions[vC + 2]);
     _glMatrix.vec3.sub(cb, pC, pB);
     _glMatrix.vec3.sub(ab, pA, pB);
     _glMatrix.vec3.cross(normal, cb, ab);
@@ -516,29 +532,29 @@ function computeVertexNormals(positions, indexArray) {
   return normals;
 }
 function normalizeNormals(normals) {
-  for (var i = 0, li = normals.length; i < li; i += 3) {
-    var normal = _glMatrix.vec3.fromValues(normals[i], normals[i + 1], normals[i + 2]);
-    var newNormal = _glMatrix.vec3.create();
+  for (let i = 0, li = normals.length; i < li; i += 3) {
+    const normal = _glMatrix.vec3.fromValues(normals[i], normals[i + 1], normals[i + 2]);
+    const newNormal = _glMatrix.vec3.create();
     _glMatrix.vec3.normalize(newNormal, normal);
     normals.set(newNormal, i);
   }
 }
 function checkIsClosed(points) {
-  var p1 = points[0][0];
-  var p2 = points[0][points[0].length - 1];
+  const p1 = points[0][0];
+  const p2 = points[0][points[0].length - 1];
   return p1[0] === p2[0] && p1[1] === p2[1];
 }
 function getHeatmapGeometry(shape) {
-  var shape3d = ['cylinder', 'triangleColumn', 'hexagonColumn', 'squareColumn'];
-  var path = _Path.geometryShape[shape] ? _Path.geometryShape[shape]() : _Path.geometryShape.circle();
-  var geometry = shape3d.indexOf(shape) === -1 ? (0, _extrude.fillPolygon)([path]) : (0, _extrude.default)([path]);
+  const shape3d = ['cylinder', 'triangleColumn', 'hexagonColumn', 'squareColumn'];
+  const path = _Path.geometryShape[shape] ? _Path.geometryShape[shape]() : _Path.geometryShape.circle();
+  const geometry = shape3d.indexOf(shape) === -1 ? (0, _extrude.fillPolygon)([path]) : (0, _extrude.default)([path]);
   // const geometry = fillPolygon([path]);
   return geometry;
 }
 // 热力图计算范围
 function addDir(dirX, dirY) {
-  var x = (dirX + 1) / 2;
-  var y = (dirY + 1) / 2;
+  const x = (dirX + 1) / 2;
+  const y = (dirY + 1) / 2;
   return [x, y];
 }
 
@@ -547,12 +563,14 @@ function addDir(dirX, dirY) {
  * @returns
  */
 function earthTriangulation() {
-  var earthmesh = (0, _utils.primitiveSphere)(_utils.EARTH_RADIUS, {
+  const earthmesh = (0, _utils.primitiveSphere)(_utils.EARTH_RADIUS, {
     segments: _utils.EARTH_SEGMENTS
   });
-  var positionsArr = earthmesh.positionsArr,
-    indicesArr = earthmesh.indicesArr,
-    normalArr = earthmesh.normalArr;
+  const {
+    positionsArr,
+    indicesArr,
+    normalArr
+  } = earthmesh;
   return {
     vertices: positionsArr,
     indices: indicesArr,
@@ -561,12 +579,14 @@ function earthTriangulation() {
   };
 }
 function earthOuterTriangulation() {
-  var earthmesh = (0, _utils.primitiveSphere)(_utils.EARTH_RADIUS + _utils.EARTH_RADIUS_OUTER, {
+  const earthmesh = (0, _utils.primitiveSphere)(_utils.EARTH_RADIUS + _utils.EARTH_RADIUS_OUTER, {
     segments: _utils.EARTH_SEGMENTS
   });
-  var positionsArr = earthmesh.positionsArr,
-    indicesArr = earthmesh.indicesArr,
-    normalArr = earthmesh.normalArr;
+  const {
+    positionsArr,
+    indicesArr,
+    normalArr
+  } = earthmesh;
   return {
     vertices: positionsArr,
     indices: indicesArr,

package/lib/core/utils.d.ts

@@ -0,0 +1,4 @@
+export declare function formatUniformsOption2Std140(uniformsOption: {
+    [key: string]: any;
+}): string;
+export declare function MultipleOfFourNumber(num: number): number;