worldorbit 2.5.16 → 2.6.0

package/packages/core/dist/draft.js

@@ -18,12 +18,13 @@ export function upgradeDocumentToV2(document, options = {}) {
     }
     return {
         format: "worldorbit",
-        version: "2.0",
-        schemaVersion: "2.0",
+        version: "2.5",
+        schemaVersion: "2.5",
         sourceVersion: document.version,
         system,
         groups: structuredClone(document.groups ?? []),
         relations: structuredClone(document.relations ?? []),
+        events: structuredClone(document.events ?? []),
         objects: document.objects.map(cloneWorldOrbitObject),
         diagnostics,
     };
@@ -31,7 +32,7 @@ export function upgradeDocumentToV2(document, options = {}) {
 export function upgradeDocumentToDraftV2(document, options = {}) {
     return convertAtlasDocumentToLegacyDraft(upgradeDocumentToV2(document, options));
 }
-export function materializeAtlasDocument(document) {
+export function materializeAtlasDocument(document, options = {}) {
     const system = document.system
         ? {
             type: "system",
@@ -44,6 +45,8 @@ export function materializeAtlasDocument(document) {
             info: materializeDraftSystemInfo(document.system),
         }
         : null;
+    const objects = document.objects.map(cloneWorldOrbitObject);
+    applyEventPoseOverrides(objects, document.events ?? [], options.activeEventId ?? null);
     return {
         format: "worldorbit",
         version: "1.0",
@@ -51,7 +54,8 @@ export function materializeAtlasDocument(document) {
         system,
         groups: structuredClone(document.groups ?? []),
         relations: structuredClone(document.relations ?? []),
-        objects: document.objects.map(cloneWorldOrbitObject),
+        events: document.events.map(cloneWorldOrbitEvent),
+        objects,
     };
 }
 export function materializeDraftDocument(document) {
@@ -78,10 +82,15 @@ function createDraftSystem(document, defaults, atlasMetadata, annotations, diagn
     };
 }
 function createDraftDefaults(document, preset, projection) {
+    const rawView = typeof document.system?.properties.view === "string"
+        ? document.system.properties.view.toLowerCase()
+        : null;
     return {
-        view: typeof document.system?.properties.view === "string" &&
-            document.system.properties.view.toLowerCase() === "topdown"
-            ? "topdown"
+        view: rawView === "topdown" ||
+            rawView === "isometric" ||
+            rawView === "orthographic" ||
+            rawView === "perspective"
+            ? rawView
             : projection,
         scale: typeof document.system?.properties.scale === "string"
             ? document.system.properties.scale
@@ -195,10 +204,12 @@ function mapSceneViewpointToDraftViewpoint(viewpoint) {
         summary: viewpoint.summary,
         focusObjectId: viewpoint.objectId,
         selectedObjectId: viewpoint.selectedObjectId,
+        events: [...viewpoint.eventIds],
         projection: viewpoint.projection,
         preset: viewpoint.preset,
         zoom: viewpoint.scale,
         rotationDeg: viewpoint.rotationDeg,
+        camera: viewpoint.camera ? { ...viewpoint.camera } : null,
         layers: { ...viewpoint.layers },
         filter: viewpoint.filter
             ? {
@@ -239,6 +250,75 @@ function cloneWorldOrbitObject(object) {
         info: { ...object.info },
     };
 }
+function cloneWorldOrbitEvent(event) {
+    return {
+        ...event,
+        participantObjectIds: [...event.participantObjectIds],
+        tags: [...event.tags],
+        positions: event.positions.map(cloneWorldOrbitEventPose),
+    };
+}
+function cloneWorldOrbitEventPose(pose) {
+    return {
+        objectId: pose.objectId,
+        placement: clonePlacement(pose.placement),
+        inner: pose.inner ? { ...pose.inner } : undefined,
+        outer: pose.outer ? { ...pose.outer } : undefined,
+        epoch: pose.epoch ?? null,
+        referencePlane: pose.referencePlane ?? null,
+    };
+}
+function clonePlacement(placement) {
+    return placement ? structuredClone(placement) : null;
+}
+function applyEventPoseOverrides(objects, events, activeEventId) {
+    if (!activeEventId) {
+        return;
+    }
+    const event = events.find((entry) => entry.id === activeEventId);
+    if (!event) {
+        return;
+    }
+    const objectMap = new Map(objects.map((object) => [object.id, object]));
+    const referencedIds = new Set([
+        ...(event.targetObjectId ? [event.targetObjectId] : []),
+        ...event.participantObjectIds,
+        ...event.positions.map((pose) => pose.objectId),
+    ]);
+    for (const objectId of referencedIds) {
+        const object = objectMap.get(objectId);
+        if (!object) {
+            continue;
+        }
+        if (event.epoch) {
+            object.epoch = event.epoch;
+        }
+        if (event.referencePlane) {
+            object.referencePlane = event.referencePlane;
+        }
+    }
+    for (const pose of event.positions) {
+        const object = objectMap.get(pose.objectId);
+        if (!object) {
+            continue;
+        }
+        if (pose.placement) {
+            object.placement = clonePlacement(pose.placement);
+        }
+        if (pose.inner) {
+            object.properties.inner = { ...pose.inner };
+        }
+        if (pose.outer) {
+            object.properties.outer = { ...pose.outer };
+        }
+        if (pose.epoch) {
+            object.epoch = pose.epoch;
+        }
+        if (pose.referencePlane) {
+            object.referencePlane = pose.referencePlane;
+        }
+    }
+}
 function cloneProperties(properties) {
     const next = {};
     for (const [key, value] of Object.entries(properties)) {
@@ -331,6 +411,18 @@ function materializeDraftSystemInfo(system) {
         if (viewpoint.rotationDeg !== 0) {
             info[`${prefix}.rotation`] = String(viewpoint.rotationDeg);
         }
+        if (viewpoint.camera?.azimuth !== null) {
+            info[`${prefix}.camera.azimuth`] = String(viewpoint.camera?.azimuth);
+        }
+        if (viewpoint.camera?.elevation !== null) {
+            info[`${prefix}.camera.elevation`] = String(viewpoint.camera?.elevation);
+        }
+        if (viewpoint.camera?.roll !== null) {
+            info[`${prefix}.camera.roll`] = String(viewpoint.camera?.roll);
+        }
+        if (viewpoint.camera?.distance !== null) {
+            info[`${prefix}.camera.distance`] = String(viewpoint.camera?.distance);
+        }
         const serializedLayers = serializeViewpointLayers(viewpoint.layers);
         if (serializedLayers) {
             info[`${prefix}.layers`] = serializedLayers;
@@ -347,6 +439,9 @@ function materializeDraftSystemInfo(system) {
         if ((viewpoint.filter?.groupIds.length ?? 0) > 0) {
             info[`${prefix}.groups`] = viewpoint.filter?.groupIds.join(" ") ?? "";
         }
+        if (viewpoint.events.length > 0) {
+            info[`${prefix}.events`] = viewpoint.events.join(" ");
+        }
     }
     for (const annotation of system.annotations) {
         const prefix = `annotation.${annotation.id}`;
@@ -371,7 +466,7 @@ function serializeViewpointLayers(layers) {
     if (orbitFront !== undefined || orbitBack !== undefined) {
         tokens.push(orbitFront !== false || orbitBack !== false ? "orbits" : "-orbits");
     }
-    for (const key of ["background", "guides", "relations", "objects", "labels", "metadata"]) {
+    for (const key of ["background", "guides", "relations", "events", "objects", "labels", "metadata"]) {
         if (layers[key] !== undefined) {
             tokens.push(layers[key] ? key : `-${key}`);
         }

package/packages/core/dist/format.js

@@ -38,15 +38,17 @@ export function formatDocument(document, options = {}) {
     const schema = options.schema ?? "auto";
     const useDraft = schema === "2.0" ||
         schema === "2.1" ||
+        schema === "2.5" ||
         schema === "2.0-draft" ||
         document.version === "2.0" ||
         document.version === "2.1" ||
+        document.version === "2.5" ||
         document.version === "2.0-draft";
     if (useDraft) {
         if (schema === "2.0-draft") {
             const legacyDraftDocument = document.version === "2.0-draft"
                 ? document
-                : document.version === "2.0" || document.version === "2.1"
+                : document.version === "2.0" || document.version === "2.1" || document.version === "2.5"
                     ? {
                         ...document,
                         version: "2.0-draft",
@@ -55,7 +57,7 @@ export function formatDocument(document, options = {}) {
                     : upgradeDocumentToDraftV2(document);
             return formatDraftDocument(legacyDraftDocument);
         }
-        const atlasDocument = document.version === "2.0" || document.version === "2.1"
+        const atlasDocument = document.version === "2.0" || document.version === "2.1" || document.version === "2.5"
             ? document
             : document.version === "2.0-draft"
                 ? {
@@ -64,11 +66,11 @@ export function formatDocument(document, options = {}) {
                     schemaVersion: "2.0",
                 }
                 : upgradeDocumentToV2(document);
-        if (schema === "2.1" && atlasDocument.version !== "2.1") {
+        if ((schema === "2.0" || schema === "2.1" || schema === "2.5") && atlasDocument.version !== schema) {
             return formatAtlasDocument({
                 ...atlasDocument,
-                version: "2.1",
-                schemaVersion: "2.1",
+                version: schema,
+                schemaVersion: schema,
             });
         }
         return formatAtlasDocument(atlasDocument);
@@ -100,6 +102,10 @@ export function formatAtlasDocument(document) {
         lines.push("");
         lines.push(...formatAtlasRelation(relation));
     }
+    for (const event of [...document.events].sort(compareIdLike)) {
+        lines.push("");
+        lines.push(...formatAtlasEvent(event));
+    }
     const sortedObjects = [...document.objects].sort(compareObjects);
     if (sortedObjects.length > 0 && lines.at(-1) !== "") {
         lines.push("");
@@ -132,6 +138,10 @@ export function formatDraftDocument(document) {
         lines.push("");
         lines.push(...formatAtlasRelation(relation));
     }
+    for (const event of [...legacy.events].sort(compareIdLike)) {
+        lines.push("");
+        lines.push(...formatAtlasEvent(event));
+    }
     const sortedObjects = [...legacy.objects].sort(compareObjects);
     if (sortedObjects.length > 0 && lines.at(-1) !== "") {
         lines.push("");
@@ -341,10 +351,28 @@ function formatAtlasViewpoint(viewpoint) {
     if (viewpoint.rotationDeg !== 0) {
         lines.push(`  rotation ${viewpoint.rotationDeg}`);
     }
+    if (viewpoint.camera && hasCameraValues(viewpoint.camera)) {
+        lines.push("  camera");
+        if (viewpoint.camera.azimuth !== null) {
+            lines.push(`    azimuth ${viewpoint.camera.azimuth}`);
+        }
+        if (viewpoint.camera.elevation !== null) {
+            lines.push(`    elevation ${viewpoint.camera.elevation}`);
+        }
+        if (viewpoint.camera.roll !== null) {
+            lines.push(`    roll ${viewpoint.camera.roll}`);
+        }
+        if (viewpoint.camera.distance !== null) {
+            lines.push(`    distance ${viewpoint.camera.distance}`);
+        }
+    }
     const layerTokens = formatDraftLayers(viewpoint.layers);
     if (layerTokens.length > 0) {
         lines.push(`  layers ${layerTokens.join(" ")}`);
     }
+    if (viewpoint.events.length > 0) {
+        lines.push(`  events ${viewpoint.events.join(" ")}`);
+    }
     if (viewpoint.filter) {
         lines.push("  filter");
         if (viewpoint.filter.query) {
@@ -417,6 +445,68 @@ function formatAtlasRelation(relation) {
     }
     return lines;
 }
+function formatAtlasEvent(event) {
+    const lines = [`event ${event.id}`, `  kind ${quoteIfNeeded(event.kind)}`];
+    if (event.label) {
+        lines.push(`  label ${quoteIfNeeded(event.label)}`);
+    }
+    if (event.summary) {
+        lines.push(`  summary ${quoteIfNeeded(event.summary)}`);
+    }
+    if (event.targetObjectId) {
+        lines.push(`  target ${event.targetObjectId}`);
+    }
+    if (event.participantObjectIds.length > 0) {
+        lines.push(`  participants ${event.participantObjectIds.join(" ")}`);
+    }
+    if (event.timing) {
+        lines.push(`  timing ${quoteIfNeeded(event.timing)}`);
+    }
+    if (event.visibility) {
+        lines.push(`  visibility ${quoteIfNeeded(event.visibility)}`);
+    }
+    if (event.epoch) {
+        lines.push(`  epoch ${quoteIfNeeded(event.epoch)}`);
+    }
+    if (event.referencePlane) {
+        lines.push(`  referencePlane ${quoteIfNeeded(event.referencePlane)}`);
+    }
+    if (event.tags.length > 0) {
+        lines.push(`  tags ${event.tags.map(quoteIfNeeded).join(" ")}`);
+    }
+    if (event.color) {
+        lines.push(`  color ${quoteIfNeeded(event.color)}`);
+    }
+    if (event.hidden) {
+        lines.push("  hidden true");
+    }
+    if (event.positions.length > 0) {
+        lines.push("");
+        lines.push("  positions");
+        for (const pose of [...event.positions].sort(comparePoseObjectId)) {
+            lines.push(`    pose ${pose.objectId}`);
+            for (const fieldLine of formatEventPoseFields(pose)) {
+                lines.push(`      ${fieldLine}`);
+            }
+        }
+    }
+    return lines;
+}
+function formatEventPoseFields(pose) {
+    return [
+        ...formatPlacement(pose.placement),
+        ...(pose.epoch ? [`epoch ${quoteIfNeeded(pose.epoch)}`] : []),
+        ...(pose.referencePlane ? [`referencePlane ${quoteIfNeeded(pose.referencePlane)}`] : []),
+        ...formatOptionalUnit("inner", pose.inner),
+        ...formatOptionalUnit("outer", pose.outer),
+    ];
+}
+function hasCameraValues(camera) {
+    return (camera.azimuth !== null ||
+        camera.elevation !== null ||
+        camera.roll !== null ||
+        camera.distance !== null);
+}
 function formatValue(value) {
     if (Array.isArray(value)) {
         return value.map((item) => quoteIfNeeded(item)).join(" ");
@@ -462,7 +552,7 @@ function formatDraftLayers(layers) {
             ? "orbits"
             : "-orbits");
     }
-    for (const key of ["background", "guides", "relations", "objects", "labels", "metadata"]) {
+    for (const key of ["background", "guides", "relations", "events", "objects", "labels", "metadata"]) {
         if (layers[key] !== undefined) {
             tokens.push(layers[key] ? key : `-${key}`);
         }
@@ -490,6 +580,9 @@ function compareObjects(left, right) {
 function compareIdLike(left, right) {
     return left.id.localeCompare(right.id);
 }
+function comparePoseObjectId(left, right) {
+    return left.objectId.localeCompare(right.objectId);
+}
 function objectTypeIndex(objectType) {
     switch (objectType) {
         case "star":

package/packages/core/dist/load.js

@@ -5,8 +5,9 @@ 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)?$/i;
+const ATLAS_SCHEMA_PATTERN = /^schema\s+2(?:\.0|\.1|\.5)?$/i;
 const ATLAS_SCHEMA_21_PATTERN = /^schema\s+2\.1$/i;
+const ATLAS_SCHEMA_25_PATTERN = /^schema\s+2\.5$/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/)) {
@@ -20,6 +21,9 @@ export function detectWorldOrbitSchemaVersion(source) {
         if (ATLAS_SCHEMA_21_PATTERN.test(trimmed)) {
             return "2.1";
         }
+        if (ATLAS_SCHEMA_25_PATTERN.test(trimmed)) {
+            return "2.5";
+        }
         if (ATLAS_SCHEMA_PATTERN.test(trimmed)) {
             return "2.0";
         }
@@ -80,7 +84,10 @@ export function loadWorldOrbitSource(source) {
 }
 export function loadWorldOrbitSourceWithDiagnostics(source) {
     const schemaVersion = detectWorldOrbitSchemaVersion(source);
-    if (schemaVersion === "2.0" || schemaVersion === "2.0-draft" || schemaVersion === "2.1") {
+    if (schemaVersion === "2.0" ||
+        schemaVersion === "2.0-draft" ||
+        schemaVersion === "2.1" ||
+        schemaVersion === "2.5") {
         return loadAtlasSourceWithDiagnostics(source, schemaVersion);
     }
     let ast;

package/packages/core/dist/normalize.js

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