@antv/l7-layers 2.17.4 → 2.17.5

package/es/core/BaseModel.js

@@ -6,9 +6,7 @@ import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _applyDecoratedDescriptor from "@babel/runtime/helpers/esm/applyDecoratedDescriptor";
 import _initializerWarningHelper from "@babel/runtime/helpers/esm/initializerWarningHelper";
-
 var _dec, _class, _descriptor;
-
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { BlendType, lazyInject, MaskOperation, StencilType, TYPES } from '@antv/l7-core';
 import { rgb2arr } from '@antv/l7-utils';
@@ -18,16 +16,14 @@ import { getCommonStyleAttributeOptions } from "./CommonStyleAttribute";
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__PURE__*/function () {
   // style texture data mapping
+
   // style texture data mapping
+
   function BaseModel(layer) {
     _classCallCheck(this, BaseModel);
-
     _defineProperty(this, "preStyleAttribute", {});
-
     _defineProperty(this, "encodeStyleAttribute", {});
-
     _initializerDefineProperty(this, "configService", _descriptor, this);
-
     this.layer = layer;
     this.rendererService = layer.getContainer().get(TYPES.IRendererService);
     this.pickingService = layer.getContainer().get(TYPES.IPickingService);
@@ -37,40 +33,39 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     this.iconService = layer.getContainer().get(TYPES.IIconService);
     this.fontService = layer.getContainer().get(TYPES.IFontService);
     this.cameraService = layer.getContainer().get(TYPES.ICameraService);
-    this.layerService = layer.getContainer().get(TYPES.ILayerService); // 初始化支持数据映射的 Style 属性
-
-    this.registerStyleAttribute(); // 注册 Attribute
-
-    this.registerBuiltinAttributes(); // 开启动画
+    this.layerService = layer.getContainer().get(TYPES.ILayerService);
+    // 初始化支持数据映射的 Style 属性
 
+    this.registerStyleAttribute();
+    // 注册 Attribute
+    this.registerBuiltinAttributes();
+    // 开启动画
     this.startModelAnimate();
     var createTexture2D = this.rendererService.createTexture2D;
     this.createTexture2D = createTexture2D;
-  } // style datatexture mapping
-
+  }
 
+  // style datatexture mapping
   _createClass(BaseModel, [{
     key: "getBlend",
     value: function getBlend() {
       var _this$layer$getLayerC = this.layer.getLayerConfig(),
-          _this$layer$getLayerC2 = _this$layer$getLayerC.blend,
-          blend = _this$layer$getLayerC2 === void 0 ? 'normal' : _this$layer$getLayerC2;
-
+        _this$layer$getLayerC2 = _this$layer$getLayerC.blend,
+        blend = _this$layer$getLayerC2 === void 0 ? 'normal' : _this$layer$getLayerC2;
       return BlendTypes[BlendType[blend]];
     }
   }, {
     key: "getStencil",
     value: function getStencil(option) {
       var _this$layer$getLayerC3 = this.layer.getLayerConfig(),
-          _this$layer$getLayerC4 = _this$layer$getLayerC3.mask,
-          mask = _this$layer$getLayerC4 === void 0 ? false : _this$layer$getLayerC4,
-          _this$layer$getLayerC5 = _this$layer$getLayerC3.maskInside,
-          maskInside = _this$layer$getLayerC5 === void 0 ? true : _this$layer$getLayerC5,
-          enableMask = _this$layer$getLayerC3.enableMask,
-          _this$layer$getLayerC6 = _this$layer$getLayerC3.maskOperation,
-          maskOperation = _this$layer$getLayerC6 === void 0 ? MaskOperation.AND : _this$layer$getLayerC6; // TODO 临时处理，后期移除MaskLayer
-
-
+        _this$layer$getLayerC4 = _this$layer$getLayerC3.mask,
+        mask = _this$layer$getLayerC4 === void 0 ? false : _this$layer$getLayerC4,
+        _this$layer$getLayerC5 = _this$layer$getLayerC3.maskInside,
+        maskInside = _this$layer$getLayerC5 === void 0 ? true : _this$layer$getLayerC5,
+        enableMask = _this$layer$getLayerC3.enableMask,
+        _this$layer$getLayerC6 = _this$layer$getLayerC3.maskOperation,
+        maskOperation = _this$layer$getLayerC6 === void 0 ? MaskOperation.AND : _this$layer$getLayerC6;
+      // TODO 临时处理，后期移除MaskLayer
       if (this.layer.type === 'MaskLayer') {
         return getStencilMask({
           isStencil: true,
@@ -84,11 +79,12 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
         })); // 用于遮罩的stencil 参数
       }
 
-      var maskflag = mask || //  mask 兼容历史写法
-      enableMask && this.layer.masks.length !== 0 || // 外部图层的mask
+      var maskflag = mask ||
+      //  mask 兼容历史写法
+      enableMask && this.layer.masks.length !== 0 ||
+      // 外部图层的mask
       this.layer.tileMask !== undefined; // 瓦片图层
       // !!(mask || enableMask || this.layer.tileMask);
-
       return _getStencil(maskflag, maskInside);
     }
   }, {
@@ -111,76 +107,58 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     value: function () {
       var _needUpdate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                return _context.abrupt("return", false);
-
-              case 1:
-              case "end":
-                return _context.stop();
-            }
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              return _context.abrupt("return", false);
+            case 1:
+            case "end":
+              return _context.stop();
           }
         }, _callee);
       }));
-
       function needUpdate() {
         return _needUpdate.apply(this, arguments);
       }
-
       return needUpdate;
     }() // eslint-disable-next-line @typescript-eslint/no-unused-vars
-
   }, {
     key: "buildModels",
     value: function () {
       var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                throw new Error('Method not implemented.');
-
-              case 1:
-              case "end":
-                return _context2.stop();
-            }
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              throw new Error('Method not implemented.');
+            case 1:
+            case "end":
+              return _context2.stop();
           }
         }, _callee2);
       }));
-
       function buildModels() {
         return _buildModels.apply(this, arguments);
       }
-
       return buildModels;
     }() // eslint-disable-next-line @typescript-eslint/no-unused-vars
-
   }, {
     key: "initModels",
     value: function () {
       var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
         return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-          while (1) {
-            switch (_context3.prev = _context3.next) {
-              case 0:
-                throw new Error('Method not implemented.');
-
-              case 1:
-              case "end":
-                return _context3.stop();
-            }
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              throw new Error('Method not implemented.');
+            case 1:
+            case "end":
+              return _context3.stop();
           }
         }, _callee3);
       }));
-
       function initModels() {
         return _initModels.apply(this, arguments);
       }
-
       return initModels;
     }() // eslint-disable-next-line @typescript-eslint/no-unused-vars
-
   }, {
     key: "clearModels",
     value: function clearModels() {
@@ -191,8 +169,8 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     key: "getAttribute",
     value: function getAttribute() {
       throw new Error('Method not implemented.');
-    } // eslint-disable-next-line @typescript-eslint/no-unused-vars
-
+    }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
   }, {
     key: "render",
     value: function render(renderOptions) {
@@ -212,8 +190,7 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     key: "startModelAnimate",
     value: function startModelAnimate() {
       var _ref = this.layer.getLayerConfig(),
-          animateOption = _ref.animateOption;
-
+        animateOption = _ref.animateOption;
       if (animateOption.enable) {
         this.layer.setAnimateStartTime();
       }
@@ -233,7 +210,6 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
         if (encodeStyleAttribute[key]) {
           str += "#define USE_ATTRIBUTE_".concat(key.toUpperCase(), " 0.0; \n\n");
         }
-
         str += "\n      #ifdef USE_ATTRIBUTE_".concat(key.toUpperCase(), "\n  attribute ").concat(attrType[key], " a_").concat(key.charAt(0).toUpperCase() + key.slice(1), ";\n#else\n  uniform ").concat(attrType[key], " u_").concat(key, ";\n#endif\n\n");
       });
       var innerStr = '';
@@ -244,14 +220,15 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
         'vs:#decl': str,
         'vs:#main-start': innerStr
       };
-    } // 获取数据映射样式
+    }
 
+    // 获取数据映射样式
   }, {
     key: "getStyleAttribute",
     value: function getStyleAttribute() {
       var _this = this;
-
-      var options = {}; // TODO: 优化
+      var options = {};
+      // TODO: 优化
 
       var defualtValue = {
         opacity: 1,
@@ -262,27 +239,22 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
         if (!_this.layer.encodeStyleAttribute[key]) {
           // @ts-ignore
           var keyValue = _this.layer.getLayerConfig()[key];
-
           var value = typeof keyValue === 'undefined' ? defualtValue[key] : keyValue;
-
           if (key === 'stroke') {
             value = rgb2arr(value);
           }
-
           options['u_' + key] = value;
         }
       });
       return options;
-    } // 注册数据映射样式
-
+    }
+    // 注册数据映射样式
   }, {
     key: "registerStyleAttribute",
     value: function registerStyleAttribute() {
       var _this2 = this;
-
       Object.keys(this.layer.encodeStyleAttribute).forEach(function (key) {
         var options = getCommonStyleAttributeOptions(key);
-
         if (options) {
           _this2.styleAttributeService.registerStyleAttribute(options);
         }
@@ -294,7 +266,6 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
       this.encodeStyleAttribute[type] = flag;
     }
   }]);
-
   return BaseModel;
 }(), (_descriptor = _applyDecoratedDescriptor(_class.prototype, "configService", [_dec], {
   configurable: true,

package/es/core/CommonStyleAttribute.js

@@ -16,12 +16,11 @@ export function getCommonStyleAttributeOptions(name) {
           size: 4,
           update: function update(feature) {
             var _feature$stroke = feature.stroke,
-                stroke = _feature$stroke === void 0 ? [1, 1, 1, 1] : _feature$stroke;
+              stroke = _feature$stroke === void 0 ? [1, 1, 1, 1] : _feature$stroke;
             return stroke;
           }
         }
       };
-
     case 'opacity':
       return {
         name: 'opacity',
@@ -37,12 +36,11 @@ export function getCommonStyleAttributeOptions(name) {
           size: 1,
           update: function update(feature) {
             var _feature$opacity = feature.opacity,
-                op = _feature$opacity === void 0 ? 1 : _feature$opacity;
+              op = _feature$opacity === void 0 ? 1 : _feature$opacity;
             return [op];
           }
         }
       };
-
     case 'offsets':
       return {
         name: 'offsets',
@@ -62,7 +60,6 @@ export function getCommonStyleAttributeOptions(name) {
           }
         }
       };
-
     default:
       return undefined;
   }

package/es/core/LayerPickService.js

@@ -4,25 +4,21 @@ import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import { TYPES } from '@antv/l7-core';
 import { lngLatInExtent } from '@antv/l7-utils';
-
 var BaseLayerPickService = /*#__PURE__*/function () {
   function BaseLayerPickService(layer) {
     _classCallCheck(this, BaseLayerPickService);
-
     this.layer = layer;
   }
-
   _createClass(BaseLayerPickService, [{
     key: "pickRender",
     value: function pickRender(target) {
       var container = this.layer.getContainer();
       var layerService = container.get(TYPES.ILayerService);
-      var layer = this.layer; // 瓦片图层的拾取绘制
-
+      var layer = this.layer;
+      // 瓦片图层的拾取绘制
       if (layer.tileLayer) {
         return layer.tileLayer.pickRender(target);
       }
-
       layer.hooks.beforePickingEncode.call();
       layerService.renderTileLayerMask(layer);
       layer.renderModels({
@@ -35,11 +31,9 @@ var BaseLayerPickService = /*#__PURE__*/function () {
     value: function pick(layer, target) {
       var container = this.layer.getContainer();
       var pickingService = container.get(TYPES.IPickingService);
-
       if (layer.type === 'RasterLayer') {
         return this.pickRasterLayer(layer, target);
       }
-
       this.pickRender(target);
       return pickingService.pickFromPickingFBO(layer, target);
     }
@@ -60,7 +54,6 @@ var BaseLayerPickService = /*#__PURE__*/function () {
         rasterValue: null
       };
       var adviceTarget = parent ? parent : layer;
-
       if (isPick) {
         var rasterValue = this.readRasterValue(layer, extent, mapService, target.x, target.y);
         layerTarget.rasterValue = rasterValue;
@@ -79,24 +72,24 @@ var BaseLayerPickService = /*#__PURE__*/function () {
     key: "readRasterValue",
     value: function readRasterValue(layer, bbox, mapService, x, y) {
       var rasterData = layer.getSource().data.dataArray[0];
-
       var _bbox = _slicedToArray(bbox, 4),
-          _bbox$ = _bbox[0],
-          minLng = _bbox$ === void 0 ? 0 : _bbox$,
-          _bbox$2 = _bbox[1],
-          minLat = _bbox$2 === void 0 ? 0 : _bbox$2,
-          _bbox$3 = _bbox[2],
-          maxLng = _bbox$3 === void 0 ? 10 : _bbox$3,
-          _bbox$4 = _bbox[3],
-          maxLat = _bbox$4 === void 0 ? -10 : _bbox$4;
-
+        _bbox$ = _bbox[0],
+        minLng = _bbox$ === void 0 ? 0 : _bbox$,
+        _bbox$2 = _bbox[1],
+        minLat = _bbox$2 === void 0 ? 0 : _bbox$2,
+        _bbox$3 = _bbox[2],
+        maxLng = _bbox$3 === void 0 ? 10 : _bbox$3,
+        _bbox$4 = _bbox[3],
+        maxLat = _bbox$4 === void 0 ? -10 : _bbox$4;
       var tileXY = mapService.lngLatToContainer([minLng, minLat]);
       var tileMaxXY = mapService.lngLatToContainer([maxLng, maxLat]);
       var tilePixelWidth = tileMaxXY.x - tileXY.x;
       var tilePixelHeight = tileXY.y - tileMaxXY.y;
-      var pos = [(x - tileXY.x) / tilePixelWidth, // x
+      var pos = [(x - tileXY.x) / tilePixelWidth,
+      // x
       (y - tileMaxXY.y) / tilePixelHeight // y
       ];
+
       var tileWidth = rasterData.width || 1;
       var tileHeight = rasterData.height || 1;
       var indexX = Math.floor(pos[0] * tileWidth);
@@ -108,13 +101,12 @@ var BaseLayerPickService = /*#__PURE__*/function () {
   }, {
     key: "selectFeature",
     value: function selectFeature(pickedColors) {
-      var layer = this.layer; // @ts-ignore
-
+      var layer = this.layer;
+      // @ts-ignore
       var _pickedColors = _slicedToArray(pickedColors, 3),
-          r = _pickedColors[0],
-          g = _pickedColors[1],
-          b = _pickedColors[2];
-
+        r = _pickedColors[0],
+        g = _pickedColors[1],
+        b = _pickedColors[2];
       layer.hooks.beforeSelect.call([r, g, b]);
     }
   }, {
@@ -122,10 +114,9 @@ var BaseLayerPickService = /*#__PURE__*/function () {
     value: function highlightPickedFeature(pickedColors) {
       // @ts-ignore
       var _pickedColors2 = _slicedToArray(pickedColors, 3),
-          r = _pickedColors2[0],
-          g = _pickedColors2[1],
-          b = _pickedColors2[2];
-
+        r = _pickedColors2[0],
+        g = _pickedColors2[1],
+        b = _pickedColors2[2];
       this.layer.hooks.beforeHighlight.call([r, g, b]);
     }
   }, {
@@ -134,8 +125,6 @@ var BaseLayerPickService = /*#__PURE__*/function () {
       return this.layer.getSource().getFeatureById(pickedFeatureIdx);
     }
   }]);
-
   return BaseLayerPickService;
 }();
-
 export { BaseLayerPickService as default };

package/es/core/TextureService.js

@@ -2,28 +2,23 @@ import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import { TYPES } from '@antv/l7-core';
 import { generateCatRamp, generateColorRamp, generateCustomRamp, generateLinearRamp, generateQuantizeRamp } from '@antv/l7-utils';
-
 var TextureService = /*#__PURE__*/function () {
   function TextureService(layer) {
     _classCallCheck(this, TextureService);
-
     this.layer = layer;
     var container = this.layer.getContainer();
     this.rendererService = container.get(TYPES.IRendererService);
   }
-
   _createClass(TextureService, [{
     key: "getColorTexture",
     value: function getColorTexture(colorRamp, domain) {
       // TODO 支持传入图片
       var currentkey = this.getTextureKey(colorRamp, domain);
-
       if (this.key === currentkey) {
         return this.colorTexture;
       } else {
         this.createColorTexture(colorRamp, domain);
       }
-
       this.key = currentkey;
       return this.colorTexture;
     }
@@ -51,7 +46,6 @@ var TextureService = /*#__PURE__*/function () {
     key: "destroy",
     value: function destroy() {
       var _this$colorTexture;
-
       (_this$colorTexture = this.colorTexture) === null || _this$colorTexture === void 0 ? void 0 : _this$colorTexture.destroy();
     }
   }, {
@@ -60,16 +54,12 @@ var TextureService = /*#__PURE__*/function () {
       switch (colorRamp.type) {
         case 'cat':
           return generateCatRamp(colorRamp);
-
         case 'quantize':
           return generateQuantizeRamp(colorRamp);
-
         case 'custom':
           return generateCustomRamp(colorRamp, domain);
-
         case 'linear':
           return generateLinearRamp(colorRamp, domain);
-
         default:
           return generateColorRamp(colorRamp);
       }
@@ -78,12 +68,9 @@ var TextureService = /*#__PURE__*/function () {
     key: "getTextureKey",
     value: function getTextureKey(colorRamp, domain) {
       var _colorRamp$positions;
-
       return "".concat(colorRamp.colors.join('_'), "_").concat(colorRamp === null || colorRamp === void 0 ? void 0 : (_colorRamp$positions = colorRamp.positions) === null || _colorRamp$positions === void 0 ? void 0 : _colorRamp$positions.join('_'), "_").concat(colorRamp.type, "_").concat(domain === null || domain === void 0 ? void 0 : domain.join('_'));
     }
   }]);
-
   return TextureService;
 }();
-
 export { TextureService as default };

package/es/core/interface.js

@@ -1,37 +1,30 @@
-export var lineStyleType;
-
-(function (lineStyleType) {
+export var lineStyleType = /*#__PURE__*/function (lineStyleType) {
   lineStyleType[lineStyleType["solid"] = 0] = "solid";
   lineStyleType[lineStyleType["dash"] = 1] = "dash";
-})(lineStyleType || (lineStyleType = {}));
-
-export var LinearDir;
-
-(function (LinearDir) {
+  return lineStyleType;
+}({});
+export var LinearDir = /*#__PURE__*/function (LinearDir) {
   LinearDir["VERTICAL"] = "vertical";
   LinearDir["HORIZONTAL"] = "horizontal";
-})(LinearDir || (LinearDir = {}));
+  return LinearDir;
+}({});
+export var TextureBlend = /*#__PURE__*/function (TextureBlend) {
+  TextureBlend["NORMAL"] = "normal";
+  TextureBlend["REPLACE"] = "replace";
+  return TextureBlend;
+}({});
 
-export var TextureBlend;
 /**
  * 基础图层类型定义
  */
 
-(function (TextureBlend) {
-  TextureBlend["NORMAL"] = "normal";
-  TextureBlend["REPLACE"] = "replace";
-})(TextureBlend || (TextureBlend = {}));
-
-export var SizeUnitType;
-
-(function (SizeUnitType) {
+export var SizeUnitType = /*#__PURE__*/function (SizeUnitType) {
   SizeUnitType[SizeUnitType["pixel"] = 0] = "pixel";
   SizeUnitType[SizeUnitType["meter"] = 1] = "meter";
-})(SizeUnitType || (SizeUnitType = {}));
-
-export var CanvasUpdateType;
-
-(function (CanvasUpdateType) {
+  return SizeUnitType;
+}({});
+export var CanvasUpdateType = /*#__PURE__*/function (CanvasUpdateType) {
   CanvasUpdateType["ALWAYS"] = "always";
   CanvasUpdateType["DRAGEND"] = "dragend";
-})(CanvasUpdateType || (CanvasUpdateType = {}));
+  return CanvasUpdateType;
+}({});

package/es/core/shape/Path.js

@@ -1,47 +1,40 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-
 var _geometryShape;
-
-export var ShapeType3D;
-
-(function (ShapeType3D) {
+export var ShapeType3D = /*#__PURE__*/function (ShapeType3D) {
   ShapeType3D["CYLINDER"] = "cylinder";
   ShapeType3D["SQUARECOLUMN"] = "squareColumn";
   ShapeType3D["TRIANGLECOLUMN"] = "triangleColumn";
   ShapeType3D["HEXAGONCOLUMN"] = "hexagonColumn";
   ShapeType3D["PENTAGONCOLUMN"] = "pentagonColumn";
-})(ShapeType3D || (ShapeType3D = {}));
-
-export var ShapeType2D;
-/**
- * 生成规则多边形顶点个数
- * @param pointCount  顶点个数 3 => 三角形
- * @param start 顶点起始角度 调整图形的方向
- */
-
-(function (ShapeType2D) {
+  return ShapeType3D;
+}({});
+export var ShapeType2D = /*#__PURE__*/function (ShapeType2D) {
   ShapeType2D["CIRCLE"] = "circle";
   ShapeType2D["SQUARE"] = "square";
   ShapeType2D["TRIANGLE"] = "triangle";
   ShapeType2D["HEXAGON"] = "hexagon";
   ShapeType2D["PENTAGON"] = "pentagon";
-})(ShapeType2D || (ShapeType2D = {}));
+  return 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++) {
     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);
     return [x, y, 0];
-  }); // path.push(path[0]);
-
+  });
+  // path.push(path[0]);
   return path;
 }
 export function circle() {