@willcgage/module-schematic 0.55.0 → 0.57.0

package/dist/index.cjs

@@ -1139,14 +1139,19 @@ var ATLAS_CODE55_N = [
     partNumbers: { left: "2052", right: "2053" },
     frogNumber: 7,
     lead: {
-      inches: 3.375,
+      inches: 3.59375,
       source: "measured",
-      note: "Steve Branton, physical Atlas code 55 #7, 3\u215C\u2033 points\u2192frog (#173)"
+      note: "Will Gage, physical Atlas 2052 (#7), 3\xB9\u2079\u2044\u2083\u2082\u2033 points\u2192frog as a single span \u2014 and it matches his two positions exactly (4\u2077\u2044\u2083\u2082 \u2212 \u2075\u2044\u2088), so the reading is internally consistent. SUPERSEDES Steve Branton's 3\u215C\u2033 (#173), which was \u2077\u2044\u2083\u2082\u2033 short and was the library's founding measurement. \u26A0\uFE0F Steve's number was also the SOLE basis of TURNOUT_LEAD_INCHES_PER_FROG (3.375/7 = 0.482) \u2014 that constant is now baseless as well as refuted."
+    },
+    pointsOffset: {
+      inches: 0.625,
+      source: "measured",
+      note: "Will Gage, physical Atlas 2052 (#7) \u2014 \xB9\u2070\u2044\u2081\u2086\u2033 tie end to point tips"
     },
     frogOffset: {
-      inches: 4.1875,
+      inches: 4.21875,
       source: "measured",
-      note: "Will Gage, physical Atlas 2052 (#7) \u2014 tie end to the apex of the V"
+      note: "Will Gage, physical Atlas 2052 (#7) \u2014 4\u2077\u2044\u2083\u2082\u2033, tie end to the apex of the V. Supersedes an initial 4\xB3\u2044\u2081\u2086\u2033. Worth noting for provenance: he was told beforehand that the clearance hypothesis predicted 4\xBC\u2033 and did NOT read 4\xBC\u2033 \u2014 so this number is not a confirmation artefact, and it sits \xB9\u2044\u2083\u2082\u2033 (one tape division) from the predicted value."
     },
     overallLength: {
       inches: 6,
@@ -1232,10 +1237,24 @@ function turnoutPartForSize(size, library = BUILT_IN_TRACK_PARTS) {
     (best, p) => Math.abs(p.frogNumber - size) < Math.abs(best.frogNumber - size) ? p : best
   );
 }
+function measuredLeadPoints(library) {
+  return library.filter(
+    (p) => p.kind === "turnout" && p.frogNumber != null && p.lead?.source === "measured"
+  ).map((p) => ({ n: p.frogNumber, lead: p.lead.inches })).sort((a, b) => a.n - b.n);
+}
 function leadInchesForSize(size, library = BUILT_IN_TRACK_PARTS) {
   const part = turnoutPartForSize(size, library);
   if (part?.lead && part.frogNumber === size) return part.lead.inches;
-  return size * TURNOUT_LEAD_INCHES_PER_FROG;
+  const pts = measuredLeadPoints(library);
+  if (!pts.length) return size * TURNOUT_LEAD_INCHES_PER_FROG;
+  if (pts.length === 1) return size / pts[0].n * pts[0].lead;
+  let i;
+  if (size >= pts[pts.length - 1].n) i = pts.length - 2;
+  else i = Math.max(0, pts.findIndex((p) => p.n >= size) - 1);
+  const lo = pts[i];
+  const hi = pts[i + 1];
+  const t = (size - lo.n) / (hi.n - lo.n);
+  return lo.lead + t * (hi.lead - lo.lead);
 }
 function parseXtpLibrary(text) {
   const parts = [];
@@ -1301,6 +1320,85 @@ function samplePartSegments(segments, stepsPerCurve = 16) {
     return out;
   });
 }
+function angleDeltaDeg(a, b) {
+  let d = ((a - b) % 360 + 540) % 360 - 180;
+  if (d === -180) d = 180;
+  return d;
+}
+function frogNumberFromName(name) {
+  if (!name) return void 0;
+  const m = name.match(/(?:#|no\.?\s*|number\s+)(\d+(?:\.\d+)?)/i);
+  if (!m) return void 0;
+  const n = Number(m[1]);
+  return Number.isFinite(n) && n > 0 ? n : void 0;
+}
+function importedKind(name) {
+  const s = (name ?? "").toLowerCase();
+  if (s.includes("wye")) return "wye";
+  if (s.includes("crossing")) return "crossing";
+  if (s.includes("curved")) return "curved-turnout";
+  return "turnout";
+}
+var slug = (s) => s.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
+function importedPartToTrackPart(part, sourceName = "imported .xtp") {
+  const name = part.name ?? part.title ?? "Imported part";
+  const manufacturer = part.manufacturer ?? "Unknown";
+  const note = `from ${sourceName} \u2014 community CAD data, not a measurement`;
+  const out = {
+    id: `xtp-${slug(manufacturer)}-${slug(part.partNumber || name)}`,
+    manufacturer,
+    name,
+    line: "",
+    scale: "N",
+    kind: importedKind(name),
+    frogNumber: frogNumberFromName(name),
+    segments: part.segments,
+    ends: part.ends,
+    importedFrom: sourceName
+  };
+  if (part.partNumber) out.partNumbers = { single: part.partNumber };
+  const ends = part.ends;
+  if (ends.length >= 2) {
+    const a = ends[0].angleDeg * Math.PI / 180;
+    const ux = Math.sin(a);
+    const uy = Math.cos(a);
+    const proj = ends.map((e) => (e.x - ends[0].x) * ux + (e.y - ends[0].y) * uy);
+    const span = Math.max(...proj) - Math.min(...proj);
+    if (span > 0) out.overallLength = { inches: span, source: "unverified", note };
+  }
+  if (ends.length >= 3) {
+    const rest = ends.slice(1);
+    const opposite = rest.map((e) => ({ e, off: Math.abs(angleDeltaDeg(e.angleDeg, ends[0].angleDeg + 180)) })).sort((p, q) => p.off - q.off);
+    const through = opposite[0].e;
+    const diverging = opposite[opposite.length - 1].e;
+    const deg = Math.abs(angleDeltaDeg(diverging.angleDeg, through.angleDeg));
+    if (deg > 0.01) out.actualAngle = { deg, source: "unverified", note };
+  }
+  return out;
+}
+function mergeImportedParts(imported, library = BUILT_IN_TRACK_PARTS, sourceName = "imported .xtp") {
+  const out = library.map((p) => ({ ...p }));
+  const numbersOf = (p) => [p.partNumbers?.left, p.partNumbers?.right, p.partNumbers?.single].filter(Boolean).map((s) => s.trim().toLowerCase());
+  for (const raw of imported) {
+    const conv = importedPartToTrackPart(raw, sourceName);
+    const pn = raw.partNumber?.trim().toLowerCase();
+    const match = (pn ? out.find((p) => numbersOf(p).includes(pn)) : void 0) ?? (conv.frogNumber != null ? out.find(
+      (p) => p.frogNumber === conv.frogNumber && p.kind === conv.kind && p.manufacturer.toLowerCase() === conv.manufacturer.toLowerCase()
+    ) : void 0);
+    if (!match) {
+      out.push(conv);
+      continue;
+    }
+    if (!match.segments?.length && conv.segments?.length) match.segments = conv.segments;
+    if (!match.ends?.length && conv.ends?.length) match.ends = conv.ends;
+    if (!match.importedFrom && (conv.segments?.length || conv.ends?.length)) {
+      match.importedFrom = sourceName;
+    }
+    if (!match.overallLength && conv.overallLength) match.overallLength = conv.overallLength;
+    if (!match.actualAngle && conv.actualAngle) match.actualAngle = conv.actualAngle;
+  }
+  return out;
+}
 function turnoutClosure(size, opts = {}) {
   const N = size > 0 ? size : 6;
   const g = opts.gaugeInches ?? RAIL_GAUGE_INCHES;
@@ -1863,12 +1961,15 @@ exports.endplateLead = endplateLead;
 exports.endplateTrackOffsetFor = endplateTrackOffsetFor;
 exports.endplateTrackOffsetInches = endplateTrackOffsetInches;
 exports.endplateWidthInches = endplateWidthInches;
+exports.frogNumberFromName = frogNumberFromName;
 exports.fromSectionRelative = fromSectionRelative;
 exports.geometryTurnDegrees = geometryTurnDegrees;
+exports.importedPartToTrackPart = importedPartToTrackPart;
 exports.inchesToScaleFeet = inchesToScaleFeet;
 exports.isLoopDoc = isLoopDoc;
 exports.isTransitionTurnout = isTransitionTurnout;
 exports.leadInchesForSize = leadInchesForSize;
+exports.mergeImportedParts = mergeImportedParts;
 exports.moduleCenterline = moduleCenterline;
 exports.moduleFeatures = moduleFeatures;
 exports.moduleFootprint = moduleFootprint;