@willcgage/module-schematic 0.32.0 → 0.34.0

package/dist/index.d.cts

@@ -438,6 +438,19 @@ declare function sectionBreaksFromSections(doc: {
  * a module like One Mile expressible: straight boards with two 24″ curved ones
  * in the middle, which no single module-level geometry can describe (#108).
  * Returns [] when the module has no sections with lengths. */
+/** Where the chained boards finish, and on what heading — computed from the
+ * section geometry itself rather than read off the sampled polyline. A curve
+ * is sampled in steps, so the last chord lags the true tangent by half a step
+ * (a 90° board sampled 12 ways reads 86.25°). That error would land straight
+ * in endplate B's heading and throw off face-to-face snapping, so the exact
+ * value is accumulated here instead. Null when there are no sections. */
+declare function sectionedEndPose(doc: {
+    sections?: SchematicSection[] | null;
+} | null | undefined): {
+    x: number;
+    y: number;
+    heading: number;
+} | null;
 declare function sectionedCenterline(doc: {
     sections?: SchematicSection[] | null;
 } | null | undefined): BenchworkPoint[];
@@ -949,6 +962,10 @@ interface ModuleGeometryInput {
     /** Half the spacing between the two tracks of a double endplate (Free-mo ≈ 1",
      * Free-moN ≈ 9/16"). */
     trackHalfSpacingInches?: number;
+    /** The module's sections. When present they define the module's real shape,
+     * so endplate B lands at the end of the CHAINED boards rather than where a
+     * single module-level geometry would have put it (#108). */
+    sections?: SchematicSection[] | null;
 }
 /** Signed turn a module applies to the through track (CCW/left positive). */
 declare function geometryTurnDegrees(geometryType?: string | null, geometryDegrees?: number | null): number;
@@ -971,4 +988,4 @@ declare function poseOverridesFromDoc(doc: ModuleSchematicDoc): Record<string, {
     heading: number;
 }>;
 
-export { type BenchworkPoint, type BranchConnector, type DrawCrossing, type DrawCrossover, type DrawIndustry, type DrawSignal, type DrawTrack, type DrawTurnout, type EditorBranch, type EditorControlPoint, type EditorCpSignal, type EditorCrossing, type EditorIndustry, type EditorState, type EditorTrack, type EditorTurnout, type EndplateBConfig, type EndplatePose, type EndplateWidthIssue, FREEMO_ENDPLATE_TRACK_FASCIA_CLEARANCE_INCHES, FREEMO_ENDPLATE_WIDTH_MIN_INCHES, FREEMO_ENDPLATE_WIDTH_RECOMMENDED_INCHES, FREEMO_TRACK_SPACING_INCHES, type GeometryType, type IndustryLabelMode, type IndustrySpot, MAIN2_TRACK_ID, MAIN_TRACK_ID, type ModuleFeatures, type ModuleFootprint, type ModuleFootprintInput, type ModuleGeometryInput, type ModuleSchematicDoc, type ModuleTrackRow, N_CAR_LENGTH_INCHES, N_SCALE_RATIO, type OutlineFace, type SchematicBlock, type SchematicControlPoint, type SchematicCrossing, type SchematicEndplate, type SchematicEndplateTrack, type SchematicIndustry, type SchematicSection, type SchematicSignal, type SchematicTrack, type SchematicTurnout, type SectionAdjacency, type SectionFootprint, type SignalFacing, type SignalSide, type TrackConfig, type TrackRole, type TurnoutKind, asModuleSchematic, benchworkBand, benchworkOutline, buildCrossover, buildPassingSiding, buildTransition, carCapacity, checkEndplateWidth, deriveEndplatePoses, divergeSideForHand, docToState, emptyEditorState, endplateFaceSegments, endplateTrackOffsetFor, endplateTrackOffsetInches, endplateWidthInches, geometryTurnDegrees, inchesToScaleFeet, isLoopDoc, isTransitionTurnout, moduleCenterline, moduleFeatures, moduleFootprint, moduleLengthFromSections, moduleSections, nextId, poseNeedsManual, poseOverridesFromDoc, sampleBenchworkOutline, samplePath, scaleFeetToInches, sectionAdjacency, sectionBand, sectionBreaksFromSections, sectionComponents, sectionFootprints, sectionNeighbours, sectionSpans, sectionedCenterline, sliceCenterline, stateToDoc, trackPath };
+export { type BenchworkPoint, type BranchConnector, type DrawCrossing, type DrawCrossover, type DrawIndustry, type DrawSignal, type DrawTrack, type DrawTurnout, type EditorBranch, type EditorControlPoint, type EditorCpSignal, type EditorCrossing, type EditorIndustry, type EditorState, type EditorTrack, type EditorTurnout, type EndplateBConfig, type EndplatePose, type EndplateWidthIssue, FREEMO_ENDPLATE_TRACK_FASCIA_CLEARANCE_INCHES, FREEMO_ENDPLATE_WIDTH_MIN_INCHES, FREEMO_ENDPLATE_WIDTH_RECOMMENDED_INCHES, FREEMO_TRACK_SPACING_INCHES, type GeometryType, type IndustryLabelMode, type IndustrySpot, MAIN2_TRACK_ID, MAIN_TRACK_ID, type ModuleFeatures, type ModuleFootprint, type ModuleFootprintInput, type ModuleGeometryInput, type ModuleSchematicDoc, type ModuleTrackRow, N_CAR_LENGTH_INCHES, N_SCALE_RATIO, type OutlineFace, type SchematicBlock, type SchematicControlPoint, type SchematicCrossing, type SchematicEndplate, type SchematicEndplateTrack, type SchematicIndustry, type SchematicSection, type SchematicSignal, type SchematicTrack, type SchematicTurnout, type SectionAdjacency, type SectionFootprint, type SignalFacing, type SignalSide, type TrackConfig, type TrackRole, type TurnoutKind, asModuleSchematic, benchworkBand, benchworkOutline, buildCrossover, buildPassingSiding, buildTransition, carCapacity, checkEndplateWidth, deriveEndplatePoses, divergeSideForHand, docToState, emptyEditorState, endplateFaceSegments, endplateTrackOffsetFor, endplateTrackOffsetInches, endplateWidthInches, geometryTurnDegrees, inchesToScaleFeet, isLoopDoc, isTransitionTurnout, moduleCenterline, moduleFeatures, moduleFootprint, moduleLengthFromSections, moduleSections, nextId, poseNeedsManual, poseOverridesFromDoc, sampleBenchworkOutline, samplePath, scaleFeetToInches, sectionAdjacency, sectionBand, sectionBreaksFromSections, sectionComponents, sectionFootprints, sectionNeighbours, sectionSpans, sectionedCenterline, sectionedEndPose, sliceCenterline, stateToDoc, trackPath };

package/dist/index.d.ts

@@ -438,6 +438,19 @@ declare function sectionBreaksFromSections(doc: {
  * a module like One Mile expressible: straight boards with two 24″ curved ones
  * in the middle, which no single module-level geometry can describe (#108).
  * Returns [] when the module has no sections with lengths. */
+/** Where the chained boards finish, and on what heading — computed from the
+ * section geometry itself rather than read off the sampled polyline. A curve
+ * is sampled in steps, so the last chord lags the true tangent by half a step
+ * (a 90° board sampled 12 ways reads 86.25°). That error would land straight
+ * in endplate B's heading and throw off face-to-face snapping, so the exact
+ * value is accumulated here instead. Null when there are no sections. */
+declare function sectionedEndPose(doc: {
+    sections?: SchematicSection[] | null;
+} | null | undefined): {
+    x: number;
+    y: number;
+    heading: number;
+} | null;
 declare function sectionedCenterline(doc: {
     sections?: SchematicSection[] | null;
 } | null | undefined): BenchworkPoint[];
@@ -949,6 +962,10 @@ interface ModuleGeometryInput {
     /** Half the spacing between the two tracks of a double endplate (Free-mo ≈ 1",
      * Free-moN ≈ 9/16"). */
     trackHalfSpacingInches?: number;
+    /** The module's sections. When present they define the module's real shape,
+     * so endplate B lands at the end of the CHAINED boards rather than where a
+     * single module-level geometry would have put it (#108). */
+    sections?: SchematicSection[] | null;
 }
 /** Signed turn a module applies to the through track (CCW/left positive). */
 declare function geometryTurnDegrees(geometryType?: string | null, geometryDegrees?: number | null): number;
@@ -971,4 +988,4 @@ declare function poseOverridesFromDoc(doc: ModuleSchematicDoc): Record<string, {
     heading: number;
 }>;
 
-export { type BenchworkPoint, type BranchConnector, type DrawCrossing, type DrawCrossover, type DrawIndustry, type DrawSignal, type DrawTrack, type DrawTurnout, type EditorBranch, type EditorControlPoint, type EditorCpSignal, type EditorCrossing, type EditorIndustry, type EditorState, type EditorTrack, type EditorTurnout, type EndplateBConfig, type EndplatePose, type EndplateWidthIssue, FREEMO_ENDPLATE_TRACK_FASCIA_CLEARANCE_INCHES, FREEMO_ENDPLATE_WIDTH_MIN_INCHES, FREEMO_ENDPLATE_WIDTH_RECOMMENDED_INCHES, FREEMO_TRACK_SPACING_INCHES, type GeometryType, type IndustryLabelMode, type IndustrySpot, MAIN2_TRACK_ID, MAIN_TRACK_ID, type ModuleFeatures, type ModuleFootprint, type ModuleFootprintInput, type ModuleGeometryInput, type ModuleSchematicDoc, type ModuleTrackRow, N_CAR_LENGTH_INCHES, N_SCALE_RATIO, type OutlineFace, type SchematicBlock, type SchematicControlPoint, type SchematicCrossing, type SchematicEndplate, type SchematicEndplateTrack, type SchematicIndustry, type SchematicSection, type SchematicSignal, type SchematicTrack, type SchematicTurnout, type SectionAdjacency, type SectionFootprint, type SignalFacing, type SignalSide, type TrackConfig, type TrackRole, type TurnoutKind, asModuleSchematic, benchworkBand, benchworkOutline, buildCrossover, buildPassingSiding, buildTransition, carCapacity, checkEndplateWidth, deriveEndplatePoses, divergeSideForHand, docToState, emptyEditorState, endplateFaceSegments, endplateTrackOffsetFor, endplateTrackOffsetInches, endplateWidthInches, geometryTurnDegrees, inchesToScaleFeet, isLoopDoc, isTransitionTurnout, moduleCenterline, moduleFeatures, moduleFootprint, moduleLengthFromSections, moduleSections, nextId, poseNeedsManual, poseOverridesFromDoc, sampleBenchworkOutline, samplePath, scaleFeetToInches, sectionAdjacency, sectionBand, sectionBreaksFromSections, sectionComponents, sectionFootprints, sectionNeighbours, sectionSpans, sectionedCenterline, sliceCenterline, stateToDoc, trackPath };
+export { type BenchworkPoint, type BranchConnector, type DrawCrossing, type DrawCrossover, type DrawIndustry, type DrawSignal, type DrawTrack, type DrawTurnout, type EditorBranch, type EditorControlPoint, type EditorCpSignal, type EditorCrossing, type EditorIndustry, type EditorState, type EditorTrack, type EditorTurnout, type EndplateBConfig, type EndplatePose, type EndplateWidthIssue, FREEMO_ENDPLATE_TRACK_FASCIA_CLEARANCE_INCHES, FREEMO_ENDPLATE_WIDTH_MIN_INCHES, FREEMO_ENDPLATE_WIDTH_RECOMMENDED_INCHES, FREEMO_TRACK_SPACING_INCHES, type GeometryType, type IndustryLabelMode, type IndustrySpot, MAIN2_TRACK_ID, MAIN_TRACK_ID, type ModuleFeatures, type ModuleFootprint, type ModuleFootprintInput, type ModuleGeometryInput, type ModuleSchematicDoc, type ModuleTrackRow, N_CAR_LENGTH_INCHES, N_SCALE_RATIO, type OutlineFace, type SchematicBlock, type SchematicControlPoint, type SchematicCrossing, type SchematicEndplate, type SchematicEndplateTrack, type SchematicIndustry, type SchematicSection, type SchematicSignal, type SchematicTrack, type SchematicTurnout, type SectionAdjacency, type SectionFootprint, type SignalFacing, type SignalSide, type TrackConfig, type TrackRole, type TurnoutKind, asModuleSchematic, benchworkBand, benchworkOutline, buildCrossover, buildPassingSiding, buildTransition, carCapacity, checkEndplateWidth, deriveEndplatePoses, divergeSideForHand, docToState, emptyEditorState, endplateFaceSegments, endplateTrackOffsetFor, endplateTrackOffsetInches, endplateWidthInches, geometryTurnDegrees, inchesToScaleFeet, isLoopDoc, isTransitionTurnout, moduleCenterline, moduleFeatures, moduleFootprint, moduleLengthFromSections, moduleSections, nextId, poseNeedsManual, poseOverridesFromDoc, sampleBenchworkOutline, samplePath, scaleFeetToInches, sectionAdjacency, sectionBand, sectionBreaksFromSections, sectionComponents, sectionFootprints, sectionNeighbours, sectionSpans, sectionedCenterline, sectionedEndPose, sliceCenterline, stateToDoc, trackPath };

package/dist/index.js

@@ -209,6 +209,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
@@ -535,18 +553,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";
@@ -664,7 +686,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,
@@ -1281,7 +1308,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;
@@ -1342,6 +1381,6 @@ function poseOverridesFromDoc(doc) {
   return out;
 }
 
-export { FREEMO_ENDPLATE_TRACK_FASCIA_CLEARANCE_INCHES, FREEMO_ENDPLATE_WIDTH_MIN_INCHES, FREEMO_ENDPLATE_WIDTH_RECOMMENDED_INCHES, FREEMO_TRACK_SPACING_INCHES, MAIN2_TRACK_ID, MAIN_TRACK_ID, N_CAR_LENGTH_INCHES, N_SCALE_RATIO, asModuleSchematic, benchworkBand, benchworkOutline, buildCrossover, buildPassingSiding, buildTransition, carCapacity, checkEndplateWidth, deriveEndplatePoses, divergeSideForHand, docToState, emptyEditorState, endplateFaceSegments, endplateTrackOffsetFor, endplateTrackOffsetInches, endplateWidthInches, geometryTurnDegrees, inchesToScaleFeet, isLoopDoc, isTransitionTurnout, moduleCenterline, moduleFeatures, moduleFootprint, moduleLengthFromSections, moduleSections, nextId, poseNeedsManual, poseOverridesFromDoc, sampleBenchworkOutline, samplePath, scaleFeetToInches, sectionAdjacency, sectionBand, sectionBreaksFromSections, sectionComponents, sectionFootprints, sectionNeighbours, sectionSpans, sectionedCenterline, sliceCenterline, stateToDoc, trackPath };
+export { FREEMO_ENDPLATE_TRACK_FASCIA_CLEARANCE_INCHES, FREEMO_ENDPLATE_WIDTH_MIN_INCHES, FREEMO_ENDPLATE_WIDTH_RECOMMENDED_INCHES, FREEMO_TRACK_SPACING_INCHES, MAIN2_TRACK_ID, MAIN_TRACK_ID, N_CAR_LENGTH_INCHES, N_SCALE_RATIO, asModuleSchematic, benchworkBand, benchworkOutline, buildCrossover, buildPassingSiding, buildTransition, carCapacity, checkEndplateWidth, deriveEndplatePoses, divergeSideForHand, docToState, emptyEditorState, endplateFaceSegments, endplateTrackOffsetFor, endplateTrackOffsetInches, endplateWidthInches, geometryTurnDegrees, inchesToScaleFeet, isLoopDoc, isTransitionTurnout, moduleCenterline, moduleFeatures, moduleFootprint, moduleLengthFromSections, moduleSections, nextId, poseNeedsManual, poseOverridesFromDoc, sampleBenchworkOutline, samplePath, scaleFeetToInches, sectionAdjacency, sectionBand, sectionBreaksFromSections, sectionComponents, sectionFootprints, sectionNeighbours, sectionSpans, sectionedCenterline, sectionedEndPose, sliceCenterline, stateToDoc, trackPath };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map