@willcgage/module-schematic 0.64.0 → 0.66.0

package/dist/index.cjs

@@ -1285,6 +1285,18 @@ function leadInchesForSize(size, library = BUILT_IN_TRACK_PARTS) {
   const t = (size - lo.n) / (hi.n - lo.n);
   return lo.lead + t * (hi.lead - lo.lead);
 }
+function pastFrogInchesForSize(size, library = BUILT_IN_TRACK_PARTS) {
+  const measured = library.filter((p) => p.kind === "turnout" && p.frogNumber != null).map((p) => ({ n: p.frogNumber, ext: partExtent(p) })).filter((p) => p.ext != null).map((p) => ({ n: p.n, past: p.ext.pastFrog })).sort((a, b) => a.n - b.n);
+  if (!measured.length) return RAIL_GAUGE_INCHES * size;
+  if (measured.length === 1) return measured[0].past;
+  let i;
+  if (size >= measured[measured.length - 1].n) i = measured.length - 2;
+  else i = Math.max(0, measured.findIndex((p) => p.n >= size) - 1);
+  const lo = measured[i];
+  const hi = measured[i + 1];
+  const t = (size - lo.n) / (hi.n - lo.n);
+  return Math.max(0, lo.past + t * (hi.past - lo.past));
+}
 function parseXtpLibrary(text) {
   const parts = [];
   let cur = null;
@@ -1767,8 +1779,9 @@ function moduleFeatures(doc) {
     ...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 LANE_GAP_FROM_OTHERS = 2;
+  let upLane = Math.max(...baseLanes, 0) + (LANE_GAP_FROM_OTHERS - 1);
+  let downLane = Math.min(...baseLanes, 0) - (LANE_GAP_FROM_OTHERS - 1);
   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) => {
@@ -1779,10 +1792,6 @@ function moduleFeatures(doc) {
     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,
@@ -1793,7 +1802,7 @@ function moduleFeatures(doc) {
       fromLane: sw ? trackLane.get(sw.onTrack) ?? 0 : 0,
       side,
       lane,
-      endFrac: clampFrac(endPos),
+      endFrac: toB ? 1 : 0,
       lengthInches: runInches
     };
   });
@@ -2181,6 +2190,7 @@ exports.parseXtpLibrary = parseXtpLibrary;
 exports.partExtent = partExtent;
 exports.partExtentForSize = partExtentForSize;
 exports.partOutlineAtFrog = partOutlineAtFrog;
+exports.pastFrogInchesForSize = pastFrogInchesForSize;
 exports.pathLengthInches = pathLengthInches;
 exports.poseNeedsManual = poseNeedsManual;
 exports.poseOverridesFromDoc = poseOverridesFromDoc;