@willcgage/module-schematic 0.49.1 → 0.49.3

package/dist/index.cjs

@@ -933,17 +933,24 @@ function docToState(doc, fallbackLength, moduleTracks = []) {
       trackB: x.tracks?.[1] ?? MAIN_TRACK_ID
     })),
     extraTracks,
-    turnouts: (d.turnouts ?? []).map((t) => ({
-      id: t.id,
-      name: t.name ?? "",
-      pos: sc(t.pos),
-      onTrack: t.onTrack,
-      divergeTrack: t.divergeTrack,
-      kind: t.kind ?? "right",
-      ...t.size ? { size: t.size } : {},
-      ...t.curved ? { curved: true } : {},
-      ...t.flipped ? { flipped: true } : {}
-    })),
+    turnouts: (d.turnouts ?? []).map((t) => {
+      let divergeTrack = t.divergeTrack;
+      if (divergeTrack === t.onTrack) {
+        if (t.onTrack === MAIN_TRACK_ID) divergeTrack = MAIN2_TRACK_ID;
+        else if (t.onTrack === MAIN2_TRACK_ID) divergeTrack = MAIN_TRACK_ID;
+      }
+      return {
+        id: t.id,
+        name: t.name ?? "",
+        pos: sc(t.pos),
+        onTrack: t.onTrack,
+        divergeTrack,
+        kind: t.kind ?? "right",
+        ...t.size ? { size: t.size } : {},
+        ...t.curved ? { curved: true } : {},
+        ...t.flipped ? { flipped: true } : {}
+      };
+    }),
     controlPoints: readControlPoints(d, sc),
     industries: (d.industries ?? []).map((ind) => ({
       id: ind.id,
@@ -1338,6 +1345,7 @@ function returnLoop(shape, opts) {
   const L = Math.max(1, opts.leadInches);
   const R = Math.max(1, opts.radius);
   const hw = Math.min(opts.boardHalfWidth ?? 6, R - 1);
+  const leadHalf = Math.max(hw, opts.endplateHalfWidth ?? hw);
   const T = { x: L, y: 0 };
   const r2 = (v) => Math.round(v * 100) / 100;
   const rd = (pts) => pts.map((p) => ({ x: r2(p.x), y: r2(p.y) }));
@@ -1360,18 +1368,18 @@ function returnLoop(shape, opts) {
   const legDir = (P) => Math.atan2(P.y - T.y, P.x - T.x);
   const half = Math.abs((legDir(P1) - legDir(P2) + Math.PI) % (2 * Math.PI) - Math.PI) / 2;
   const ringOuter = (rr) => {
-    const xTop = C.x - Math.sqrt(Math.max(0, rr * rr - (hw - C.y) ** 2));
-    const xBot = C.x - Math.sqrt(Math.max(0, rr * rr - (-hw - C.y) ** 2));
-    const tTop = Math.atan2(hw - C.y, xTop - C.x);
-    const tBot = Math.atan2(-hw - C.y, xBot - C.x);
+    const xTop = C.x - Math.sqrt(Math.max(0, rr * rr - (leadHalf - C.y) ** 2));
+    const xBot = C.x - Math.sqrt(Math.max(0, rr * rr - (-leadHalf - C.y) ** 2));
+    const tTop = Math.atan2(leadHalf - C.y, xTop - C.x);
+    const tBot = Math.atan2(-leadHalf - C.y, xBot - C.x);
     let end = tBot;
     while (end >= tTop) end -= 2 * Math.PI;
     return [
-      { x: 0, y: hw },
-      { x: xTop, y: hw },
+      { x: 0, y: leadHalf },
+      { x: xTop, y: leadHalf },
       ...arc(C.x, C.y, rr, tTop, end, 48).slice(1, -1),
-      { x: xBot, y: -hw },
-      { x: 0, y: -hw }
+      { x: xBot, y: -leadHalf },
+      { x: 0, y: -leadHalf }
     ];
   };
   const Ri = R - hw;
@@ -1380,14 +1388,14 @@ function returnLoop(shape, opts) {
     const xR = C.x + R + hw;
     const yT = R + hw;
     const outerSquare = [
-      { x: 0, y: hw },
-      { x: xL, y: hw },
+      { x: 0, y: leadHalf },
+      { x: xL, y: leadHalf },
       { x: xL, y: yT },
       { x: xR, y: yT },
       { x: xR, y: -yT },
       { x: xL, y: -yT },
-      { x: xL, y: -hw },
-      { x: 0, y: -hw }
+      { x: xL, y: -leadHalf },
+      { x: 0, y: -leadHalf }
     ];
     const iHalf = (R - hw) / Math.SQRT2;
     const holeSquare = iHalf > 2 ? [