@willcgage/module-schematic 0.96.0 → 0.97.1

package/dist/index.cjs

@@ -2019,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 } : {},
@@ -2061,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,
@@ -2174,6 +2177,13 @@ 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";
@@ -2187,6 +2197,18 @@ 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 }],
@@ -2291,6 +2313,16 @@ function pieceRoutePaths(piece, library = BUILT_IN_TRACK_PARTS) {
     const len = part.overallLength?.inches ?? BUMPER_DRAWN_INCHES;
     return [{ route: ["a", "a"], points: [{ x: at2.x, y: at2.y }, place(len, 0)] }];
   }
+  if (part.kind === "curve") {
+    const a = joints.find((j) => j.joint === "a");
+    const b = joints.find((j) => j.joint === "b");
+    if (!a || !b) return out;
+    const pts = flexRunPoints(sectionalArcInches(part), part.radius.inches).map(
+      (q) => place(q.x, q.y)
+    );
+    pts[pts.length - 1] = { x: b.x, y: b.y };
+    return [{ route: ["a", "b"], points: pts }];
+  }
   for (const route of geo.routes) {
     const a = at(route[0]);
     const b = at(route[1]);
@@ -2354,7 +2386,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;
@@ -2530,6 +2577,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);
   };
@@ -3541,6 +3589,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;
@@ -3625,6 +3674,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;