@willcgage/module-schematic 0.101.0 → 0.103.0

package/dist/index.cjs

@@ -3214,7 +3214,25 @@ function docToGraph(doc, answers = {}, library = BUILT_IN_TRACK_PARTS) {
     );
     return out;
   };
-  const turnoutsOn = (trackId, hostY) => turnouts.filter((t) => t.onTrack === trackId && chosen.has(t.id)).sort((a, b) => a.pos - b.pos).map((t) => layTurnout(t, hostY));
+  const turnoutsOn = (trackId, hostY) => {
+    const laid = turnouts.filter((t) => t.onTrack === trackId && chosen.has(t.id)).map((t) => layTurnout(t, hostY)).sort((a, b) => a.span.fromPos - b.span.fromPos);
+    const clashed = /* @__PURE__ */ new Set();
+    for (let i = 1; i < laid.length; i += 1) {
+      const prev = laid[i - 1];
+      const cur = laid[i];
+      if (cur.span.fromPos < prev.span.toPos - 1e-6) {
+        clashed.add(prev.t.id);
+        clashed.add(cur.t.id);
+        const gap = Math.abs(cur.t.pos - prev.t.pos);
+        const body = prev.span.toPos - prev.span.fromPos;
+        notLaid.push({
+          id: cur.t.divergeTrack,
+          why: `${prev.t.name || prev.t.id} and ${cur.t.name || cur.t.id} are ${gap.toFixed(1)}\u2033 apart on the same track, but the turnout chosen is ${body.toFixed(1)}\u2033 long \u2014 their mouldings would overlap, which is why this is sold as one assembly rather than two turnouts`
+        });
+      }
+    }
+    return laid.filter((l) => !clashed.has(l.t.id));
+  };
   const main = trackById.get(MAIN_TRACK_ID) ?? tracks.find((t) => t.role === "main");
   if (!main) return refuse("this module's document has no mainline to convert");
   const mains = [main, ...tracks.filter((t) => t.role === "main" && t.id !== main.id)];
@@ -3246,6 +3264,35 @@ function docToGraph(doc, answers = {}, library = BUILT_IN_TRACK_PARTS) {
         notLaid.push({ id: branch.id, why: `turnout ${t.id} has no diverging end to leave from` });
         continue;
       }
+      const farSw0 = turnouts.find(
+        (o) => o.id !== t.id && o.divergeTrack === branch.id && laidTurnouts.has(o.id)
+      );
+      const farJoint0 = farSw0 ? (() => {
+        const f = laidTurnouts.get(farSw0.id);
+        return jointAt(f.piece, f.divergeId);
+      })() : null;
+      if (branch.role === "crossover" && farJoint0) {
+        const dx = farJoint0.x - dj.x;
+        const dy = farJoint0.y - dj.y;
+        const len = Math.hypot(dx, dy);
+        if (len > 1e-6) {
+          pieces.push({
+            id: `x-${branch.id}`,
+            partId: flexId,
+            x: dj.x,
+            y: dj.y,
+            rotationDeg: Math.atan2(dy, dx) * 180 / Math.PI,
+            lengthInches: r3(len),
+            ...branch.trackName ? { name: branch.trackName } : {}
+          });
+        } else {
+          notLaid.push({
+            id: branch.id,
+            why: "this crossover's two turnouts meet at the same point, so there is no connector between them to lay"
+          });
+        }
+        continue;
+      }
       const branchY = laneOffsetAt(branch.lane ?? 0, 0);
       const curve = transition(branch.id, { x: dj.x, y: dj.y, headingDeg: dj.headingDeg }, branchY);
       let start = { x: dj.x, y: dj.y, headingDeg: dj.headingDeg };
@@ -3254,13 +3301,7 @@ function docToGraph(doc, answers = {}, library = BUILT_IN_TRACK_PARTS) {
         const e = jointAt(curve, "b");
         if (e) start = { x: e.x, y: e.y, headingDeg: e.headingDeg };
       }
-      const farSw = turnouts.find(
-        (o) => o.id !== t.id && o.divergeTrack === branch.id && laidTurnouts.has(o.id)
-      );
-      const farJoint = farSw ? (() => {
-        const f = laidTurnouts.get(farSw.id);
-        return jointAt(f.piece, f.divergeId);
-      })() : null;
+      const farJoint = farJoint0;
       let endX = farJoint != null ? farJoint.x : Math.max(branch.fromPos ?? t.pos, branch.toPos ?? t.pos);
       let farCurve = null;
       if (farJoint) {