From 92f13b429dc991bbaba924831dc74bb17566bfa3 Mon Sep 17 00:00:00 2001
From: seveibar <seveibar@gmail.com>
Date: Wed, 15 May 2024 11:44:59 -0700
Subject: [PATCH] fix missing or incorrect x/y position issues

---
 src/pcb/pcb_silkscreen_circle.ts | 5 +++--
 src/pcb/pcb_silkscreen_rect.ts   | 2 ++
 src/pcb/pcb_silkscreen_text.ts   | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/pcb/pcb_silkscreen_circle.ts b/src/pcb/pcb_silkscreen_circle.ts
index fec6d82..f1facb4 100644
--- a/src/pcb/pcb_silkscreen_circle.ts
+++ b/src/pcb/pcb_silkscreen_circle.ts
@@ -1,14 +1,15 @@
 import { z } from "zod"
 import { distance } from "../units"
 import { layer_ref, visible_layer } from "./properties/layer_ref"
+import { point } from "src/common/point"
 
 export const pcb_silkscreen_circle = z
   .object({
     type: z.literal("pcb_silkscreen_circle"),
     pcb_silkscreen_circle_id: z.string(),
     pcb_component_id: z.string(),
-    width: distance,
-    height: distance,
+    center: point,
+    radius: distance,
     layer: visible_layer,
   })
   .describe("Defines a silkscreen circle on the PCB")
diff --git a/src/pcb/pcb_silkscreen_rect.ts b/src/pcb/pcb_silkscreen_rect.ts
index 90a0193..d1ae153 100644
--- a/src/pcb/pcb_silkscreen_rect.ts
+++ b/src/pcb/pcb_silkscreen_rect.ts
@@ -1,12 +1,14 @@
 import { z } from "zod"
 import { distance } from "../units"
 import { layer_ref, visible_layer } from "./properties/layer_ref"
+import { point } from "src/common/point"
 
 export const pcb_silkscreen_rect = z
   .object({
     type: z.literal("pcb_silkscreen_rect"),
     pcb_silkscreen_rect_id: z.string(),
     pcb_component_id: z.string(),
+    center: point,
     width: distance,
     height: distance,
     layer: visible_layer,
diff --git a/src/pcb/pcb_silkscreen_text.ts b/src/pcb/pcb_silkscreen_text.ts
index 03ecb5d..49866bd 100644
--- a/src/pcb/pcb_silkscreen_text.ts
+++ b/src/pcb/pcb_silkscreen_text.ts
@@ -6,11 +6,11 @@ export const pcb_silkscreen_text = z
   .object({
     type: z.literal("pcb_silkscreen_text"),
     font: z.literal("tscircuit2024").default("tscircuit2024"),
+    font_size: z.number().default(1),
     pcb_component_id: z.string(),
     text: z.string(),
     layer: visible_layer,
-    pcbX: z.number(),
-    pcbY: z.number(),
+    center: point,
   })
   .describe("Defines silkscreen text on the PCB")