@willcgage/module-schematic 0.49.5 → 0.50.0

package/dist/index.cjs

@@ -541,12 +541,23 @@ function carCapacity(fromPos, toPos, carLengthInches = N_CAR_LENGTH_INCHES) {
   if (!(carLengthInches > 0)) return 0;
   return Math.max(0, Math.floor(Math.abs(toPos - fromPos) / carLengthInches));
 }
+function healSelfDivergingTurnouts(turnouts) {
+  if (!turnouts?.some((t) => t.onTrack === t.divergeTrack)) return turnouts;
+  return turnouts.map((t) => {
+    if (t.onTrack !== t.divergeTrack) return t;
+    if (t.onTrack === MAIN_TRACK_ID) return { ...t, divergeTrack: MAIN2_TRACK_ID };
+    if (t.onTrack === MAIN2_TRACK_ID) return { ...t, divergeTrack: MAIN_TRACK_ID };
+    return t;
+  });
+}
 function asModuleSchematic(x) {
   if (!x || typeof x !== "object") return null;
   const d = x;
   if (typeof d.version !== "number") return null;
   if (!Array.isArray(d.endplates) || !Array.isArray(d.tracks)) return null;
-  return d;
+  const doc = d;
+  const healed = healSelfDivergingTurnouts(doc.turnouts);
+  return healed === doc.turnouts ? doc : { ...doc, turnouts: healed };
 }
 function emptyEditorState(lengthInches) {
   return {
@@ -935,24 +946,19 @@ function docToState(doc, fallbackLength, moduleTracks = []) {
       trackB: x.tracks?.[1] ?? MAIN_TRACK_ID
     })),
     extraTracks,
-    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 } : {}
-      };
-    }),
+    // Heal a turnout that diverges into the track it sits on (#172) with the
+    // same helper the read path uses, so the editor and every renderer agree.
+    turnouts: (healSelfDivergingTurnouts(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 } : {}
+    })),
     controlPoints: readControlPoints(d, sc),
     industries: (d.industries ?? []).map((ind) => ({
       id: ind.id,
@@ -1084,6 +1090,24 @@ function buildCrossover(state) {
   ];
   return { track, turnouts };
 }
+var RAIL_GAUGE_INCHES = 0.354;
+var TURNOUT_LEAD_INCHES_PER_FROG = 0.482;
+function turnoutClosure(size, opts = {}) {
+  const N = size > 0 ? size : 6;
+  const g = opts.gaugeInches ?? RAIL_GAUGE_INCHES;
+  const lead = Math.max(0.01, opts.leadInches ?? N * TURNOUT_LEAD_INCHES_PER_FROG);
+  const frogSlope = 1 / N;
+  const k = (lead / N - g) / (lead * lead);
+  const switchSlope = Math.max(0, frogSlope - 2 * k * lead);
+  return {
+    lead,
+    switchSlope,
+    frogSlope,
+    // Past the frog the route is straight at the frog angle — the closure curve
+    // has done its work, so don't keep bending (that's the tangent Option 1).
+    offsetAt: (s) => s <= lead ? switchSlope * s + k * s * s : g + frogSlope * (s - lead)
+  };
+}
 function divergeSideForHand(kind, stubDir, flipped) {
   if (kind !== "left" && kind !== "right") return 0;
   const s = (stubDir >= 0 ? 1 : -1) * (flipped ? -1 : 1);
@@ -1607,6 +1631,8 @@ exports.MAIN2_TRACK_ID = MAIN2_TRACK_ID;
 exports.MAIN_TRACK_ID = MAIN_TRACK_ID;
 exports.N_CAR_LENGTH_INCHES = N_CAR_LENGTH_INCHES;
 exports.N_SCALE_RATIO = N_SCALE_RATIO;
+exports.RAIL_GAUGE_INCHES = RAIL_GAUGE_INCHES;
+exports.TURNOUT_LEAD_INCHES_PER_FROG = TURNOUT_LEAD_INCHES_PER_FROG;
 exports.WHOLE_MODULE_SECTION_ID = WHOLE_MODULE_SECTION_ID;
 exports.asModuleSchematic = asModuleSchematic;
 exports.benchworkBand = benchworkBand;
@@ -1658,5 +1684,6 @@ exports.stateToDoc = stateToDoc;
 exports.toSectionRelative = toSectionRelative;
 exports.trackMeetsEndplateIssues = trackMeetsEndplateIssues;
 exports.trackPath = trackPath;
+exports.turnoutClosure = turnoutClosure;
 //# sourceMappingURL=index.cjs.map
 //# sourceMappingURL=index.cjs.map