@willcgage/module-schematic 0.93.0 → 0.94.0

package/dist/index.cjs

@@ -2442,6 +2442,33 @@ function snapPiece(moving, others, library = BUILT_IN_TRACK_PARTS, withinInches
     to: best.t.key
   };
 }
+function fitFlexBetween(piece, others, library = BUILT_IN_TRACK_PARTS, withinInches = 0.5) {
+  const part = library.find((p) => p.id === piece.partId);
+  if (part?.kind !== "flex" || piece.radiusInches) return null;
+  const mine = placedJoints([piece], library);
+  const far = mine.find((j) => j.joint === "b");
+  const near = mine.find((j) => j.joint === "a");
+  if (!far || !near) return null;
+  const graph = buildTrackGraph(others, library);
+  const taken = new Set(graph.connections.flatMap((c) => [c.a, c.b]));
+  let best = null;
+  for (const j of graph.joints) {
+    if (taken.has(j.key)) continue;
+    if (Math.hypot(j.x - near.x, j.y - near.y) <= JOINT_SNAP_INCHES) continue;
+    const d = Math.hypot(j.x - far.x, j.y - far.y);
+    if (d <= withinInches && (!best || d < best.d)) best = { j, d };
+  }
+  if (!best) return null;
+  const dx = best.j.x - piece.x;
+  const dy = best.j.y - piece.y;
+  const len = Math.hypot(dx, dy);
+  if (!(len > 0)) return null;
+  return {
+    ...piece,
+    rotationDeg: norm360(Math.atan2(dy, dx) * 180 / Math.PI),
+    lengthInches: Math.round(len * 1e3) / 1e3
+  };
+}
 var danglingDivergeWarning = (id) => `the route diverging at ${id} is not connected to anything`;
 var unreachedWarning = (id) => `${id} is not reachable from the endplate \u2014 nothing connects it`;
 function walkTrackGraph(graph, pieces, startAt, library = BUILT_IN_TRACK_PARTS) {
@@ -2635,9 +2662,16 @@ function graphToDoc(pieces, input) {
   const trackIdOf = /* @__PURE__ */ new Map([["main", MAIN_TRACK_ID]]);
   if (twoMains) trackIdOf.set("main2:main", MAIN2_TRACK_ID);
   for (const r of branches) trackIdOf.set(r.id, r.pieces[0]);
-  const laneOf = (r) => {
+  const emitted = /* @__PURE__ */ new Set();
+  const uniqueBranches = branches.filter((r) => {
+    const id = trackIdOf.get(r.id);
+    if (emitted.has(id)) return false;
+    emitted.add(id);
+    return true;
+  });
+  const laneOf = (r, among) => {
     const side = Math.sign(r.lateral) || 1;
-    const sameSide = branches.filter((x) => (Math.sign(x.lateral) || 1) === side).sort((a, b) => Math.abs(a.lateral) - Math.abs(b.lateral));
+    const sameSide = among.filter((x) => (Math.sign(x.lateral) || 1) === side).sort((a, b) => Math.abs(a.lateral) - Math.abs(b.lateral));
     const taken = side === main2Lane ? 1 : 0;
     return side * (sameSide.indexOf(r) + 1 + taken);
   };
@@ -2663,7 +2697,7 @@ function graphToDoc(pieces, input) {
       }
     ] : []
   ];
-  for (const r of branches) {
+  for (const r of uniqueBranches) {
     const id = trackIdOf.get(r.id);
     const meta = input.meta?.[id] ?? {};
     tracks.push({
@@ -2671,7 +2705,7 @@ function graphToDoc(pieces, input) {
       // It runs back into a second turnout, or it doesn't. That is the whole
       // difference between a siding and a spur, and it is read, not declared.
       role: r.endsAt ? "siding" : "spur",
-      lane: laneOf(r),
+      lane: laneOf(r, uniqueBranches),
       fromPos: round(Math.min(r.fromPos, r.toPos)),
       toPos: round(Math.max(r.fromPos, r.toPos)),
       ...meta.trackName ? { trackName: meta.trackName } : {},
@@ -2722,6 +2756,12 @@ function graphToDoc(pieces, input) {
     });
   }
   turnouts.sort((a, b) => a.pos - b.pos);
+  for (const t of tracks) {
+    if (t.role === "main") continue;
+    const ends = turnouts.filter((sw) => sw.divergeTrack === t.id);
+    if (ends.length >= 2 && new Set(ends.map((sw) => sw.onTrack)).size >= 2)
+      t.role = "crossover";
+  }
   const place = (a, what) => {
     if (!a) return null;
     const hit = resolveGraphAnchor(a, walk, pieces, library);
@@ -3475,6 +3515,7 @@ exports.endplateFaceSegments = endplateFaceSegments;
 exports.endplateLead = endplateLead;
 exports.endplateTrackOffsetInches = endplateTrackOffsetInches;
 exports.endplateWidthInches = endplateWidthInches;
+exports.fitFlexBetween = fitFlexBetween;
 exports.flexPartFor = flexPartFor;
 exports.flexParts = flexParts;
 exports.flexPieces = flexPieces;