altium-to-circuit-json 0.0.73 → 0.0.75

package/dist/index.js

@@ -5055,25 +5055,47 @@ import {
   AltiumViaRecord as AltiumViaRecord3
 } from "altiumts";
 
-// lib/pcb/annotations/convertPcbCircularKeepout.ts
-function convertPcbCircularKeepout({
+// lib/pcb/annotations/convertPcbArcKeepout.ts
+import { approximateAltiumArc as approximateAltiumArc3 } from "altiumts";
+function convertPcbArcKeepout({
   layerMap,
   record,
   recordIndex
 }) {
   const center = record.center;
   const radiusMils = record.radiusMils;
+  if (!center || !radiusMils) return void 0;
   const rawSweepDegrees = record.endAngle - record.startAngle;
   const isFullCircle = rawSweepDegrees === 0 || Math.abs(rawSweepDegrees) >= 360;
-  if (!center || !radiusMils || !isFullCircle) return void 0;
+  if (isKeepoutLayer(record.layer)) {
+    if (!isFullCircle) return void 0;
+    return {
+      type: "pcb_keepout",
+      pcb_keepout_id: `pcb_keepout_altium_arc_${recordIndex}`,
+      shape: "circle",
+      center: toMillimeterPoint(center),
+      radius: milsToMillimeters(radiusMils + (record.widthMils ?? 0) / 2),
+      layers: layerMap.layers,
+      description: "Altium circular keepout"
+    };
+  }
+  const layer = layerMap.getLayer(record.layer);
+  if (!layer) return void 0;
+  const outline = approximateAltiumArc3({
+    center,
+    radius: radiusMils,
+    startAngleDegrees: record.startAngle,
+    endAngleDegrees: record.endAngle
+  }).map(toMillimeterPoint);
+  if (outline.length < 2) return void 0;
   return {
     type: "pcb_keepout",
     pcb_keepout_id: `pcb_keepout_altium_arc_${recordIndex}`,
-    shape: "circle",
-    center: toMillimeterPoint(center),
-    radius: milsToMillimeters(radiusMils + (record.widthMils ?? 0) / 2),
-    layers: layerMap.layers,
-    description: "Altium circular keepout"
+    shape: "outline",
+    outline,
+    stroke_width: milsToMillimeters(record.widthMils ?? 4),
+    layers: [layer],
+    description: "Altium arc keepout"
   };
 }
 
@@ -5153,7 +5175,7 @@ function convertPcbDimension({
 // lib/pcb/annotations/convertPcbFabricationNotePath.ts
 import {
   AltiumTrackRecord as AltiumTrackRecord6,
-  approximateAltiumArc as approximateAltiumArc3
+  approximateAltiumArc as approximateAltiumArc4
 } from "altiumts";
 function convertPcbFabricationNotePath({
   record,
@@ -5165,7 +5187,7 @@ function convertPcbFabricationNotePath({
     route = [record.start, record.end];
   } else {
     if (!record.center || !record.radiusMils) return void 0;
-    route = approximateAltiumArc3({
+    route = approximateAltiumArc4({
       center: record.center,
       radius: record.radiusMils,
       startAngleDegrees: record.startAngle,
@@ -5197,7 +5219,7 @@ function isExplodedPcbDimensionGraphic(document, record) {
 }
 
 // lib/pcb/routing/convertPcbArcTrack.ts
-import { approximateAltiumArc as approximateAltiumArc4 } from "altiumts";
+import { approximateAltiumArc as approximateAltiumArc5 } from "altiumts";
 function convertPcbArcTrack({
   layerMap,
   record,
@@ -5208,7 +5230,7 @@ function convertPcbArcTrack({
   const layer = layerMap.getLayer(record.layer);
   if (!layer) return void 0;
   const width = milsToMillimeters(record.widthMils ?? 4);
-  const points = approximateAltiumArc4({
+  const points = approximateAltiumArc5({
     center: record.center,
     radius: record.radiusMils,
     startAngleDegrees: record.startAngle,
@@ -5289,13 +5311,13 @@ function convertPcbVia({
 }
 
 // lib/pcb/silkscreen/convertPcbSilkscreenArc.ts
-import { approximateAltiumArc as approximateAltiumArc5 } from "altiumts";
+import { approximateAltiumArc as approximateAltiumArc6 } from "altiumts";
 function convertPcbSilkscreenArc({
   record,
   recordIndex
 }) {
   if (!record.center || !record.radiusMils) return void 0;
-  const points = approximateAltiumArc5({
+  const points = approximateAltiumArc6({
     center: record.center,
     radius: record.radiusMils,
     startAngleDegrees: record.startAngle,
@@ -5885,13 +5907,16 @@ function convertPcbRecords(context) {
   const { document, elements, layerMap, netContext, options } = context;
   const routing = { layerMap, netContext };
   for (const [recordIndex, record] of document.records.entries()) {
-    if (record instanceof AltiumArcRecord5 && isKeepoutLayer(record.layer) && options.includeKeepouts !== false) {
-      const keepout = convertPcbCircularKeepout({
-        layerMap,
-        record,
-        recordIndex
-      });
-      if (keepout) elements.push(keepout);
+    const isKeepoutArc = record instanceof AltiumArcRecord5 && (isKeepoutLayer(record.layer) || record.getBoolean("KEEPOUT") === true);
+    if (isKeepoutArc) {
+      if (options.includeKeepouts !== false) {
+        const keepout = convertPcbArcKeepout({
+          layerMap,
+          record,
+          recordIndex
+        });
+        if (keepout) elements.push(keepout);
+      }
       continue;
     }
     if (record instanceof AltiumDimensionRecord) {