@antv/l7-layers 2.21.0 → 2.21.2

package/es/core/shape/Path.js

@@ -1,6 +1,4 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-var _geometryShape;
-export var ShapeType3D = /*#__PURE__*/function (ShapeType3D) {
+export let ShapeType3D = /*#__PURE__*/function (ShapeType3D) {
   ShapeType3D["CYLINDER"] = "cylinder";
   ShapeType3D["SQUARECOLUMN"] = "squareColumn";
   ShapeType3D["TRIANGLECOLUMN"] = "triangleColumn";
@@ -8,7 +6,7 @@ export var ShapeType3D = /*#__PURE__*/function (ShapeType3D) {
   ShapeType3D["PENTAGONCOLUMN"] = "pentagonColumn";
   return ShapeType3D;
 }({});
-export var ShapeType2D = /*#__PURE__*/function (ShapeType2D) {
+export let ShapeType2D = /*#__PURE__*/function (ShapeType2D) {
   ShapeType2D["CIRCLE"] = "circle";
   ShapeType2D["SQUARE"] = "square";
   ShapeType2D["TRIANGLE"] = "triangle";
@@ -22,16 +20,15 @@ export var ShapeType2D = /*#__PURE__*/function (ShapeType2D) {
  * @param pointCount  顶点个数 3 => 三角形
  * @param start 顶点起始角度 调整图形的方向
  */
-export function polygonPath(pointCount) {
-  var start = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
-  var step = Math.PI * 2 / pointCount;
-  var line = [];
-  for (var i = 0; i < pointCount; i++) {
+export function polygonPath(pointCount, start = 0) {
+  const step = Math.PI * 2 / pointCount;
+  const line = [];
+  for (let i = 0; i < pointCount; i++) {
     line.push(step * i + start * Math.PI / 12);
   }
-  var path = line.map(function (t) {
-    var x = Math.sin(t + Math.PI / 4);
-    var y = Math.cos(t + Math.PI / 4);
+  const path = line.map(t => {
+    const x = Math.sin(t + Math.PI / 4);
+    const y = Math.cos(t + Math.PI / 4);
     return [x, y, 0];
   });
   // path.push(path[0]);
@@ -52,4 +49,15 @@ export function hexagon() {
 export function pentagon() {
   return polygonPath(5);
 }
-export var geometryShape = (_geometryShape = {}, _defineProperty(_geometryShape, ShapeType2D.CIRCLE, circle), _defineProperty(_geometryShape, ShapeType2D.HEXAGON, hexagon), _defineProperty(_geometryShape, ShapeType2D.TRIANGLE, triangle), _defineProperty(_geometryShape, ShapeType2D.SQUARE, square), _defineProperty(_geometryShape, ShapeType2D.PENTAGON, pentagon), _defineProperty(_geometryShape, ShapeType3D.CYLINDER, circle), _defineProperty(_geometryShape, ShapeType3D.HEXAGONCOLUMN, hexagon), _defineProperty(_geometryShape, ShapeType3D.TRIANGLECOLUMN, triangle), _defineProperty(_geometryShape, ShapeType3D.SQUARECOLUMN, square), _defineProperty(_geometryShape, ShapeType3D.PENTAGONCOLUMN, pentagon), _geometryShape);
+export const geometryShape = {
+  [ShapeType2D.CIRCLE]: circle,
+  [ShapeType2D.HEXAGON]: hexagon,
+  [ShapeType2D.TRIANGLE]: triangle,
+  [ShapeType2D.SQUARE]: square,
+  [ShapeType2D.PENTAGON]: pentagon,
+  [ShapeType3D.CYLINDER]: circle,
+  [ShapeType3D.HEXAGONCOLUMN]: hexagon,
+  [ShapeType3D.TRIANGLECOLUMN]: triangle,
+  [ShapeType3D.SQUARECOLUMN]: square,
+  [ShapeType3D.PENTAGONCOLUMN]: pentagon
+};

package/es/core/shape/arrow.js

@@ -1,8 +1,6 @@
-import _typeof from "@babel/runtime/helpers/esm/typeof";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import { circle } from "./Path";
 import earcut from 'earcut';
-var maxArrowWidthMap = {
+const maxArrowWidthMap = {
   circle: 2,
   triangle: 2,
   diamond: 4,
@@ -11,12 +9,12 @@ var maxArrowWidthMap = {
   halfTriangle: 2,
   'none': 0
 };
-var PathHeight = 1 / 2;
+const PathHeight = 1 / 2;
 export 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],
@@ -28,10 +26,10 @@ export function halfTriangleArrow(dir, options) {
   };
 }
 export 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],
@@ -41,10 +39,10 @@ export function triangleArrow(dir, options) {
   };
 }
 export 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,
@@ -54,10 +52,10 @@ export function rectArrow(dir, options) {
   };
 }
 export 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,
@@ -67,10 +65,10 @@ export function diamondArrow(dir, options) {
   };
 }
 export 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,
@@ -80,56 +78,46 @@ export function classicArrow(dir, options) {
   };
 }
 export 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 = circle();
-  var flattengeo = earcut.flatten([path]);
-  var triangles = earcut(flattengeo.vertices, flattengeo.holes, flattengeo.dimensions);
+  const {
+    width = 2,
+    height = 2
+  } = options;
+  const path = circle();
+  const flattengeo = earcut.flatten([path]);
+  const triangles = earcut(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(_toConsumableArray(vertice), _toConsumableArray(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(_toConsumableArray(path.map(function (t) {
-      return [t[1] * height, t[0] * width * dir, 1];
-    }).flat()), _toConsumableArray(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)]
   };
 }
-export function lineArrowPath(coord) {
-  var indexOffset = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
-  var symbol = arguments.length > 2 ? arguments[2] : undefined;
-  var sourceType = _typeof(symbol['source']) === 'object' ? symbol['source'].type : symbol['source'];
-  var targetType = _typeof(symbol['target']) === 'object' ? symbol['target'].type : symbol['target'];
-  var _ref = _typeof(symbol['source']) === 'object' ? symbol['source'] : {},
-    _ref$width = _ref.width,
-    sourceWidth = _ref$width === void 0 ? sourceType ? maxArrowWidthMap[sourceType] : 0 : _ref$width;
-  var _ref2 = _typeof(symbol['target']) === 'object' ? symbol['target'] : {},
-    _ref2$width = _ref2.width,
-    targetWidth = _ref2$width === void 0 ? targetType ? maxArrowWidthMap[targetType] : 0 : _ref2$width;
+export 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(_toConsumableArray(coord), [1, PathHeight, -1 * targetWidth], _toConsumableArray(coord), [1, -PathHeight, -1 * targetWidth], _toConsumableArray(coord), [0, -PathHeight, 1 * sourceWidth], _toConsumableArray(coord), [0, PathHeight, 1 * sourceWidth], _toConsumableArray(coord), [1, PathHeight, -1 * targetWidth], _toConsumableArray(coord), [1, -PathHeight, -1 * targetWidth], _toConsumableArray(coord), [0, -PathHeight, 1 * sourceWidth], _toConsumableArray(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
   };
 }
 export function getSymbol(type, position) {
-  var shape = _typeof(type) === 'object' ? type.type : type;
-  var dir = position === 'source' ? 1 : -1;
-  var option = _typeof(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/es/core/shape/extrude.js

@@ -1,4 +1,3 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import { lngLatToMeters } from '@antv/l7-utils';
 import earcut from 'earcut';
 import { vec3 } from 'gl-matrix';
@@ -8,71 +7,70 @@ import { vec3 } from 'gl-matrix';
  * @param extrude 是否拉伸
  */
 export default 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.flatten(path);
-  var vertices = flattengeo.vertices,
-    dimensions = flattengeo.dimensions;
-  var positions = [];
-  var indexArray = [];
+  const n = path[0].length;
+  const flattengeo = earcut.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 = earcut(flattengeo.vertices, flattengeo.holes, flattengeo.dimensions);
-  indexArray.push.apply(indexArray, _toConsumableArray(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 = earcut(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, _toConsumableArray([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
   };
 }
 export function fillPolygon(points) {
-  var flattengeo = earcut.flatten(points);
-  var triangles = earcut(flattengeo.vertices, flattengeo.holes, flattengeo.dimensions);
+  const flattengeo = earcut.flatten(points);
+  const triangles = earcut(flattengeo.vertices, flattengeo.holes, flattengeo.dimensions);
   return {
     positions: flattengeo.vertices,
     index: triangles
   };
 }
-export 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];
+export 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.flatten(path);
-  var vertices = flattengeo.vertices,
-    dimensions = flattengeo.dimensions;
-  var positions = [];
-  var indexArray = [];
-  var normals = [];
+  const n = path[0].length;
+  const flattengeo = earcut.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],
@@ -83,57 +81,50 @@ export function extrude_PolygonNormal(path) {
     // 顶部uv
     -1 // 顶部uv
     );
-
     normals.push(0, 0, 1);
   }
-  var triangles = earcut(flattengeo.vertices, flattengeo.holes, flattengeo.dimensions);
-  indexArray.push.apply(indexArray, _toConsumableArray(triangles));
+  const triangles = earcut(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, _toConsumableArray(normal).concat(_toConsumableArray(normal), _toConsumableArray(normal), _toConsumableArray(normal)));
-    indexArray.push.apply(indexArray, _toConsumableArray([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 = vec3.create();
-  var ab = vec3.create();
-  var normal = vec3.create();
+function computeVertexNormals(p1, p2, p3, needFlat = false) {
+  const cb = vec3.create();
+  const ab = vec3.create();
+  const normal = vec3.create();
   if (needFlat) {
     p1 = lngLatToMeters(p1);
     p2 = lngLatToMeters(p2);
     p3 = lngLatToMeters(p3);
   }
-  var pA = vec3.fromValues.apply(vec3, _toConsumableArray(p1));
-  var pB = vec3.fromValues.apply(vec3, _toConsumableArray(p2));
-  var pC = vec3.fromValues.apply(vec3, _toConsumableArray(p3));
+  const pA = vec3.fromValues(...p1);
+  const pB = vec3.fromValues(...p2);
+  const pC = vec3.fromValues(...p3);
   vec3.sub(cb, pC, pB);
   vec3.sub(ab, pA, pB);
   vec3.cross(normal, cb, ab);
-  var newNormal = vec3.create();
+  const newNormal = vec3.create();
   vec3.normalize(newNormal, normal);
   return newNormal;
 }