@willcgage/module-schematic 0.49.2 → 0.49.4

package/dist/index.cjs

@@ -933,17 +933,24 @@ function docToState(doc, fallbackLength, moduleTracks = []) {
       trackB: x.tracks?.[1] ?? MAIN_TRACK_ID
     })),
     extraTracks,
-    turnouts: (d.turnouts ?? []).map((t) => ({
-      id: t.id,
-      name: t.name ?? "",
-      pos: sc(t.pos),
-      onTrack: t.onTrack,
-      divergeTrack: t.divergeTrack,
-      kind: t.kind ?? "right",
-      ...t.size ? { size: t.size } : {},
-      ...t.curved ? { curved: true } : {},
-      ...t.flipped ? { flipped: true } : {}
-    })),
+    turnouts: (d.turnouts ?? []).map((t) => {
+      let divergeTrack = t.divergeTrack;
+      if (divergeTrack === t.onTrack) {
+        if (t.onTrack === MAIN_TRACK_ID) divergeTrack = MAIN2_TRACK_ID;
+        else if (t.onTrack === MAIN2_TRACK_ID) divergeTrack = MAIN_TRACK_ID;
+      }
+      return {
+        id: t.id,
+        name: t.name ?? "",
+        pos: sc(t.pos),
+        onTrack: t.onTrack,
+        divergeTrack,
+        kind: t.kind ?? "right",
+        ...t.size ? { size: t.size } : {},
+        ...t.curved ? { curved: true } : {},
+        ...t.flipped ? { flipped: true } : {}
+      };
+    }),
     controlPoints: readControlPoints(d, sc),
     industries: (d.industries ?? []).map((ind) => ({
       id: ind.id,
@@ -1289,9 +1296,10 @@ function moduleFeatures(doc) {
       };
     });
   });
+  const main2Lane = trackLane.has(MAIN2_TRACK_ID) ? trackLane.get(MAIN2_TRACK_ID) : null;
   const allLanes = [
     0,
-    doubleMain ? 1 : 0,
+    main2Lane ?? (doubleMain ? 1 : 0),
     ...extraTracks.map((t) => t.lane),
     ...signals.map((s) => s.lane),
     ...crossings.flatMap((x) => [x.laneA, x.laneB]),
@@ -1319,6 +1327,7 @@ function moduleFeatures(doc) {
     doubleMain,
     loop,
     main2Extent,
+    main2Lane,
     transition,
     loopInterchange: loop && doc.endplates.filter((e) => !e.at).length >= 2,
     loopReturn: loop && doc.loopReturn === "main2" ? "main2" : "same",