@willcgage/module-schematic 0.17.0 → 0.19.0

package/dist/index.cjs

@@ -45,6 +45,45 @@ function sampleBenchworkOutline(pts, segsPerArc = 20) {
   }
   return out;
 }
+function samplePath(pts, segsPerArc = 20) {
+  const n = pts.length;
+  if (n < 2) return pts.map((p) => ({ x: p.x, y: p.y }));
+  const out = [];
+  for (let i = 0; i < n - 1; i++) {
+    const p0 = pts[i];
+    const p1 = pts[i + 1];
+    out.push({ x: p0.x, y: p0.y });
+    const bulge = p0.bulge ?? 0;
+    if (!bulge) continue;
+    const dx = p1.x - p0.x;
+    const dy = p1.y - p0.y;
+    const c = Math.hypot(dx, dy);
+    if (c < 1e-6) continue;
+    const nx = -dy / c;
+    const ny = dx / c;
+    const mid = { x: (p0.x + p1.x) / 2 + nx * bulge, y: (p0.y + p1.y) / 2 + ny * bulge };
+    const circ = circleThrough(p0, mid, p1);
+    if (!circ) continue;
+    const a0 = Math.atan2(p0.y - circ.cy, p0.x - circ.cx);
+    const am = Math.atan2(mid.y - circ.cy, mid.x - circ.cx);
+    const a1 = Math.atan2(p1.y - circ.cy, p1.x - circ.cx);
+    const sweep = arcSweep(a0, a1, am);
+    for (let s = 1; s < segsPerArc; s++) {
+      const a = a0 + sweep * s / segsPerArc;
+      out.push({ x: circ.cx + circ.r * Math.cos(a), y: circ.cy + circ.r * Math.sin(a) });
+    }
+  }
+  out.push({ x: pts[n - 1].x, y: pts[n - 1].y });
+  return out;
+}
+function trackPath(path) {
+  const pts = (path ?? []).filter((p) => p && Number.isFinite(p.x) && Number.isFinite(p.y)).map((p) => ({
+    x: p.x,
+    y: p.y,
+    ...Number.isFinite(p.bulge) && p.bulge ? { bulge: p.bulge } : {}
+  }));
+  return pts.length >= 2 ? pts : null;
+}
 function circleThrough(a, b, c) {
   const d = 2 * (a.x * (b.y - c.y) + b.x * (c.y - a.y) + c.x * (a.y - b.y));
   if (Math.abs(d) < 1e-9) return null;
@@ -67,6 +106,8 @@ function arcSweep(a0, a1, am) {
 }
 var DEG_FP = Math.PI / 180;
 function moduleCenterline(input) {
+  const drawn = trackPath(input.mainPath);
+  if (drawn) return samplePath(drawn);
   const L = input.lengthInches > 0 ? input.lengthInches : 24;
   const gt = input.geometryType;
   if (gt === "dead_end") return [{ x: 0, y: 0 }];
@@ -149,6 +190,11 @@ function inchesToScaleFeet(inches, ratio = N_SCALE_RATIO) {
 function scaleFeetToInches(feet, ratio = N_SCALE_RATIO) {
   return feet * 12 / ratio;
 }
+var N_CAR_LENGTH_INCHES = 3.3;
+function carCapacity(fromPos, toPos, carLengthInches = N_CAR_LENGTH_INCHES) {
+  if (!(carLengthInches > 0)) return 0;
+  return Math.max(0, Math.floor(Math.abs(toPos - fromPos) / carLengthInches));
+}
 function asModuleSchematic(x) {
   if (!x || typeof x !== "object") return null;
   const d = x;
@@ -170,7 +216,9 @@ function emptyEditorState(lengthInches) {
     poseOverrides: {},
     endplateWidths: {},
     outline: [],
-    controlPoints: []
+    controlPoints: [],
+    industries: [],
+    mainPath: []
   };
 }
 function isTransitionTurnout(t) {
@@ -307,7 +355,8 @@ function stateToDoc(state, recordNumber) {
         moduleTrackId: t.moduleTrackId,
         trackName: t.trackName || void 0,
         capacityFeet: Math.round(inchesToScaleFeet(Math.abs(t.toPos - t.fromPos))),
-        ...state.loop && t.inLoop ? { inLoop: true } : {}
+        ...state.loop && t.inLoop ? { inLoop: true } : {},
+        ...t.path && t.path.length >= 2 ? { path: t.path } : {}
       }))
     ],
     turnouts: state.turnouts.map((t) => ({
@@ -340,9 +389,26 @@ function stateToDoc(state, recordNumber) {
         side: s.side
       }))
     })),
+    // Industries — car-spot spans on a track; only when any are authored.
+    ...state.industries.length > 0 ? {
+      industries: state.industries.map((ind) => ({
+        id: ind.id,
+        name: ind.name,
+        ...ind.type ? { type: ind.type } : {},
+        track: ind.track,
+        fromPos: ind.fromPos,
+        toPos: ind.toPos,
+        side: ind.side,
+        ...ind.labelMode && ind.labelMode !== "none" ? { labelMode: ind.labelMode } : {},
+        ...ind.carTypes.length ? { carTypes: ind.carTypes } : {},
+        moduleIndustryId: ind.moduleIndustryId
+      }))
+    } : {},
     // Benchwork footprint outline (module-local inches); only when it's a real
     // ring (≥ 3 vertices).
-    ...state.outline.length >= 3 ? { outline: state.outline } : {}
+    ...state.outline.length >= 3 ? { outline: state.outline } : {},
+    // Authored mainline path (module-local inches); only when it's a real path.
+    ...state.mainPath.length >= 2 ? { mainPath: state.mainPath } : {}
   };
 }
 function docToState(doc, fallbackLength, moduleTracks = []) {
@@ -372,7 +438,9 @@ function docToState(doc, fallbackLength, moduleTracks = []) {
         toPos: t.toPos != null ? sc(t.toPos) : len,
         moduleTrackId,
         trackName: t.trackName ?? nameOf(moduleTrackId),
-        ...t.inLoop ? { inLoop: true } : {}
+        ...t.inLoop ? { inLoop: true } : {},
+        // Authored path kept as-drawn (a physical shape, not rescaled with length).
+        ...trackPath(t.path) ? { path: trackPath(t.path) } : {}
       });
     }
   }
@@ -421,6 +489,7 @@ function docToState(doc, fallbackLength, moduleTracks = []) {
     y: p.y,
     ...Number.isFinite(p.bulge) && p.bulge ? { bulge: p.bulge } : {}
   }));
+  const mainPath = trackPath(d.mainPath) ?? [];
   return {
     lengthInches: len,
     loop,
@@ -437,6 +506,7 @@ function docToState(doc, fallbackLength, moduleTracks = []) {
     poseOverrides,
     endplateWidths,
     outline,
+    mainPath,
     crossings: (d.crossings ?? []).map((x) => ({
       id: x.id,
       name: x.name ?? "",
@@ -453,7 +523,19 @@ function docToState(doc, fallbackLength, moduleTracks = []) {
       divergeTrack: t.divergeTrack,
       kind: t.kind ?? "right"
     })),
-    controlPoints: readControlPoints(d, sc)
+    controlPoints: readControlPoints(d, sc),
+    industries: (d.industries ?? []).map((ind) => ({
+      id: ind.id,
+      name: ind.name ?? "",
+      type: ind.type ?? "",
+      track: ind.track,
+      fromPos: sc(ind.fromPos ?? 0),
+      toPos: ind.toPos != null ? sc(ind.toPos) : len,
+      side: ind.side ?? "above",
+      labelMode: ind.labelMode ?? "none",
+      carTypes: Array.isArray(ind.carTypes) ? ind.carTypes : [],
+      moduleIndustryId: ind.moduleIndustryId ?? null
+    }))
   };
 }
 function readControlPoints(d, sc = (p) => p) {
@@ -752,6 +834,22 @@ function moduleFeatures(doc) {
     posFrac: clampFrac(e.at.pos),
     side: e.at.side === "down" ? "down" : "up"
   }));
+  const industries = (doc.industries ?? []).map((ind) => {
+    const from = ind.fromPos ?? 0;
+    const to = ind.toPos ?? len;
+    return {
+      id: ind.id,
+      name: ind.name ?? "",
+      type: ind.type ?? null,
+      fromFrac: clampFrac(Math.min(from, to)),
+      toFrac: clampFrac(Math.max(from, to)),
+      lane: trackLane.get(ind.track) ?? 0,
+      side: ind.side ?? "above",
+      labelMode: ind.labelMode ?? "none",
+      cars: carCapacity(from, to),
+      carTypes: Array.isArray(ind.carTypes) ? ind.carTypes : []
+    };
+  });
   const allLanes = [
     0,
     doubleMain ? 1 : 0,
@@ -792,6 +890,7 @@ function moduleFeatures(doc) {
     crossings,
     crossovers,
     branchConnectors,
+    industries,
     laneMin: Math.min(...allLanes),
     laneMax: Math.max(...allLanes)
   };
@@ -898,6 +997,7 @@ exports.FREEMO_ENDPLATE_WIDTH_MIN_INCHES = FREEMO_ENDPLATE_WIDTH_MIN_INCHES;
 exports.FREEMO_ENDPLATE_WIDTH_RECOMMENDED_INCHES = FREEMO_ENDPLATE_WIDTH_RECOMMENDED_INCHES;
 exports.MAIN2_TRACK_ID = MAIN2_TRACK_ID;
 exports.MAIN_TRACK_ID = MAIN_TRACK_ID;
+exports.N_CAR_LENGTH_INCHES = N_CAR_LENGTH_INCHES;
 exports.N_SCALE_RATIO = N_SCALE_RATIO;
 exports.asModuleSchematic = asModuleSchematic;
 exports.benchworkBand = benchworkBand;
@@ -905,6 +1005,7 @@ exports.benchworkOutline = benchworkOutline;
 exports.buildCrossover = buildCrossover;
 exports.buildPassingSiding = buildPassingSiding;
 exports.buildTransition = buildTransition;
+exports.carCapacity = carCapacity;
 exports.deriveEndplatePoses = deriveEndplatePoses;
 exports.divergeSideForHand = divergeSideForHand;
 exports.docToState = docToState;
@@ -922,7 +1023,9 @@ exports.nextId = nextId;
 exports.poseNeedsManual = poseNeedsManual;
 exports.poseOverridesFromDoc = poseOverridesFromDoc;
 exports.sampleBenchworkOutline = sampleBenchworkOutline;
+exports.samplePath = samplePath;
 exports.scaleFeetToInches = scaleFeetToInches;
 exports.stateToDoc = stateToDoc;
+exports.trackPath = trackPath;
 //# sourceMappingURL=index.cjs.map
 //# sourceMappingURL=index.cjs.map