@willcgage/module-schematic 0.49.6 → 0.51.0

package/dist/index.d.cts

@@ -1032,6 +1032,49 @@ interface ModuleFeatures {
  * right-hand throws to the opposite side. `kind` is the source of truth for the
  * drawn side (#bug1) — the stored lane's sign is reconciled to match it.
  */
+/** N-scale track gauge, inches (9 mm). */
+declare const RAIL_GAUGE_INCHES = 0.354;
+/** Points → FROG for a #1 frog, inches — a turnout's LEAD, scaled by frog
+ * number. Calibrated COMMERCIALLY rather than on the prototype, since owners lay
+ * real product: an Atlas code 55 #7 measures 3⅜″ points→frog (Steve Branton,
+ * #173) ⇒ 3.375 / 7. (The prototype #7 lead is 62′-1″ ≈ 4.66″ in N; commercial
+ * turnouts are compressed against that.) */
+declare const TURNOUT_LEAD_INCHES_PER_FROG = 0.482;
+/** A turnout's CLOSURE — the diverging route's lateral offset from the through
+ * route, from the points (s = 0) to the frog (s = lead) and beyond.
+ *
+ * Anchored on one geometric fact: the FROG is where the two routes' inner rails
+ * cross, which happens where the centre-lines are exactly ONE GAUGE apart. So
+ * `pos` (which means the frog, #132) must be where d = gauge — otherwise the
+ * drawn crossing and the frog marker disagree.
+ *
+ * The curve is `d(s) = α·s + k·s²`, fixed by three conditions:
+ *   d(0)      = 0      — the points start ON the stock rail
+ *   d(lead)   = gauge  — the frog lands exactly on `pos`
+ *   d'(lead)  = 1/N    — it leaves at the frog angle
+ *
+ * ⚠️ `α` is the SWITCH ANGLE and is deliberately non-zero. A curve leaving
+ * TANGENT to the stock rail only reaches `lead/2N` of lateral by the frog
+ * (0.24″ on a #7) — it could never reach a gauge within a commercial lead; you'd
+ * need `lead = 2·gauge·N` ≈ the prototype figure. Real points leave the stock
+ * rail at a finite angle, which is exactly why a commercial turnout can be
+ * shorter than prototype. Valid while `lead < 2·gauge·N`; α is clamped at 0
+ * otherwise so an absurd lead degrades to a tangent start instead of bending
+ * backwards. */
+interface TurnoutClosure {
+    /** Lateral offset from the through route at arc length `s` past the points. */
+    offsetAt: (s: number) => number;
+    /** Points→frog, inches. */
+    lead: number;
+    /** Slope at the points (the switch angle), rise over run. */
+    switchSlope: number;
+    /** Slope at and beyond the frog — the frog angle, 1/N. */
+    frogSlope: number;
+}
+declare function turnoutClosure(size: number, opts?: {
+    leadInches?: number;
+    gaugeInches?: number;
+}): TurnoutClosure;
 declare function divergeSideForHand(kind: TurnoutKind | undefined, stubDir: number, 
 /** The turnout is installed the other way round — the points face the far
  * direction, which swaps the side the diverging route leaves on. */
@@ -1190,4 +1233,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, ENDPLATE_FASCIA_CLEAR_INCHES, ENDPLATE_LEAD_INCHES, type EditorBranch, type EditorControlPoint, type EditorCpSignal, type EditorCrossing, type EditorIndustry, type EditorState, type EditorTrack, type EditorTurnout, type EndplateBConfig, type EndplatePose, type EndplateTrackIssue, 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 ReturnLoopGeometry, type ReturnLoopShape, 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 SectionRelativePos, type SignalFacing, type SignalSide, type TrackConfig, type TrackRole, type TurnoutKind, WHOLE_MODULE_SECTION_ID, asModuleSchematic, benchworkBand, benchworkOutline, buildCrossover, buildPassingSiding, buildTransition, carCapacity, checkEndplateWidth, deriveEndplatePoses, divergeSideForHand, docToState, emptyEditorState, endplateFaceSegments, endplateLead, endplateTrackOffsetFor, endplateTrackOffsetInches, endplateWidthInches, fromSectionRelative, geometryTurnDegrees, inchesToScaleFeet, isLoopDoc, isTransitionTurnout, moduleCenterline, moduleFeatures, moduleFootprint, moduleLengthFromSections, moduleSections, nextId, poseNeedsManual, poseOverridesFromDoc, remapPos, returnLoop, sampleBenchworkOutline, samplePath, scaleFeetToInches, sectionAdjacency, sectionBand, sectionBreaksFromSections, sectionComponents, sectionFootprints, sectionNeighbours, sectionSpans, sectionSpansOrWhole, sectionedCenterline, sectionedEndPose, sliceCenterline, stateToDoc, toSectionRelative, trackMeetsEndplateIssues, trackPath };
+export { type BenchworkPoint, type BranchConnector, type DrawCrossing, type DrawCrossover, type DrawIndustry, type DrawSignal, type DrawTrack, type DrawTurnout, ENDPLATE_FASCIA_CLEAR_INCHES, ENDPLATE_LEAD_INCHES, type EditorBranch, type EditorControlPoint, type EditorCpSignal, type EditorCrossing, type EditorIndustry, type EditorState, type EditorTrack, type EditorTurnout, type EndplateBConfig, type EndplatePose, type EndplateTrackIssue, 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, RAIL_GAUGE_INCHES, type ReturnLoopGeometry, type ReturnLoopShape, 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 SectionRelativePos, type SignalFacing, type SignalSide, TURNOUT_LEAD_INCHES_PER_FROG, type TrackConfig, type TrackRole, type TurnoutClosure, type TurnoutKind, WHOLE_MODULE_SECTION_ID, asModuleSchematic, benchworkBand, benchworkOutline, buildCrossover, buildPassingSiding, buildTransition, carCapacity, checkEndplateWidth, deriveEndplatePoses, divergeSideForHand, docToState, emptyEditorState, endplateFaceSegments, endplateLead, endplateTrackOffsetFor, endplateTrackOffsetInches, endplateWidthInches, fromSectionRelative, geometryTurnDegrees, inchesToScaleFeet, isLoopDoc, isTransitionTurnout, moduleCenterline, moduleFeatures, moduleFootprint, moduleLengthFromSections, moduleSections, nextId, poseNeedsManual, poseOverridesFromDoc, remapPos, returnLoop, sampleBenchworkOutline, samplePath, scaleFeetToInches, sectionAdjacency, sectionBand, sectionBreaksFromSections, sectionComponents, sectionFootprints, sectionNeighbours, sectionSpans, sectionSpansOrWhole, sectionedCenterline, sectionedEndPose, sliceCenterline, stateToDoc, toSectionRelative, trackMeetsEndplateIssues, trackPath, turnoutClosure };

package/dist/index.d.ts

@@ -1032,6 +1032,49 @@ interface ModuleFeatures {
  * right-hand throws to the opposite side. `kind` is the source of truth for the
  * drawn side (#bug1) — the stored lane's sign is reconciled to match it.
  */
+/** N-scale track gauge, inches (9 mm). */
+declare const RAIL_GAUGE_INCHES = 0.354;
+/** Points → FROG for a #1 frog, inches — a turnout's LEAD, scaled by frog
+ * number. Calibrated COMMERCIALLY rather than on the prototype, since owners lay
+ * real product: an Atlas code 55 #7 measures 3⅜″ points→frog (Steve Branton,
+ * #173) ⇒ 3.375 / 7. (The prototype #7 lead is 62′-1″ ≈ 4.66″ in N; commercial
+ * turnouts are compressed against that.) */
+declare const TURNOUT_LEAD_INCHES_PER_FROG = 0.482;
+/** A turnout's CLOSURE — the diverging route's lateral offset from the through
+ * route, from the points (s = 0) to the frog (s = lead) and beyond.
+ *
+ * Anchored on one geometric fact: the FROG is where the two routes' inner rails
+ * cross, which happens where the centre-lines are exactly ONE GAUGE apart. So
+ * `pos` (which means the frog, #132) must be where d = gauge — otherwise the
+ * drawn crossing and the frog marker disagree.
+ *
+ * The curve is `d(s) = α·s + k·s²`, fixed by three conditions:
+ *   d(0)      = 0      — the points start ON the stock rail
+ *   d(lead)   = gauge  — the frog lands exactly on `pos`
+ *   d'(lead)  = 1/N    — it leaves at the frog angle
+ *
+ * ⚠️ `α` is the SWITCH ANGLE and is deliberately non-zero. A curve leaving
+ * TANGENT to the stock rail only reaches `lead/2N` of lateral by the frog
+ * (0.24″ on a #7) — it could never reach a gauge within a commercial lead; you'd
+ * need `lead = 2·gauge·N` ≈ the prototype figure. Real points leave the stock
+ * rail at a finite angle, which is exactly why a commercial turnout can be
+ * shorter than prototype. Valid while `lead < 2·gauge·N`; α is clamped at 0
+ * otherwise so an absurd lead degrades to a tangent start instead of bending
+ * backwards. */
+interface TurnoutClosure {
+    /** Lateral offset from the through route at arc length `s` past the points. */
+    offsetAt: (s: number) => number;
+    /** Points→frog, inches. */
+    lead: number;
+    /** Slope at the points (the switch angle), rise over run. */
+    switchSlope: number;
+    /** Slope at and beyond the frog — the frog angle, 1/N. */
+    frogSlope: number;
+}
+declare function turnoutClosure(size: number, opts?: {
+    leadInches?: number;
+    gaugeInches?: number;
+}): TurnoutClosure;
 declare function divergeSideForHand(kind: TurnoutKind | undefined, stubDir: number, 
 /** The turnout is installed the other way round — the points face the far
  * direction, which swaps the side the diverging route leaves on. */
@@ -1190,4 +1233,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, ENDPLATE_FASCIA_CLEAR_INCHES, ENDPLATE_LEAD_INCHES, type EditorBranch, type EditorControlPoint, type EditorCpSignal, type EditorCrossing, type EditorIndustry, type EditorState, type EditorTrack, type EditorTurnout, type EndplateBConfig, type EndplatePose, type EndplateTrackIssue, 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 ReturnLoopGeometry, type ReturnLoopShape, 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 SectionRelativePos, type SignalFacing, type SignalSide, type TrackConfig, type TrackRole, type TurnoutKind, WHOLE_MODULE_SECTION_ID, asModuleSchematic, benchworkBand, benchworkOutline, buildCrossover, buildPassingSiding, buildTransition, carCapacity, checkEndplateWidth, deriveEndplatePoses, divergeSideForHand, docToState, emptyEditorState, endplateFaceSegments, endplateLead, endplateTrackOffsetFor, endplateTrackOffsetInches, endplateWidthInches, fromSectionRelative, geometryTurnDegrees, inchesToScaleFeet, isLoopDoc, isTransitionTurnout, moduleCenterline, moduleFeatures, moduleFootprint, moduleLengthFromSections, moduleSections, nextId, poseNeedsManual, poseOverridesFromDoc, remapPos, returnLoop, sampleBenchworkOutline, samplePath, scaleFeetToInches, sectionAdjacency, sectionBand, sectionBreaksFromSections, sectionComponents, sectionFootprints, sectionNeighbours, sectionSpans, sectionSpansOrWhole, sectionedCenterline, sectionedEndPose, sliceCenterline, stateToDoc, toSectionRelative, trackMeetsEndplateIssues, trackPath };
+export { type BenchworkPoint, type BranchConnector, type DrawCrossing, type DrawCrossover, type DrawIndustry, type DrawSignal, type DrawTrack, type DrawTurnout, ENDPLATE_FASCIA_CLEAR_INCHES, ENDPLATE_LEAD_INCHES, type EditorBranch, type EditorControlPoint, type EditorCpSignal, type EditorCrossing, type EditorIndustry, type EditorState, type EditorTrack, type EditorTurnout, type EndplateBConfig, type EndplatePose, type EndplateTrackIssue, 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, RAIL_GAUGE_INCHES, type ReturnLoopGeometry, type ReturnLoopShape, 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 SectionRelativePos, type SignalFacing, type SignalSide, TURNOUT_LEAD_INCHES_PER_FROG, type TrackConfig, type TrackRole, type TurnoutClosure, type TurnoutKind, WHOLE_MODULE_SECTION_ID, asModuleSchematic, benchworkBand, benchworkOutline, buildCrossover, buildPassingSiding, buildTransition, carCapacity, checkEndplateWidth, deriveEndplatePoses, divergeSideForHand, docToState, emptyEditorState, endplateFaceSegments, endplateLead, endplateTrackOffsetFor, endplateTrackOffsetInches, endplateWidthInches, fromSectionRelative, geometryTurnDegrees, inchesToScaleFeet, isLoopDoc, isTransitionTurnout, moduleCenterline, moduleFeatures, moduleFootprint, moduleLengthFromSections, moduleSections, nextId, poseNeedsManual, poseOverridesFromDoc, remapPos, returnLoop, sampleBenchworkOutline, samplePath, scaleFeetToInches, sectionAdjacency, sectionBand, sectionBreaksFromSections, sectionComponents, sectionFootprints, sectionNeighbours, sectionSpans, sectionSpansOrWhole, sectionedCenterline, sectionedEndPose, sliceCenterline, stateToDoc, toSectionRelative, trackMeetsEndplateIssues, trackPath, turnoutClosure };

package/dist/index.js

@@ -829,7 +829,7 @@ function docToState(doc, fallbackLength, moduleTracks = []) {
   const len = fallbackLength > 0 ? fallbackLength : hasDoc ? d.lengthInches : 24;
   const docLen = hasDoc && d.lengthInches > 0 ? d.lengthInches : len;
   const scale = docLen > 0 ? len / docLen : 1;
-  const sc = (p) => Math.round(p * scale);
+  const sc = (p) => Math.round(p * scale * 100) / 100;
   const nameOf = (id) => {
     const mt = id != null ? moduleTracks.find((m) => m.id === id) : void 0;
     return mt?.track_name ?? "";
@@ -1088,6 +1088,24 @@ function buildCrossover(state) {
   ];
   return { track, turnouts };
 }
+var RAIL_GAUGE_INCHES = 0.354;
+var TURNOUT_LEAD_INCHES_PER_FROG = 0.482;
+function turnoutClosure(size, opts = {}) {
+  const N = size > 0 ? size : 6;
+  const g = opts.gaugeInches ?? RAIL_GAUGE_INCHES;
+  const lead = Math.max(0.01, opts.leadInches ?? N * TURNOUT_LEAD_INCHES_PER_FROG);
+  const frogSlope = 1 / N;
+  const k = (lead / N - g) / (lead * lead);
+  const switchSlope = Math.max(0, frogSlope - 2 * k * lead);
+  return {
+    lead,
+    switchSlope,
+    frogSlope,
+    // Past the frog the route is straight at the frog angle — the closure curve
+    // has done its work, so don't keep bending (that's the tangent Option 1).
+    offsetAt: (s) => s <= lead ? switchSlope * s + k * s * s : g + frogSlope * (s - lead)
+  };
+}
 function divergeSideForHand(kind, stubDir, flipped) {
   if (kind !== "left" && kind !== "right") return 0;
   const s = (stubDir >= 0 ? 1 : -1) * (flipped ? -1 : 1);
@@ -1601,6 +1619,6 @@ function poseOverridesFromDoc(doc) {
   return out;
 }
 
-export { ENDPLATE_FASCIA_CLEAR_INCHES, ENDPLATE_LEAD_INCHES, 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, WHOLE_MODULE_SECTION_ID, asModuleSchematic, benchworkBand, benchworkOutline, buildCrossover, buildPassingSiding, buildTransition, carCapacity, checkEndplateWidth, deriveEndplatePoses, divergeSideForHand, docToState, emptyEditorState, endplateFaceSegments, endplateLead, endplateTrackOffsetFor, endplateTrackOffsetInches, endplateWidthInches, fromSectionRelative, geometryTurnDegrees, inchesToScaleFeet, isLoopDoc, isTransitionTurnout, moduleCenterline, moduleFeatures, moduleFootprint, moduleLengthFromSections, moduleSections, nextId, poseNeedsManual, poseOverridesFromDoc, remapPos, returnLoop, sampleBenchworkOutline, samplePath, scaleFeetToInches, sectionAdjacency, sectionBand, sectionBreaksFromSections, sectionComponents, sectionFootprints, sectionNeighbours, sectionSpans, sectionSpansOrWhole, sectionedCenterline, sectionedEndPose, sliceCenterline, stateToDoc, toSectionRelative, trackMeetsEndplateIssues, trackPath };
+export { ENDPLATE_FASCIA_CLEAR_INCHES, ENDPLATE_LEAD_INCHES, 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, RAIL_GAUGE_INCHES, TURNOUT_LEAD_INCHES_PER_FROG, WHOLE_MODULE_SECTION_ID, asModuleSchematic, benchworkBand, benchworkOutline, buildCrossover, buildPassingSiding, buildTransition, carCapacity, checkEndplateWidth, deriveEndplatePoses, divergeSideForHand, docToState, emptyEditorState, endplateFaceSegments, endplateLead, endplateTrackOffsetFor, endplateTrackOffsetInches, endplateWidthInches, fromSectionRelative, geometryTurnDegrees, inchesToScaleFeet, isLoopDoc, isTransitionTurnout, moduleCenterline, moduleFeatures, moduleFootprint, moduleLengthFromSections, moduleSections, nextId, poseNeedsManual, poseOverridesFromDoc, remapPos, returnLoop, sampleBenchworkOutline, samplePath, scaleFeetToInches, sectionAdjacency, sectionBand, sectionBreaksFromSections, sectionComponents, sectionFootprints, sectionNeighbours, sectionSpans, sectionSpansOrWhole, sectionedCenterline, sectionedEndPose, sliceCenterline, stateToDoc, toSectionRelative, trackMeetsEndplateIssues, trackPath, turnoutClosure };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map