@willcgage/module-schematic 0.32.0 → 0.34.0

package/dist/index.cjs

@@ -211,6 +211,24 @@ function sectionBreaksFromSections(doc) {
   const spans = sectionSpans(doc);
   return spans.slice(0, -1).map((sp) => sp.toPos);
 }
+function sectionedEndPose(doc) {
+  const secs = moduleSections(doc).filter(
+    (sec) => typeof sec.lengthInches === "number" && sec.lengthInches > 0
+  );
+  if (!secs.length) return null;
+  let ox = 0;
+  let oy = 0;
+  let heading = 0;
+  for (const sec of secs) {
+    const local = sectionCenterlineLocal(sec);
+    const c = Math.cos(heading * DEG_FP);
+    const sn = Math.sin(heading * DEG_FP);
+    ox += local.endX * c - local.endY * sn;
+    oy += local.endX * sn + local.endY * c;
+    heading += local.endHeadingDeg;
+  }
+  return { x: ox, y: oy, heading };
+}
 function sectionedCenterline(doc) {
   const secs = moduleSections(doc).filter(
     (sec) => typeof sec.lengthInches === "number" && sec.lengthInches > 0
@@ -537,18 +555,22 @@ function main1Track(state) {
 }
 function main2Track(state) {
   const bothDouble = state.configA === "double" && state.configB === "double";
-  const sw = state.turnouts.find(isTransitionTurnout);
+  const sws = state.turnouts.filter((t) => isTransitionTurnout(t) && t.divergeTrack === MAIN2_TRACK_ID).sort((a, b) => a.pos - b.pos);
   const lane = state.mainsSwapped ? 0 : 1;
-  if (bothDouble || !sw || sw.divergeTrack !== MAIN2_TRACK_ID) {
+  if (bothDouble || !sws.length) {
     return { id: MAIN2_TRACK_ID, role: "main", lane, from: "A", to: "B" };
   }
-  return state.configA === "double" ? (
-    // Double at A: Main 2 runs from A and ends at the turnout.
-    { id: MAIN2_TRACK_ID, role: "main", lane, fromPos: 0, toPos: sw.pos }
-  ) : (
-    // Double at B: Main 2 begins at the turnout and runs to B.
-    { id: MAIN2_TRACK_ID, role: "main", lane, fromPos: sw.pos, toPos: state.lengthInches }
-  );
+  const track = (fromPos, toPos) => ({
+    id: MAIN2_TRACK_ID,
+    role: "main",
+    lane,
+    fromPos,
+    toPos
+  });
+  if (state.configA === "double") return track(0, sws[0].pos);
+  if (state.configB === "double") return track(sws[0].pos, state.lengthInches);
+  if (sws.length >= 2) return track(sws[0].pos, sws[sws.length - 1].pos);
+  return track(sws[0].pos, state.lengthInches);
 }
 function buildTransition(state) {
   const aDouble = state.configA === "double";
@@ -666,7 +688,12 @@ function stateToDoc(state, recordNumber) {
       // double) Main 2 only runs from the mainline turnout to the double end —
       // the turnout that diverges to main2 is the single source of truth for
       // where the transition sits (fd#175 / FMN-0038).
-      ...!state.loop && (state.configA === "double" || state.configB === "double") ? [main2Track(state)] : [],
+      // …and on a module that's SINGLE at both ends but goes double in the
+      // middle to form a siding: the turnouts are what make Main 2 exist, so a
+      // pair of them is reason enough to emit it (#118). Without this the
+      // second main simply wasn't in the doc, and neither the board nor the
+      // dispatcher panel could draw it.
+      ...!state.loop && (state.configA === "double" || state.configB === "double" || state.turnouts.some((t) => isTransitionTurnout(t) && t.divergeTrack === MAIN2_TRACK_ID)) ? [main2Track(state)] : [],
       ...state.loop && state.loopReturn === "main2" ? [{ id: MAIN2_TRACK_ID, role: "main", lane: 1, fromPos: 0, toPos: state.lengthInches }] : [],
       ...state.extraTracks.map((t) => ({
         id: t.id,
@@ -1283,7 +1310,19 @@ function deriveEndplatePoses(geo) {
     })
   );
   const noB = geo.geometryType === "dead_end";
-  if (!noB) {
+  const end = sectionedEndPose({ sections: geo.sections });
+  if (!noB && end) {
+    poses.push(
+      withOverride({
+        id: "B",
+        x: end.x,
+        y: end.y,
+        heading: norm360(end.heading),
+        trackConfig: cfg(1),
+        trackOffsets: offsetsFor(cfg(1), half)
+      })
+    );
+  } else if (!noB) {
     const turn = geometryTurnDegrees(geo.geometryType, geo.geometryDegrees);
     let bx;
     let by;
@@ -1391,6 +1430,7 @@ exports.sectionFootprints = sectionFootprints;
 exports.sectionNeighbours = sectionNeighbours;
 exports.sectionSpans = sectionSpans;
 exports.sectionedCenterline = sectionedCenterline;
+exports.sectionedEndPose = sectionedEndPose;
 exports.sliceCenterline = sliceCenterline;
 exports.stateToDoc = stateToDoc;
 exports.trackPath = trackPath;