@willcgage/module-schematic 0.47.0 → 0.49.0

package/dist/index.d.cts

@@ -253,6 +253,10 @@ interface ModuleSchematicDoc {
      * +y up). Stored as an open ring; renderers close it. Absent = derive an
      * approximate band from the endplate widths. */
     outline?: BenchworkPoint[];
+    /** Benchwork HOLE — an inner boundary punched out of `outline`, making the
+     * board a DONUT (a return loop's open middle). Same frame as `outline`; stored
+     * as an open ring, renderers close it. Absent = a solid board. */
+    outlineInner?: BenchworkPoint[];
     /** Internal section joints — inches from endplate A where the module's boards
      * split into sections. Operationally one unit; these mark construction/transport
      * seams (exempt from the end-interface standards). Empty/absent = one section.
@@ -405,6 +409,9 @@ interface ModuleFootprintInput {
     endplateTrackOffsets?: Record<string, number>;
     /** Authored benchwork outline (module-local inches), or absent for the band. */
     outline?: BenchworkPoint[] | null;
+    /** Authored benchwork HOLE — the inner boundary punched out of `outline` to
+     * make a donut. Absent/short = a solid board. */
+    outlineInner?: BenchworkPoint[] | null;
     /** The module's sections (#96 phase 2). When any carries an outline, the
      * module's footprint is the union of those — `outline` is then ignored. */
     sections?: SchematicSection[] | null;
@@ -432,6 +439,9 @@ interface ModuleFootprint {
     /** Authored outline (arc-sampled closed ring) or null → render the band.
      * Null too when `sectionOutlines` is non-empty — the sections ARE the shape. */
     outline: BenchworkPoint[] | null;
+    /** Authored HOLE (arc-sampled closed ring) punched out of `outline` → a donut
+     * board. Null = solid. Renderers fill `outline` with `outlineInner` cut out. */
+    outlineInner: BenchworkPoint[] | null;
     /** Per-section footprints, arc-sampled (#96 phase 2b). Draw every one: together
      * they are the module's footprint. Empty = this module doesn't use sections,
      * so fall back to `outline ?? band` exactly as before. */
@@ -793,6 +803,9 @@ interface EditorState {
      * (endplate A's track point at the origin, mainline +x, perpendicular +y up).
      * Empty = no authored outline (fall back to the endplate-width band). */
     outline: BenchworkPoint[];
+    /** Benchwork HOLE (donut inner boundary), module-local inches. Empty = a solid
+     * board. Set by the return-loop generator; punched out of `outline`. */
+    outlineInner: BenchworkPoint[];
     /** Internal section joints — inches from endplate A where the boards split
      * into sections. Empty = a single section (#48). */
     sectionBreaks: number[];
@@ -1042,6 +1055,31 @@ interface EndplatePose {
     /** True when the pose was hand-entered, not derived (wye/loop/other). */
     manual?: boolean;
 }
+type ReturnLoopShape = "circle" | "teardrop" | "offset-teardrop" | "square";
+/** A computed return-loop: a mainline LEAD to the throat, a WYE that splits into
+ * two legs, and the LOOP track those legs form, closing back at the throat. Pure
+ * geometry, module-local inches, endplate A at the origin, lead heading +x. All
+ * shapes are built so the loop CLOSES exactly at the throat and the two wye legs
+ * diverge symmetrically about the lead — the piece the earlier eyeballed versions
+ * kept getting wrong (#loop). */
+interface ReturnLoopGeometry {
+    throat: BenchworkPoint;
+    /** The loop track, throat → around → throat (starts and ends at the throat). */
+    loop: BenchworkPoint[];
+    /** The two diverging wye legs at the throat (each throat → its tangent point). */
+    wyeLegs: [BenchworkPoint[], BenchworkPoint[]];
+    /** Half the angle between the two wye legs, degrees (0 = tangent/no wye). */
+    wyeHalfAngleDeg: number;
+    /** Benchwork fascia: outer boundary, and an inner boundary for a donut (empty
+     * when the board is solid). */
+    outlineOuter: BenchworkPoint[];
+    outlineInner: BenchworkPoint[];
+}
+declare function returnLoop(shape: ReturnLoopShape, opts: {
+    leadInches: number;
+    radius: number;
+    boardHalfWidth?: number;
+}): ReturnLoopGeometry;
 interface ModuleGeometryInput {
     lengthInches: number;
     geometryType?: string | null;
@@ -1141,4 +1179,4 @@ declare function poseOverridesFromDoc(doc: ModuleSchematicDoc): Record<string, {
     heading: number;
 }>;
 
-export { type BenchworkPoint, type BranchConnector, type DrawCrossing, type DrawCrossover, type DrawIndustry, type DrawSignal, type DrawTrack, type DrawTurnout, ENDPLATE_FASCIA_CLEAR_INCHES, ENDPLATE_LEAD_INCHES, type EditorBranch, type EditorControlPoint, type EditorCpSignal, type EditorCrossing, type EditorIndustry, type EditorState, type EditorTrack, type EditorTurnout, type EndplateBConfig, type EndplatePose, type EndplateTrackIssue, type EndplateWidthIssue, FREEMO_ENDPLATE_TRACK_FASCIA_CLEARANCE_INCHES, FREEMO_ENDPLATE_WIDTH_MIN_INCHES, FREEMO_ENDPLATE_WIDTH_RECOMMENDED_INCHES, FREEMO_TRACK_SPACING_INCHES, type GeometryType, type IndustryLabelMode, type IndustrySpot, MAIN2_TRACK_ID, MAIN_TRACK_ID, type ModuleFeatures, type ModuleFootprint, type ModuleFootprintInput, type ModuleGeometryInput, type ModuleSchematicDoc, type ModuleTrackRow, N_CAR_LENGTH_INCHES, N_SCALE_RATIO, type OutlineFace, type SchematicBlock, type SchematicControlPoint, type SchematicCrossing, type SchematicEndplate, type SchematicEndplateTrack, type SchematicIndustry, type SchematicSection, type SchematicSignal, type SchematicTrack, type SchematicTurnout, type SectionAdjacency, type SectionFootprint, type SectionRelativePos, type SignalFacing, type SignalSide, type TrackConfig, type TrackRole, type TurnoutKind, WHOLE_MODULE_SECTION_ID, asModuleSchematic, benchworkBand, benchworkOutline, buildCrossover, buildPassingSiding, buildTransition, carCapacity, checkEndplateWidth, deriveEndplatePoses, divergeSideForHand, docToState, emptyEditorState, endplateFaceSegments, endplateLead, endplateTrackOffsetFor, endplateTrackOffsetInches, endplateWidthInches, fromSectionRelative, geometryTurnDegrees, inchesToScaleFeet, isLoopDoc, isTransitionTurnout, moduleCenterline, moduleFeatures, moduleFootprint, moduleLengthFromSections, moduleSections, nextId, poseNeedsManual, poseOverridesFromDoc, remapPos, sampleBenchworkOutline, samplePath, scaleFeetToInches, sectionAdjacency, sectionBand, sectionBreaksFromSections, sectionComponents, sectionFootprints, sectionNeighbours, sectionSpans, sectionSpansOrWhole, sectionedCenterline, sectionedEndPose, sliceCenterline, stateToDoc, toSectionRelative, trackMeetsEndplateIssues, trackPath };
+export { type BenchworkPoint, type BranchConnector, type DrawCrossing, type DrawCrossover, type DrawIndustry, type DrawSignal, type DrawTrack, type DrawTurnout, ENDPLATE_FASCIA_CLEAR_INCHES, ENDPLATE_LEAD_INCHES, type EditorBranch, type EditorControlPoint, type EditorCpSignal, type EditorCrossing, type EditorIndustry, type EditorState, type EditorTrack, type EditorTurnout, type EndplateBConfig, type EndplatePose, type EndplateTrackIssue, type EndplateWidthIssue, FREEMO_ENDPLATE_TRACK_FASCIA_CLEARANCE_INCHES, FREEMO_ENDPLATE_WIDTH_MIN_INCHES, FREEMO_ENDPLATE_WIDTH_RECOMMENDED_INCHES, FREEMO_TRACK_SPACING_INCHES, type GeometryType, type IndustryLabelMode, type IndustrySpot, MAIN2_TRACK_ID, MAIN_TRACK_ID, type ModuleFeatures, type ModuleFootprint, type ModuleFootprintInput, type ModuleGeometryInput, type ModuleSchematicDoc, type ModuleTrackRow, N_CAR_LENGTH_INCHES, N_SCALE_RATIO, type OutlineFace, type ReturnLoopGeometry, type ReturnLoopShape, type SchematicBlock, type SchematicControlPoint, type SchematicCrossing, type SchematicEndplate, type SchematicEndplateTrack, type SchematicIndustry, type SchematicSection, type SchematicSignal, type SchematicTrack, type SchematicTurnout, type SectionAdjacency, type SectionFootprint, type SectionRelativePos, type SignalFacing, type SignalSide, type TrackConfig, type TrackRole, type TurnoutKind, WHOLE_MODULE_SECTION_ID, asModuleSchematic, benchworkBand, benchworkOutline, buildCrossover, buildPassingSiding, buildTransition, carCapacity, checkEndplateWidth, deriveEndplatePoses, divergeSideForHand, docToState, emptyEditorState, endplateFaceSegments, endplateLead, endplateTrackOffsetFor, endplateTrackOffsetInches, endplateWidthInches, fromSectionRelative, geometryTurnDegrees, inchesToScaleFeet, isLoopDoc, isTransitionTurnout, moduleCenterline, moduleFeatures, moduleFootprint, moduleLengthFromSections, moduleSections, nextId, poseNeedsManual, poseOverridesFromDoc, remapPos, returnLoop, sampleBenchworkOutline, samplePath, scaleFeetToInches, sectionAdjacency, sectionBand, sectionBreaksFromSections, sectionComponents, sectionFootprints, sectionNeighbours, sectionSpans, sectionSpansOrWhole, sectionedCenterline, sectionedEndPose, sliceCenterline, stateToDoc, toSectionRelative, trackMeetsEndplateIssues, trackPath };

package/dist/index.d.ts

@@ -253,6 +253,10 @@ interface ModuleSchematicDoc {
      * +y up). Stored as an open ring; renderers close it. Absent = derive an
      * approximate band from the endplate widths. */
     outline?: BenchworkPoint[];
+    /** Benchwork HOLE — an inner boundary punched out of `outline`, making the
+     * board a DONUT (a return loop's open middle). Same frame as `outline`; stored
+     * as an open ring, renderers close it. Absent = a solid board. */
+    outlineInner?: BenchworkPoint[];
     /** Internal section joints — inches from endplate A where the module's boards
      * split into sections. Operationally one unit; these mark construction/transport
      * seams (exempt from the end-interface standards). Empty/absent = one section.
@@ -405,6 +409,9 @@ interface ModuleFootprintInput {
     endplateTrackOffsets?: Record<string, number>;
     /** Authored benchwork outline (module-local inches), or absent for the band. */
     outline?: BenchworkPoint[] | null;
+    /** Authored benchwork HOLE — the inner boundary punched out of `outline` to
+     * make a donut. Absent/short = a solid board. */
+    outlineInner?: BenchworkPoint[] | null;
     /** The module's sections (#96 phase 2). When any carries an outline, the
      * module's footprint is the union of those — `outline` is then ignored. */
     sections?: SchematicSection[] | null;
@@ -432,6 +439,9 @@ interface ModuleFootprint {
     /** Authored outline (arc-sampled closed ring) or null → render the band.
      * Null too when `sectionOutlines` is non-empty — the sections ARE the shape. */
     outline: BenchworkPoint[] | null;
+    /** Authored HOLE (arc-sampled closed ring) punched out of `outline` → a donut
+     * board. Null = solid. Renderers fill `outline` with `outlineInner` cut out. */
+    outlineInner: BenchworkPoint[] | null;
     /** Per-section footprints, arc-sampled (#96 phase 2b). Draw every one: together
      * they are the module's footprint. Empty = this module doesn't use sections,
      * so fall back to `outline ?? band` exactly as before. */
@@ -793,6 +803,9 @@ interface EditorState {
      * (endplate A's track point at the origin, mainline +x, perpendicular +y up).
      * Empty = no authored outline (fall back to the endplate-width band). */
     outline: BenchworkPoint[];
+    /** Benchwork HOLE (donut inner boundary), module-local inches. Empty = a solid
+     * board. Set by the return-loop generator; punched out of `outline`. */
+    outlineInner: BenchworkPoint[];
     /** Internal section joints — inches from endplate A where the boards split
      * into sections. Empty = a single section (#48). */
     sectionBreaks: number[];
@@ -1042,6 +1055,31 @@ interface EndplatePose {
     /** True when the pose was hand-entered, not derived (wye/loop/other). */
     manual?: boolean;
 }
+type ReturnLoopShape = "circle" | "teardrop" | "offset-teardrop" | "square";
+/** A computed return-loop: a mainline LEAD to the throat, a WYE that splits into
+ * two legs, and the LOOP track those legs form, closing back at the throat. Pure
+ * geometry, module-local inches, endplate A at the origin, lead heading +x. All
+ * shapes are built so the loop CLOSES exactly at the throat and the two wye legs
+ * diverge symmetrically about the lead — the piece the earlier eyeballed versions
+ * kept getting wrong (#loop). */
+interface ReturnLoopGeometry {
+    throat: BenchworkPoint;
+    /** The loop track, throat → around → throat (starts and ends at the throat). */
+    loop: BenchworkPoint[];
+    /** The two diverging wye legs at the throat (each throat → its tangent point). */
+    wyeLegs: [BenchworkPoint[], BenchworkPoint[]];
+    /** Half the angle between the two wye legs, degrees (0 = tangent/no wye). */
+    wyeHalfAngleDeg: number;
+    /** Benchwork fascia: outer boundary, and an inner boundary for a donut (empty
+     * when the board is solid). */
+    outlineOuter: BenchworkPoint[];
+    outlineInner: BenchworkPoint[];
+}
+declare function returnLoop(shape: ReturnLoopShape, opts: {
+    leadInches: number;
+    radius: number;
+    boardHalfWidth?: number;
+}): ReturnLoopGeometry;
 interface ModuleGeometryInput {
     lengthInches: number;
     geometryType?: string | null;
@@ -1141,4 +1179,4 @@ declare function poseOverridesFromDoc(doc: ModuleSchematicDoc): Record<string, {
     heading: number;
 }>;
 
-export { type BenchworkPoint, type BranchConnector, type DrawCrossing, type DrawCrossover, type DrawIndustry, type DrawSignal, type DrawTrack, type DrawTurnout, ENDPLATE_FASCIA_CLEAR_INCHES, ENDPLATE_LEAD_INCHES, type EditorBranch, type EditorControlPoint, type EditorCpSignal, type EditorCrossing, type EditorIndustry, type EditorState, type EditorTrack, type EditorTurnout, type EndplateBConfig, type EndplatePose, type EndplateTrackIssue, type EndplateWidthIssue, FREEMO_ENDPLATE_TRACK_FASCIA_CLEARANCE_INCHES, FREEMO_ENDPLATE_WIDTH_MIN_INCHES, FREEMO_ENDPLATE_WIDTH_RECOMMENDED_INCHES, FREEMO_TRACK_SPACING_INCHES, type GeometryType, type IndustryLabelMode, type IndustrySpot, MAIN2_TRACK_ID, MAIN_TRACK_ID, type ModuleFeatures, type ModuleFootprint, type ModuleFootprintInput, type ModuleGeometryInput, type ModuleSchematicDoc, type ModuleTrackRow, N_CAR_LENGTH_INCHES, N_SCALE_RATIO, type OutlineFace, type SchematicBlock, type SchematicControlPoint, type SchematicCrossing, type SchematicEndplate, type SchematicEndplateTrack, type SchematicIndustry, type SchematicSection, type SchematicSignal, type SchematicTrack, type SchematicTurnout, type SectionAdjacency, type SectionFootprint, type SectionRelativePos, type SignalFacing, type SignalSide, type TrackConfig, type TrackRole, type TurnoutKind, WHOLE_MODULE_SECTION_ID, asModuleSchematic, benchworkBand, benchworkOutline, buildCrossover, buildPassingSiding, buildTransition, carCapacity, checkEndplateWidth, deriveEndplatePoses, divergeSideForHand, docToState, emptyEditorState, endplateFaceSegments, endplateLead, endplateTrackOffsetFor, endplateTrackOffsetInches, endplateWidthInches, fromSectionRelative, geometryTurnDegrees, inchesToScaleFeet, isLoopDoc, isTransitionTurnout, moduleCenterline, moduleFeatures, moduleFootprint, moduleLengthFromSections, moduleSections, nextId, poseNeedsManual, poseOverridesFromDoc, remapPos, sampleBenchworkOutline, samplePath, scaleFeetToInches, sectionAdjacency, sectionBand, sectionBreaksFromSections, sectionComponents, sectionFootprints, sectionNeighbours, sectionSpans, sectionSpansOrWhole, sectionedCenterline, sectionedEndPose, sliceCenterline, stateToDoc, toSectionRelative, trackMeetsEndplateIssues, trackPath };
+export { type BenchworkPoint, type BranchConnector, type DrawCrossing, type DrawCrossover, type DrawIndustry, type DrawSignal, type DrawTrack, type DrawTurnout, ENDPLATE_FASCIA_CLEAR_INCHES, ENDPLATE_LEAD_INCHES, type EditorBranch, type EditorControlPoint, type EditorCpSignal, type EditorCrossing, type EditorIndustry, type EditorState, type EditorTrack, type EditorTurnout, type EndplateBConfig, type EndplatePose, type EndplateTrackIssue, type EndplateWidthIssue, FREEMO_ENDPLATE_TRACK_FASCIA_CLEARANCE_INCHES, FREEMO_ENDPLATE_WIDTH_MIN_INCHES, FREEMO_ENDPLATE_WIDTH_RECOMMENDED_INCHES, FREEMO_TRACK_SPACING_INCHES, type GeometryType, type IndustryLabelMode, type IndustrySpot, MAIN2_TRACK_ID, MAIN_TRACK_ID, type ModuleFeatures, type ModuleFootprint, type ModuleFootprintInput, type ModuleGeometryInput, type ModuleSchematicDoc, type ModuleTrackRow, N_CAR_LENGTH_INCHES, N_SCALE_RATIO, type OutlineFace, type ReturnLoopGeometry, type ReturnLoopShape, type SchematicBlock, type SchematicControlPoint, type SchematicCrossing, type SchematicEndplate, type SchematicEndplateTrack, type SchematicIndustry, type SchematicSection, type SchematicSignal, type SchematicTrack, type SchematicTurnout, type SectionAdjacency, type SectionFootprint, type SectionRelativePos, type SignalFacing, type SignalSide, type TrackConfig, type TrackRole, type TurnoutKind, WHOLE_MODULE_SECTION_ID, asModuleSchematic, benchworkBand, benchworkOutline, buildCrossover, buildPassingSiding, buildTransition, carCapacity, checkEndplateWidth, deriveEndplatePoses, divergeSideForHand, docToState, emptyEditorState, endplateFaceSegments, endplateLead, endplateTrackOffsetFor, endplateTrackOffsetInches, endplateWidthInches, fromSectionRelative, geometryTurnDegrees, inchesToScaleFeet, isLoopDoc, isTransitionTurnout, moduleCenterline, moduleFeatures, moduleFootprint, moduleLengthFromSections, moduleSections, nextId, poseNeedsManual, poseOverridesFromDoc, remapPos, returnLoop, sampleBenchworkOutline, samplePath, scaleFeetToInches, sectionAdjacency, sectionBand, sectionBreaksFromSections, sectionComponents, sectionFootprints, sectionNeighbours, sectionSpans, sectionSpansOrWhole, sectionedCenterline, sectionedEndPose, sliceCenterline, stateToDoc, toSectionRelative, trackMeetsEndplateIssues, trackPath };

package/dist/index.js

@@ -476,6 +476,9 @@ function moduleFootprint(input) {
     // endplate A's face (the far face would be a spurious plate at the throat).
     endplateFaces: input.loop ? endplateFaceSegments(centerline, widthA, widthB, offA, offB).slice(0, 1) : endplateFaceSegments(centerline, widthA, widthB, offA, offB),
     outline: sectionOutlines.length || !authored ? null : sampleBenchworkOutline(authored),
+    // The donut hole, arc-sampled — only when there's a solid outline to punch it
+    // out of (a sectioned module isn't a donut). Renderers cut it from `outline`.
+    outlineInner: sectionOutlines.length || !authored || !input.outlineInner || input.outlineInner.length < 3 ? null : sampleBenchworkOutline(input.outlineInner),
     sectionOutlines
   };
 }
@@ -557,6 +560,7 @@ function emptyEditorState(lengthInches) {
     endplateWidths: {},
     endplateTrackOffsets: {},
     outline: [],
+    outlineInner: [],
     sectionBreaks: [],
     sections: [],
     controlPoints: [],
@@ -793,6 +797,8 @@ function stateToDoc(state, recordNumber) {
     // Benchwork footprint outline (module-local inches); only when it's a real
     // ring (≥ 3 vertices).
     ...state.outline.length >= 3 ? { outline: state.outline } : {},
+    // Benchwork hole (donut inner boundary), when it's a real ring.
+    ...state.outlineInner.length >= 3 ? { outlineInner: state.outlineInner } : {},
     // Internal section joints (inches from A), when the module has more than one.
     ...state.sectionBreaks.length ? { sectionBreaks: state.sectionBreaks } : {},
     // Sections as objects — emitted only once the owner has some, so a module
@@ -884,6 +890,11 @@ function docToState(doc, fallbackLength, moduleTracks = []) {
     y: p.y,
     ...Number.isFinite(p.bulge) && p.bulge ? { bulge: p.bulge } : {}
   }));
+  const outlineInner = (d.outlineInner ?? []).filter((p) => p && Number.isFinite(p.x) && Number.isFinite(p.y)).map((p) => ({
+    x: p.x,
+    y: p.y,
+    ...Number.isFinite(p.bulge) && p.bulge ? { bulge: p.bulge } : {}
+  }));
   const mainPath = trackPath(d.mainPath) ?? [];
   const main2Track_ = (d.tracks ?? []).find((t) => t.id === MAIN2_TRACK_ID);
   const main2Path = trackPath(d.main2Path ?? main2Track_?.path) ?? [];
@@ -907,6 +918,7 @@ function docToState(doc, fallbackLength, moduleTracks = []) {
     endplateWidths,
     endplateTrackOffsets,
     outline,
+    outlineInner,
     sectionBreaks: (d.sectionBreaks ?? []).filter((n) => Number.isFinite(n)).map((n) => sc(n)),
     sections: moduleSections(d),
     mainPath,
@@ -1320,6 +1332,84 @@ function moduleFeatures(doc) {
     laneMax: Math.max(...allLanes)
   };
 }
+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 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) }));
+  const arc = (cx, cy, r, a0, a12, steps) => {
+    const out = [];
+    for (let i = 0; i <= steps; i++) out.push({ x: cx + r * Math.cos(a0 + (a12 - a0) * i / steps), y: cy + r * Math.sin(a0 + (a12 - a0) * i / steps) });
+    return out;
+  };
+  const D = shape === "circle" || shape === "square" ? R * 1.15 : R * 1.6;
+  const offY = shape === "offset-teardrop" ? R * 0.7 : 0;
+  const C = { x: L + D, y: offY };
+  const dist = Math.hypot(C.x - T.x, C.y - T.y);
+  const ac = Math.acos(Math.min(1, R / dist));
+  const base = Math.atan2(T.y - C.y, T.x - C.x);
+  const a1 = base + ac;
+  const a2 = base - ac;
+  const P1 = { x: C.x + R * Math.cos(a1), y: C.y + R * Math.sin(a1) };
+  const P2 = { x: C.x + R * Math.cos(a2), y: C.y + R * Math.sin(a2) };
+  const loop = [T, P1, ...arc(C.x, C.y, R, a1, a2 + 2 * Math.PI, 64).slice(1), T];
+  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);
+    return [
+      { x: 0, y: hw },
+      { x: xTop, y: hw },
+      ...arc(C.x, C.y, rr, tTop, tBot - 2 * Math.PI, 48).slice(1, -1),
+      { x: xBot, y: -hw },
+      { x: 0, y: -hw }
+    ];
+  };
+  const Ri = R - hw;
+  if (shape === "square") {
+    const xL = C.x - R - hw;
+    const xR = C.x + R + hw;
+    const yT = R + hw;
+    const outerSquare = [
+      { x: 0, y: hw },
+      { x: xL, y: hw },
+      { x: xL, y: yT },
+      { x: xR, y: yT },
+      { x: xR, y: -yT },
+      { x: xL, y: -yT },
+      { x: xL, y: -hw },
+      { x: 0, y: -hw }
+    ];
+    const iHalf = (R - hw) / Math.SQRT2;
+    const holeSquare = iHalf > 2 ? [
+      { x: C.x - iHalf, y: iHalf },
+      { x: C.x + iHalf, y: iHalf },
+      { x: C.x + iHalf, y: -iHalf },
+      { x: C.x - iHalf, y: -iHalf }
+    ] : [];
+    return {
+      throat: T,
+      loop: rd(loop),
+      wyeLegs: [rd([T, P1]), rd([T, P2])],
+      wyeHalfAngleDeg: r2(half * 180 / Math.PI),
+      outlineOuter: rd(outerSquare),
+      outlineInner: rd(holeSquare)
+    };
+  }
+  return {
+    throat: T,
+    loop: rd(loop),
+    wyeLegs: [rd([T, P1]), rd([T, P2])],
+    wyeHalfAngleDeg: r2(half * 180 / Math.PI),
+    outlineOuter: rd(ringOuter(R + hw)),
+    outlineInner: Ri > 2 ? rd(arc(C.x, C.y, Ri, 0, 2 * Math.PI, 40)) : []
+  };
+}
 function geometryTurnDegrees(geometryType, geometryDegrees) {
   switch (geometryType) {
     case "corner_45":
@@ -1491,6 +1581,6 @@ function poseOverridesFromDoc(doc) {
   return out;
 }
 
-export { ENDPLATE_FASCIA_CLEAR_INCHES, ENDPLATE_LEAD_INCHES, FREEMO_ENDPLATE_TRACK_FASCIA_CLEARANCE_INCHES, FREEMO_ENDPLATE_WIDTH_MIN_INCHES, FREEMO_ENDPLATE_WIDTH_RECOMMENDED_INCHES, FREEMO_TRACK_SPACING_INCHES, MAIN2_TRACK_ID, MAIN_TRACK_ID, N_CAR_LENGTH_INCHES, N_SCALE_RATIO, WHOLE_MODULE_SECTION_ID, asModuleSchematic, benchworkBand, benchworkOutline, buildCrossover, buildPassingSiding, buildTransition, carCapacity, checkEndplateWidth, deriveEndplatePoses, divergeSideForHand, docToState, emptyEditorState, endplateFaceSegments, endplateLead, endplateTrackOffsetFor, endplateTrackOffsetInches, endplateWidthInches, fromSectionRelative, geometryTurnDegrees, inchesToScaleFeet, isLoopDoc, isTransitionTurnout, moduleCenterline, moduleFeatures, moduleFootprint, moduleLengthFromSections, moduleSections, nextId, poseNeedsManual, poseOverridesFromDoc, remapPos, sampleBenchworkOutline, samplePath, scaleFeetToInches, sectionAdjacency, sectionBand, sectionBreaksFromSections, sectionComponents, sectionFootprints, sectionNeighbours, sectionSpans, sectionSpansOrWhole, sectionedCenterline, sectionedEndPose, sliceCenterline, stateToDoc, toSectionRelative, trackMeetsEndplateIssues, trackPath };
+export { ENDPLATE_FASCIA_CLEAR_INCHES, ENDPLATE_LEAD_INCHES, FREEMO_ENDPLATE_TRACK_FASCIA_CLEARANCE_INCHES, FREEMO_ENDPLATE_WIDTH_MIN_INCHES, FREEMO_ENDPLATE_WIDTH_RECOMMENDED_INCHES, FREEMO_TRACK_SPACING_INCHES, MAIN2_TRACK_ID, MAIN_TRACK_ID, N_CAR_LENGTH_INCHES, N_SCALE_RATIO, WHOLE_MODULE_SECTION_ID, asModuleSchematic, benchworkBand, benchworkOutline, buildCrossover, buildPassingSiding, buildTransition, carCapacity, checkEndplateWidth, deriveEndplatePoses, divergeSideForHand, docToState, emptyEditorState, endplateFaceSegments, endplateLead, endplateTrackOffsetFor, endplateTrackOffsetInches, endplateWidthInches, fromSectionRelative, geometryTurnDegrees, inchesToScaleFeet, isLoopDoc, isTransitionTurnout, moduleCenterline, moduleFeatures, moduleFootprint, moduleLengthFromSections, moduleSections, nextId, poseNeedsManual, poseOverridesFromDoc, remapPos, returnLoop, sampleBenchworkOutline, samplePath, scaleFeetToInches, sectionAdjacency, sectionBand, sectionBreaksFromSections, sectionComponents, sectionFootprints, sectionNeighbours, sectionSpans, sectionSpansOrWhole, sectionedCenterline, sectionedEndPose, sliceCenterline, stateToDoc, toSectionRelative, trackMeetsEndplateIssues, trackPath };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map