@antv/l7-layers 2.19.10 → 2.20.0

package/lib/core/line_trangluation.js

@@ -0,0 +1,99 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ArrowLineTriangulation = ArrowLineTriangulation;
+exports.FlowHalfArrowFillTriangulation = FlowHalfArrowFillTriangulation;
+exports.FlowLineTriangulation = FlowLineTriangulation;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _arrow = require("./shape/arrow");
+// list all arrow shape
+
+// Half Edge
+function FlowHalfArrowFillTriangulation(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 FlowLineTriangulation(feature, symbolOption) {
+  return symbolOption ? ArrowLineTriangulation(feature, symbolOption) : FlowHalfArrowFillTriangulation(feature);
+}
+function ArrowLineTriangulation(feature, symbolOption) {
+  // @ts-ignore
+  var coord = feature.coordinates.flat();
+  var _ref = symbolOption,
+    _ref$target = _ref.target,
+    target = _ref$target === void 0 ? 'classic' : _ref$target,
+    _ref$source = _ref.source,
+    source = _ref$source === void 0 ? 'circle' : _ref$source;
+  var startSymbol = shape2Vertices((0, _arrow.getSymbol)(source, 'source'), coord, 0, 0);
+  var linePath = (0, _arrow.lineArrowPath)(coord, startSymbol.vertices.length / 7, symbolOption);
+  var endSymbol = shape2Vertices((0, _arrow.getSymbol)(target, 'target'), coord, 1, startSymbol.vertices.length / 7 + linePath.vertices.length / 7);
+  var data = {
+    vertices: [].concat((0, _toConsumableArray2.default)(startSymbol.vertices), (0, _toConsumableArray2.default)(linePath.vertices), (0, _toConsumableArray2.default)(endSymbol.vertices)),
+    indices: [].concat((0, _toConsumableArray2.default)(startSymbol.outLineIndices), (0, _toConsumableArray2.default)(linePath.outLineIndices), (0, _toConsumableArray2.default)(endSymbol.outLineIndices), (0, _toConsumableArray2.default)(startSymbol.indices), (0, _toConsumableArray2.default)(linePath.indices), (0, _toConsumableArray2.default)(endSymbol.indices)),
+    normals: [].concat((0, _toConsumableArray2.default)(startSymbol.normals), (0, _toConsumableArray2.default)(linePath.normals), (0, _toConsumableArray2.default)(endSymbol.normals)),
+    size: 7
+  };
+  return data;
+}
+// start 0,end 1;
+function shape2Vertices(shape, coord) {
+  var type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+  var indexOffset = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
+  var shapeVertices = [];
+  var vertices = shape.vertices,
+    indices = shape.indices,
+    dimensions = shape.dimensions,
+    outLineIndices = shape.outLineIndices;
+  for (var i = 0; i < vertices.length; i += dimensions) {
+    shapeVertices.push.apply(shapeVertices, [type, vertices[i + 1], vertices[i]].concat((0, _toConsumableArray2.default)(coord)));
+  }
+  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, shape), {}, {
+    vertices: shapeVertices,
+    indices: indices.map(function (i) {
+      return i + indexOffset;
+    }),
+    outLineIndices: outLineIndices.map(function (i) {
+      return i + indexOffset;
+    })
+  });
+}

package/lib/core/schema.js

@@ -7,7 +7,7 @@ exports.default = void 0;
 /**
  * BaseLayer Schema
  */
-var _default = {
+var _default = exports.default = {
   properties: {
     enablePicking: {
       type: 'boolean'
@@ -28,5 +28,4 @@ var _default = {
       }]
     }
   }
-};
-exports.default = _default;
+};

package/lib/core/shape/Path.js

@@ -14,7 +14,7 @@ exports.square = square;
 exports.triangle = triangle;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _geometryShape;
-var ShapeType3D = /*#__PURE__*/function (ShapeType3D) {
+var ShapeType3D = exports.ShapeType3D = /*#__PURE__*/function (ShapeType3D) {
   ShapeType3D["CYLINDER"] = "cylinder";
   ShapeType3D["SQUARECOLUMN"] = "squareColumn";
   ShapeType3D["TRIANGLECOLUMN"] = "triangleColumn";
@@ -22,8 +22,7 @@ var ShapeType3D = /*#__PURE__*/function (ShapeType3D) {
   ShapeType3D["PENTAGONCOLUMN"] = "pentagonColumn";
   return ShapeType3D;
 }({});
-exports.ShapeType3D = ShapeType3D;
-var ShapeType2D = /*#__PURE__*/function (ShapeType2D) {
+var ShapeType2D = exports.ShapeType2D = /*#__PURE__*/function (ShapeType2D) {
   ShapeType2D["CIRCLE"] = "circle";
   ShapeType2D["SQUARE"] = "square";
   ShapeType2D["TRIANGLE"] = "triangle";
@@ -36,7 +35,6 @@ var ShapeType2D = /*#__PURE__*/function (ShapeType2D) {
  * @param pointCount  顶点个数 3 => 三角形
  * @param start 顶点起始角度 调整图形的方向
  */
-exports.ShapeType2D = ShapeType2D;
 function polygonPath(pointCount) {
   var start = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
   var step = Math.PI * 2 / pointCount;
@@ -67,5 +65,4 @@ function hexagon() {
 function pentagon() {
   return polygonPath(5);
 }
-var geometryShape = (_geometryShape = {}, (0, _defineProperty2.default)(_geometryShape, ShapeType2D.CIRCLE, circle), (0, _defineProperty2.default)(_geometryShape, ShapeType2D.HEXAGON, hexagon), (0, _defineProperty2.default)(_geometryShape, ShapeType2D.TRIANGLE, triangle), (0, _defineProperty2.default)(_geometryShape, ShapeType2D.SQUARE, square), (0, _defineProperty2.default)(_geometryShape, ShapeType2D.PENTAGON, pentagon), (0, _defineProperty2.default)(_geometryShape, ShapeType3D.CYLINDER, circle), (0, _defineProperty2.default)(_geometryShape, ShapeType3D.HEXAGONCOLUMN, hexagon), (0, _defineProperty2.default)(_geometryShape, ShapeType3D.TRIANGLECOLUMN, triangle), (0, _defineProperty2.default)(_geometryShape, ShapeType3D.SQUARECOLUMN, square), (0, _defineProperty2.default)(_geometryShape, ShapeType3D.PENTAGONCOLUMN, pentagon), _geometryShape);
-exports.geometryShape = geometryShape;
+var geometryShape = exports.geometryShape = (_geometryShape = {}, (0, _defineProperty2.default)(_geometryShape, ShapeType2D.CIRCLE, circle), (0, _defineProperty2.default)(_geometryShape, ShapeType2D.HEXAGON, hexagon), (0, _defineProperty2.default)(_geometryShape, ShapeType2D.TRIANGLE, triangle), (0, _defineProperty2.default)(_geometryShape, ShapeType2D.SQUARE, square), (0, _defineProperty2.default)(_geometryShape, ShapeType2D.PENTAGON, pentagon), (0, _defineProperty2.default)(_geometryShape, ShapeType3D.CYLINDER, circle), (0, _defineProperty2.default)(_geometryShape, ShapeType3D.HEXAGONCOLUMN, hexagon), (0, _defineProperty2.default)(_geometryShape, ShapeType3D.TRIANGLECOLUMN, triangle), (0, _defineProperty2.default)(_geometryShape, ShapeType3D.SQUARECOLUMN, square), (0, _defineProperty2.default)(_geometryShape, ShapeType3D.PENTAGONCOLUMN, pentagon), _geometryShape);

package/lib/core/shape/arrow.js

@@ -0,0 +1,174 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.circleArraw = circleArraw;
+exports.classicArrow = classicArrow;
+exports.diamondArrow = diamondArrow;
+exports.getSymbol = getSymbol;
+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 = {
+  circle: 2,
+  triangle: 2,
+  diamond: 4,
+  rect: 2,
+  classic: 3,
+  halfTriangle: 2,
+  'none': 0
+};
+var 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;
+  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],
+    outLineIndices: [0, 1, 2],
+    normals: [1 * dir, -2 * dir, 1,
+    // y,x
+    -2 * dir, 1.5 * dir, 1, 1 * dir, 1.5 * dir, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    dimensions: 2
+  };
+}
+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;
+  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],
+    indices: [3, 4, 5],
+    normals: [0, -1.5 * dir, 1, 2, 1 * dir, 1, -2, 1 * dir, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    dimensions: 2
+  };
+}
+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;
+  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,
+    indices: [4, 5, 6, 4, 6, 7],
+    outLineIndices: [0, 1, 2, 0, 2, 3],
+    normals: [0, -dir, 1, 1, 0, 1, 0, -dir, 1, -1, -0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+  };
+}
+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;
+  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,
+    indices: [4, 5, 6, 4, 6, 7],
+    outLineIndices: [0, 1, 2, 0, 2, 3],
+    normals: [0, -dir, 1, 1, 0, 1, 0, -dir, 1, -1, -0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+  };
+}
+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;
+  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,
+    indices: [4, 5, 6, 4, 6, 7],
+    outLineIndices: [0, 1, 2, 0, 2, 3],
+    normals: [0, -dir, 1, 1, 0, 1, 0, -dir, 1, -1, -0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+  };
+}
+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);
+  // @ts-ignore
+  var vertice = path.map(function (t) {
+    return [t[0] * width * dir, t[1] * height];
+  }).flat();
+  return {
+    vertices: [].concat((0, _toConsumableArray2.default)(vertice), (0, _toConsumableArray2.default)(vertice)),
+    dimensions: 2,
+    indices: triangles.map(function (v) {
+      return 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)))
+  };
+}
+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,
+    _ref$height = _ref.height,
+    sourceHeight = _ref$height === void 0 ? 2 : _ref$height;
+  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,
+    _ref2$height = _ref2.height,
+    targetHeight = _ref2$height === void 0 ? 2 : _ref2$height;
+  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;
+    }),
+    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 : {};
+  switch (shape) {
+    case 'circle':
+      return circleArraw(dir, option);
+    case 'triangle':
+      return triangleArrow(dir, option);
+    case 'diamond':
+      return diamondArrow(dir, option);
+    case 'rect':
+      return rectArrow(dir, option);
+    case 'classic':
+      return classicArrow(dir, option);
+    case 'halfTriangle':
+      return halfTriangleArrow(dir, option);
+    default:
+      return {
+        vertices: [],
+        indices: [],
+        normals: [],
+        dimensions: 2,
+        outLineIndices: [],
+        outLineNormals: []
+      };
+  }
+}

package/lib/core/triangulation.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FlowLineFillTriangulation = FlowLineFillTriangulation;
-exports.FlowLineStrokeTriangulation = FlowLineStrokeTriangulation;
 exports.GlobelPointFillTriangulation = GlobelPointFillTriangulation;
 exports.HeatmapGridTriangulation = HeatmapGridTriangulation;
 exports.HeatmapTriangulation = HeatmapTriangulation;
@@ -34,8 +33,8 @@ 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(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+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; }
 // @ts-ignore
 
 var GeometryCache = {};
@@ -191,36 +190,6 @@ function FlowLineFillTriangulation(feature) {
     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 = [];
@@ -422,8 +391,10 @@ function RasterImageTriangulation(feature) {
  * @param feature 映射数据
  * @param segNum 弧线线段数
  */
-function LineArcTriangulation(feature, segmentNumber) {
-  var segNum = segmentNumber ? segmentNumber : 30;
+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 = [];
@@ -431,13 +402,13 @@ function LineArcTriangulation(feature, segmentNumber) {
     // 上线两个顶点
     // [ 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 !== segNum - 1) {
+    if (i !== segmentNumber - 1) {
       indexArray.push.apply(indexArray, (0, _toConsumableArray2.default)([0, 1, 2, 1, 3, 2].map(function (v) {
         return i * 2 + v;
       })));
     }
   };
-  for (var i = 0; i < segNum; i++) {
+  for (var i = 0; i < segmentNumber; i++) {
     _loop(i);
   }
   return {

package/lib/earth/index.js

@@ -26,7 +26,7 @@ var EarthModels = {
   bloomSphere: _bloomsphere.default
 };
 var earthLayerTypes = ['base', 'atomSphere', 'bloomSphere'];
-var EarthLayer = /*#__PURE__*/function (_BaseLayer) {
+var EarthLayer = exports.default = /*#__PURE__*/function (_BaseLayer) {
   (0, _inherits2.default)(EarthLayer, _BaseLayer);
   var _super = _createSuper(EarthLayer);
   function EarthLayer() {
@@ -88,7 +88,7 @@ var EarthLayer = /*#__PURE__*/function (_BaseLayer) {
     value: function getModelType() {
       var _shapeAttribute$scale;
       var shapeAttribute = this.styleAttributeService.getLayerStyleAttribute('shape');
-      var shape = (shapeAttribute === null || shapeAttribute === void 0 ? void 0 : (_shapeAttribute$scale = shapeAttribute.scale) === null || _shapeAttribute$scale === void 0 ? void 0 : _shapeAttribute$scale.field) || 'base';
+      var shape = (shapeAttribute === null || shapeAttribute === void 0 || (_shapeAttribute$scale = shapeAttribute.scale) === null || _shapeAttribute$scale === void 0 ? void 0 : _shapeAttribute$scale.field) || 'base';
       if (earthLayerTypes.indexOf(shape) < 0) {
         shape = 'base';
       }
@@ -96,5 +96,4 @@ var EarthLayer = /*#__PURE__*/function (_BaseLayer) {
     }
   }]);
   return EarthLayer;
-}(_BaseLayer2.default);
-exports.default = EarthLayer;
+}(_BaseLayer2.default);

package/lib/earth/models/atmosphere.js

@@ -23,7 +23,7 @@ var atmoSphereFrag = "\nuniform float u_opacity;\nuniform vec3 u_CameraPosition;
 /* babel-plugin-inline-import '../shaders/atmosphere_vert.glsl' */
 var atmoSphereVert = "\nattribute vec3 a_Position;\nattribute vec3 a_Normal;\nattribute vec2 a_Uv;\nattribute vec4 a_Color;\nuniform vec3 u_CameraPosition;\nvarying float v_CamreaDistance;\n\nuniform mat4 u_ViewProjectionMatrix;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_ViewMatrix;\n\nvarying vec3 vVertexNormal;\nvarying vec4 v_Color;\nvarying float v_offset;\n\nvoid main() {\n    float EARTH_RADIUS = 100.0;\n    \n    v_Color = a_Color;\n\n    v_offset = min(((length(u_CameraPosition) - EARTH_RADIUS)/600.0) * 0.5 + 0.4, 1.0);\n    vVertexNormal = a_Normal;\n\n    gl_Position = u_ViewProjectionMatrix * u_ModelMatrix * vec4(a_Position, 1.0);\n}\n";
 var isNumber = _l7Utils.lodashUtil.isNumber;
-var EarthAtomSphereModel = /*#__PURE__*/function (_BaseModel) {
+var EarthAtomSphereModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(EarthAtomSphereModel, _BaseModel);
   var _super = _createSuper(EarthAtomSphereModel);
   function EarthAtomSphereModel() {
@@ -156,5 +156,4 @@ var EarthAtomSphereModel = /*#__PURE__*/function (_BaseModel) {
     }
   }]);
   return EarthAtomSphereModel;
-}(_BaseModel2.default);
-exports.default = EarthAtomSphereModel;
+}(_BaseModel2.default);

package/lib/earth/models/base.js

@@ -23,7 +23,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 var baseFrag = "\nuniform sampler2D u_texture;\n\nvarying vec2 v_texCoord;\nvarying float v_lightWeight;\n\n\nvoid main() {\n\n    vec4 color = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y));\n    color.xyz = color.xyz * v_lightWeight;\n    gl_FragColor = color;\n}\n";
 /* babel-plugin-inline-import '../shaders/base_vert.glsl' */
 var baseVert = "// attribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Normal;\nattribute vec2 a_Uv;\nvarying vec2 v_texCoord;\n\n// attribute vec2 a_Extrude;\n// attribute float a_Size;\n// attribute float a_Shape;\n\nuniform vec3 u_CameraPosition;\nuniform mat4 u_ViewProjectionMatrix;\nuniform mat4 u_ModelMatrix;\nuniform float u_ambientRatio : 0.5;\nuniform float u_diffuseRatio : 0.3;\nuniform float u_specularRatio : 0.2;\nuniform vec3 u_sunLight: [1.0, -10.5, 12.0];\n\n\n\nfloat calc_lighting(vec4 pos) {\n\n    vec3 worldPos = vec3(pos * u_ModelMatrix);\n\n    vec3 worldNormal = a_Normal;\n\n    // cal light weight\n    vec3 viewDir = normalize(u_CameraPosition - worldPos);\n\n    vec3 lightDir = normalize(u_sunLight);\n\n    vec3 halfDir = normalize(viewDir+lightDir);\n    // lambert\n    float lambert = dot(worldNormal, lightDir);\n    // specular\n    float specular = pow(max(0.0, dot(worldNormal, halfDir)), 32.0);\n    //sum to light weight\n    float lightWeight = u_ambientRatio + u_diffuseRatio * lambert + u_specularRatio * specular;\n\n    return lightWeight;\n}\n\nvarying float v_lightWeight;\nvoid main() {\n\n    v_texCoord = a_Uv;\n\n    float lightWeight = calc_lighting(vec4(a_Position, 1.0));\n    v_lightWeight = lightWeight;\n\n    gl_Position = u_ViewProjectionMatrix * u_ModelMatrix * vec4(a_Position, 1.0);\n}\n";
-var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
+var BaseEarthModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(BaseEarthModel, _BaseModel);
   var _super = _createSuper(BaseEarthModel);
   function BaseEarthModel() {
@@ -214,5 +214,4 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
     }
   }]);
   return BaseEarthModel;
-}(_BaseModel2.default);
-exports.default = BaseEarthModel;
+}(_BaseModel2.default);

package/lib/earth/models/bloomsphere.js

@@ -23,7 +23,7 @@ var bloomSphereFrag = "\nuniform float u_opacity;\nuniform vec3 u_CameraPosition
 /* babel-plugin-inline-import '../shaders/bloomsphere_vert.glsl' */
 var bloomSphereVert = "\nattribute vec3 a_Position;\nattribute vec3 a_Normal;\nattribute vec2 a_Uv;\nattribute vec4 a_Color;\nuniform vec3 u_CameraPosition;\nuniform mat4 u_ViewProjectionMatrix;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_ViewMatrix;\n\nvarying vec3 vVertexNormal;\nvarying vec4 v_Color;\n\nvoid main() {\n    v_Color = a_Color;\n\n    vVertexNormal = a_Normal;\n\n    gl_Position = u_ViewProjectionMatrix * u_ModelMatrix * vec4(a_Position, 1.0);\n}\n";
 var isNumber = _l7Utils.lodashUtil.isNumber;
-var EarthBloomSphereModel = /*#__PURE__*/function (_BaseModel) {
+var EarthBloomSphereModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(EarthBloomSphereModel, _BaseModel);
   var _super = _createSuper(EarthBloomSphereModel);
   function EarthBloomSphereModel() {
@@ -155,5 +155,4 @@ var EarthBloomSphereModel = /*#__PURE__*/function (_BaseModel) {
     }
   }]);
   return EarthBloomSphereModel;
-}(_BaseModel2.default);
-exports.default = EarthBloomSphereModel;
+}(_BaseModel2.default);

package/lib/earth/utils.js

@@ -12,18 +12,15 @@ var _glMatrix = require("gl-matrix");
 // 该文件专门记录地球模式的数值
 
 // 地球网格半径
-var EARTH_RADIUS = 100;
-exports.EARTH_RADIUS = EARTH_RADIUS;
-var EARTH_SEGMENTS = 36;
-exports.EARTH_SEGMENTS = EARTH_SEGMENTS;
-var EARTH_RADIUS_OUTER = 40;
+var EARTH_RADIUS = exports.EARTH_RADIUS = 100;
+var EARTH_SEGMENTS = exports.EARTH_SEGMENTS = 36;
+var EARTH_RADIUS_OUTER = exports.EARTH_RADIUS_OUTER = 40;
 
 /**
  * 角度转弧度
  * @param deg
  * @returns
  */
-exports.EARTH_RADIUS_OUTER = EARTH_RADIUS_OUTER;
 function torad(deg) {
   return deg / 180 * Math.acos(-1);
 }

package/lib/geometry/index.js

@@ -18,7 +18,7 @@ var _BaseLayer2 = _interopRequireDefault(require("../core/BaseLayer"));
 var _models = _interopRequireDefault(require("./models"));
 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; } }
-var GeometryLayer = /*#__PURE__*/function (_BaseLayer) {
+var GeometryLayer = exports.default = /*#__PURE__*/function (_BaseLayer) {
   (0, _inherits2.default)(GeometryLayer, _BaseLayer);
   var _super = _createSuper(GeometryLayer);
   function GeometryLayer() {
@@ -83,7 +83,7 @@ var GeometryLayer = /*#__PURE__*/function (_BaseLayer) {
     value: function getModelType() {
       var _shapeAttribute$scale;
       var shapeAttribute = this.styleAttributeService.getLayerStyleAttribute('shape');
-      var shape = shapeAttribute === null || shapeAttribute === void 0 ? void 0 : (_shapeAttribute$scale = shapeAttribute.scale) === null || _shapeAttribute$scale === void 0 ? void 0 : _shapeAttribute$scale.field;
+      var shape = shapeAttribute === null || shapeAttribute === void 0 || (_shapeAttribute$scale = shapeAttribute.scale) === null || _shapeAttribute$scale === void 0 ? void 0 : _shapeAttribute$scale.field;
       if (shape === 'plane') {
         return 'plane';
       } else if (shape === 'sprite') {
@@ -96,5 +96,4 @@ var GeometryLayer = /*#__PURE__*/function (_BaseLayer) {
     }
   }]);
   return GeometryLayer;
-}(_BaseLayer2.default);
-exports.default = GeometryLayer;
+}(_BaseLayer2.default);

package/lib/geometry/models/billboard.js

@@ -23,7 +23,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 var planeFrag = "\nuniform sampler2D u_texture;\nuniform float u_opacity;\n\nvarying vec3 v_Color;\nvarying vec2 v_uv;\n\n#pragma include \"picking\"\nvoid main() {\n  gl_FragColor = texture2D(u_texture, vec2(v_uv.x, 1.0 - v_uv.y));\n  gl_FragColor.a *= u_opacity;\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
 /* babel-plugin-inline-import '../shaders/billboard_vert.glsl' */
 var planeVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\nuniform float u_raisingHeight: 0.0;\nuniform float u_opacity;\nuniform vec2 u_size: [1.0, 1.0];\nuniform mat2 u_RotateMatrix;\n\nattribute vec3 a_Extrude;\nattribute vec3 a_Position;\nattribute vec2 a_Uv;\nattribute vec3 a_Color;\n\nvarying vec3 v_Color;\nvarying vec2 v_uv;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\nvoid main() {\n   vec3 extrude = a_Extrude;\n   v_Color = a_Color;\n   v_uv = a_Uv;\n\n   float raiseHeight = u_raisingHeight;\n   if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n      float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);\n      raiseHeight = u_raisingHeight * mapboxZoomScale;\n   }\n\n   // \u8BA1\u7B97\u7ECF\u7EAC\u5EA6\u70B9\u4F4D\u5750\u6807\n   vec4 project_pos = project_position(vec4(a_Position.xy, 0.0, 1.0));\n\n   // \u8BA1\u7B97\u7ED5 z \u8F74\u65CB\u8F6C\u540E\u7684\u504F\u79FB\n   vec2 offsetXY = project_pixel(u_RotateMatrix * vec2(extrude.x * u_size.x, 0.0));\n   // \u7ED5 z \u8F74\u65CB\u8F6C\n   float x = project_pos.x + offsetXY.x;\n   float y = project_pos.y + offsetXY.y;\n   // z \u8F74\u4E0D\u53C2\u4E0E\u65CB\u8F6C\n   float z = project_pixel(extrude.y * u_size.y + raiseHeight);\n\n   gl_Position = project_common_position_to_clipspace_v2(vec4(x , y, z , 1.0));\n\n   setPickingColor(a_PickingColor);\n}\n";
-var BillBoardModel = /*#__PURE__*/function (_BaseModel) {
+var BillBoardModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(BillBoardModel, _BaseModel);
   var _super = _createSuper(BillBoardModel);
   function BillBoardModel() {
@@ -86,7 +86,7 @@ var BillBoardModel = /*#__PURE__*/function (_BaseModel) {
     key: "clearModels",
     value: function clearModels() {
       var _this$texture;
-      (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
+      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
     }
   }, {
     key: "initModels",
@@ -214,5 +214,4 @@ var BillBoardModel = /*#__PURE__*/function (_BaseModel) {
     }
   }]);
   return BillBoardModel;
-}(_BaseModel2.default);
-exports.default = BillBoardModel;
+}(_BaseModel2.default);

package/lib/geometry/models/index.js

@@ -13,5 +13,4 @@ var GeometryModels = {
   sprite: _sprite.default,
   billboard: _billboard.default
 };
-var _default = GeometryModels;
-exports.default = _default;
+var _default = exports.default = GeometryModels;

package/lib/geometry/models/plane.js

@@ -24,7 +24,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 var planeFrag = "\nuniform sampler2D u_texture;\nuniform float u_mapFlag;\nuniform float u_opacity;\n\nvarying vec3 v_Color;\nvarying vec2 v_uv;\nvarying float v_clip;\n\n#pragma include \"picking\"\nvoid main() {\n  // gl_FragColor = vec4(v_Color, u_opacity);\n  if(u_mapFlag > 0.0) {\n    gl_FragColor = texture2D(u_texture, vec2(v_uv.x, 1.0 - v_uv.y));\n    gl_FragColor.a *= u_opacity;\n  } else {\n    // gl_FragColor = vec4(v_uv, 0.0, u_opacity);\n    gl_FragColor = vec4(v_Color, u_opacity);\n  }\n  gl_FragColor.a *= v_clip;\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
 /* babel-plugin-inline-import '../shaders/plane_vert.glsl' */
 var planeVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\n\nuniform float u_opacity;\nuniform float u_terrainClipHeight;\n\nattribute vec3 a_Position;\nattribute vec2 a_Uv;\nattribute vec3 a_Color;\n\nvarying vec3 v_Color;\nvarying vec2 v_uv;\nvarying float v_clip;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\nvoid main() {\n   v_Color = a_Color;\n   v_uv = a_Uv;\n  \n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n   v_clip = 1.0;\n   if(a_Position.z < u_terrainClipHeight) {\n      v_clip = 0.0;\n   }\n  \n  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy, a_Position.z, 1.0));\n\n   setPickingColor(a_PickingColor);\n}\n";
-var PlaneModel = /*#__PURE__*/function (_BaseModel) {
+var PlaneModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(PlaneModel, _BaseModel);
   var _super = _createSuper(PlaneModel);
   function PlaneModel() {
@@ -129,7 +129,7 @@ var PlaneModel = /*#__PURE__*/function (_BaseModel) {
       if (this.mapTexture !== mapTexture) {
         var _this$texture;
         this.mapTexture = mapTexture;
-        (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
+        (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
         this.updateTexture(mapTexture);
       }
       return {
@@ -145,7 +145,7 @@ var PlaneModel = /*#__PURE__*/function (_BaseModel) {
       var _this$texture2;
       // @ts-ignore
       this.terrainImage = null;
-      (_this$texture2 = this.texture) === null || _this$texture2 === void 0 ? void 0 : _this$texture2.destroy();
+      (_this$texture2 = this.texture) === null || _this$texture2 === void 0 || _this$texture2.destroy();
     }
   }, {
     key: "initModels",
@@ -378,5 +378,4 @@ var PlaneModel = /*#__PURE__*/function (_BaseModel) {
     }
   }]);
   return PlaneModel;
-}(_BaseModel2.default);
-exports.default = PlaneModel;
+}(_BaseModel2.default);

package/lib/geometry/models/sprite.js

@@ -29,7 +29,7 @@ var SPRITE_ANIMATE_DIR = /*#__PURE__*/function (SPRITE_ANIMATE_DIR) {
   SPRITE_ANIMATE_DIR["DOWN"] = "down";
   return SPRITE_ANIMATE_DIR;
 }(SPRITE_ANIMATE_DIR || {});
-var SpriteModel = /*#__PURE__*/function (_BaseModel) {
+var SpriteModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(SpriteModel, _BaseModel);
   var _super = _createSuper(SpriteModel);
   function SpriteModel() {
@@ -148,7 +148,7 @@ var SpriteModel = /*#__PURE__*/function (_BaseModel) {
       if (this.mapTexture !== mapTexture) {
         var _this$texture;
         this.mapTexture = mapTexture;
-        (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
+        (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
         this.updateTexture(mapTexture);
       }
       return {
@@ -163,7 +163,7 @@ var SpriteModel = /*#__PURE__*/function (_BaseModel) {
     value: function clearModels() {
       var _this$texture2;
       cancelAnimationFrame(this.timer);
-      (_this$texture2 = this.texture) === null || _this$texture2 === void 0 ? void 0 : _this$texture2.destroy();
+      (_this$texture2 = this.texture) === null || _this$texture2 === void 0 || _this$texture2.destroy();
     }
   }, {
     key: "initModels",
@@ -266,5 +266,4 @@ var SpriteModel = /*#__PURE__*/function (_BaseModel) {
     }
   }]);
   return SpriteModel;
-}(_BaseModel2.default);
-exports.default = SpriteModel;
+}(_BaseModel2.default);