worldorbit 3.2.2 → 5.0.0

package/dist/browser/core/dist/draft.js

@@ -18,15 +18,16 @@ export function upgradeDocumentToV2(document, options = {}) {
     }
     return {
         format: "worldorbit",
-        version: "2.6",
-        schemaVersion: "2.6",
+        version: "3.1",
+        schemaVersion: "3.1",
         sourceVersion: document.version,
         theme: document.theme ?? null,
         system,
         groups: structuredClone(document.groups ?? []),
         relations: structuredClone(document.relations ?? []),
         events: structuredClone(document.events ?? []),
-        objects: document.objects.map(cloneWorldOrbitObject),
+        trajectories: structuredClone(document.trajectories ?? []),
+        objects: document.objects.map(cloneWorldOrbitObject).map(normalizeLegacyCraftObject),
         diagnostics,
     };
 }
@@ -57,6 +58,7 @@ export function materializeAtlasDocument(document, options = {}) {
         groups: structuredClone(document.groups ?? []),
         relations: structuredClone(document.relations ?? []),
         events: document.events.map(cloneWorldOrbitEvent),
+        trajectories: document.trajectories.map(cloneWorldOrbitTrajectory),
         objects,
     };
 }
@@ -226,6 +228,7 @@ function mapSceneViewpointToDraftViewpoint(viewpoint) {
 function cloneWorldOrbitObject(object) {
     return {
         ...object,
+        trajectoryId: object.trajectoryId ?? null,
         groups: object.groups ? [...object.groups] : undefined,
         resonance: object.resonance ? { ...object.resonance } : object.resonance,
         renderHints: object.renderHints ? { ...object.renderHints } : object.renderHints,
@@ -255,6 +258,7 @@ function cloneWorldOrbitObject(object) {
 function cloneWorldOrbitEvent(event) {
     return {
         ...event,
+        trajectoryId: event.trajectoryId ?? null,
         participantObjectIds: [...event.participantObjectIds],
         tags: [...event.tags],
         positions: event.positions.map(cloneWorldOrbitEventPose),
@@ -264,12 +268,30 @@ function cloneWorldOrbitEventPose(pose) {
     return {
         objectId: pose.objectId,
         placement: clonePlacement(pose.placement),
+        trajectorySegmentId: pose.trajectorySegmentId ?? null,
+        trajectoryManeuverId: pose.trajectoryManeuverId ?? null,
         inner: pose.inner ? { ...pose.inner } : undefined,
         outer: pose.outer ? { ...pose.outer } : undefined,
         epoch: pose.epoch ?? null,
         referencePlane: pose.referencePlane ?? null,
     };
 }
+function cloneWorldOrbitTrajectory(trajectory) {
+    return structuredClone(trajectory);
+}
+function normalizeLegacyCraftObject(object) {
+    if (object.type !== "structure") {
+        return object;
+    }
+    const kind = typeof object.properties.kind === "string" ? object.properties.kind.toLowerCase() : "";
+    if (!["ship", "probe", "station"].includes(kind)) {
+        return object;
+    }
+    return {
+        ...object,
+        type: "craft",
+    };
+}
 function clonePlacement(placement) {
     return placement ? structuredClone(placement) : null;
 }
@@ -468,7 +490,7 @@ function serializeViewpointLayers(layers) {
     if (orbitFront !== undefined || orbitBack !== undefined) {
         tokens.push(orbitFront !== false || orbitBack !== false ? "orbits" : "-orbits");
     }
-    for (const key of ["background", "guides", "relations", "events", "objects", "labels", "metadata"]) {
+    for (const key of ["background", "guides", "relations", "events", "objects", "trajectories", "labels", "metadata"]) {
         if (layers[key] !== undefined) {
             tokens.push(layers[key] ? key : `-${key}`);
         }

package/dist/browser/core/dist/format.js

@@ -40,10 +40,14 @@ export function formatDocument(document, options = {}) {
         schema === "2.1" ||
         schema === "2.5" ||
         schema === "2.6" ||
+        schema === "3.0" ||
+        schema === "3.1" ||
         schema === "2.0-draft" ||
         document.version === "2.0" ||
         document.version === "2.1" ||
         document.version === "2.5" ||
+        document.version === "3.0" ||
+        document.version === "3.1" ||
         document.version === "2.6" ||
         document.version === "2.0-draft";
     if (useDraft) {
@@ -59,7 +63,12 @@ export function formatDocument(document, options = {}) {
                     : upgradeDocumentToDraftV2(document);
             return formatDraftDocument(legacyDraftDocument);
         }
-        const atlasDocument = document.version === "2.0" || document.version === "2.1" || document.version === "2.5" || document.version === "2.6"
+        const atlasDocument = document.version === "2.0" ||
+            document.version === "2.1" ||
+            document.version === "2.5" ||
+            document.version === "2.6" ||
+            document.version === "3.0" ||
+            document.version === "3.1"
             ? document
             : document.version === "2.0-draft"
                 ? {
@@ -68,7 +77,13 @@ export function formatDocument(document, options = {}) {
                     schemaVersion: "2.0",
                 }
                 : upgradeDocumentToV2(document);
-        if ((schema === "2.0" || schema === "2.1" || schema === "2.5" || schema === "2.6") && atlasDocument.version !== schema) {
+        if ((schema === "2.0" ||
+            schema === "2.1" ||
+            schema === "2.5" ||
+            schema === "2.6" ||
+            schema === "3.0" ||
+            schema === "3.1") &&
+            atlasDocument.version !== schema) {
             return formatAtlasDocument({
                 ...atlasDocument,
                 version: schema,
@@ -108,6 +123,10 @@ export function formatAtlasDocument(document) {
         lines.push("");
         lines.push(...formatAtlasEvent(event));
     }
+    for (const trajectory of [...document.trajectories].sort(compareIdLike)) {
+        lines.push("");
+        lines.push(...formatAtlasTrajectory(trajectory));
+    }
     const sortedObjects = [...document.objects].sort(compareObjects);
     if (sortedObjects.length > 0 && lines.at(-1) !== "") {
         lines.push("");
@@ -295,6 +314,9 @@ function formatObjectMetadata(object) {
     if (object.groups?.length) {
         lines.push(`groups ${object.groups.join(" ")}`);
     }
+    if (object.trajectoryId) {
+        lines.push(`trajectory ${object.trajectoryId}`);
+    }
     if (object.epoch) {
         lines.push(`epoch ${quoteIfNeeded(object.epoch)}`);
     }
@@ -455,6 +477,9 @@ function formatAtlasEvent(event) {
     if (event.summary) {
         lines.push(`  summary ${quoteIfNeeded(event.summary)}`);
     }
+    if (event.trajectoryId) {
+        lines.push(`  trajectory ${event.trajectoryId}`);
+    }
     if (event.targetObjectId) {
         lines.push(`  target ${event.targetObjectId}`);
     }
@@ -497,12 +522,106 @@ function formatAtlasEvent(event) {
 function formatEventPoseFields(pose) {
     return [
         ...formatPlacement(pose.placement),
+        ...(pose.trajectorySegmentId ? [`segment ${pose.trajectorySegmentId}`] : []),
+        ...(pose.trajectoryManeuverId ? [`maneuver ${pose.trajectoryManeuverId}`] : []),
         ...(pose.epoch ? [`epoch ${quoteIfNeeded(pose.epoch)}`] : []),
         ...(pose.referencePlane ? [`referencePlane ${quoteIfNeeded(pose.referencePlane)}`] : []),
         ...formatOptionalUnit("inner", pose.inner),
         ...formatOptionalUnit("outer", pose.outer),
     ];
 }
+function formatAtlasTrajectory(trajectory) {
+    const lines = [`trajectory ${trajectory.id}`];
+    if (trajectory.label) {
+        lines.push(`  label ${quoteIfNeeded(trajectory.label)}`);
+    }
+    if (trajectory.summary) {
+        lines.push(`  summary ${quoteIfNeeded(trajectory.summary)}`);
+    }
+    if (trajectory.craftObjectId) {
+        lines.push(`  craft ${trajectory.craftObjectId}`);
+    }
+    if (trajectory.tags.length > 0) {
+        lines.push(`  tags ${trajectory.tags.map(quoteIfNeeded).join(" ")}`);
+    }
+    if (trajectory.color) {
+        lines.push(`  color ${quoteIfNeeded(trajectory.color)}`);
+    }
+    if (trajectory.renderMode) {
+        lines.push(`  renderMode ${trajectory.renderMode}`);
+    }
+    if (trajectory.stroke) {
+        lines.push(`  stroke ${quoteIfNeeded(trajectory.stroke)}`);
+    }
+    if (trajectory.strokeWidth !== null && trajectory.strokeWidth !== undefined) {
+        lines.push(`  strokeWidth ${trajectory.strokeWidth}`);
+    }
+    if (trajectory.marker) {
+        lines.push(`  marker ${quoteIfNeeded(trajectory.marker)}`);
+    }
+    if (trajectory.labelMode) {
+        lines.push(`  labelMode ${quoteIfNeeded(trajectory.labelMode)}`);
+    }
+    if (trajectory.showWaypoints !== null && trajectory.showWaypoints !== undefined) {
+        lines.push(`  showWaypoints ${trajectory.showWaypoints ? "true" : "false"}`);
+    }
+    if (trajectory.hidden) {
+        lines.push("  hidden true");
+    }
+    for (const segment of [...trajectory.segments].sort(compareIdLike)) {
+        lines.push("");
+        lines.push(`  segment ${segment.id}`);
+        for (const field of formatTrajectorySegmentFields(segment)) {
+            lines.push(`    ${field}`);
+        }
+        for (const maneuver of [...segment.maneuvers].sort(compareIdLike)) {
+            lines.push(`    maneuver ${maneuver.id}`);
+            for (const field of formatTrajectoryManeuverFields(maneuver)) {
+                lines.push(`      ${field}`);
+            }
+        }
+    }
+    return lines;
+}
+function formatTrajectorySegmentFields(segment) {
+    return [
+        `kind ${segment.kind}`,
+        ...(segment.label ? [`label ${quoteIfNeeded(segment.label)}`] : []),
+        ...(segment.summary ? [`summary ${quoteIfNeeded(segment.summary)}`] : []),
+        ...(segment.fromObjectId ? [`from ${segment.fromObjectId}`] : []),
+        ...(segment.toObjectId ? [`to ${segment.toObjectId}`] : []),
+        ...(segment.aroundObjectId ? [`around ${segment.aroundObjectId}`] : []),
+        ...(segment.assist?.objectId ? [`assist ${segment.assist.objectId}`] : []),
+        ...(segment.epoch ? [`epoch ${quoteIfNeeded(segment.epoch)}`] : []),
+        ...formatOptionalUnit("periapsis", segment.periapsis),
+        ...formatOptionalUnit("apoapsis", segment.apoapsis),
+        ...formatOptionalUnit("inclination", segment.inclination),
+        ...formatOptionalUnit("duration", segment.duration),
+        ...formatOptionalUnit("deltaV", segment.deltaV),
+        ...formatOptionalUnit("phaseAngle", segment.phaseAngle),
+        ...formatOptionalUnit("turnAngle", segment.turnAngle),
+        ...formatOptionalUnit("energy", segment.energy),
+        ...(segment.waypointLabel ? [`waypointLabel ${quoteIfNeeded(segment.waypointLabel)}`] : []),
+        ...(segment.waypointDate ? [`waypointDate ${quoteIfNeeded(segment.waypointDate)}`] : []),
+        ...(segment.renderHidden !== null && segment.renderHidden !== undefined
+            ? [`renderHidden ${segment.renderHidden ? "true" : "false"}`]
+            : []),
+        ...(segment.sampleDensity !== null && segment.sampleDensity !== undefined
+            ? [`sampleDensity ${segment.sampleDensity}`]
+            : []),
+        ...(segment.notes.length > 0 ? [`notes ${segment.notes.map(quoteIfNeeded).join(" ")}`] : []),
+    ];
+}
+function formatTrajectoryManeuverFields(maneuver) {
+    return [
+        `kind ${quoteIfNeeded(maneuver.kind)}`,
+        ...(maneuver.label ? [`label ${quoteIfNeeded(maneuver.label)}`] : []),
+        ...(maneuver.epoch ? [`epoch ${quoteIfNeeded(maneuver.epoch)}`] : []),
+        ...formatOptionalUnit("deltaV", maneuver.deltaV),
+        ...formatOptionalUnit("duration", maneuver.duration),
+        ...(maneuver.notes.length > 0 ? [`notes ${maneuver.notes.map(quoteIfNeeded).join(" ")}`] : []),
+    ];
+}
 function hasCameraValues(camera) {
     return (camera.azimuth !== null ||
         camera.elevation !== null ||
@@ -554,7 +673,7 @@ function formatDraftLayers(layers) {
             ? "orbits"
             : "-orbits");
     }
-    for (const key of ["background", "guides", "relations", "events", "objects", "labels", "metadata"]) {
+    for (const key of ["background", "guides", "relations", "events", "objects", "trajectories", "labels", "metadata"]) {
         if (layers[key] !== undefined) {
             tokens.push(layers[key] ? key : `-${key}`);
         }
@@ -601,10 +720,12 @@ function objectTypeIndex(objectType) {
             return 5;
         case "ring":
             return 6;
-        case "structure":
+        case "craft":
             return 7;
-        case "phenomenon":
+        case "structure":
             return 8;
+        case "phenomenon":
+            return 9;
     }
 }
 function quoteIfNeeded(value) {

package/dist/browser/core/dist/index.d.ts

@@ -8,6 +8,7 @@ export { validateDocument } from "./validate.js";
 export { createDiagnostic, diagnosticFromError, normalizeWithDiagnostics, parseWithDiagnostics, validateDocumentWithDiagnostics, } from "./diagnostics.js";
 export { renderDocumentToScene, rotatePoint } from "./scene.js";
 export { evaluateSpatialSceneAtTime, renderDocumentToSpatialScene, } from "./spatial-scene.js";
+export { createTrajectorySolverSnapshot } from "./solver.js";
 export { formatAtlasDocument, formatDocument, formatDraftDocument } from "./format.js";
 export { materializeAtlasDocument, materializeDraftDocument, upgradeDocumentToDraftV2, upgradeDocumentToV2, } from "./draft.js";
 export { parseWorldOrbitAtlas, parseWorldOrbitDraft } from "./draft-parse.js";

package/dist/browser/core/dist/index.js

@@ -8,6 +8,7 @@ export { validateDocument } from "./validate.js";
 export { createDiagnostic, diagnosticFromError, normalizeWithDiagnostics, parseWithDiagnostics, validateDocumentWithDiagnostics, } from "./diagnostics.js";
 export { renderDocumentToScene, rotatePoint } from "./scene.js";
 export { evaluateSpatialSceneAtTime, renderDocumentToSpatialScene, } from "./spatial-scene.js";
+export { createTrajectorySolverSnapshot } from "./solver.js";
 export { formatAtlasDocument, formatDocument, formatDraftDocument } from "./format.js";
 export { materializeAtlasDocument, materializeDraftDocument, upgradeDocumentToDraftV2, upgradeDocumentToV2, } from "./draft.js";
 export { parseWorldOrbitAtlas, parseWorldOrbitDraft } from "./draft-parse.js";

package/dist/browser/core/dist/load.js

@@ -5,10 +5,12 @@ import { WorldOrbitError } from "./errors.js";
 import { normalizeDocument } from "./normalize.js";
 import { parseWorldOrbit } from "./parse.js";
 import { validateDocument } from "./validate.js";
-const ATLAS_SCHEMA_PATTERN = /^schema\s+2(?:\.0|\.1|\.5|\.6)?$/i;
+const ATLAS_SCHEMA_PATTERN = /^schema\s+(?:2(?:\.0|\.1|\.5|\.6)?|3(?:\.0|\.1)?)$/i;
 const ATLAS_SCHEMA_21_PATTERN = /^schema\s+2\.1$/i;
 const ATLAS_SCHEMA_25_PATTERN = /^schema\s+2\.5$/i;
 const ATLAS_SCHEMA_26_PATTERN = /^schema\s+2\.6$/i;
+const ATLAS_SCHEMA_30_PATTERN = /^schema\s+3(?:\.0)?$/i;
+const ATLAS_SCHEMA_31_PATTERN = /^schema\s+3\.1$/i;
 const LEGACY_DRAFT_SCHEMA_PATTERN = /^schema\s+2\.0-draft$/i;
 export function detectWorldOrbitSchemaVersion(source) {
     for (const line of stripCommentsForSchemaDetection(source).split(/\r?\n/)) {
@@ -28,6 +30,12 @@ export function detectWorldOrbitSchemaVersion(source) {
         if (ATLAS_SCHEMA_26_PATTERN.test(trimmed)) {
             return "2.6";
         }
+        if (ATLAS_SCHEMA_30_PATTERN.test(trimmed)) {
+            return "3.0";
+        }
+        if (ATLAS_SCHEMA_31_PATTERN.test(trimmed)) {
+            return "3.1";
+        }
         if (ATLAS_SCHEMA_PATTERN.test(trimmed)) {
             return "2.0";
         }
@@ -92,7 +100,9 @@ export function loadWorldOrbitSourceWithDiagnostics(source) {
         schemaVersion === "2.0-draft" ||
         schemaVersion === "2.1" ||
         schemaVersion === "2.5" ||
-        schemaVersion === "2.6") {
+        schemaVersion === "2.6" ||
+        schemaVersion === "3.0" ||
+        schemaVersion === "3.1") {
         return loadAtlasSourceWithDiagnostics(source, schemaVersion);
     }
     let ast;

package/dist/browser/core/dist/normalize.js

@@ -33,6 +33,7 @@ export function normalizeDocument(ast) {
         groups: [],
         relations: [],
         events: [],
+        trajectories: [],
         objects,
     };
 }

package/dist/browser/core/dist/scene.js

@@ -138,7 +138,8 @@ export function renderDocumentToScene(document, options = {}) {
     const labels = createSceneLabels(objects, width, height, scaleModel.labelMultiplier);
     const relations = createSceneRelations(document, objects);
     const events = createSceneEvents(document.events ?? [], objects, activeEventId);
-    const layers = createSceneLayers(orbitVisuals, relations, events, leaders, objects, labels);
+    const trajectories = createSceneTrajectories(document, objects, events, options);
+    const layers = createSceneLayers(orbitVisuals, trajectories, relations, events, leaders, objects, labels);
     const groups = createSceneGroups(objects, orbitVisuals, leaders, labels, relationships, scaleModel.labelMultiplier);
     const semanticGroups = createSceneSemanticGroups(document, objects);
     const viewpoints = createSceneViewpoints(document, schemaProjection, frame.preset, relationships, objectMap);
@@ -179,6 +180,7 @@ export function renderDocumentToScene(document, options = {}) {
         viewpoints,
         events,
         activeEventId,
+        trajectories,
         objects,
         orbitVisuals,
         relations,
@@ -467,7 +469,9 @@ function createSceneObject(position, scaleModel, relationships) {
         anchorX,
         anchorY,
         label: object.id,
-        secondaryLabel: object.type === "structure" ? String(object.properties.kind ?? object.type) : object.type,
+        secondaryLabel: object.type === "structure" || object.type === "craft"
+            ? String(object.properties.kind ?? object.type)
+            : object.type,
         fillColor: customColorFor(object.properties.color),
         imageHref: typeof object.properties.image === "string" && object.properties.image.trim()
             ? object.properties.image
@@ -566,6 +570,7 @@ function labelPlacementPriority(object) {
         case "asteroid":
         case "comet":
             return 4;
+        case "craft":
         case "structure":
         case "phenomenon":
             return 5;
@@ -590,7 +595,8 @@ function preferredLabelDirections(object, objectMap, sceneWidth, sceneHeight) {
     const oppositeVertical = vertical === "below" ? "above" : "below";
     const horizontal = defaultHorizontalDirection(object, parent, sceneWidth);
     const oppositeHorizontal = horizontal === "right" ? "left" : "right";
-    const preferHorizontal = object.object.type === "structure" ||
+    const preferHorizontal = object.object.type === "craft" ||
+        object.object.type === "structure" ||
         object.object.type === "phenomenon" ||
         object.object.placement?.mode === "at" ||
         object.object.placement?.mode === "surface" ||
@@ -658,7 +664,7 @@ function createLabelPlacement(object, direction, attempt, labelMultiplier) {
         }
     }
 }
-function createSceneLayers(orbitVisuals, relations, events, leaders, objects, labels) {
+function createSceneLayers(orbitVisuals, trajectories, relations, events, leaders, objects, labels) {
     const backOrbitIds = orbitVisuals
         .filter((visual) => !visual.hidden && Boolean(visual.backArcPath))
         .map((visual) => visual.renderId);
@@ -673,6 +679,15 @@ function createSceneLayers(orbitVisuals, relations, events, leaders, objects, la
         },
         { id: "orbits-back", renderIds: backOrbitIds },
         { id: "orbits-front", renderIds: frontOrbitIds },
+        {
+            id: "trajectories",
+            renderIds: trajectories
+                .filter((trajectory) => !trajectory.hidden)
+                .flatMap((trajectory) => [
+                trajectory.renderId,
+                ...trajectory.waypoints.filter((waypoint) => !waypoint.hidden).map((waypoint) => waypoint.renderId),
+            ]),
+        },
         {
             id: "relations",
             renderIds: relations.filter((relation) => !relation.hidden).map((relation) => relation.renderId),
@@ -815,6 +830,206 @@ function createSceneEvents(events, objects, activeEventId) {
     })
         .sort((left, right) => left.event.id.localeCompare(right.event.id));
 }
+function createSceneTrajectories(document, objects, events, options) {
+    const objectMap = new Map(objects.map((object) => [object.objectId, object]));
+    return document.trajectories
+        .map((trajectory) => createSceneTrajectory(trajectory, objectMap, events, options))
+        .sort((left, right) => left.trajectoryId.localeCompare(right.trajectoryId));
+}
+function createSceneTrajectory(trajectory, objectMap, events, options) {
+    const craftObject = trajectory.craftObjectId ? objectMap.get(trajectory.craftObjectId) ?? null : null;
+    const mode = resolveTrajectoryMode(trajectory, options);
+    const stroke = trajectory.stroke ?? trajectory.color ?? craftObject?.fillColor ?? null;
+    const strokeWidth = trajectory.strokeWidth ?? 2.4;
+    const showWaypoints = options.showTrajectoryWaypoints ?? trajectory.showWaypoints ?? true;
+    const labelMode = trajectory.labelMode ?? (options.showTrajectoryLabels === false ? "hidden" : "waypoint");
+    const pathParts = [];
+    const waypoints = [];
+    const objectIds = new Set();
+    let lastAnchor = craftObject;
+    if (craftObject) {
+        objectIds.add(craftObject.objectId);
+    }
+    trajectory.segments.forEach((segment, index) => {
+        const geometry = buildTrajectorySegmentGeometry(trajectory, segment, index, mode, objectMap, lastAnchor, showWaypoints);
+        if (geometry.path) {
+            pathParts.push(geometry.path);
+        }
+        geometry.objectIds.forEach((objectId) => objectIds.add(objectId));
+        waypoints.push(...geometry.waypoints);
+        lastAnchor = geometry.lastAnchor ?? lastAnchor;
+    });
+    for (const event of events.filter((entry) => entry.event.trajectoryId === trajectory.id)) {
+        const eventObject = event.targetObjectId
+            ? objectMap.get(event.targetObjectId) ?? null
+            : event.objectIds.map((objectId) => objectMap.get(objectId) ?? null).find(Boolean) ?? null;
+        if (!eventObject) {
+            continue;
+        }
+        waypoints.push({
+            renderId: `${createRenderId(`${trajectory.id}-${event.eventId}`)}-waypoint`,
+            trajectoryId: trajectory.id,
+            segmentId: null,
+            maneuverId: null,
+            objectId: eventObject.objectId,
+            x: eventObject.x,
+            y: eventObject.y,
+            label: event.event.label ?? event.event.id,
+            dateLabel: event.event.epoch ?? null,
+            hidden: trajectory.hidden || event.hidden || !showWaypoints,
+        });
+        objectIds.add(eventObject.objectId);
+    }
+    return {
+        renderId: `${createRenderId(trajectory.id)}-trajectory`,
+        trajectoryId: trajectory.id,
+        trajectory,
+        craftObjectId: trajectory.craftObjectId,
+        mode,
+        path: pathParts.join(" "),
+        stroke,
+        strokeWidth,
+        marker: trajectory.marker ?? "arrow",
+        labelMode,
+        showWaypoints,
+        objectIds: [...objectIds],
+        waypoints,
+        hidden: trajectory.hidden || pathParts.length === 0,
+    };
+}
+function buildTrajectorySegmentGeometry(trajectory, segment, segmentIndex, mode, objectMap, fallbackStart, showWaypoints) {
+    const start = resolveTrajectoryObject(segment.fromObjectId, objectMap) ??
+        fallbackStart;
+    const assist = resolveTrajectoryObject(segment.assist?.objectId ?? segment.aroundObjectId ?? null, objectMap);
+    const end = resolveTrajectoryObject(segment.toObjectId, objectMap) ??
+        resolveTrajectoryObject(segment.aroundObjectId, objectMap) ??
+        assist ??
+        start;
+    if (!start || !end) {
+        return {
+            path: "",
+            objectIds: [],
+            waypoints: [],
+            lastAnchor: fallbackStart,
+        };
+    }
+    const objectIds = [start.objectId, end.objectId];
+    if (assist) {
+        objectIds.push(assist.objectId);
+    }
+    const hidden = trajectory.hidden || segment.renderHidden === true || start.hidden || end.hidden;
+    const waypoints = [];
+    const label = segment.waypointLabel ?? segment.label ?? humanizeIdentifier(segment.id);
+    const dateLabel = segment.waypointDate ?? segment.epoch ?? null;
+    if (showWaypoints) {
+        if (segmentIndex === 0) {
+            waypoints.push(createTrajectoryWaypoint(trajectory.id, segment.id, null, start, start.label, null, hidden));
+        }
+        if (assist && assist.objectId !== start.objectId && assist.objectId !== end.objectId) {
+            waypoints.push(createTrajectoryWaypoint(trajectory.id, segment.id, null, assist, label, dateLabel, hidden));
+        }
+        waypoints.push(createTrajectoryWaypoint(trajectory.id, segment.id, null, end, label, dateLabel, hidden));
+    }
+    const samples = mode === "solver"
+        ? sampleQuadraticPoints(start, resolveTrajectoryControlPoint(start, end, assist, segmentIndex), end, Math.max(10, Math.round((segment.sampleDensity ?? 1) * 14)))
+        : null;
+    const control = resolveTrajectoryControlPoint(start, end, assist, segmentIndex);
+    const path = mode === "solver"
+        ? pointsToPath(samples ?? [start, end])
+        : `M ${formatPathNumber(start.x)} ${formatPathNumber(start.y)} Q ${formatPathNumber(control.x)} ${formatPathNumber(control.y)} ${formatPathNumber(end.x)} ${formatPathNumber(end.y)}`;
+    segment.maneuvers.forEach((maneuver, maneuverIndex) => {
+        if (!showWaypoints) {
+            return;
+        }
+        const point = samplePointOnQuadratic(start, control, end, (maneuverIndex + 1) / (segment.maneuvers.length + 1));
+        waypoints.push({
+            renderId: `${createRenderId(`${trajectory.id}-${segment.id}-${maneuver.id}`)}-waypoint`,
+            trajectoryId: trajectory.id,
+            segmentId: segment.id,
+            maneuverId: maneuver.id,
+            objectId: null,
+            x: point.x,
+            y: point.y,
+            label: maneuver.label ?? maneuver.kind,
+            dateLabel: maneuver.epoch ?? null,
+            hidden,
+        });
+    });
+    return {
+        path,
+        objectIds: [...new Set(objectIds)],
+        waypoints,
+        lastAnchor: end,
+    };
+}
+function createTrajectoryWaypoint(trajectoryId, segmentId, maneuverId, object, label, dateLabel, hidden) {
+    return {
+        renderId: `${createRenderId(`${trajectoryId}-${segmentId ?? object.objectId}-${maneuverId ?? object.objectId}`)}-waypoint`,
+        trajectoryId,
+        segmentId,
+        maneuverId,
+        objectId: object.objectId,
+        x: object.x,
+        y: object.y,
+        label,
+        dateLabel,
+        hidden,
+    };
+}
+function resolveTrajectoryMode(trajectory, options) {
+    const requested = options.trajectoryMode ?? trajectory.renderMode ?? "auto";
+    if (requested !== "auto") {
+        return requested;
+    }
+    const segmentCount = trajectory.segments.filter((segment) => segment.fromObjectId || segment.toObjectId || segment.assist?.objectId || segment.aroundObjectId).length;
+    return segmentCount > 0 ? "solver" : "illustrative";
+}
+function resolveTrajectoryObject(objectId, objectMap) {
+    return objectId ? objectMap.get(objectId) ?? null : null;
+}
+function resolveTrajectoryControlPoint(start, end, assist, segmentIndex) {
+    if (assist) {
+        return {
+            x: assist.x,
+            y: assist.y,
+        };
+    }
+    const dx = end.x - start.x;
+    const dy = end.y - start.y;
+    const length = Math.max(Math.hypot(dx, dy), 1);
+    const offset = Math.min(Math.max(length * 0.18, 26), 120) * (segmentIndex % 2 === 0 ? 1 : -1);
+    const normalX = -dy / length;
+    const normalY = dx / length;
+    return {
+        x: (start.x + end.x) / 2 + normalX * offset,
+        y: (start.y + end.y) / 2 + normalY * offset,
+    };
+}
+function sampleQuadraticPoints(start, control, end, count) {
+    const samples = [];
+    for (let index = 0; index <= count; index += 1) {
+        samples.push(samplePointOnQuadratic(start, control, end, index / count));
+    }
+    return samples;
+}
+function samplePointOnQuadratic(start, control, end, t) {
+    const inverse = 1 - t;
+    return {
+        x: inverse * inverse * start.x + 2 * inverse * t * control.x + t * t * end.x,
+        y: inverse * inverse * start.y + 2 * inverse * t * control.y + t * t * end.y,
+    };
+}
+function pointsToPath(points) {
+    if (points.length === 0) {
+        return "";
+    }
+    return points
+        .map((point, index) => `${index === 0 ? "M" : "L"} ${formatPathNumber(point.x)} ${formatPathNumber(point.y)}`)
+        .join(" ");
+}
+function formatPathNumber(value) {
+    return Number.isFinite(value) ? value.toFixed(2) : "0";
+}
 function createSceneViewpoints(document, projection, preset, relationships, objectMap) {
     const generatedOverview = createGeneratedOverviewViewpoint(document, projection, preset);
     const drafts = new Map();
@@ -1095,7 +1310,8 @@ function parseViewpointLayers(value) {
             rawLayer === "events" ||
             rawLayer === "objects" ||
             rawLayer === "labels" ||
-            rawLayer === "metadata") {
+            rawLayer === "metadata" ||
+            rawLayer === "trajectories") {
             next[rawLayer] = enabled;
         }
     }
@@ -1109,6 +1325,7 @@ function parseViewpointObjectTypes(value) {
         entry === "asteroid" ||
         entry === "comet" ||
         entry === "ring" ||
+        entry === "craft" ||
         entry === "structure" ||
         entry === "phenomenon");
 }
@@ -1785,6 +2002,8 @@ function visualRadiusFor(object, depth, scaleModel, sceneMetricScale) {
             return clampNumber(6 * multiplier, scaleModel.minBodyRadius, scaleModel.maxBodyRadius);
         case "ring":
             return clampNumber(5 * multiplier, scaleModel.minBodyRadius, scaleModel.maxBodyRadius);
+        case "craft":
+            return clampNumber(5 * multiplier, scaleModel.minBodyRadius, scaleModel.maxBodyRadius);
         case "structure":
             return clampNumber(6 * multiplier, scaleModel.minBodyRadius, scaleModel.maxBodyRadius);
         case "phenomenon":
@@ -1798,6 +2017,8 @@ function visualExtentForObject(object, radius, scaleModel) {
             return radius * 2.4;
         case "phenomenon":
             return radius * 1.25;
+        case "craft":
+            return radius + 1.5;
         case "structure":
             return radius + 2;
         default: