@willcgage/module-schematic 0.95.1 → 0.97.0

package/dist/index.cjs

@@ -1703,11 +1703,22 @@ var FAST_TRACKS_N_ME55_CROSSOVERS = [
   };
 });
 var DEFAULT_FLEX_PART_ID = "atlas-c55-n-flex";
+var GENERIC_END_OF_TRACK = [
+  {
+    id: "generic-bumper",
+    manufacturer: "Generic",
+    line: "N scale",
+    scale: "N",
+    name: "Bumper",
+    kind: "bumper"
+  }
+];
 var BUILT_IN_TRACK_PARTS = [
   ...ATLAS_CODE55_N,
   ...FAST_TRACKS_N_ME55,
   ...FAST_TRACKS_N_ME55_CROSSOVERS,
-  ...FLEX_TRACK_PARTS
+  ...FLEX_TRACK_PARTS,
+  ...GENERIC_END_OF_TRACK
 ];
 function flexParts(library = BUILT_IN_TRACK_PARTS) {
   return library.filter((p) => p.kind === "flex");
@@ -2008,14 +2019,14 @@ function storedPartToTrackPart(row) {
     source: points.source === "measured" && frog.source === "measured" ? "measured" : "derived",
     ...note ? { note } : {}
   } : dim(row.leadInches, row.leadSource);
-  const kind = row.kind;
+  const kind = TRACK_PART_KINDS.includes(row.kind) ? row.kind : "turnout";
   const part = {
     id: row.slug,
     manufacturer: row.manufacturer,
     line: row.line,
     scale: "N",
     name: row.name,
-    kind: kind === "wye" || kind === "curved-turnout" || kind === "crossing" ? kind : "turnout"
+    kind
   };
   const numbers = {
     ...row.partNumberLeft ? { left: row.partNumberLeft } : {},
@@ -2050,6 +2061,9 @@ function storedPartToTrackPart(row) {
   const inner = dim(row.innerRadiusInches, row.radiusSource);
   if (outer) part.outerRadius = outer;
   if (inner) part.innerRadius = inner;
+  const radius = dim(row.radiusInches, row.radiusSource);
+  if (radius) part.radius = radius;
+  if (typeof row.arcDegrees === "number") part.arcDegrees = row.arcDegrees;
   if (typeof row.actualAngleDeg === "number")
     part.actualAngle = {
       deg: row.actualAngleDeg,
@@ -2162,6 +2176,14 @@ function turnoutClosure(size, opts = {}) {
 }
 function partGeometryGap(part) {
   if (part.kind === "flex") return null;
+  if (part.kind === "bumper") return null;
+  if (part.kind === "straight")
+    return part.overallLength ? null : "no overall length \u2014 a sectional straight IS its length";
+  if (part.kind === "curve") {
+    if (!part.radius) return "no radius \u2014 a sectional curve is a radius and an arc";
+    if (part.arcDegrees == null) return "no arc \u2014 the radius alone does not say how far it turns";
+    return null;
+  }
   if (part.kind === "crossover")
     return "a crossover fixture builds one HALF of the assembly (piecesPerAssembly), so its published lengths describe a piece, not the finished part \u2014 the geometry of the whole crossover is not yet derivable from them";
   if (part.kind === "crossing") return "crossing geometry is not modelled yet";
@@ -2175,6 +2197,26 @@ function partGeometryGap(part) {
 }
 function partGeometry(part, library = BUILT_IN_TRACK_PARTS) {
   if (partGeometryGap(part)) return null;
+  if (part.kind === "straight" || part.kind === "curve") {
+    const end = part.kind === "curve" ? flexRunEnd(sectionalArcInches(part), part.radius.inches) : { x: part.overallLength.inches, y: 0, headingDeg: 0 };
+    return {
+      joints: [
+        { id: "a", role: "throat", x: 0, y: 0, angleDeg: 180 },
+        { id: "b", role: "through", x: end.x, y: end.y, angleDeg: end.headingDeg }
+      ],
+      routes: [["a", "b"]],
+      source: (part.kind === "curve" ? part.radius : part.overallLength)?.source ?? "unverified",
+      divergingEndMeasured: false
+    };
+  }
+  if (part.kind === "bumper") {
+    return {
+      joints: [{ id: "a", role: "throat", x: 0, y: 0, angleDeg: 180 }],
+      routes: [],
+      source: part.overallLength?.source ?? "unverified",
+      divergingEndMeasured: false
+    };
+  }
   if (part.kind === "flex") {
     return {
       joints: [
@@ -2265,6 +2307,12 @@ function pieceRoutePaths(piece, library = BUILT_IN_TRACK_PARTS) {
     return { x: piece.x + x * c - ly * s, y: piece.y + x * s + ly * c };
   };
   const out = [];
+  if (part.kind === "bumper") {
+    const at2 = joints[0];
+    if (!at2) return out;
+    const len = part.overallLength?.inches ?? BUMPER_DRAWN_INCHES;
+    return [{ route: ["a", "a"], points: [{ x: at2.x, y: at2.y }, place(len, 0)] }];
+  }
   for (const route of geo.routes) {
     const a = at(route[0]);
     const b = at(route[1]);
@@ -2328,6 +2376,22 @@ function partsPlaceable(library = BUILT_IN_TRACK_PARTS) {
   return { placeable, blocked };
 }
 var JOINT_SNAP_INCHES = 0.01;
+var TRACK_PART_KINDS = [
+  "turnout",
+  "wye",
+  "curved-turnout",
+  "crossover",
+  "crossing",
+  "flex",
+  "straight",
+  "curve",
+  "bumper"
+];
+var BUMPER_DRAWN_INCHES = 0.75;
+function sectionalArcInches(part) {
+  if (part.kind !== "curve" || !part.radius || part.arcDegrees == null) return 0;
+  return part.radius.inches * Math.abs(part.arcDegrees) * Math.PI / 180;
+}
 function flexRunEnd(lengthInches, radiusInches) {
   const L = lengthInches;
   const R = radiusInches;
@@ -2503,6 +2567,7 @@ function walkTrackGraph(graph, pieces, startAt, library = BUILT_IN_TRACK_PARTS)
       const piece = pieceById.get(a.piece);
       const part = piece ? partOf(a.piece) : void 0;
       if (piece && part?.kind === "flex") return piece.lengthInches ?? 0;
+      if (part?.kind === "curve") return sectionalArcInches(part);
     }
     return Math.hypot(a.x - b.x, a.y - b.y);
   };
@@ -2519,6 +2584,7 @@ function walkTrackGraph(graph, pieces, startAt, library = BUILT_IN_TRACK_PARTS)
       toPos: startPos,
       bornAt,
       endsAt: null,
+      closedBy: null,
       pieces: [],
       spans: [],
       lateral: 0
@@ -2533,7 +2599,11 @@ function walkTrackGraph(graph, pieces, startAt, library = BUILT_IN_TRACK_PARTS)
       const geo = geoOf(here.piece);
       if (!geo) break;
       const opts = geo.routes.filter((r) => r.includes(here.joint));
-      if (!opts.length) break;
+      if (!opts.length) {
+        route.pieces.push(here.piece);
+        route.closedBy = here.piece;
+        break;
+      }
       const pick = opts.find((r) => r.includes("through")) ?? opts[0];
       const exitJoint = pick[0] === here.joint ? pick[1] : pick[0];
       const exit = byKey.get(`${here.piece}.${exitJoint}`);
@@ -2691,7 +2761,10 @@ function graphToDoc(pieces, input) {
       role: "main",
       lane: 0,
       from: epA?.id ?? "A",
-      ...epB ? { to: epB.id } : {}
+      ...epB ? { to: epB.id } : {},
+      // A main can be closed too — that is a pocket module, where the track
+      // runs in and stops rather than crossing to a second endplate.
+      ...main.closedBy ? { bumperAt: "to" } : {}
     },
     ...twoMains ? [
       {
@@ -2718,6 +2791,11 @@ function graphToDoc(pieces, input) {
       lane: laneOf(r, uniqueBranches),
       fromPos: round(Math.min(r.fromPos, r.toPos)),
       toPos: round(Math.max(r.fromPos, r.toPos)),
+      // ⚠️ ALWAYS THE `to` END, and not because of an assumption: a branch's
+      // positions are ARC LENGTH FROM ITS THROAT, so they only ever grow — a
+      // spur running physically back toward endplate A still ends at the larger
+      // number. The closed end is the far one from the turnout, by definition.
+      ...r.closedBy ? { bumperAt: "to" } : {},
       ...meta.trackName ? { trackName: meta.trackName } : {},
       ...meta.capacityFeet != null ? { capacityFeet: meta.capacityFeet } : {},
       ...meta.moduleTrackId != null ? { moduleTrackId: meta.moduleTrackId } : {}
@@ -3477,6 +3555,7 @@ function poseOverridesFromDoc(doc) {
 
 exports.ATLAS_CODE55_N = ATLAS_CODE55_N;
 exports.BUILT_IN_TRACK_PARTS = BUILT_IN_TRACK_PARTS;
+exports.BUMPER_DRAWN_INCHES = BUMPER_DRAWN_INCHES;
 exports.CLEARANCE_SPACING_INCHES = CLEARANCE_SPACING_INCHES;
 exports.CODE55_RAIL_HEIGHT_INCHES = CODE55_RAIL_HEIGHT_INCHES;
 exports.DEFAULT_FLEX_PART_ID = DEFAULT_FLEX_PART_ID;
@@ -3491,6 +3570,7 @@ exports.FREEMO_ENDPLATE_WIDTH_RECOMMENDED_INCHES = FREEMO_ENDPLATE_WIDTH_RECOMME
 exports.FREEMO_MAIN_MIN_RADIUS_INCHES = FREEMO_MAIN_MIN_RADIUS_INCHES;
 exports.FREEMO_REVERSE_CURVE_STRAIGHT_INCHES = FREEMO_REVERSE_CURVE_STRAIGHT_INCHES;
 exports.FREEMO_TRACK_SPACING_INCHES = FREEMO_TRACK_SPACING_INCHES;
+exports.GENERIC_END_OF_TRACK = GENERIC_END_OF_TRACK;
 exports.JOINT_SNAP_INCHES = JOINT_SNAP_INCHES;
 exports.MAIN2_TRACK_ID = MAIN2_TRACK_ID;
 exports.MAIN_TRACK_ID = MAIN_TRACK_ID;
@@ -3499,6 +3579,7 @@ exports.N_SCALE_RATIO = N_SCALE_RATIO;
 exports.PINCH_EASE_INCHES = PINCH_EASE_INCHES;
 exports.RAIL_GAUGE_INCHES = RAIL_GAUGE_INCHES;
 exports.TIE_HALF_LENGTH_INCHES = TIE_HALF_LENGTH_INCHES;
+exports.TRACK_PART_KINDS = TRACK_PART_KINDS;
 exports.TURNOUT_LEAD_INCHES_PER_FROG = TURNOUT_LEAD_INCHES_PER_FROG;
 exports.WHOLE_MODULE_SECTION_ID = WHOLE_MODULE_SECTION_ID;
 exports.asModuleSchematic = asModuleSchematic;
@@ -3583,6 +3664,7 @@ exports.sectionFootprints = sectionFootprints;
 exports.sectionNeighbours = sectionNeighbours;
 exports.sectionSpans = sectionSpans;
 exports.sectionSpansOrWhole = sectionSpansOrWhole;
+exports.sectionalArcInches = sectionalArcInches;
 exports.sectionedCenterline = sectionedCenterline;
 exports.sectionedEndPose = sectionedEndPose;
 exports.sliceCenterline = sliceCenterline;