@willcgage/module-schematic 0.37.0 → 0.39.0

package/dist/index.d.cts

@@ -263,17 +263,17 @@ interface ModuleSchematicDoc {
      * Absent = the module keeps using its own `outline` exactly as before; this
      * is purely additive and nothing migrates on read. */
     sections?: SchematicSection[];
-    /** Which compass axis the module actually runs along. The dispatcher panel
-     * always draws LEFT→RIGHT — that's what makes a layout of modules read as one
-     * strip — but a module built north/south should still be labelled N and S.
-     * Absent = east/west. */
-    orientation?: ModuleOrientation;
     /** @deprecated pre-grouping flat signals; read for back-compat. */
     signals?: SchematicSignal[];
     /** Authored mainline centre-line (module-local inches, open path with arcs).
      * Present = the owner drew the real shape; absent = derive from geometry.
      * Physical view only — the operations view stays derived (#2d-track). */
     mainPath?: BenchworkPoint[] | null;
+    /** Authored centre-line for MAIN 2 on a double-track module (module-local
+     * inches, open path with arcs). Present = the owner bent Main 2 to its real
+     * shape; absent = derive it as a lane offset from Main 1. Physical view only
+     * (#131). */
+    main2Path?: BenchworkPoint[] | null;
 }
 /** A benchwork-outline vertex, module-local inches. The edge from this vertex
  * to the NEXT one is a straight line, unless `bulge` is set — then it's a
@@ -284,20 +284,12 @@ interface BenchworkPoint {
     y: number;
     bulge?: number;
 }
-/** The compass axis a module runs along. Endplate A is the first label,
- * endplate B the second, so A→B reads left→right in the dispatcher panel
- * whichever axis it is. */
-type ModuleOrientation = "east-west" | "north-south";
-/** The compass letters for a module's two ends, A first. */
-declare function endLabels(o: ModuleOrientation | null | undefined): {
-    a: string;
-    b: string;
-};
-/** …spelled out, for a caption like "derived, South → North". */
-declare function endLabelsLong(o: ModuleOrientation | null | undefined): {
-    a: string;
-    b: string;
-};
+/** NB: a module has NO compass direction of its own, deliberately. It has ends
+ * A and B. Direction is a property of the LAYOUT — the same board can be
+ * installed running either way round, or on either axis, so a compass label
+ * stored here could only ever contradict the layout that placed it. Railroads
+ * do the same thing with timetable direction: the railroad declares which way
+ * is "east", not any one piece of track. Free-Dispatcher owns direction. */
 /** One bench-work section of a module (#96 phase 2). */
 interface SectionFootprint {
     id: string;
@@ -790,14 +782,14 @@ interface EditorState {
     /** The module's sections as named objects, each optionally carrying its own
      * outline (#96 phase 2). Empty = fall back to `outline` + `sectionBreaks`. */
     sections: SchematicSection[];
-    /** Compass axis the module runs along; the panel still draws left→right. */
-    orientation: ModuleOrientation;
     controlPoints: EditorControlPoint[];
     /** Rail-served industries — car-spot spans on a track (#industries). */
     industries: EditorIndustry[];
     /** Authored mainline centre-line (module-local inches) — empty = derive from
      * geometry. The owner-drawn real shape (#2d-track, physical view only). */
     mainPath: BenchworkPoint[];
+    /** Authored Main 2 centre-line (double-track only) — empty = lane offset (#131). */
+    main2Path: BenchworkPoint[];
 }
 /** Build the empty editor state for a module of the given length. */
 declare function emptyEditorState(lengthInches: number): EditorState;
@@ -1083,4 +1075,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 ModuleOrientation, 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 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, endLabels, endLabelsLong, endplateFaceSegments, endplateTrackOffsetFor, endplateTrackOffsetInches, endplateWidthInches, fromSectionRelative, geometryTurnDegrees, inchesToScaleFeet, isLoopDoc, isTransitionTurnout, moduleCenterline, moduleFeatures, moduleFootprint, moduleLengthFromSections, moduleSections, nextId, poseNeedsManual, poseOverridesFromDoc, remapPos, sampleBenchworkOutline, samplePath, scaleFeetToInches, sectionAdjacency, sectionBand, sectionBreaksFromSections, sectionComponents, sectionFootprints, sectionNeighbours, sectionSpans, sectionSpansOrWhole, sectionedCenterline, sectionedEndPose, sliceCenterline, stateToDoc, toSectionRelative, 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 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, endplateTrackOffsetFor, endplateTrackOffsetInches, endplateWidthInches, fromSectionRelative, geometryTurnDegrees, inchesToScaleFeet, isLoopDoc, isTransitionTurnout, moduleCenterline, moduleFeatures, moduleFootprint, moduleLengthFromSections, moduleSections, nextId, poseNeedsManual, poseOverridesFromDoc, remapPos, sampleBenchworkOutline, samplePath, scaleFeetToInches, sectionAdjacency, sectionBand, sectionBreaksFromSections, sectionComponents, sectionFootprints, sectionNeighbours, sectionSpans, sectionSpansOrWhole, sectionedCenterline, sectionedEndPose, sliceCenterline, stateToDoc, toSectionRelative, trackPath };

package/dist/index.d.ts

@@ -263,17 +263,17 @@ interface ModuleSchematicDoc {
      * Absent = the module keeps using its own `outline` exactly as before; this
      * is purely additive and nothing migrates on read. */
     sections?: SchematicSection[];
-    /** Which compass axis the module actually runs along. The dispatcher panel
-     * always draws LEFT→RIGHT — that's what makes a layout of modules read as one
-     * strip — but a module built north/south should still be labelled N and S.
-     * Absent = east/west. */
-    orientation?: ModuleOrientation;
     /** @deprecated pre-grouping flat signals; read for back-compat. */
     signals?: SchematicSignal[];
     /** Authored mainline centre-line (module-local inches, open path with arcs).
      * Present = the owner drew the real shape; absent = derive from geometry.
      * Physical view only — the operations view stays derived (#2d-track). */
     mainPath?: BenchworkPoint[] | null;
+    /** Authored centre-line for MAIN 2 on a double-track module (module-local
+     * inches, open path with arcs). Present = the owner bent Main 2 to its real
+     * shape; absent = derive it as a lane offset from Main 1. Physical view only
+     * (#131). */
+    main2Path?: BenchworkPoint[] | null;
 }
 /** A benchwork-outline vertex, module-local inches. The edge from this vertex
  * to the NEXT one is a straight line, unless `bulge` is set — then it's a
@@ -284,20 +284,12 @@ interface BenchworkPoint {
     y: number;
     bulge?: number;
 }
-/** The compass axis a module runs along. Endplate A is the first label,
- * endplate B the second, so A→B reads left→right in the dispatcher panel
- * whichever axis it is. */
-type ModuleOrientation = "east-west" | "north-south";
-/** The compass letters for a module's two ends, A first. */
-declare function endLabels(o: ModuleOrientation | null | undefined): {
-    a: string;
-    b: string;
-};
-/** …spelled out, for a caption like "derived, South → North". */
-declare function endLabelsLong(o: ModuleOrientation | null | undefined): {
-    a: string;
-    b: string;
-};
+/** NB: a module has NO compass direction of its own, deliberately. It has ends
+ * A and B. Direction is a property of the LAYOUT — the same board can be
+ * installed running either way round, or on either axis, so a compass label
+ * stored here could only ever contradict the layout that placed it. Railroads
+ * do the same thing with timetable direction: the railroad declares which way
+ * is "east", not any one piece of track. Free-Dispatcher owns direction. */
 /** One bench-work section of a module (#96 phase 2). */
 interface SectionFootprint {
     id: string;
@@ -790,14 +782,14 @@ interface EditorState {
     /** The module's sections as named objects, each optionally carrying its own
      * outline (#96 phase 2). Empty = fall back to `outline` + `sectionBreaks`. */
     sections: SchematicSection[];
-    /** Compass axis the module runs along; the panel still draws left→right. */
-    orientation: ModuleOrientation;
     controlPoints: EditorControlPoint[];
     /** Rail-served industries — car-spot spans on a track (#industries). */
     industries: EditorIndustry[];
     /** Authored mainline centre-line (module-local inches) — empty = derive from
      * geometry. The owner-drawn real shape (#2d-track, physical view only). */
     mainPath: BenchworkPoint[];
+    /** Authored Main 2 centre-line (double-track only) — empty = lane offset (#131). */
+    main2Path: BenchworkPoint[];
 }
 /** Build the empty editor state for a module of the given length. */
 declare function emptyEditorState(lengthInches: number): EditorState;
@@ -1083,4 +1075,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 ModuleOrientation, 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 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, endLabels, endLabelsLong, endplateFaceSegments, endplateTrackOffsetFor, endplateTrackOffsetInches, endplateWidthInches, fromSectionRelative, geometryTurnDegrees, inchesToScaleFeet, isLoopDoc, isTransitionTurnout, moduleCenterline, moduleFeatures, moduleFootprint, moduleLengthFromSections, moduleSections, nextId, poseNeedsManual, poseOverridesFromDoc, remapPos, sampleBenchworkOutline, samplePath, scaleFeetToInches, sectionAdjacency, sectionBand, sectionBreaksFromSections, sectionComponents, sectionFootprints, sectionNeighbours, sectionSpans, sectionSpansOrWhole, sectionedCenterline, sectionedEndPose, sliceCenterline, stateToDoc, toSectionRelative, 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 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, endplateTrackOffsetFor, endplateTrackOffsetInches, endplateWidthInches, fromSectionRelative, geometryTurnDegrees, inchesToScaleFeet, isLoopDoc, isTransitionTurnout, moduleCenterline, moduleFeatures, moduleFootprint, moduleLengthFromSections, moduleSections, nextId, poseNeedsManual, poseOverridesFromDoc, remapPos, sampleBenchworkOutline, samplePath, scaleFeetToInches, sectionAdjacency, sectionBand, sectionBreaksFromSections, sectionComponents, sectionFootprints, sectionNeighbours, sectionSpans, sectionSpansOrWhole, sectionedCenterline, sectionedEndPose, sliceCenterline, stateToDoc, toSectionRelative, trackPath };

package/dist/index.js

@@ -7,12 +7,6 @@ function endplateWidthInches(ep) {
   const w = ep?.widthInches;
   return typeof w === "number" && w > 0 ? w : FREEMO_ENDPLATE_WIDTH_RECOMMENDED_INCHES;
 }
-function endLabels(o) {
-  return o === "north-south" ? { a: "S", b: "N" } : { a: "W", b: "E" };
-}
-function endLabelsLong(o) {
-  return o === "north-south" ? { a: "South", b: "North" } : { a: "West", b: "East" };
-}
 function benchworkOutline(doc) {
   const pts = (doc?.outline ?? []).filter((p) => p && Number.isFinite(p.x) && Number.isFinite(p.y)).map((p) => ({
     x: p.x,
@@ -563,10 +557,10 @@ function emptyEditorState(lengthInches) {
     outline: [],
     sectionBreaks: [],
     sections: [],
-    orientation: "east-west",
     controlPoints: [],
     industries: [],
-    mainPath: []
+    mainPath: [],
+    main2Path: []
   };
 }
 function isTransitionTurnout(t) {
@@ -592,15 +586,17 @@ function main2Track(state) {
   const bothDouble = state.configA === "double" && state.configB === "double";
   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;
+  const authored = state.main2Path.length >= 2 ? { path: state.main2Path } : {};
   if (bothDouble || !sws.length) {
-    return { id: MAIN2_TRACK_ID, role: "main", lane, from: "A", to: "B" };
+    return { id: MAIN2_TRACK_ID, role: "main", lane, from: "A", to: "B", ...authored };
   }
   const track = (fromPos, toPos) => ({
     id: MAIN2_TRACK_ID,
     role: "main",
     lane,
     fromPos,
-    toPos
+    toPos,
+    ...authored
   });
   if (state.configA === "double") return track(0, sws[0].pos);
   if (state.configB === "double") return track(sws[0].pos, state.lengthInches);
@@ -800,11 +796,9 @@ function stateToDoc(state, recordNumber) {
     // Sections as objects — emitted only once the owner has some, so a module
     // that never used them keeps exactly the doc it had before (#96 phase 2).
     ...state.sections.length ? { sections: moduleSections({ sections: state.sections }) } : {},
-    // Emitted only when it isn't the east/west default, so existing docs are
-    // byte-identical.
-    ...state.orientation === "north-south" ? { orientation: state.orientation } : {},
     // Authored mainline path (module-local inches); only when it's a real path.
-    ...state.mainPath.length >= 2 ? { mainPath: state.mainPath } : {}
+    ...state.mainPath.length >= 2 ? { mainPath: state.mainPath } : {},
+    ...state.main2Path.length >= 2 ? { main2Path: state.main2Path } : {}
   };
 }
 function docToState(doc, fallbackLength, moduleTracks = []) {
@@ -889,6 +883,8 @@ function docToState(doc, fallbackLength, moduleTracks = []) {
     ...Number.isFinite(p.bulge) && p.bulge ? { bulge: p.bulge } : {}
   }));
   const mainPath = trackPath(d.mainPath) ?? [];
+  const main2Track_ = (d.tracks ?? []).find((t) => t.id === MAIN2_TRACK_ID);
+  const main2Path = trackPath(d.main2Path ?? main2Track_?.path) ?? [];
   return {
     lengthInches: len,
     loop,
@@ -909,8 +905,8 @@ function docToState(doc, fallbackLength, moduleTracks = []) {
     outline,
     sectionBreaks: (d.sectionBreaks ?? []).filter((n) => Number.isFinite(n)).map((n) => sc(n)),
     sections: moduleSections(d),
-    orientation: d.orientation === "north-south" ? "north-south" : "east-west",
     mainPath,
+    main2Path,
     crossings: (d.crossings ?? []).map((x) => ({
       id: x.id,
       name: x.name ?? "",
@@ -1424,6 +1420,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, WHOLE_MODULE_SECTION_ID, asModuleSchematic, benchworkBand, benchworkOutline, buildCrossover, buildPassingSiding, buildTransition, carCapacity, checkEndplateWidth, deriveEndplatePoses, divergeSideForHand, docToState, emptyEditorState, endLabels, endLabelsLong, endplateFaceSegments, endplateTrackOffsetFor, endplateTrackOffsetInches, endplateWidthInches, fromSectionRelative, geometryTurnDegrees, inchesToScaleFeet, isLoopDoc, isTransitionTurnout, moduleCenterline, moduleFeatures, moduleFootprint, moduleLengthFromSections, moduleSections, nextId, poseNeedsManual, poseOverridesFromDoc, remapPos, sampleBenchworkOutline, samplePath, scaleFeetToInches, sectionAdjacency, sectionBand, sectionBreaksFromSections, sectionComponents, sectionFootprints, sectionNeighbours, sectionSpans, sectionSpansOrWhole, sectionedCenterline, sectionedEndPose, sliceCenterline, stateToDoc, toSectionRelative, 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, WHOLE_MODULE_SECTION_ID, asModuleSchematic, benchworkBand, benchworkOutline, buildCrossover, buildPassingSiding, buildTransition, carCapacity, checkEndplateWidth, deriveEndplatePoses, divergeSideForHand, docToState, emptyEditorState, endplateFaceSegments, endplateTrackOffsetFor, endplateTrackOffsetInches, endplateWidthInches, fromSectionRelative, geometryTurnDegrees, inchesToScaleFeet, isLoopDoc, isTransitionTurnout, moduleCenterline, moduleFeatures, moduleFootprint, moduleLengthFromSections, moduleSections, nextId, poseNeedsManual, poseOverridesFromDoc, remapPos, sampleBenchworkOutline, samplePath, scaleFeetToInches, sectionAdjacency, sectionBand, sectionBreaksFromSections, sectionComponents, sectionFootprints, sectionNeighbours, sectionSpans, sectionSpansOrWhole, sectionedCenterline, sectionedEndPose, sliceCenterline, stateToDoc, toSectionRelative, trackPath };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map