circuit-json-to-step 0.0.30 → 0.0.31

package/dist/index.js

@@ -916,6 +916,11 @@ function rotatePoint(x, y, centerX, centerY, angle) {
     y: centerY + dx * sin + dy * cos
   };
 }
+function createVertexAt(repo, x, y, z) {
+  return repo.add(
+    new VertexPoint2("", repo.add(new CartesianPoint3("", x, y, z)))
+  );
+}
 function createLineEdge(repo, v1, v2) {
   const p1 = v1.resolve(repo).pnt.resolve(repo);
   const p2 = v2.resolve(repo).pnt.resolve(repo);
@@ -934,228 +939,54 @@ function createLineEdge(repo, v1, v2) {
   const line = repo.add(new Line2("", v1.resolve(repo).pnt, vec));
   return repo.add(new EdgeCurve2("", v1, v2, line, true));
 }
-function createArcEdge(repo, centerX, centerY, z, radius, startAngle, endAngle, rotation, centerX0, centerY0) {
-  const startX = centerX + radius * Math.cos(startAngle);
-  const startY = centerY + radius * Math.sin(startAngle);
-  const endX = centerX + radius * Math.cos(endAngle);
-  const endY = centerY + radius * Math.sin(endAngle);
-  const startRotated = rotatePoint(startX, startY, centerX0, centerY0, rotation);
-  const endRotated = rotatePoint(endX, endY, centerX0, centerY0, rotation);
-  const startVertex = repo.add(
-    new VertexPoint2(
-      "",
-      repo.add(new CartesianPoint3("", startRotated.x, startRotated.y, z))
-    )
-  );
-  const endVertex = repo.add(
-    new VertexPoint2(
-      "",
-      repo.add(new CartesianPoint3("", endRotated.x, endRotated.y, z))
-    )
-  );
-  const centerRotated = rotatePoint(
-    centerX,
-    centerY,
+function createLineSegment(repo, start, end, z) {
+  const startVertex = createVertexAt(repo, start.x, start.y, z);
+  const endVertex = createVertexAt(repo, end.x, end.y, z);
+  return {
+    kind: "line",
+    edge: createLineEdge(repo, startVertex, endVertex),
+    start: startVertex,
+    end: endVertex
+  };
+}
+function createArcSegment(repo, centerX, centerY, z, radius, startAngle, endAngle, rotation, centerX0, centerY0) {
+  const start = rotatePoint(
+    centerX + radius * Math.cos(startAngle),
+    centerY + radius * Math.sin(startAngle),
     centerX0,
     centerY0,
     rotation
   );
-  const centerPoint = repo.add(
-    new CartesianPoint3("", centerRotated.x, centerRotated.y, z)
+  const end = rotatePoint(
+    centerX + radius * Math.cos(endAngle),
+    centerY + radius * Math.sin(endAngle),
+    centerX0,
+    centerY0,
+    rotation
   );
+  const center = rotatePoint(centerX, centerY, centerX0, centerY0, rotation);
+  const startVertex = createVertexAt(repo, start.x, start.y, z);
+  const endVertex = createVertexAt(repo, end.x, end.y, z);
+  const centerPoint = repo.add(new CartesianPoint3("", center.x, center.y, z));
   const normalDir = repo.add(new Direction3("", 0, 0, -1));
-  const refAngle = rotation;
   const refDir = repo.add(
-    new Direction3("", Math.cos(refAngle), Math.sin(refAngle), 0)
+    new Direction3("", Math.cos(rotation), Math.sin(rotation), 0)
   );
   const placement = repo.add(
     new Axis2Placement3D3("", centerPoint, normalDir, refDir)
   );
   const circle = repo.add(new Circle("", placement, radius));
-  return repo.add(new EdgeCurve2("", startVertex, endVertex, circle, false));
-}
-function createPillHoleLoop(repo, hole, z, xDir) {
-  const geom = getPillGeometry(hole);
-  const {
+  return {
+    kind: "arc",
+    edge: repo.add(new EdgeCurve2("", startVertex, endVertex, circle, false)),
+    start: startVertex,
+    end: endVertex,
     centerX,
     centerY,
-    radius,
-    straightHalfLength,
-    rotation,
-    isHorizontal
-  } = geom;
-  const edges = [];
-  if (isHorizontal) {
-    const capOffset = straightHalfLength;
-    const rightArc = createArcEdge(
-      repo,
-      centerX + capOffset,
-      centerY,
-      z,
-      radius,
-      -Math.PI / 2,
-      Math.PI / 2,
-      rotation,
-      centerX,
-      centerY
-    );
-    edges.push(rightArc);
-    const bottomStart = rotatePoint(
-      centerX + capOffset,
-      centerY - radius,
-      centerX,
-      centerY,
-      rotation
-    );
-    const bottomEnd = rotatePoint(
-      centerX - capOffset,
-      centerY - radius,
-      centerX,
-      centerY,
-      rotation
-    );
-    const bottomV1 = repo.add(
-      new VertexPoint2(
-        "",
-        repo.add(new CartesianPoint3("", bottomStart.x, bottomStart.y, z))
-      )
-    );
-    const bottomV2 = repo.add(
-      new VertexPoint2(
-        "",
-        repo.add(new CartesianPoint3("", bottomEnd.x, bottomEnd.y, z))
-      )
-    );
-    edges.push(createLineEdge(repo, bottomV1, bottomV2));
-    const leftArc = createArcEdge(
-      repo,
-      centerX - capOffset,
-      centerY,
-      z,
-      radius,
-      Math.PI / 2,
-      3 * Math.PI / 2,
-      rotation,
-      centerX,
-      centerY
-    );
-    edges.push(leftArc);
-    const topStart = rotatePoint(
-      centerX - capOffset,
-      centerY + radius,
-      centerX,
-      centerY,
-      rotation
-    );
-    const topEnd = rotatePoint(
-      centerX + capOffset,
-      centerY + radius,
-      centerX,
-      centerY,
-      rotation
-    );
-    const topV1 = repo.add(
-      new VertexPoint2(
-        "",
-        repo.add(new CartesianPoint3("", topStart.x, topStart.y, z))
-      )
-    );
-    const topV2 = repo.add(
-      new VertexPoint2(
-        "",
-        repo.add(new CartesianPoint3("", topEnd.x, topEnd.y, z))
-      )
-    );
-    edges.push(createLineEdge(repo, topV1, topV2));
-  } else {
-    const capOffset = straightHalfLength;
-    const topArc = createArcEdge(
-      repo,
-      centerX,
-      centerY - capOffset,
-      z,
-      radius,
-      Math.PI,
-      0,
-      rotation,
-      centerX,
-      centerY
-    );
-    edges.push(topArc);
-    const rightStart = rotatePoint(
-      centerX + radius,
-      centerY - capOffset,
-      centerX,
-      centerY,
-      rotation
-    );
-    const rightEnd = rotatePoint(
-      centerX + radius,
-      centerY + capOffset,
-      centerX,
-      centerY,
-      rotation
-    );
-    const rightV1 = repo.add(
-      new VertexPoint2(
-        "",
-        repo.add(new CartesianPoint3("", rightStart.x, rightStart.y, z))
-      )
-    );
-    const rightV2 = repo.add(
-      new VertexPoint2(
-        "",
-        repo.add(new CartesianPoint3("", rightEnd.x, rightEnd.y, z))
-      )
-    );
-    edges.push(createLineEdge(repo, rightV1, rightV2));
-    const bottomArc = createArcEdge(
-      repo,
-      centerX,
-      centerY + capOffset,
-      z,
-      radius,
-      0,
-      Math.PI,
-      rotation,
-      centerX,
-      centerY
-    );
-    edges.push(bottomArc);
-    const leftStart = rotatePoint(
-      centerX - radius,
-      centerY + capOffset,
-      centerX,
-      centerY,
-      rotation
-    );
-    const leftEnd = rotatePoint(
-      centerX - radius,
-      centerY - capOffset,
-      centerX,
-      centerY,
-      rotation
-    );
-    const leftV1 = repo.add(
-      new VertexPoint2(
-        "",
-        repo.add(new CartesianPoint3("", leftStart.x, leftStart.y, z))
-      )
-    );
-    const leftV2 = repo.add(
-      new VertexPoint2(
-        "",
-        repo.add(new CartesianPoint3("", leftEnd.x, leftEnd.y, z))
-      )
-    );
-    edges.push(createLineEdge(repo, leftV1, leftV2));
-  }
-  const orientedEdges = edges.map(
-    (edge) => repo.add(new OrientedEdge2("", edge, true))
-  );
-  return repo.add(new EdgeLoop2("", orientedEdges));
+    radius
+  };
 }
-function createPillCylindricalFaces(repo, hole, zMin, zMax, xDir, zDir) {
+function createPillBoundarySegments(repo, hole, z) {
   const geom = getPillGeometry(hole);
   const {
     centerX,
@@ -1165,341 +996,233 @@ function createPillCylindricalFaces(repo, hole, zMin, zMax, xDir, zDir) {
     rotation,
     isHorizontal
   } = geom;
-  const faces = [];
+  const capOffset = straightHalfLength;
   if (isHorizontal) {
-    const capOffset = straightHalfLength;
-    faces.push(
-      createCylindricalWall(
+    return [
+      createArcSegment(
         repo,
         centerX + capOffset,
         centerY,
+        z,
         radius,
         -Math.PI / 2,
         Math.PI / 2,
         rotation,
         centerX,
-        centerY,
-        zMin,
-        zMax,
-        zDir,
-        xDir
-      )
-    );
-    faces.push(
-      createPlanarWall(
+        centerY
+      ),
+      createLineSegment(
         repo,
-        centerX - capOffset,
-        centerY - radius,
-        centerX + capOffset,
-        centerY - radius,
-        rotation,
-        centerX,
-        centerY,
-        zMin,
-        zMax,
-        zDir
-      )
-    );
-    faces.push(
-      createCylindricalWall(
+        rotatePoint(
+          centerX + capOffset,
+          centerY - radius,
+          centerX,
+          centerY,
+          rotation
+        ),
+        rotatePoint(
+          centerX - capOffset,
+          centerY - radius,
+          centerX,
+          centerY,
+          rotation
+        ),
+        z
+      ),
+      createArcSegment(
         repo,
         centerX - capOffset,
         centerY,
+        z,
         radius,
         Math.PI / 2,
         3 * Math.PI / 2,
         rotation,
         centerX,
-        centerY,
-        zMin,
-        zMax,
-        zDir,
-        xDir
-      )
-    );
-    faces.push(
-      createPlanarWall(
+        centerY
+      ),
+      createLineSegment(
         repo,
-        centerX + capOffset,
-        centerY + radius,
-        centerX - capOffset,
-        centerY + radius,
-        rotation,
-        centerX,
-        centerY,
-        zMin,
-        zMax,
-        zDir
+        rotatePoint(
+          centerX - capOffset,
+          centerY + radius,
+          centerX,
+          centerY,
+          rotation
+        ),
+        rotatePoint(
+          centerX + capOffset,
+          centerY + radius,
+          centerX,
+          centerY,
+          rotation
+        ),
+        z
       )
-    );
-  } else {
-    const capOffset = straightHalfLength;
-    faces.push(
-      createCylindricalWall(
-        repo,
-        centerX,
+    ];
+  }
+  return [
+    createArcSegment(
+      repo,
+      centerX,
+      centerY - capOffset,
+      z,
+      radius,
+      Math.PI,
+      0,
+      rotation,
+      centerX,
+      centerY
+    ),
+    createLineSegment(
+      repo,
+      rotatePoint(
+        centerX + radius,
         centerY - capOffset,
-        radius,
-        Math.PI,
-        0,
-        rotation,
         centerX,
         centerY,
-        zMin,
-        zMax,
-        zDir,
-        xDir
-      )
-    );
-    faces.push(
-      createPlanarWall(
-        repo,
-        centerX + radius,
-        centerY - capOffset,
+        rotation
+      ),
+      rotatePoint(
         centerX + radius,
         centerY + capOffset,
-        rotation,
         centerX,
         centerY,
-        zMin,
-        zMax,
-        zDir
-      )
-    );
-    faces.push(
-      createCylindricalWall(
-        repo,
-        centerX,
+        rotation
+      ),
+      z
+    ),
+    createArcSegment(
+      repo,
+      centerX,
+      centerY + capOffset,
+      z,
+      radius,
+      0,
+      Math.PI,
+      rotation,
+      centerX,
+      centerY
+    ),
+    createLineSegment(
+      repo,
+      rotatePoint(
+        centerX - radius,
         centerY + capOffset,
-        radius,
-        0,
-        Math.PI,
-        rotation,
         centerX,
         centerY,
-        zMin,
-        zMax,
-        zDir,
-        xDir
-      )
-    );
-    faces.push(
-      createPlanarWall(
-        repo,
-        centerX - radius,
-        centerY + capOffset,
+        rotation
+      ),
+      rotatePoint(
         centerX - radius,
         centerY - capOffset,
-        rotation,
         centerX,
         centerY,
-        zMin,
-        zMax,
-        zDir
-      )
-    );
-  }
-  return faces;
-}
-function createCylindricalWall(repo, centerX, centerY, radius, startAngle, endAngle, rotation, centerX0, centerY0, zMin, zMax, zDir, xDir) {
-  const bottomStartX = centerX + radius * Math.cos(startAngle);
-  const bottomStartY = centerY + radius * Math.sin(startAngle);
-  const bottomEndX = centerX + radius * Math.cos(endAngle);
-  const bottomEndY = centerY + radius * Math.sin(endAngle);
-  const bottomStart = rotatePoint(
-    bottomStartX,
-    bottomStartY,
-    centerX0,
-    centerY0,
-    rotation
-  );
-  const bottomEnd = rotatePoint(
-    bottomEndX,
-    bottomEndY,
-    centerX0,
-    centerY0,
-    rotation
-  );
-  const bottomStartVertex = repo.add(
-    new VertexPoint2(
-      "",
-      repo.add(new CartesianPoint3("", bottomStart.x, bottomStart.y, zMin))
-    )
-  );
-  const bottomEndVertex = repo.add(
-    new VertexPoint2(
-      "",
-      repo.add(new CartesianPoint3("", bottomEnd.x, bottomEnd.y, zMin))
-    )
-  );
-  const topStart = repo.add(
-    new VertexPoint2(
-      "",
-      repo.add(new CartesianPoint3("", bottomStart.x, bottomStart.y, zMax))
-    )
-  );
-  const topEnd = repo.add(
-    new VertexPoint2(
-      "",
-      repo.add(new CartesianPoint3("", bottomEnd.x, bottomEnd.y, zMax))
+        rotation
+      ),
+      z
     )
-  );
-  const centerRotated = rotatePoint(
-    centerX,
-    centerY,
-    centerX0,
-    centerY0,
-    rotation
-  );
-  const bottomCenter = repo.add(
-    new CartesianPoint3("", centerRotated.x, centerRotated.y, zMin)
-  );
-  const bottomPlacement = repo.add(
-    new Axis2Placement3D3(
-      "",
-      bottomCenter,
-      repo.add(new Direction3("", 0, 0, -1)),
-      xDir
-    )
-  );
-  const bottomCircle = repo.add(new Circle("", bottomPlacement, radius));
-  const bottomArc = repo.add(
-    new EdgeCurve2("", bottomStartVertex, bottomEndVertex, bottomCircle, false)
-  );
-  const topCenter = repo.add(
-    new CartesianPoint3("", centerRotated.x, centerRotated.y, zMax)
-  );
-  const topPlacement = repo.add(new Axis2Placement3D3("", topCenter, zDir, xDir));
-  const topCircle = repo.add(new Circle("", topPlacement, radius));
-  const topArc = repo.add(new EdgeCurve2("", topEnd, topStart, topCircle, false));
-  const v1 = repo.add(
-    new VertexPoint2(
-      "",
-      repo.add(new CartesianPoint3("", bottomStart.x, bottomStart.y, zMin))
-    )
-  );
-  const v2 = repo.add(
-    new VertexPoint2(
-      "",
-      repo.add(new CartesianPoint3("", bottomStart.x, bottomStart.y, zMax))
-    )
-  );
-  const v3 = repo.add(
-    new VertexPoint2(
-      "",
-      repo.add(new CartesianPoint3("", bottomEnd.x, bottomEnd.y, zMin))
-    )
-  );
-  const v4 = repo.add(
-    new VertexPoint2(
-      "",
-      repo.add(new CartesianPoint3("", bottomEnd.x, bottomEnd.y, zMax))
-    )
-  );
-  const dir1 = repo.add(new Direction3("", 0, 0, 1));
-  const height = zMax - zMin;
-  const vec1 = repo.add(new Vector2("", dir1, height));
-  const line1 = repo.add(new Line2("", v1.resolve(repo).pnt, vec1));
-  const edge1 = repo.add(new EdgeCurve2("", v1, v2, line1, true));
-  const dir2 = repo.add(new Direction3("", 0, 0, 1));
-  const vec2 = repo.add(new Vector2("", dir2, height));
-  const line2 = repo.add(new Line2("", v3.resolve(repo).pnt, vec2));
-  const edge2 = repo.add(new EdgeCurve2("", v3, v4, line2, true));
-  const loop = repo.add(
-    new EdgeLoop2("", [
-      repo.add(new OrientedEdge2("", bottomArc, true)),
-      repo.add(new OrientedEdge2("", edge2, true)),
-      repo.add(new OrientedEdge2("", topArc, false)),
-      repo.add(new OrientedEdge2("", edge1, false))
-    ])
-  );
-  const cylinderPlacement = repo.add(
-    new Axis2Placement3D3("", bottomCenter, zDir, xDir)
-  );
-  const cylinderSurface = repo.add(
-    new CylindricalSurface("", cylinderPlacement, radius)
-  );
-  return repo.add(
-    new AdvancedFace2(
-      "",
-      [repo.add(new FaceOuterBound2("", loop, true))],
-      cylinderSurface,
-      false
-    )
-  );
+  ];
 }
-function createPlanarWall(repo, startX, startY, endX, endY, rotation, centerX0, centerY0, zMin, zMax, zDir) {
-  const start = rotatePoint(startX, startY, centerX0, centerY0, rotation);
-  const end = rotatePoint(endX, endY, centerX0, centerY0, rotation);
-  const v1 = repo.add(
-    new VertexPoint2(
-      "",
-      repo.add(new CartesianPoint3("", start.x, start.y, zMin))
-    )
-  );
-  const v2 = repo.add(
-    new VertexPoint2("", repo.add(new CartesianPoint3("", end.x, end.y, zMin)))
-  );
-  const v3 = repo.add(
-    new VertexPoint2("", repo.add(new CartesianPoint3("", end.x, end.y, zMax)))
-  );
-  const v4 = repo.add(
-    new VertexPoint2(
-      "",
-      repo.add(new CartesianPoint3("", start.x, start.y, zMax))
-    )
-  );
-  const dx = end.x - start.x;
-  const dy = end.y - start.y;
-  const edgeLength = Math.sqrt(dx * dx + dy * dy);
-  const bottomDir = repo.add(
-    new Direction3("", dx / edgeLength, dy / edgeLength, 0)
-  );
-  const bottomVec = repo.add(new Vector2("", bottomDir, edgeLength));
-  const bottomLine = repo.add(new Line2("", v1.resolve(repo).pnt, bottomVec));
-  const bottomEdge = repo.add(new EdgeCurve2("", v1, v2, bottomLine, true));
-  const topDir = repo.add(
-    new Direction3("", dx / edgeLength, dy / edgeLength, 0)
-  );
-  const topVec = repo.add(new Vector2("", topDir, edgeLength));
-  const topLine = repo.add(new Line2("", v4.resolve(repo).pnt, topVec));
-  const topEdge = repo.add(new EdgeCurve2("", v4, v3, topLine, true));
-  const vertDir = repo.add(new Direction3("", 0, 0, 1));
-  const height = zMax - zMin;
-  const vertVec1 = repo.add(new Vector2("", vertDir, height));
-  const vertLine1 = repo.add(new Line2("", v2.resolve(repo).pnt, vertVec1));
-  const vertEdge1 = repo.add(new EdgeCurve2("", v2, v3, vertLine1, true));
-  const vertVec2 = repo.add(new Vector2("", vertDir, height));
-  const vertLine2 = repo.add(new Line2("", v1.resolve(repo).pnt, vertVec2));
-  const vertEdge2 = repo.add(new EdgeCurve2("", v1, v4, vertLine2, true));
-  const loop = repo.add(
-    new EdgeLoop2("", [
-      repo.add(new OrientedEdge2("", bottomEdge, true)),
-      repo.add(new OrientedEdge2("", vertEdge1, true)),
-      repo.add(new OrientedEdge2("", topEdge, false)),
-      repo.add(new OrientedEdge2("", vertEdge2, false))
-    ])
-  );
-  const normalDir = repo.add(
-    new Direction3("", dy / edgeLength, -dx / edgeLength, 0)
-  );
-  const refDir = repo.add(
-    new Direction3("", dx / edgeLength, dy / edgeLength, 0)
-  );
-  const planeOrigin = repo.add(new CartesianPoint3("", start.x, start.y, zMin));
-  const placement = repo.add(
-    new Axis2Placement3D3("", planeOrigin, normalDir, refDir)
-  );
-  const plane = repo.add(new Plane2("", placement));
+function createLoopFromSegments(repo, segments, orientation) {
   return repo.add(
-    new AdvancedFace2(
+    new EdgeLoop2(
       "",
-      [repo.add(new FaceOuterBound2("", loop, true))],
-      plane,
-      true
+      segments.map(
+        (segment) => repo.add(new OrientedEdge2("", segment.edge, orientation))
+      )
     )
   );
 }
+function createPillHoleGeometry(repo, hole, zMin, zMax, zDir) {
+  const geom = getPillGeometry(hole);
+  const bottomSegments = createPillBoundarySegments(repo, hole, zMin);
+  const topSegments = createPillBoundarySegments(repo, hole, zMax);
+  const bottomLoop = createLoopFromSegments(repo, bottomSegments, true);
+  const topLoop = createLoopFromSegments(repo, topSegments, true);
+  const wallFaces = [];
+  for (let i = 0; i < bottomSegments.length; i++) {
+    const bottomSegment = bottomSegments[i];
+    const topSegment = topSegments[i];
+    const startVertical = createLineEdge(
+      repo,
+      bottomSegment.start,
+      topSegment.start
+    );
+    const endVertical = createLineEdge(repo, bottomSegment.end, topSegment.end);
+    const loop = repo.add(
+      new EdgeLoop2("", [
+        repo.add(new OrientedEdge2("", bottomSegment.edge, true)),
+        repo.add(new OrientedEdge2("", endVertical, true)),
+        repo.add(new OrientedEdge2("", topSegment.edge, false)),
+        repo.add(new OrientedEdge2("", startVertical, false))
+      ])
+    );
+    if (bottomSegment.kind === "arc") {
+      const center = rotatePoint(
+        bottomSegment.centerX,
+        bottomSegment.centerY,
+        geom.centerX,
+        geom.centerY,
+        geom.rotation
+      );
+      const bottomCenter = repo.add(
+        new CartesianPoint3("", center.x, center.y, zMin)
+      );
+      const refDir2 = repo.add(
+        new Direction3("", Math.cos(geom.rotation), Math.sin(geom.rotation), 0)
+      );
+      const cylinderPlacement = repo.add(
+        new Axis2Placement3D3("", bottomCenter, zDir, refDir2)
+      );
+      const cylinderSurface = repo.add(
+        new CylindricalSurface("", cylinderPlacement, bottomSegment.radius)
+      );
+      wallFaces.push(
+        repo.add(
+          new AdvancedFace2(
+            "",
+            [repo.add(new FaceOuterBound2("", loop, true))],
+            cylinderSurface,
+            false
+          )
+        )
+      );
+      continue;
+    }
+    const startPoint = bottomSegment.start.resolve(repo).pnt.resolve(repo);
+    const endPoint = bottomSegment.end.resolve(repo).pnt.resolve(repo);
+    const dx = endPoint.x - startPoint.x;
+    const dy = endPoint.y - startPoint.y;
+    const edgeLength = Math.sqrt(dx * dx + dy * dy);
+    const normalDir = repo.add(
+      new Direction3("", dy / edgeLength, -dx / edgeLength, 0)
+    );
+    const refDir = repo.add(
+      new Direction3("", dx / edgeLength, dy / edgeLength, 0)
+    );
+    const placement = repo.add(
+      new Axis2Placement3D3(
+        "",
+        bottomSegment.start.resolve(repo).pnt,
+        normalDir,
+        refDir
+      )
+    );
+    const plane = repo.add(new Plane2("", placement));
+    wallFaces.push(
+      repo.add(
+        new AdvancedFace2(
+          "",
+          [repo.add(new FaceOuterBound2("", loop, true))],
+          plane,
+          true
+        )
+      )
+    );
+  }
+  return { bottomLoop, topLoop, wallFaces };
+}
 
 // lib/index.ts
 async function circuitJsonToStep(circuitJson, options = {}) {
@@ -1711,53 +1434,6 @@ async function circuitJsonToStep(circuitJson, options = {}) {
       bottomEdges.map((edge) => repo.add(new OrientedEdge3("", edge, true)))
     )
   );
-  const bottomHoleLoops = [];
-  for (const hole of holes) {
-    const holeShape = hole.hole_shape ?? hole.shape;
-    if (holeShape === "circle") {
-      const holeX = typeof hole.x === "number" ? hole.x : hole.x ?? 0;
-      const holeY = typeof hole.y === "number" ? hole.y : hole.y ?? 0;
-      const radius = (hole.hole_diameter ?? 0) / 2;
-      const holeCenter = repo.add(
-        new CartesianPoint4("", holeX, holeY, -halfBoardThickness)
-      );
-      const holeVertex = repo.add(
-        new VertexPoint3(
-          "",
-          repo.add(
-            new CartesianPoint4("", holeX + radius, holeY, -halfBoardThickness)
-          )
-        )
-      );
-      const holePlacement = repo.add(
-        new Axis2Placement3D4(
-          "",
-          holeCenter,
-          repo.add(new Direction4("", 0, 0, -1)),
-          xDir
-        )
-      );
-      const holeCircle = repo.add(new Circle2("", holePlacement, radius));
-      const holeEdge = repo.add(
-        new EdgeCurve3("", holeVertex, holeVertex, holeCircle, true)
-      );
-      const holeLoop = repo.add(
-        new EdgeLoop3("", [repo.add(new OrientedEdge3("", holeEdge, false))])
-      );
-      bottomHoleLoops.push(repo.add(new FaceBound("", holeLoop, true)));
-    } else if (holeShape === "rotated_pill" || holeShape === "pill") {
-      const pillLoop = createPillHoleLoop(repo, hole, -halfBoardThickness, xDir);
-      bottomHoleLoops.push(repo.add(new FaceBound("", pillLoop, true)));
-    }
-  }
-  const bottomFace = repo.add(
-    new AdvancedFace3(
-      "",
-      [repo.add(new FaceOuterBound3("", bottomLoop, true)), ...bottomHoleLoops],
-      bottomPlane,
-      true
-    )
-  );
   const topOrigin = repo.add(new CartesianPoint4("", 0, 0, halfBoardThickness));
   const topFrame = repo.add(new Axis2Placement3D4("", topOrigin, zDir, xDir));
   const topPlane = repo.add(new Plane3("", topFrame));
@@ -1767,40 +1443,124 @@ async function circuitJsonToStep(circuitJson, options = {}) {
       topEdges.map((edge) => repo.add(new OrientedEdge3("", edge, false)))
     )
   );
-  const topHoleLoops = [];
+  function getHoleCoordinate(coordinate) {
+    if (typeof coordinate === "number") return coordinate;
+    return coordinate?.value ?? 0;
+  }
+  function createCircularHoleGeometry(hole) {
+    const holeX = getHoleCoordinate(hole.x);
+    const holeY = getHoleCoordinate(hole.y);
+    const radius = (hole.hole_diameter ?? 0) / 2;
+    const bottomHoleCenter = repo.add(
+      new CartesianPoint4("", holeX, holeY, -halfBoardThickness)
+    );
+    const bottomHoleVertex = repo.add(
+      new VertexPoint3(
+        "",
+        repo.add(
+          new CartesianPoint4("", holeX + radius, holeY, -halfBoardThickness)
+        )
+      )
+    );
+    const bottomHolePlacement = repo.add(
+      new Axis2Placement3D4(
+        "",
+        bottomHoleCenter,
+        repo.add(new Direction4("", 0, 0, -1)),
+        xDir
+      )
+    );
+    const bottomHoleCircle = repo.add(
+      new Circle2("", bottomHolePlacement, radius)
+    );
+    const bottomHoleEdge = repo.add(
+      new EdgeCurve3(
+        "",
+        bottomHoleVertex,
+        bottomHoleVertex,
+        bottomHoleCircle,
+        true
+      )
+    );
+    const topHoleCenter = repo.add(
+      new CartesianPoint4("", holeX, holeY, halfBoardThickness)
+    );
+    const topHoleVertex = repo.add(
+      new VertexPoint3(
+        "",
+        repo.add(
+          new CartesianPoint4("", holeX + radius, holeY, halfBoardThickness)
+        )
+      )
+    );
+    const topHolePlacement = repo.add(
+      new Axis2Placement3D4("", topHoleCenter, zDir, xDir)
+    );
+    const topHoleCircle = repo.add(new Circle2("", topHolePlacement, radius));
+    const topHoleEdge = repo.add(
+      new EdgeCurve3("", topHoleVertex, topHoleVertex, topHoleCircle, true)
+    );
+    const bottomLoop2 = repo.add(
+      new EdgeLoop3("", [repo.add(new OrientedEdge3("", bottomHoleEdge, false))])
+    );
+    const topLoop2 = repo.add(
+      new EdgeLoop3("", [repo.add(new OrientedEdge3("", topHoleEdge, true))])
+    );
+    const wallLoop = repo.add(
+      new EdgeLoop3("", [
+        repo.add(new OrientedEdge3("", bottomHoleEdge, true)),
+        repo.add(new OrientedEdge3("", topHoleEdge, false))
+      ])
+    );
+    const holeCylinderPlacement = repo.add(
+      new Axis2Placement3D4("", bottomHoleCenter, zDir, xDir)
+    );
+    const holeCylinderSurface = repo.add(
+      new CylindricalSurface2("", holeCylinderPlacement, radius)
+    );
+    const wallFace = repo.add(
+      new AdvancedFace3(
+        "",
+        [repo.add(new FaceOuterBound3("", wallLoop, true))],
+        holeCylinderSurface,
+        false
+      )
+    );
+    return { bottomLoop: bottomLoop2, topLoop: topLoop2, wallFaces: [wallFace] };
+  }
+  const sharedHoleGeometries = [];
   for (const hole of holes) {
     const holeShape = hole.hole_shape ?? hole.shape;
     if (holeShape === "circle") {
-      const holeX = typeof hole.x === "number" ? hole.x : hole.x ?? 0;
-      const holeY = typeof hole.y === "number" ? hole.y : hole.y ?? 0;
-      const radius = (hole.hole_diameter ?? 0) / 2;
-      const holeCenter = repo.add(
-        new CartesianPoint4("", holeX, holeY, halfBoardThickness)
-      );
-      const holeVertex = repo.add(
-        new VertexPoint3(
-          "",
-          repo.add(
-            new CartesianPoint4("", holeX + radius, holeY, halfBoardThickness)
-          )
+      sharedHoleGeometries.push(createCircularHoleGeometry(hole));
+    } else if (holeShape === "rotated_pill" || holeShape === "pill") {
+      sharedHoleGeometries.push(
+        createPillHoleGeometry(
+          repo,
+          hole,
+          -halfBoardThickness,
+          halfBoardThickness,
+          zDir
         )
       );
-      const holePlacement = repo.add(
-        new Axis2Placement3D4("", holeCenter, zDir, xDir)
-      );
-      const holeCircle = repo.add(new Circle2("", holePlacement, radius));
-      const holeEdge = repo.add(
-        new EdgeCurve3("", holeVertex, holeVertex, holeCircle, true)
-      );
-      const holeLoop = repo.add(
-        new EdgeLoop3("", [repo.add(new OrientedEdge3("", holeEdge, true))])
-      );
-      topHoleLoops.push(repo.add(new FaceBound("", holeLoop, true)));
-    } else if (holeShape === "rotated_pill" || holeShape === "pill") {
-      const pillLoop = createPillHoleLoop(repo, hole, halfBoardThickness, xDir);
-      topHoleLoops.push(repo.add(new FaceBound("", pillLoop, true)));
     }
   }
+  const bottomHoleLoops = [];
+  const topHoleLoops = [];
+  for (const holeGeometry of sharedHoleGeometries) {
+    bottomHoleLoops.push(
+      repo.add(new FaceBound("", holeGeometry.bottomLoop, true))
+    );
+    topHoleLoops.push(repo.add(new FaceBound("", holeGeometry.topLoop, true)));
+  }
+  const bottomFace = repo.add(
+    new AdvancedFace3(
+      "",
+      [repo.add(new FaceOuterBound3("", bottomLoop, true)), ...bottomHoleLoops],
+      bottomPlane,
+      true
+    )
+  );
   const topFace = repo.add(
     new AdvancedFace3(
       "",
@@ -1809,6 +1569,10 @@ async function circuitJsonToStep(circuitJson, options = {}) {
       true
     )
   );
+  const holeCylindricalFaces = [];
+  for (const holeGeometry of sharedHoleGeometries) {
+    holeCylindricalFaces.push(...holeGeometry.wallFaces);
+  }
   const sideFaces = [];
   for (let i = 0; i < bottomEdges.length; i++) {
     const nextI = (i + 1) % bottomEdges.length;
@@ -1845,95 +1609,6 @@ async function circuitJsonToStep(circuitJson, options = {}) {
     );
     sideFaces.push(sideFace);
   }
-  const holeCylindricalFaces = [];
-  for (const hole of holes) {
-    const holeShape = hole.hole_shape ?? hole.shape;
-    if (holeShape === "circle") {
-      const holeX = typeof hole.x === "number" ? hole.x : hole.x ?? 0;
-      const holeY = typeof hole.y === "number" ? hole.y : hole.y ?? 0;
-      const radius = (hole.hole_diameter ?? 0) / 2;
-      const bottomHoleCenter = repo.add(
-        new CartesianPoint4("", holeX, holeY, -halfBoardThickness)
-      );
-      const bottomHoleVertex = repo.add(
-        new VertexPoint3(
-          "",
-          repo.add(
-            new CartesianPoint4("", holeX + radius, holeY, -halfBoardThickness)
-          )
-        )
-      );
-      const bottomHolePlacement = repo.add(
-        new Axis2Placement3D4(
-          "",
-          bottomHoleCenter,
-          repo.add(new Direction4("", 0, 0, -1)),
-          xDir
-        )
-      );
-      const bottomHoleCircle = repo.add(
-        new Circle2("", bottomHolePlacement, radius)
-      );
-      const bottomHoleEdge = repo.add(
-        new EdgeCurve3(
-          "",
-          bottomHoleVertex,
-          bottomHoleVertex,
-          bottomHoleCircle,
-          true
-        )
-      );
-      const topHoleCenter = repo.add(
-        new CartesianPoint4("", holeX, holeY, halfBoardThickness)
-      );
-      const topHoleVertex = repo.add(
-        new VertexPoint3(
-          "",
-          repo.add(
-            new CartesianPoint4("", holeX + radius, holeY, halfBoardThickness)
-          )
-        )
-      );
-      const topHolePlacement = repo.add(
-        new Axis2Placement3D4("", topHoleCenter, zDir, xDir)
-      );
-      const topHoleCircle = repo.add(new Circle2("", topHolePlacement, radius));
-      const topHoleEdge = repo.add(
-        new EdgeCurve3("", topHoleVertex, topHoleVertex, topHoleCircle, true)
-      );
-      const holeCylinderLoop = repo.add(
-        new EdgeLoop3("", [
-          repo.add(new OrientedEdge3("", bottomHoleEdge, true)),
-          repo.add(new OrientedEdge3("", topHoleEdge, false))
-        ])
-      );
-      const holeCylinderPlacement = repo.add(
-        new Axis2Placement3D4("", bottomHoleCenter, zDir, xDir)
-      );
-      const holeCylinderSurface = repo.add(
-        new CylindricalSurface2("", holeCylinderPlacement, radius)
-      );
-      const holeCylinderFace = repo.add(
-        new AdvancedFace3(
-          "",
-          [repo.add(new FaceOuterBound3("", holeCylinderLoop, true))],
-          holeCylinderSurface,
-          false
-        )
-      );
-      holeCylindricalFaces.push(holeCylinderFace);
-    } else if (holeShape === "rotated_pill" || holeShape === "pill") {
-      const pillFaces = createPillCylindricalFaces(
-        repo,
-        hole,
-        -halfBoardThickness,
-        halfBoardThickness,
-        xDir,
-        zDir
-      );
-      holeCylindricalFaces.push(...pillFaces);
-    }
-  }
   const allFaces = [bottomFace, topFace, ...sideFaces, ...holeCylindricalFaces];
   const styleCache = createStyleCache();
   const boardStyledItems = createStyledItems(repo, {