@willcgage/module-schematic 0.19.0 → 0.21.0

package/dist/index.d.cts

@@ -92,6 +92,8 @@ interface SchematicTurnout {
     kind?: TurnoutKind;
     name?: string | null;
     address?: string | null;
+    /** Frog number ("size") — #4, #6, #8, etc. Governs the diverging angle. */
+    size?: number | null;
 }
 interface SchematicSignal {
     id: string;
@@ -147,16 +149,27 @@ type IndustryLabelMode = "none" | "cars" | "inches";
  * offset to `side`. The span length gives its car capacity; the dispatcher and
  * crews read where cars set out. Mirrors a `freemon_industries` row.
  */
+/** One car-spot span of an industry on a track — an industry may have several
+ * (a house track serving one customer across multiple spot tracks, #54). */
+interface IndustrySpot {
+    track: string;
+    fromPos: number;
+    toPos: number;
+    side?: SignalSide;
+}
 interface SchematicIndustry {
     id: string;
     name: string;
     /** Industry type value from the lookup (e.g. "team_track", "grain"). */
     type?: string | null;
-    /** The track this industry spots cars on (a spur/siding id, or the main). */
+    /** The primary track this industry spots cars on (a spur/siding id or main).
+     * Additional spots (other tracks) live in `spots`. */
     track: string;
-    /** The car-spot span along that track, inches from endplate A. */
+    /** The primary car-spot span along `track`, inches from endplate A. */
     fromPos: number;
     toPos: number;
+    /** Extra car-spot spans on other tracks — the industry's house-track spots. */
+    spots?: IndustrySpot[];
     /** Which side of the track the building + label sit on. */
     side?: SignalSide;
     /** Secondary readout at the label — a car count, a length, or none. */
@@ -340,6 +353,8 @@ interface EditorTurnout {
     onTrack: string;
     divergeTrack: string;
     kind: TurnoutKind;
+    /** Frog number ("size") — #4, #6, #8, etc. Governs the diverging angle. */
+    size?: number;
 }
 interface EditorCpSignal {
     id: string;
@@ -371,6 +386,8 @@ interface EditorIndustry {
     track: string;
     fromPos: number;
     toPos: number;
+    /** Extra car-spot spans on other tracks (house-track spots, #54). */
+    spots: IndustrySpot[];
     side: SignalSide;
     labelMode: IndustryLabelMode;
     carTypes: string[];
@@ -705,4 +722,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, FREEMO_ENDPLATE_WIDTH_MIN_INCHES, FREEMO_ENDPLATE_WIDTH_RECOMMENDED_INCHES, type GeometryType, type IndustryLabelMode, 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 SchematicSignal, type SchematicTrack, type SchematicTurnout, type SignalFacing, type SignalSide, type TrackConfig, type TrackRole, type TurnoutKind, asModuleSchematic, benchworkBand, benchworkOutline, buildCrossover, buildPassingSiding, buildTransition, carCapacity, deriveEndplatePoses, divergeSideForHand, docToState, emptyEditorState, endplateFaceSegments, endplateWidthInches, geometryTurnDegrees, inchesToScaleFeet, isLoopDoc, isTransitionTurnout, moduleCenterline, moduleFeatures, moduleFootprint, nextId, poseNeedsManual, poseOverridesFromDoc, sampleBenchworkOutline, samplePath, scaleFeetToInches, 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, FREEMO_ENDPLATE_WIDTH_MIN_INCHES, FREEMO_ENDPLATE_WIDTH_RECOMMENDED_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 SchematicSignal, type SchematicTrack, type SchematicTurnout, type SignalFacing, type SignalSide, type TrackConfig, type TrackRole, type TurnoutKind, asModuleSchematic, benchworkBand, benchworkOutline, buildCrossover, buildPassingSiding, buildTransition, carCapacity, deriveEndplatePoses, divergeSideForHand, docToState, emptyEditorState, endplateFaceSegments, endplateWidthInches, geometryTurnDegrees, inchesToScaleFeet, isLoopDoc, isTransitionTurnout, moduleCenterline, moduleFeatures, moduleFootprint, nextId, poseNeedsManual, poseOverridesFromDoc, sampleBenchworkOutline, samplePath, scaleFeetToInches, stateToDoc, trackPath };

package/dist/index.d.ts

@@ -92,6 +92,8 @@ interface SchematicTurnout {
     kind?: TurnoutKind;
     name?: string | null;
     address?: string | null;
+    /** Frog number ("size") — #4, #6, #8, etc. Governs the diverging angle. */
+    size?: number | null;
 }
 interface SchematicSignal {
     id: string;
@@ -147,16 +149,27 @@ type IndustryLabelMode = "none" | "cars" | "inches";
  * offset to `side`. The span length gives its car capacity; the dispatcher and
  * crews read where cars set out. Mirrors a `freemon_industries` row.
  */
+/** One car-spot span of an industry on a track — an industry may have several
+ * (a house track serving one customer across multiple spot tracks, #54). */
+interface IndustrySpot {
+    track: string;
+    fromPos: number;
+    toPos: number;
+    side?: SignalSide;
+}
 interface SchematicIndustry {
     id: string;
     name: string;
     /** Industry type value from the lookup (e.g. "team_track", "grain"). */
     type?: string | null;
-    /** The track this industry spots cars on (a spur/siding id, or the main). */
+    /** The primary track this industry spots cars on (a spur/siding id or main).
+     * Additional spots (other tracks) live in `spots`. */
     track: string;
-    /** The car-spot span along that track, inches from endplate A. */
+    /** The primary car-spot span along `track`, inches from endplate A. */
     fromPos: number;
     toPos: number;
+    /** Extra car-spot spans on other tracks — the industry's house-track spots. */
+    spots?: IndustrySpot[];
     /** Which side of the track the building + label sit on. */
     side?: SignalSide;
     /** Secondary readout at the label — a car count, a length, or none. */
@@ -340,6 +353,8 @@ interface EditorTurnout {
     onTrack: string;
     divergeTrack: string;
     kind: TurnoutKind;
+    /** Frog number ("size") — #4, #6, #8, etc. Governs the diverging angle. */
+    size?: number;
 }
 interface EditorCpSignal {
     id: string;
@@ -371,6 +386,8 @@ interface EditorIndustry {
     track: string;
     fromPos: number;
     toPos: number;
+    /** Extra car-spot spans on other tracks (house-track spots, #54). */
+    spots: IndustrySpot[];
     side: SignalSide;
     labelMode: IndustryLabelMode;
     carTypes: string[];
@@ -705,4 +722,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, FREEMO_ENDPLATE_WIDTH_MIN_INCHES, FREEMO_ENDPLATE_WIDTH_RECOMMENDED_INCHES, type GeometryType, type IndustryLabelMode, 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 SchematicSignal, type SchematicTrack, type SchematicTurnout, type SignalFacing, type SignalSide, type TrackConfig, type TrackRole, type TurnoutKind, asModuleSchematic, benchworkBand, benchworkOutline, buildCrossover, buildPassingSiding, buildTransition, carCapacity, deriveEndplatePoses, divergeSideForHand, docToState, emptyEditorState, endplateFaceSegments, endplateWidthInches, geometryTurnDegrees, inchesToScaleFeet, isLoopDoc, isTransitionTurnout, moduleCenterline, moduleFeatures, moduleFootprint, nextId, poseNeedsManual, poseOverridesFromDoc, sampleBenchworkOutline, samplePath, scaleFeetToInches, 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, FREEMO_ENDPLATE_WIDTH_MIN_INCHES, FREEMO_ENDPLATE_WIDTH_RECOMMENDED_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 SchematicSignal, type SchematicTrack, type SchematicTurnout, type SignalFacing, type SignalSide, type TrackConfig, type TrackRole, type TurnoutKind, asModuleSchematic, benchworkBand, benchworkOutline, buildCrossover, buildPassingSiding, buildTransition, carCapacity, deriveEndplatePoses, divergeSideForHand, docToState, emptyEditorState, endplateFaceSegments, endplateWidthInches, geometryTurnDegrees, inchesToScaleFeet, isLoopDoc, isTransitionTurnout, moduleCenterline, moduleFeatures, moduleFootprint, nextId, poseNeedsManual, poseOverridesFromDoc, sampleBenchworkOutline, samplePath, scaleFeetToInches, stateToDoc, trackPath };

package/dist/index.js

@@ -363,7 +363,8 @@ function stateToDoc(state, recordNumber) {
       onTrack: t.onTrack,
       divergeTrack: t.divergeTrack,
       kind: t.kind,
-      name: t.name || void 0
+      name: t.name || void 0,
+      ...t.size ? { size: t.size } : {}
     })),
     ...state.crossings.length > 0 ? {
       crossings: state.crossings.map((x) => ({
@@ -396,6 +397,7 @@ function stateToDoc(state, recordNumber) {
         track: ind.track,
         fromPos: ind.fromPos,
         toPos: ind.toPos,
+        ...ind.spots?.length ? { spots: ind.spots } : {},
         side: ind.side,
         ...ind.labelMode && ind.labelMode !== "none" ? { labelMode: ind.labelMode } : {},
         ...ind.carTypes.length ? { carTypes: ind.carTypes } : {},
@@ -519,7 +521,8 @@ function docToState(doc, fallbackLength, moduleTracks = []) {
       pos: sc(t.pos),
       onTrack: t.onTrack,
       divergeTrack: t.divergeTrack,
-      kind: t.kind ?? "right"
+      kind: t.kind ?? "right",
+      ...t.size ? { size: t.size } : {}
     })),
     controlPoints: readControlPoints(d, sc),
     industries: (d.industries ?? []).map((ind) => ({
@@ -529,6 +532,12 @@ function docToState(doc, fallbackLength, moduleTracks = []) {
       track: ind.track,
       fromPos: sc(ind.fromPos ?? 0),
       toPos: ind.toPos != null ? sc(ind.toPos) : len,
+      spots: (ind.spots ?? []).map((s) => ({
+        track: s.track,
+        fromPos: sc(s.fromPos ?? 0),
+        toPos: s.toPos != null ? sc(s.toPos) : len,
+        ...s.side ? { side: s.side } : {}
+      })),
       side: ind.side ?? "above",
       labelMode: ind.labelMode ?? "none",
       carTypes: Array.isArray(ind.carTypes) ? ind.carTypes : [],
@@ -832,21 +841,27 @@ function moduleFeatures(doc) {
     posFrac: clampFrac(e.at.pos),
     side: e.at.side === "down" ? "down" : "up"
   }));
-  const industries = (doc.industries ?? []).map((ind) => {
-    const from = ind.fromPos ?? 0;
-    const to = ind.toPos ?? len;
-    return {
-      id: ind.id,
-      name: ind.name ?? "",
-      type: ind.type ?? null,
-      fromFrac: clampFrac(Math.min(from, to)),
-      toFrac: clampFrac(Math.max(from, to)),
-      lane: trackLane.get(ind.track) ?? 0,
-      side: ind.side ?? "above",
-      labelMode: ind.labelMode ?? "none",
-      cars: carCapacity(from, to),
-      carTypes: Array.isArray(ind.carTypes) ? ind.carTypes : []
-    };
+  const industries = (doc.industries ?? []).flatMap((ind) => {
+    const spots = [
+      { track: ind.track, fromPos: ind.fromPos, toPos: ind.toPos, side: ind.side },
+      ...ind.spots ?? []
+    ];
+    return spots.map((sp, i) => {
+      const from = sp.fromPos ?? 0;
+      const to = sp.toPos ?? len;
+      return {
+        id: i === 0 ? ind.id : `${ind.id}-s${i}`,
+        name: ind.name ?? "",
+        type: ind.type ?? null,
+        fromFrac: clampFrac(Math.min(from, to)),
+        toFrac: clampFrac(Math.max(from, to)),
+        lane: trackLane.get(sp.track) ?? 0,
+        side: sp.side ?? "above",
+        labelMode: ind.labelMode ?? "none",
+        cars: carCapacity(from, to),
+        carTypes: Array.isArray(ind.carTypes) ? ind.carTypes : []
+      };
+    });
   });
   const allLanes = [
     0,