@willcgage/module-schematic 0.60.0 → 0.61.0

package/dist/index.cjs

@@ -117,6 +117,15 @@ function samplePath(pts, segsPerArc = 20) {
   out.push({ x: pts[n - 1].x, y: pts[n - 1].y });
   return out;
 }
+function pathLengthInches(path) {
+  const pts = trackPath(path);
+  if (!pts) return 0;
+  const poly = samplePath(pts);
+  let total = 0;
+  for (let i = 1; i < poly.length; i++)
+    total += Math.hypot(poly[i].x - poly[i - 1].x, poly[i].y - poly[i - 1].y);
+  return total;
+}
 function trackPath(path) {
   const pts = (path ?? []).filter((p) => p && Number.isFinite(p.x) && Number.isFinite(p.y)).map((p) => ({
     x: p.x,
@@ -1682,15 +1691,43 @@ function moduleFeatures(doc) {
     laneA: trackLane.get(x.tracks?.[0] ?? "") ?? 0,
     laneB: trackLane.get(x.tracks?.[1] ?? "") ?? 1
   }));
+  const main2Lane = trackLane.has(MAIN2_TRACK_ID) ? trackLane.get(MAIN2_TRACK_ID) : null;
+  const baseLanes = [
+    0,
+    main2Lane ?? (doubleMain ? 1 : 0),
+    ...extraTracks.map((t) => t.lane),
+    ...signals.map((s) => s.lane),
+    ...crossings.flatMap((x) => [x.laneA, x.laneB]),
+    ...crossovers.flatMap((x) => [x.fromLane, x.toLane])
+  ];
+  let upLane = Math.max(...baseLanes, 0);
+  let downLane = Math.min(...baseLanes, 0);
   const branchConnectors = doc.endplates.filter(
     (e) => e.id !== "A" && e.id !== "B" && e.at && !!e.trackId && (doc.tracks ?? []).some((t) => t.id === e.trackId)
   ).map((e) => {
+    const trk = (doc.tracks ?? []).find((t) => t.id === e.trackId);
     const sw = (doc.turnouts ?? []).find((t) => t.divergeTrack === e.trackId);
+    const startPos = sw ? sw.pos : e.at.pos;
+    const side = e.at.side === "down" ? "down" : "up";
+    const lane = side === "down" ? --downLane : ++upLane;
+    const runInches = pathLengthInches(trk.path) || Math.abs(e.at.pos - startPos) || FREEMO_ENDPLATE_WIDTH_MIN_INCHES;
+    const toB = e.at.pos >= startPos;
+    const fits = (p) => p >= 0 && p <= len;
+    const ahead = startPos + runInches;
+    const behind = startPos - runInches;
+    const endPos = toB && fits(ahead) ? ahead : !toB && fits(behind) ? behind : fits(toB ? behind : ahead) ? toB ? behind : ahead : ahead;
     return {
       id: e.id,
       label: e.label ?? e.id,
-      posFrac: clampFrac(sw ? sw.pos : e.at.pos),
-      side: e.at.side === "down" ? "down" : "up"
+      name: trk.trackName ?? "",
+      trackId: trk.id,
+      kind: e.kind === "main" ? "main" : "branch",
+      posFrac: clampFrac(startPos),
+      fromLane: sw ? trackLane.get(sw.onTrack) ?? 0 : 0,
+      side,
+      lane,
+      endFrac: clampFrac(endPos),
+      lengthInches: runInches
     };
   });
   const industries = (doc.industries ?? []).flatMap((ind) => {
@@ -1715,15 +1752,7 @@ function moduleFeatures(doc) {
       };
     });
   });
-  const main2Lane = trackLane.has(MAIN2_TRACK_ID) ? trackLane.get(MAIN2_TRACK_ID) : null;
-  const allLanes = [
-    0,
-    main2Lane ?? (doubleMain ? 1 : 0),
-    ...extraTracks.map((t) => t.lane),
-    ...signals.map((s) => s.lane),
-    ...crossings.flatMap((x) => [x.laneA, x.laneB]),
-    ...crossovers.flatMap((x) => [x.fromLane, x.toLane])
-  ];
+  const allLanes = [...baseLanes, ...branchConnectors.map((b) => b.lane)];
   const loop = isLoopDoc(doc);
   const main2 = doc.tracks.find((t) => t.id === MAIN2_TRACK_ID);
   const main2Positioned = !!main2 && (main2.fromPos != null || main2.toPos != null) && !loop;
@@ -2065,6 +2094,7 @@ exports.moduleSections = moduleSections;
 exports.nextId = nextId;
 exports.parseXtpLibrary = parseXtpLibrary;
 exports.partOutlineAtFrog = partOutlineAtFrog;
+exports.pathLengthInches = pathLengthInches;
 exports.poseNeedsManual = poseNeedsManual;
 exports.poseOverridesFromDoc = poseOverridesFromDoc;
 exports.remapPos = remapPos;