worldorbit 3.2.2 → 4.0.0

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

@@ -40,10 +40,12 @@ export function formatDocument(document, options = {}) {
         schema === "2.1" ||
         schema === "2.5" ||
         schema === "2.6" ||
+        schema === "3.0" ||
         schema === "2.0-draft" ||
         document.version === "2.0" ||
         document.version === "2.1" ||
         document.version === "2.5" ||
+        document.version === "3.0" ||
         document.version === "2.6" ||
         document.version === "2.0-draft";
     if (useDraft) {
@@ -59,7 +61,7 @@ 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
             : document.version === "2.0-draft"
                 ? {
@@ -68,7 +70,7 @@ 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") && atlasDocument.version !== schema) {
             return formatAtlasDocument({
                 ...atlasDocument,
                 version: schema,
@@ -108,6 +110,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 +301,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 +464,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 +509,80 @@ 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.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.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 ||
@@ -601,10 +681,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,11 @@ 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)?)$/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 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 +29,9 @@ 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_PATTERN.test(trimmed)) {
             return "2.0";
         }
@@ -92,7 +96,8 @@ export function loadWorldOrbitSourceWithDiagnostics(source) {
         schemaVersion === "2.0-draft" ||
         schemaVersion === "2.1" ||
         schemaVersion === "2.5" ||
-        schemaVersion === "2.6") {
+        schemaVersion === "2.6" ||
+        schemaVersion === "3.0") {
         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

@@ -467,7 +467,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 +568,7 @@ function labelPlacementPriority(object) {
         case "asteroid":
         case "comet":
             return 4;
+        case "craft":
         case "structure":
         case "phenomenon":
             return 5;
@@ -590,7 +593,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" ||
@@ -1109,6 +1113,7 @@ function parseViewpointObjectTypes(value) {
         entry === "asteroid" ||
         entry === "comet" ||
         entry === "ring" ||
+        entry === "craft" ||
         entry === "structure" ||
         entry === "phenomenon");
 }
@@ -1785,6 +1790,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 +1805,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:

package/dist/browser/core/dist/schema.js

@@ -7,6 +7,7 @@ const ALL_OBJECTS = [
     "asteroid",
     "comet",
     "ring",
+    "craft",
     "structure",
     "phenomenon",
 ];
@@ -17,10 +18,11 @@ const IMAGE_OBJECTS = [
     "moon",
     "asteroid",
     "comet",
+    "craft",
     "structure",
     "phenomenon",
 ];
-const ANCHORED_OBJECTS = ["structure", "phenomenon"];
+const ANCHORED_OBJECTS = ["craft", "structure", "phenomenon"];
 const ORBITAL_OBJECTS = [
     "star",
     "planet",
@@ -29,6 +31,7 @@ const ORBITAL_OBJECTS = [
     "asteroid",
     "comet",
     "ring",
+    "craft",
     "structure",
     "phenomenon",
 ];
@@ -40,6 +43,7 @@ const FREE_OBJECTS = [
     "asteroid",
     "comet",
     "ring",
+    "craft",
     "structure",
     "phenomenon",
 ];
@@ -269,6 +273,12 @@ export const WORLDORBIT_FIELD_SCHEMAS = new Map([
         objectTypes: NON_SYSTEM_OBJECTS,
         unitFamily: "duration",
     }),
+    createField("trajectory", {
+        kind: "string",
+        placement: false,
+        arity: "single",
+        objectTypes: ["craft", "structure"],
+    }),
 ].map((schema) => [schema.key, schema]));
 export const WORLDORBIT_FIELD_KEYS = new Set(WORLDORBIT_FIELD_SCHEMAS.keys());
 export function getFieldSchema(key) {

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

@@ -0,0 +1,26 @@
+import type { UnitValue, WorldOrbitTrajectory, WorldOrbitTrajectorySegment } from "./types.js";
+export interface SolverSegmentSample {
+    segmentId: string;
+    kind: WorldOrbitTrajectorySegment["kind"];
+    fromObjectId: string | null;
+    toObjectId: string | null;
+    aroundObjectId: string | null;
+    assistObjectId: string | null;
+    duration: UnitValue | null;
+    deltaV: UnitValue | null;
+}
+export interface SolverManeuverSample {
+    segmentId: string;
+    maneuverId: string;
+    kind: string;
+    epoch: string | null;
+    deltaV: UnitValue | null;
+    duration: UnitValue | null;
+}
+export interface SolverTrajectorySnapshot {
+    trajectoryId: string;
+    craftObjectId: string | null;
+    segments: SolverSegmentSample[];
+    maneuvers: SolverManeuverSample[];
+}
+export declare function createTrajectorySolverSnapshot(trajectory: WorldOrbitTrajectory): SolverTrajectorySnapshot;

package/dist/browser/core/dist/solver.js

@@ -0,0 +1,27 @@
+export function createTrajectorySolverSnapshot(trajectory) {
+    return {
+        trajectoryId: trajectory.id,
+        craftObjectId: trajectory.craftObjectId,
+        segments: trajectory.segments.map((segment) => ({
+            segmentId: segment.id,
+            kind: segment.kind,
+            fromObjectId: segment.fromObjectId,
+            toObjectId: segment.toObjectId,
+            aroundObjectId: segment.aroundObjectId,
+            assistObjectId: segment.assist?.objectId ?? null,
+            duration: segment.duration ?? null,
+            deltaV: segment.deltaV ?? null,
+        })),
+        maneuvers: trajectory.segments.flatMap((segment) => segment.maneuvers.map((maneuver) => mapManeuver(segment.id, maneuver))),
+    };
+}
+function mapManeuver(segmentId, maneuver) {
+    return {
+        segmentId,
+        maneuverId: maneuver.id,
+        kind: maneuver.kind,
+        epoch: maneuver.epoch,
+        deltaV: maneuver.deltaV ?? null,
+        duration: maneuver.duration ?? null,
+    };
+}

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

@@ -1,8 +1,8 @@
-export type WorldOrbitObjectType = "system" | "star" | "planet" | "moon" | "belt" | "asteroid" | "comet" | "ring" | "structure" | "phenomenon";
+export type WorldOrbitObjectType = "system" | "star" | "planet" | "moon" | "belt" | "asteroid" | "comet" | "ring" | "craft" | "structure" | "phenomenon";
 export type PlacementMode = "orbit" | "at" | "surface" | "free";
 export type Unit = "au" | "km" | "m" | "ly" | "pc" | "kpc" | "re" | "rj" | "sol" | "me" | "mj" | "s" | "min" | "h" | "d" | "y" | "ky" | "my" | "gy" | "K" | "deg";
 export type WorldOrbitDocumentVersion = "1.0";
-export type WorldOrbitAtlasDocumentVersion = "2.0" | "2.1" | "2.5" | "2.6";
+export type WorldOrbitAtlasDocumentVersion = "2.0" | "2.1" | "2.5" | "2.6" | "3.0";
 export type WorldOrbitDraftDocumentVersion = "2.0-draft";
 export type WorldOrbitAnyDocumentVersion = WorldOrbitDocumentVersion | WorldOrbitAtlasDocumentVersion | WorldOrbitDraftDocumentVersion;
 export type ViewProjection = "topdown" | "isometric" | "orthographic" | "perspective";
@@ -86,6 +86,7 @@ export interface WorldOrbitDocument {
     groups: WorldOrbitGroup[];
     relations: WorldOrbitRelation[];
     events: WorldOrbitEvent[];
+    trajectories: WorldOrbitTrajectory[];
     objects: WorldOrbitObject[];
 }
 export interface WorldOrbitAtlasDocument {
@@ -98,6 +99,7 @@ export interface WorldOrbitAtlasDocument {
     groups: WorldOrbitGroup[];
     relations: WorldOrbitRelation[];
     events: WorldOrbitEvent[];
+    trajectories: WorldOrbitTrajectory[];
     objects: WorldOrbitObject[];
     diagnostics: WorldOrbitDiagnostic[];
 }
@@ -111,6 +113,7 @@ export interface WorldOrbitDraftDocument {
     groups: WorldOrbitGroup[];
     relations: WorldOrbitRelation[];
     events: WorldOrbitEvent[];
+    trajectories: WorldOrbitTrajectory[];
     objects: WorldOrbitObject[];
     diagnostics: WorldOrbitDiagnostic[];
 }
@@ -127,6 +130,7 @@ export interface WorldOrbitSystem {
 export interface WorldOrbitObject {
     type: Exclude<WorldOrbitObjectType, "system">;
     id: string;
+    trajectoryId?: string | null;
     groups?: string[];
     epoch?: string | null;
     referencePlane?: string | null;
@@ -167,6 +171,7 @@ export interface WorldOrbitEvent {
     kind: string;
     label: string;
     summary: string | null;
+    trajectoryId?: string | null;
     targetObjectId: string | null;
     participantObjectIds: string[];
     timing: string | null;
@@ -181,11 +186,60 @@ export interface WorldOrbitEvent {
 export interface WorldOrbitEventPose {
     objectId: string;
     placement: Placement | null;
+    trajectorySegmentId?: string | null;
+    trajectoryManeuverId?: string | null;
     inner?: UnitValue;
     outer?: UnitValue;
     epoch?: string | null;
     referencePlane?: string | null;
 }
+export interface WorldOrbitTrajectory {
+    id: string;
+    label: string;
+    summary: string | null;
+    craftObjectId: string | null;
+    tags: string[];
+    color: string | null;
+    hidden: boolean;
+    segments: WorldOrbitTrajectorySegment[];
+}
+export interface WorldOrbitTrajectorySegment {
+    id: string;
+    kind: WorldOrbitTrajectorySegmentKind;
+    label: string | null;
+    summary: string | null;
+    fromObjectId: string | null;
+    toObjectId: string | null;
+    aroundObjectId: string | null;
+    assist: WorldOrbitGravityAssist | null;
+    epoch: string | null;
+    periapsis?: UnitValue;
+    apoapsis?: UnitValue;
+    inclination?: UnitValue;
+    duration?: UnitValue;
+    deltaV?: UnitValue;
+    phaseAngle?: UnitValue;
+    turnAngle?: UnitValue;
+    energy?: UnitValue;
+    notes: string[];
+    maneuvers: WorldOrbitManeuver[];
+}
+export type WorldOrbitTrajectorySegmentKind = "departure" | "transfer" | "flyby" | "capture" | "stationkeeping" | "escape";
+export interface WorldOrbitManeuver {
+    id: string;
+    kind: string;
+    label: string | null;
+    epoch: string | null;
+    deltaV?: UnitValue;
+    duration?: UnitValue;
+    notes: string[];
+}
+export interface WorldOrbitGravityAssist {
+    objectId: string;
+    periapsis?: UnitValue;
+    turnAngle?: UnitValue;
+    notes: string[];
+}
 export interface WorldOrbitResonance {
     targetObjectId: string;
     ratio: string;
@@ -632,7 +686,7 @@ export interface WorldOrbitAtlasSystem {
     viewpoints: WorldOrbitAtlasViewpoint[];
     annotations: WorldOrbitAtlasAnnotation[];
 }
-export type AtlasDocumentPathKind = "system" | "defaults" | "metadata" | "group" | "event" | "event-pose" | "object" | "viewpoint" | "annotation" | "relation";
+export type AtlasDocumentPathKind = "system" | "defaults" | "metadata" | "group" | "event" | "event-pose" | "trajectory" | "trajectory-segment" | "trajectory-maneuver" | "object" | "viewpoint" | "annotation" | "relation";
 export interface AtlasDocumentPath {
     kind: AtlasDocumentPathKind;
     id?: string;