@willcgage/module-schematic 0.109.0 → 0.111.0

package/dist/index.cjs

@@ -3149,8 +3149,12 @@ function graphToDoc(pieces, input) {
   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";
+    if (!(ends.length >= 2 && new Set(ends.map((sw) => sw.onTrack)).size >= 2)) continue;
+    t.role = "crossover";
+    const at = ends.map((sw) => sw.pos);
+    t.fromPos = round(Math.min(...at));
+    t.toPos = round(Math.max(...at));
+    t.lane = main2Lane || 1;
   }
   const place = (a, what) => {
     if (!a) return null;
@@ -3417,7 +3421,12 @@ function docToGraph(doc, answers = {}, library = BUILT_IN_TRACK_PARTS) {
     const ends = [branch?.fromPos, branch?.toPos].filter(
       (n) => typeof n === "number" && Number.isFinite(n)
     );
-    const divergeFarPos = ends.length ? ends.reduce((a, b) => Math.abs(b - t.pos) > Math.abs(a - t.pos) ? b : a) : void 0;
+    const divergeFarPos = (
+      // ⭐ A crossover half diverges TOWARD its partner. Its diverging track is a
+      // MAIN, whose ends are the whole module, so the ordinary rule has nothing
+      // useful to sign and would point it away from the turnout it feeds.
+      divergeFarOverride.get(t.id) ?? (ends.length ? ends.reduce((a, b) => Math.abs(b - t.pos) > Math.abs(a - t.pos) ? b : a) : void 0)
+    );
     const facing = turnoutFacing({
       pos: t.pos,
       divergeFarPos,
@@ -3534,6 +3543,7 @@ function docToGraph(doc, answers = {}, library = BUILT_IN_TRACK_PARTS) {
     fromPos: a.x0,
     toPos: a.x0 + a.geom.lengthInches
   }));
+  const mainIdsAll = new Set(mains.map((m) => m.id));
   const attachment = /* @__PURE__ */ new Map();
   for (const t of turnouts) {
     const m = mains.find((x) => x.id === t.divergeTrack && x.id !== main.id);
@@ -3542,11 +3552,34 @@ function docToGraph(doc, answers = {}, library = BUILT_IN_TRACK_PARTS) {
     const to = m.toPos ?? mainLen;
     if (from > 0 && Math.abs(t.pos - from) < 0.01) attachment.set(m.id, { sw: t, at: "from" });
     else if (Math.abs(t.pos - to) < 0.01) attachment.set(m.id, { sw: t, at: "to" });
-    else
-      notLaid.push({
-        id: m.id,
-        why: `${t.name || t.id} joins ${m.id} at ${t.pos}\u2033, which is neither end of it \u2014 two mains joined partway along are a crossover, and this document has no connector track between them to lay one from`
+  }
+  const mainToMainPairs = [];
+  {
+    const isMain = (id) => mainIdsAll.has(id);
+    const used = /* @__PURE__ */ new Set();
+    for (const t of turnouts) {
+      if (used.has(t.id) || !isMain(t.onTrack) || !isMain(t.divergeTrack)) continue;
+      if (t.onTrack === t.divergeTrack) continue;
+      const partner = turnouts.filter(
+        (u) => !used.has(u.id) && u.id !== t.id && u.onTrack === t.divergeTrack && u.divergeTrack === t.onTrack
+      ).sort((x, y) => Math.abs(x.pos - t.pos) - Math.abs(y.pos - t.pos))[0];
+      if (!partner) continue;
+      used.add(t.id);
+      used.add(partner.id);
+      mainToMainPairs.push({
+        a: t,
+        b: partner,
+        pairKey: [t.onTrack, t.divergeTrack].sort().join("\u2194")
       });
+    }
+  }
+  const crossingsBetween = /* @__PURE__ */ new Map();
+  for (const p of mainToMainPairs)
+    crossingsBetween.set(p.pairKey, (crossingsBetween.get(p.pairKey) ?? 0) + 1);
+  const divergeFarOverride = /* @__PURE__ */ new Map();
+  for (const { a, b } of mainToMainPairs) {
+    divergeFarOverride.set(a.id, b.pos);
+    divergeFarOverride.set(b.id, a.pos);
   }
   for (const m of mains) {
     if (attachment.get(m.id)?.at === "from") continue;
@@ -3601,6 +3634,36 @@ function docToGraph(doc, answers = {}, library = BUILT_IN_TRACK_PARTS) {
     done.add(m.id);
   }
   for (const id of assemblyTracks) done.add(id);
+  for (const [i, pair] of mainToMainPairs.entries()) {
+    const la = laidTurnouts.get(pair.a.id);
+    const lb = laidTurnouts.get(pair.b.id);
+    if (!la || !lb) continue;
+    const ja = jointAt(la.piece, la.divergeId);
+    const jb = jointAt(lb.piece, lb.divergeId);
+    if (!ja || !jb) continue;
+    const dx = jb.x - ja.x;
+    const dy = jb.y - ja.y;
+    const len = Math.hypot(dx, dy);
+    if (!(len > 1e-6)) {
+      notLaid.push({
+        id: pair.a.divergeTrack,
+        why: `${pair.a.name || pair.a.id} and ${pair.b.name || pair.b.id} meet at the same point, so there is no track between them to lay`
+      });
+      continue;
+    }
+    pieces.push({
+      id: `xc-${i}`,
+      partId: flexId,
+      x: ja.x,
+      y: ja.y,
+      rotationDeg: Math.atan2(dy, dx) * 180 / Math.PI,
+      lengthInches: r3(len)
+    });
+    if ((crossingsBetween.get(pair.pairKey) ?? 1) > 1)
+      warnings.push(
+        `${pair.a.name || pair.a.id} and ${pair.b.name || pair.b.id} are two of four turnouts crossing between the same pair of mains \u2014 a double crossover. They are laid as separate turnouts with a ${len.toFixed(1)}\u2033 piece of track between them, which is what the document describes. If it is really a one-piece double crossover, name the product on a connector track and it will be laid as the single assembly it is.`
+      );
+  }
   let progressed = true;
   while (progressed) {
     progressed = false;