@jscad/modeling 2.7.2 → 2.9.1

package/src/operations/transforms/translate.js

@@ -7,10 +7,10 @@ const geom3 = require('../../geometries/geom3')
 const path2 = require('../../geometries/path2')
 
 /**
- * Translate the given geometries using the given options.
- * @param {Array} offset - offset (vector) of which to translate the geometries
- * @param {...Object} geometries - the geometries to translate
- * @return {Object|Array} the translated geometry, or a list of translated geometries
+ * Translate the given objects using the given options.
+ * @param {Array} offset - offset (vector) of which to translate the objects
+ * @param {...Object} objects - the objects to translate
+ * @return {Object|Array} the translated object, or a list of translated objects
  * @alias module:modeling/transforms.translate
  *
  * @example
@@ -38,28 +38,28 @@ const translate = (offset, ...objects) => {
 }
 
 /**
- * Translate the given geometries along the X axis using the given options.
- * @param {Number} offset - X offset of which to translate the geometries
- * @param {...Object} geometries - the geometries to translate
- * @return {Object|Array} the translated geometry, or a list of translated geometries
+ * Translate the given objects along the X axis using the given options.
+ * @param {Number} offset - X offset of which to translate the objects
+ * @param {...Object} objects - the objects to translate
+ * @return {Object|Array} the translated object, or a list of translated objects
  * @alias module:modeling/transforms.translateX
  */
 const translateX = (offset, ...objects) => translate([offset, 0, 0], objects)
 
 /**
- * Translate the given geometries along the Y axis using the given options.
+ * Translate the given objects along the Y axis using the given options.
  * @param {Number} offset - Y offset of which to translate the geometries
- * @param {...Object} geometries - the geometries to translate
- * @return {Object|Array} the translated geometry, or a list of translated geometries
+ * @param {...Object} objects - the objects to translate
+ * @return {Object|Array} the translated object, or a list of translated objects
  * @alias module:modeling/transforms.translateY
  */
 const translateY = (offset, ...objects) => translate([0, offset, 0], objects)
 
 /**
- * Translate the given geometries along the Z axis using the given options.
+ * Translate the given objects along the Z axis using the given options.
  * @param {Number} offset - Z offset of which to translate the geometries
- * @param {...Object} geometries - the geometries to translate
- * @return {Object|Array} the translated geometry, or a list of translated geometries
+ * @param {...Object} objects - the objects to translate
+ * @return {Object|Array} the translated object, or a list of translated objects
  * @alias module:modeling/transforms.translateZ
  */
 const translateZ = (offset, ...objects) => translate([0, 0, offset], objects)

package/src/operations/transforms/translate.test.js

@@ -13,20 +13,24 @@ test('translate: translating of a path2 produces expected changes to points', (t
   let translated = translate([1], line)
   let obs = path2.toPoints(translated)
   let exp = [[1, 0], [2, 0]]
+  t.notThrows(() => path2.validate(translated))
   t.true(comparePoints(obs, exp))
 
   translated = translateX(1, line)
   obs = path2.toPoints(translated)
+  t.notThrows(() => path2.validate(translated))
   t.true(comparePoints(obs, exp))
 
   // translate Y
   translated = translate([0, 1], line)
   obs = path2.toPoints(translated)
   exp = [[0, 1], [1, 1]]
+  t.notThrows(() => path2.validate(translated))
   t.true(comparePoints(obs, exp))
 
   translated = translateY(1, line)
   obs = path2.toPoints(translated)
+  t.notThrows(() => path2.validate(translated))
   t.true(comparePoints(obs, exp))
 })
 
@@ -37,20 +41,24 @@ test('translate: translating of a geom2 produces expected changes to points', (t
   let translated = translate([1], geometry)
   let obs = geom2.toPoints(translated)
   let exp = [[1, 0], [2, 0], [1, 1]]
+  t.notThrows(() => geom2.validate(translated))
   t.true(comparePoints(obs, exp))
 
   translated = translateX(1, geometry)
   obs = geom2.toPoints(translated)
+  t.notThrows(() => geom2.validate(translated))
   t.true(comparePoints(obs, exp))
 
   // translate Y
   translated = translate([0, 1], geometry)
   obs = geom2.toPoints(translated)
   exp = [[0, 1], [1, 1], [0, 2]]
+  t.notThrows(() => geom2.validate(translated))
   t.true(comparePoints(obs, exp))
 
   translated = translateY(1, geometry)
   obs = geom2.toPoints(translated)
+  t.notThrows(() => geom2.validate(translated))
   t.true(comparePoints(obs, exp))
 })
 
@@ -76,10 +84,12 @@ test('translate: translating of a geom3 produces expected changes to polygons',
     [[1, -7, -12], [1, 13, -12], [11, 13, -12], [11, -7, -12]],
     [[1, -7, 18], [11, -7, 18], [11, 13, 18], [1, 13, 18]]
   ]
+  t.notThrows(() => geom3.validate(translated))
   t.true(comparePolygonsAsPoints(obs, exp))
 
   translated = translateX(3, geometry)
   obs = geom3.toPoints(translated)
+  t.notThrows(() => geom3.validate(translated))
   t.true(comparePolygonsAsPoints(obs, exp))
 
   // translated Y
@@ -93,10 +103,12 @@ test('translate: translating of a geom3 produces expected changes to polygons',
     [[-2, -4, -12], [-2, 16, -12], [8, 16, -12], [8, -4, -12]],
     [[-2, -4, 18], [8, -4, 18], [8, 16, 18], [-2, 16, 18]]
   ]
+  t.notThrows(() => geom3.validate(translated))
   t.true(comparePolygonsAsPoints(obs, exp))
 
   translated = translateY(3, geometry)
   obs = geom3.toPoints(translated)
+  t.notThrows(() => geom3.validate(translated))
   t.true(comparePolygonsAsPoints(obs, exp))
 
   // translate Z
@@ -110,10 +122,12 @@ test('translate: translating of a geom3 produces expected changes to polygons',
     [[-2, -7, -9], [-2, 13, -9], [8, 13, -9], [8, -7, -9]],
     [[-2, -7, 21], [8, -7, 21], [8, 13, 21], [-2, 13, 21]]
   ]
+  t.notThrows(() => geom3.validate(translated))
   t.true(comparePolygonsAsPoints(obs, exp))
 
   translated = translateZ(3, geometry)
   obs = geom3.toPoints(translated)
+  t.notThrows(() => geom3.validate(translated))
   t.true(comparePolygonsAsPoints(obs, exp))
 })
 
@@ -127,9 +141,11 @@ test('translate: translating of multiple objects produces expected changes', (t)
 
   let obs = path2.toPoints(translated[1])
   let exp = [[-2, 8], [8, 8], [-2, -2], [13, -2]]
+  t.notThrows(() => path2.validate(translated[1]))
   t.true(comparePoints(obs, exp))
 
   obs = geom2.toPoints(translated[2])
   exp = [[-2, -2], [3, 8], [13, -2]]
+  t.notThrows(() => geom2.validate(translated[2]))
   t.true(comparePoints(obs, exp))
 })

package/src/primitives/arc.js

@@ -78,7 +78,7 @@ const arc = (options) => {
       pointArray.push(point)
     }
   }
-  return path2.fromPoints({ close: false }, pointArray)
+  return path2.fromPoints({ closed: false }, pointArray)
 }
 
 module.exports = arc

package/src/primitives/arc.test.js

@@ -10,6 +10,7 @@ test('arc (defaults)', (t) => {
   const geometry = arc()
   const obs = path2.toPoints(geometry)
 
+  t.notThrows(() => path2.validate(geometry))
   t.deepEqual(obs.length, 33)
 })
 
@@ -37,6 +38,7 @@ test('arc (options)', (t) => {
   let geometry = arc({ center: [2, 2], segments: 16 })
   let obs = path2.toPoints(geometry)
 
+  t.notThrows(() => path2.validate(geometry))
   t.deepEqual(obs.length, 17)
   t.true(comparePoints(obs, exp))
 
@@ -63,6 +65,7 @@ test('arc (options)', (t) => {
   geometry = arc({ radius: 2, segments: 16 })
   obs = path2.toPoints(geometry)
 
+  t.notThrows(() => path2.validate(geometry))
   t.deepEqual(obs.length, 17)
   t.true(comparePoints(obs, exp))
 
@@ -86,6 +89,7 @@ test('arc (options)', (t) => {
   geometry = arc({ startAngle: Math.PI / 2, segments: 16 })
   obs = path2.toPoints(geometry)
 
+  t.notThrows(() => path2.validate(geometry))
   t.deepEqual(obs.length, 14)
   t.true(comparePoints(obs, exp))
 
@@ -101,6 +105,7 @@ test('arc (options)', (t) => {
   geometry = arc({ endAngle: Math.PI / 2, segments: 16 })
   obs = path2.toPoints(geometry)
 
+  t.notThrows(() => path2.validate(geometry))
   t.deepEqual(obs.length, 6)
   t.true(comparePoints(obs, exp))
 
@@ -129,6 +134,7 @@ test('arc (options)', (t) => {
   geometry = arc({ makeTangent: true, segments: 16 })
   obs = path2.toPoints(geometry)
 
+  t.notThrows(() => path2.validate(geometry))
   t.deepEqual(obs.length, 19)
   t.true(comparePoints(obs, exp))
 
@@ -147,6 +153,7 @@ test('arc (options)', (t) => {
   geometry = arc({ segments: 8 })
   obs = path2.toPoints(geometry)
 
+  t.notThrows(() => path2.validate(geometry))
   t.deepEqual(obs.length, 9)
   t.true(comparePoints(obs, exp))
 })
@@ -163,6 +170,7 @@ test('arc (rotations)', (t) => {
   let geometry = arc({ startAngle: Math.PI / 2, endAngle: Math.PI, segments: 16 })
   let obs = path2.toPoints(geometry)
 
+  t.notThrows(() => path2.validate(geometry))
   t.deepEqual(obs.length, 6)
   t.true(comparePoints(obs, exp))
 
@@ -181,6 +189,7 @@ test('arc (rotations)', (t) => {
   geometry = arc({ startAngle: Math.PI, endAngle: Math.PI * 2, segments: 16 })
   obs = path2.toPoints(geometry)
 
+  t.notThrows(() => path2.validate(geometry))
   t.deepEqual(obs.length, 10)
   t.true(comparePoints(obs, exp))
 
@@ -199,6 +208,7 @@ test('arc (rotations)', (t) => {
   geometry = arc({ startAngle: Math.PI * 2 * 0.75, endAngle: Math.PI / 2, segments: 16 })
   obs = path2.toPoints(geometry)
 
+  t.notThrows(() => path2.validate(geometry))
   t.deepEqual(obs.length, 10)
   t.true(comparePoints(obs, exp))
 
@@ -206,6 +216,7 @@ test('arc (rotations)', (t) => {
   geometry = arc({ startAngle: Math.PI * 2 * 0.75, endAngle: 270.000000005 * 0.017453292519943295, segments: 16 })
   obs = path2.toPoints(geometry)
 
+  t.notThrows(() => path2.validate(geometry))
   t.deepEqual(obs.length, 1)
   t.true(comparePoints(obs, exp))
 })

package/src/primitives/circle.test.js

@@ -10,6 +10,7 @@ test('circle (defaults)', (t) => {
   const geometry = circle()
   const pts = geom2.toPoints(geometry)
 
+  t.notThrows(() => geom2.validate(geometry))
   t.deepEqual(pts.length, 32)
 })
 
@@ -42,7 +43,7 @@ test('circle (options)', (t) => {
     [4.555504184431392, 3.5898563569410915],
     [5.160607986722184, 3.266421636210497],
     [5.817183872943549, 3.067251518588694],
-    [6.499999999999999, 3],
+    [6.5, 3],
     [7.182816127056449, 3.0672515185886935],
     [7.8393920132778145, 3.266421636210497],
     [8.444495815568606, 3.589856356941091],
@@ -52,6 +53,7 @@ test('circle (options)', (t) => {
     [9.932748481411306, 5.817183872943549]
   ]
 
+  t.notThrows(() => geom2.validate(geometry))
   t.deepEqual(pts.length, 32)
   t.true(comparePoints(pts, exp))
 
@@ -63,20 +65,21 @@ test('circle (options)', (t) => {
     [3.2335783637895035, 1.3393920132778143],
     [2.4748737341529163, 2.474873734152916],
     [1.3393920132778145, 3.2335783637895035],
-    [2.143131898507868e-16, 3.5],
+    [0, 3.5],
     [-1.339392013277814, 3.2335783637895035],
     [-2.474873734152916, 2.4748737341529163],
     [-3.2335783637895035, 1.3393920132778145],
-    [-3.5, 4.286263797015736e-16],
+    [-3.5, 0],
     [-3.233578363789504, -1.3393920132778139],
     [-2.474873734152917, -2.474873734152916],
     [-1.339392013277816, -3.233578363789503],
-    [-6.429395695523604e-16, -3.5],
+    [0, -3.5],
     [1.339392013277815, -3.233578363789503],
     [2.474873734152916, -2.474873734152917],
     [3.233578363789503, -1.3393920132778163]
   ]
 
+  t.notThrows(() => geom2.validate(geometry))
   t.deepEqual(pts.length, 16)
   t.true(comparePoints(pts, exp))
 
@@ -84,22 +87,23 @@ test('circle (options)', (t) => {
   geometry = circle({ radius: 3.5, startAngle: Math.PI / 2, segments: 16 })
   pts = geom2.toPoints(geometry)
   exp = [
-    [2.143131898507868e-16, 3.5],
+    [0, 3.5],
     [-1.339392013277814, 3.2335783637895035],
     [-2.474873734152916, 2.4748737341529163],
     [-3.2335783637895035, 1.3393920132778145],
-    [-3.5, 4.286263797015736e-16],
+    [-3.5, 0],
     [-3.233578363789504, -1.3393920132778139],
     [-2.474873734152917, -2.474873734152916],
     [-1.339392013277816, -3.233578363789503],
-    [-6.429395695523604e-16, -3.5],
+    [0, -3.5],
     [1.339392013277815, -3.233578363789503],
     [2.474873734152916, -2.474873734152917],
     [3.233578363789503, -1.3393920132778163],
-    [3.5, -8.572527594031472e-16],
+    [3.5, 0],
     [0, 0]
   ]
 
+  t.notThrows(() => geom2.validate(geometry))
   t.deepEqual(pts.length, 14)
   t.true(comparePoints(pts, exp))
 
@@ -111,10 +115,11 @@ test('circle (options)', (t) => {
     [3.2335783637895035, 1.3393920132778143],
     [2.4748737341529163, 2.474873734152916],
     [1.3393920132778145, 3.2335783637895035],
-    [2.143131898507868e-16, 3.5],
+    [0, 3.5],
     [0, 0]
   ]
 
+  t.notThrows(() => geom2.validate(geometry))
   t.deepEqual(pts.length, 6)
   t.true(comparePoints(pts, exp))
 
@@ -129,6 +134,7 @@ test('circle (options)', (t) => {
     [1.0815594803123152, -3.3286978070330377]
   ]
 
+  t.notThrows(() => geom2.validate(geometry))
   t.deepEqual(pts.length, 5)
   t.true(comparePoints(pts, exp))
 })

package/src/primitives/cube.test.js

@@ -9,6 +9,7 @@ const comparePolygonsAsPoints = require('../../test/helpers/comparePolygonsAsPoi
 test('cube (defaults)', (t) => {
   const obs = cube()
   const pts = geom3.toPoints(obs)
+  t.notThrows(() => geom3.validate(obs))
   t.is(pts.length, 6)
 })
 
@@ -25,6 +26,7 @@ test('cube (options)', (t) => {
     [[3, 3, 10], [10, 3, 10], [10, 10, 10], [3, 10, 10]]
   ]
 
+  t.notThrows(() => geom3.validate(obs))
   t.is(pts.length, 6)
   t.true(comparePolygonsAsPoints(pts, exp))
 
@@ -40,6 +42,7 @@ test('cube (options)', (t) => {
     [[-3.5, -3.5, 3.5], [3.5, -3.5, 3.5], [3.5, 3.5, 3.5], [-3.5, 3.5, 3.5]]
   ]
 
+  t.notThrows(() => geom3.validate(obs))
   t.is(pts.length, 6)
   t.true(comparePolygonsAsPoints(pts, exp))
 })

package/src/primitives/cuboid.test.js

@@ -10,31 +10,14 @@ test('cuboid (defaults)', (t) => {
   const obs = cuboid()
   const pts = geom3.toPoints(obs)
   const exp = [
-    [[-1.0000000, -1.0000000, -1.0000000],
-      [-1.0000000, -1.0000000, 1.0000000],
-      [-1.0000000, 1.0000000, 1.0000000],
-      [-1.0000000, 1.0000000, -1.0000000]],
-    [[1.0000000, -1.0000000, -1.0000000],
-      [1.0000000, 1.0000000, -1.0000000],
-      [1.0000000, 1.0000000, 1.0000000],
-      [1.0000000, -1.0000000, 1.0000000]],
-    [[-1.0000000, -1.0000000, -1.0000000],
-      [1.0000000, -1.0000000, -1.0000000],
-      [1.0000000, -1.0000000, 1.0000000],
-      [-1.0000000, -1.0000000, 1.0000000]],
-    [[-1.0000000, 1.0000000, -1.0000000],
-      [-1.0000000, 1.0000000, 1.0000000],
-      [1.0000000, 1.0000000, 1.0000000],
-      [1.0000000, 1.0000000, -1.0000000]],
-    [[-1.0000000, -1.0000000, -1.0000000],
-      [-1.0000000, 1.0000000, -1.0000000],
-      [1.0000000, 1.0000000, -1.0000000],
-      [1.0000000, -1.0000000, -1.0000000]],
-    [[-1.0000000, -1.0000000, 1.0000000],
-      [1.0000000, -1.0000000, 1.0000000],
-      [1.0000000, 1.0000000, 1.0000000],
-      [-1.0000000, 1.0000000, 1.0000000]]
+    [[-1, -1, -1], [-1, -1, 1], [-1, 1, 1], [-1, 1, -1]],
+    [[1, -1, -1], [1, 1, -1], [1, 1, 1], [1, -1, 1]],
+    [[-1, -1, -1], [1, -1, -1], [1, -1, 1], [-1, -1, 1]],
+    [[-1, 1, -1], [-1, 1, 1], [1, 1, 1], [1, 1, -1]],
+    [[-1, -1, -1], [-1, 1, -1], [1, 1, -1], [1, -1, -1]],
+    [[-1, -1, 1], [1, -1, 1], [1, 1, 1], [-1, 1, 1]]
   ]
+  t.notThrows(() => geom3.validate(obs))
   t.is(pts.length, 6)
   t.true(comparePolygonsAsPoints(pts, exp))
 })
@@ -52,6 +35,7 @@ test('cuboid (options)', (t) => {
     [[0, 2, 10], [6, 2, 10], [6, 8, 10], [0, 8, 10]]
   ]
 
+  t.notThrows(() => geom3.validate(obs))
   t.is(pts.length, 6)
   t.true(comparePolygonsAsPoints(pts, exp))
 
@@ -67,6 +51,7 @@ test('cuboid (options)', (t) => {
     [[-2.25, -0.75, 3.5], [2.25, -0.75, 3.5], [2.25, 0.75, 3.5], [-2.25, 0.75, 3.5]]
   ]
 
+  t.notThrows(() => geom3.validate(obs))
   t.is(pts.length, 6)
   t.true(comparePolygonsAsPoints(pts, exp))
 })

package/src/primitives/cylinder.test.js

@@ -10,6 +10,7 @@ test('cylinder (defaults)', (t) => {
   const obs = cylinder()
   const pts = geom3.toPoints(obs)
 
+  t.notThrows(() => geom3.validate(obs))
   t.is(pts.length, 96)
 })
 
@@ -33,12 +34,13 @@ test('cylinder (options)', (t) => {
     [[1.236067977499789, -3.8042260651806146, -5], [1.236067977499789, -3.8042260651806146, 5],
       [-3.23606797749979, -2.351141009169892, 5], [-3.23606797749979, -2.351141009169892, -5]],
     [[0, 0, 5], [-3.23606797749979, -2.351141009169892, 5], [1.236067977499789, -3.8042260651806146, 5]],
-    [[0, 0, -5], [4, -9.797174393178826e-16, -5], [1.236067977499789, -3.8042260651806146, -5]],
-    [[4, -9.797174393178826e-16, -5], [4, -9.797174393178826e-16, 5],
-      [1.236067977499789, -3.8042260651806146, 5], [1.236067977499789, -3.8042260651806146, -5]],
-    [[0, 0, 5], [1.236067977499789, -3.8042260651806146, 5], [4, -9.797174393178826e-16, 5]]
+    [[0, 0, -5], [4, 0, -5], [1.236067977499789, -3.8042260651806146, -5]],
+    [[4, 0, -5], [4, 0, 5], [1.236067977499789, -3.8042260651806146, 5],
+      [1.236067977499789, -3.8042260651806146, -5]],
+    [[0, 0, 5], [1.236067977499789, -3.8042260651806146, 5], [4, 0, 5]]
   ]
 
+  t.notThrows(() => geom3.validate(obs))
   t.is(pts.length, 15)
   t.true(comparePolygonsAsPoints(pts, exp))
 
@@ -68,6 +70,7 @@ test('cylinder (options)', (t) => {
     [[-5, -5, -4], [-4.6909830056250525, -5.951056516295154, -4], [-4, -5, -4]]
   ]
 
+  t.notThrows(() => geom3.validate(obs))
   t.is(pts.length, 15)
   t.true(comparePolygonsAsPoints(pts, exp))
 })

package/src/primitives/cylinderElliptic.js

@@ -5,6 +5,8 @@ const vec3 = require('../maths/vec3')
 const geom3 = require('../geometries/geom3')
 const poly3 = require('../geometries/poly3')
 
+const { sin, cos } = require('../utils/trigonometry')
+
 const { isGT, isGTE, isNumberArray } = require('./commonChecks')
 
 /**
@@ -38,9 +40,10 @@ const cylinderElliptic = (options) => {
   if (!isNumberArray(center, 3)) throw new Error('center must be an array of X, Y and Z values')
   if (!isGT(height, 0)) throw new Error('height must be greater then zero')
   if (!isNumberArray(startRadius, 2)) throw new Error('startRadius must be an array of X and Y values')
-  if (!startRadius.every((n) => n > 0)) throw new Error('startRadius values must be greater than zero')
+  if (!startRadius.every((n) => n >= 0)) throw new Error('startRadius values must be positive')
   if (!isNumberArray(endRadius, 2)) throw new Error('endRadius must be an array of X and Y values')
-  if (!endRadius.every((n) => n > 0)) throw new Error('endRadius values must be greater than zero')
+  if (!endRadius.every((n) => n >= 0)) throw new Error('endRadius values must be positive')
+  if (endRadius.every((n) => n === 0) && startRadius.every((n) => n === 0)) throw new Error('at least one radius must be positive')
   if (!isGTE(startAngle, 0)) throw new Error('startAngle must be positive')
   if (!isGTE(endAngle, 0)) throw new Error('endAngle must be positive')
   if (!isGTE(segments, 4)) throw new Error('segments must be four or more')
@@ -75,8 +78,8 @@ const cylinderElliptic = (options) => {
   const v3 = vec3.create()
   const point = (stack, slice, radius) => {
     const angle = slice * rotation + startAngle
-    vec3.scale(v1, axisX, radius[0] * Math.cos(angle))
-    vec3.scale(v2, axisY, radius[1] * Math.sin(angle))
+    vec3.scale(v1, axisX, radius[0] * cos(angle))
+    vec3.scale(v2, axisY, radius[1] * sin(angle))
     vec3.add(v1, v1, v2)
 
     vec3.scale(v3, ray, stack)
@@ -100,12 +103,16 @@ const cylinderElliptic = (options) => {
       polygons.push(fromPoints(point(0, t1, endRadius), point(1, t1, endRadius), point(1, t0, endRadius), point(0, t0, endRadius)))
       polygons.push(fromPoints(end, point(1, t0, endRadius), point(1, t1, endRadius)))
     } else {
-      if (startRadius[0] > 0) {
+      if (startRadius[0] > 0 && startRadius[1] > 0) {
         polygons.push(fromPoints(start, point(0, t1, startRadius), point(0, t0, startRadius)))
+      }
+      if (startRadius[0] > 0 || startRadius[1] > 0) {
         polygons.push(fromPoints(point(0, t0, startRadius), point(0, t1, startRadius), point(1, t0, endRadius)))
       }
-      if (endRadius[0] > 0) {
+      if (endRadius[0] > 0 && endRadius[1] > 0) {
         polygons.push(fromPoints(end, point(1, t0, endRadius), point(1, t1, endRadius)))
+      }
+      if (endRadius[0] > 0 || endRadius[1] > 0) {
         polygons.push(fromPoints(point(1, t0, endRadius), point(0, t1, startRadius), point(1, t1, endRadius)))
       }
     }