circuit-to-svg 0.0.253 → 0.0.254

package/dist/index.js

@@ -1444,14 +1444,23 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
     const scaledOuterHeight = hole.outer_height * Math.abs(transform.a);
     const scaledHoleWidth = hole.hole_width * Math.abs(transform.a);
     const scaledHoleHeight = hole.hole_height * Math.abs(transform.a);
-    const outerRadiusX = scaledOuterWidth / 2;
-    const outerRadiusY = scaledOuterHeight / 2;
-    const innerRadiusX = scaledHoleWidth / 2;
-    const innerRadiusY = scaledHoleHeight / 2;
-    const straightLength = scaledOuterHeight - scaledOuterWidth;
     const rotation = hole.ccw_rotation || 0;
     const outerTransform = rotation ? `translate(${x} ${y}) rotate(${-rotation})` : `translate(${x} ${y})`;
     const innerTransform = rotation ? `translate(${x} ${y}) rotate(${-rotation})` : `translate(${x} ${y})`;
+    const createPillPath = (width, height) => {
+      if (width > height) {
+        const radius = height / 2;
+        const straightLength = width - 2 * radius;
+        return `M${-width / 2 + radius},${-radius} h${straightLength} a${radius},${radius} 0 0 1 0,${height} h${-straightLength} a${radius},${radius} 0 0 1 0,${-height} z`;
+      } else if (height > width) {
+        const radius = width / 2;
+        const straightLength = height - 2 * radius;
+        return `M${radius},${-height / 2 + radius} v${straightLength} a${radius},${radius} 0 0 1 ${-width},0 v${-straightLength} a${radius},${radius} 0 0 1 ${width},0 z`;
+      } else {
+        const radius = width / 2;
+        return `M${-radius},0 a${radius},${radius} 0 0 1 ${width},0 a${radius},${radius} 0 0 1 ${-width},0 z`;
+      }
+    };
     return [
       {
         name: "g",
@@ -1468,7 +1477,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
             attributes: {
               class: "pcb-hole-outer",
               fill: colorMap2.copper.top,
-              d: `M${-outerRadiusX},${-straightLength / 2} v${straightLength} a${outerRadiusX},${outerRadiusX} 0 0 0 ${scaledOuterWidth},0 v-${straightLength} a${outerRadiusX},${outerRadiusX} 0 0 0 -${scaledOuterWidth},0 z`,
+              d: createPillPath(scaledOuterWidth, scaledOuterHeight),
               transform: outerTransform,
               "data-type": "pcb_plated_hole",
               "data-pcb-layer": copperLayer
@@ -1483,7 +1492,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
             attributes: {
               class: "pcb-hole-inner",
               fill: colorMap2.drill,
-              d: `M${-innerRadiusX},${-(scaledHoleHeight - scaledHoleWidth) / 2} v${scaledHoleHeight - scaledHoleWidth} a${innerRadiusX},${innerRadiusX} 0 0 0 ${scaledHoleWidth},0 v-${scaledHoleHeight - scaledHoleWidth} a${innerRadiusX},${innerRadiusX} 0 0 0 -${scaledHoleWidth},0 z`,
+              d: createPillPath(scaledHoleWidth, scaledHoleHeight),
               transform: innerTransform,
               "data-type": "pcb_plated_hole_drill",
               "data-pcb-layer": "drill"
@@ -3339,7 +3348,7 @@ function getSoftwareUsedString(circuitJson) {
 var package_default = {
   name: "circuit-to-svg",
   type: "module",
-  version: "0.0.252",
+  version: "0.0.253",
   description: "Convert Circuit JSON to SVG",
   main: "dist/index.js",
   files: [