worldorbit 3.1.0 → 3.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "worldorbit",
-  "version": "3.1.0",
+  "version": "3.2.1",
   "description": "A text-based DSL and parser pipeline for orbital worldbuilding",
   "type": "module",
   "main": "./dist/unpkg/worldorbit.esm.js",

package/packages/core/dist/atlas-edit.js

@@ -1,5 +1,5 @@
 import { collectAtlasDiagnostics } from "./atlas-validate.js";
-export function createEmptyAtlasDocument(systemId = "WorldOrbit", version = "2.6.1") {
+export function createEmptyAtlasDocument(systemId = "WorldOrbit", version = "2.6") {
     return {
         format: "worldorbit",
         version,

package/packages/core/dist/atlas-validate.js

@@ -67,7 +67,7 @@ function validateRelation(relation, objectMap, diagnostics) {
 }
 function validateViewpoint(viewpoint, groupIds, eventIds, sourceSchemaVersion, diagnostics, objectMap) {
     const filter = viewpoint.filter;
-    if (sourceSchemaVersion === "2.1" || sourceSchemaVersion === "2.5" || sourceSchemaVersion === "2.6.1") {
+    if (sourceSchemaVersion === "2.1" || sourceSchemaVersion === "2.5" || sourceSchemaVersion === "2.6") {
         if (filter) {
             for (const groupId of filter.groupIds) {
                 if (!groupIds.has(groupId)) {

package/packages/core/dist/draft-parse.js

@@ -210,12 +210,12 @@ function parseAtlasSource(source, forcedOutputVersion) {
 function assertDraftSchemaHeader(tokens, line) {
     if (tokens.length !== 2 ||
         tokens[0].value.toLowerCase() !== "schema" ||
-        !["2.0-draft", "2.0", "2.1", "2.5", "2.6.1"].includes(tokens[1].value.toLowerCase())) {
-        throw new WorldOrbitError('Expected atlas header "schema 2.0", "schema 2.1", "schema 2.5", "schema 2.6.1", or legacy "schema 2.0-draft"', line, tokens[0]?.column ?? 1);
+        !["2.0-draft", "2.0", "2.1", "2.5", "2.6"].includes(tokens[1].value.toLowerCase())) {
+        throw new WorldOrbitError('Expected atlas header "schema 2.0", "schema 2.1", "schema 2.5", "schema 2.6", or legacy "schema 2.0-draft"', line, tokens[0]?.column ?? 1);
     }
     const version = tokens[1].value.toLowerCase();
-    return version === "2.6.1"
-        ? "2.6.1"
+    return version === "2.6"
+        ? "2.6"
         : version === "2.5"
             ? "2.5"
             : version === "2.1"
@@ -1566,8 +1566,10 @@ function schemaVersionRank(version) {
             return 2;
         case "2.5":
             return 3;
-        case "2.6.1":
+        case "2.6":
             return 4;
+        default:
+            return 5;
     }
 }
 function preprocessAtlasSource(source) {

package/packages/core/dist/draft.js

@@ -18,8 +18,8 @@ export function upgradeDocumentToV2(document, options = {}) {
     }
     return {
         format: "worldorbit",
-        version: "2.6.1",
-        schemaVersion: "2.6.1",
+        version: "2.6",
+        schemaVersion: "2.6",
         sourceVersion: document.version,
         theme: document.theme ?? null,
         system,

package/packages/core/dist/format.js

@@ -39,18 +39,18 @@ export function formatDocument(document, options = {}) {
     const useDraft = schema === "2.0" ||
         schema === "2.1" ||
         schema === "2.5" ||
-        schema === "2.6.1" ||
+        schema === "2.6" ||
         schema === "2.0-draft" ||
         document.version === "2.0" ||
         document.version === "2.1" ||
         document.version === "2.5" ||
-        document.version === "2.6.1" ||
+        document.version === "2.6" ||
         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.5" || document.version === "2.6.1"
+                : document.version === "2.0" || document.version === "2.1" || document.version === "2.5" || document.version === "2.6"
                     ? {
                         ...document,
                         version: "2.0-draft",
@@ -59,7 +59,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.1"
+        const atlasDocument = document.version === "2.0" || document.version === "2.1" || document.version === "2.5" || document.version === "2.6"
             ? document
             : document.version === "2.0-draft"
                 ? {
@@ -68,7 +68,7 @@ export function formatDocument(document, options = {}) {
                     schemaVersion: "2.0",
                 }
                 : upgradeDocumentToV2(document);
-        if ((schema === "2.0" || schema === "2.1" || schema === "2.5" || schema === "2.6.1") && atlasDocument.version !== schema) {
+        if ((schema === "2.0" || schema === "2.1" || schema === "2.5" || schema === "2.6") && atlasDocument.version !== schema) {
             return formatAtlasDocument({
                 ...atlasDocument,
                 version: schema,

package/packages/core/dist/load.js

@@ -5,9 +5,10 @@ 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)?$/i;
+const ATLAS_SCHEMA_PATTERN = /^schema\s+2(?:\.0|\.1|\.5|\.6)?$/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 LEGACY_DRAFT_SCHEMA_PATTERN = /^schema\s+2\.0-draft$/i;
 export function detectWorldOrbitSchemaVersion(source) {
     for (const line of stripCommentsForSchemaDetection(source).split(/\r?\n/)) {
@@ -22,7 +23,10 @@ export function detectWorldOrbitSchemaVersion(source) {
             return "2.1";
         }
         if (ATLAS_SCHEMA_25_PATTERN.test(trimmed)) {
-            return "2.6.1";
+            return "2.5";
+        }
+        if (ATLAS_SCHEMA_26_PATTERN.test(trimmed)) {
+            return "2.6";
         }
         if (ATLAS_SCHEMA_PATTERN.test(trimmed)) {
             return "2.0";
@@ -88,7 +92,7 @@ export function loadWorldOrbitSourceWithDiagnostics(source) {
         schemaVersion === "2.0-draft" ||
         schemaVersion === "2.1" ||
         schemaVersion === "2.5" ||
-        schemaVersion === "2.6.1") {
+        schemaVersion === "2.6") {
         return loadAtlasSourceWithDiagnostics(source, schemaVersion);
     }
     let ast;

package/packages/core/dist/scene.js

@@ -17,11 +17,12 @@ export function renderDocumentToScene(document, options = {}) {
     const schemaProjection = resolveProjection(document, options.projection);
     const camera = normalizeViewCamera(options.camera ?? null);
     const renderProjection = resolveRenderProjection(schemaProjection, camera);
-    const scaleModel = resolveScaleModel(layoutPreset, options.scaleModel);
     const spacingFactor = layoutPresetSpacing(layoutPreset);
+    const scaleModel = resolveScaleModel(layoutPreset, options.scaleModel, options.bodyScaleMode);
     const systemId = document.system?.id ?? null;
     const activeEventId = options.activeEventId ?? null;
     const effectiveObjects = createEffectiveObjects(document.objects, document.events ?? [], activeEventId);
+    const sceneMetricScale = resolveSceneMetricScale(effectiveObjects, width, height, padding, spacingFactor, scaleModel);
     const objectMap = new Map(effectiveObjects.map((object) => [object.id, object]));
     const relationships = buildSceneRelationships(effectiveObjects, objectMap);
     const positions = new Map();
@@ -61,6 +62,7 @@ export function renderDocumentToScene(document, options = {}) {
         spacingFactor,
         projection: renderProjection,
         scaleModel,
+        sceneMetricScale,
     };
     const primaryRoot = rootObjects.find((object) => object.type === "star") ?? rootObjects[0] ?? null;
     if (primaryRoot) {
@@ -82,14 +84,14 @@ export function renderDocumentToScene(document, options = {}) {
         const x = width -
             padding -
             140 -
-            freePlacementOffsetPx(object.placement?.mode === "free" ? object.placement.distance : undefined, scaleModel);
+            freePlacementOffsetPx(object.placement?.mode === "free" ? object.placement.distance : undefined, scaleModel, sceneMetricScale);
         const rowStep = Math.max(76, ((height - padding * 2 - 180) / Math.max(1, freeObjects.length)) * spacingFactor) * scaleModel.freePlacementMultiplier;
         const y = padding + 92 + index * rowStep;
         positions.set(object.id, {
             object,
             x,
             y,
-            radius: visualRadiusFor(object, 0, scaleModel),
+            radius: visualRadiusFor(object, 0, scaleModel, sceneMetricScale),
             sortKey: computeSortKey(x, y, 0),
         });
         leaderDrafts.push({
@@ -112,7 +114,7 @@ export function renderDocumentToScene(document, options = {}) {
             object,
             x: resolved.x,
             y: resolved.y,
-            radius: visualRadiusFor(object, 2, scaleModel),
+            radius: visualRadiusFor(object, 2, scaleModel, sceneMetricScale),
             sortKey: computeSortKey(resolved.x, resolved.y, 2),
             anchorX: resolved.anchorX,
             anchorY: resolved.anchorY,
@@ -164,6 +166,7 @@ export function renderDocumentToScene(document, options = {}) {
             scale: String(document.system?.properties.scale ?? layoutPreset),
             units: String(document.system?.properties.units ?? "mixed"),
             preset: frame.preset ?? "custom",
+            "body.scaleMode": scaleModel.bodyScaleMode,
             ...(camera?.azimuth !== null ? { "camera.azimuth": String(camera?.azimuth) } : {}),
             ...(camera?.elevation !== null ? { "camera.elevation": String(camera?.elevation) } : {}),
             ...(camera?.roll !== null ? { "camera.roll": String(camera?.roll) } : {}),
@@ -344,10 +347,11 @@ function buildSceneSubtitle(projection, renderProjection, layoutPreset, camera)
     }
     return parts.join(" - ");
 }
-function resolveScaleModel(layoutPreset, overrides) {
+function resolveScaleModel(layoutPreset, overrides, bodyScaleMode) {
     const defaults = defaultScaleModel(layoutPreset);
     return {
         ...defaults,
+        ...(bodyScaleMode ? { bodyScaleMode } : {}),
         ...overrides,
     };
 }
@@ -362,6 +366,7 @@ function defaultScaleModel(layoutPreset) {
                 ringThicknessMultiplier: 0.92,
                 minBodyRadius: 4,
                 maxBodyRadius: 36,
+                bodyScaleMode: "readable",
             };
         case "presentation":
             return {
@@ -372,6 +377,7 @@ function defaultScaleModel(layoutPreset) {
                 ringThicknessMultiplier: 1.16,
                 minBodyRadius: 5,
                 maxBodyRadius: 48,
+                bodyScaleMode: "readable",
             };
         default:
             return {
@@ -382,6 +388,7 @@ function defaultScaleModel(layoutPreset) {
                 ringThicknessMultiplier: 1,
                 minBodyRadius: 4,
                 maxBodyRadius: 40,
+                bodyScaleMode: "readable",
             };
     }
 }
@@ -395,6 +402,51 @@ function layoutPresetSpacing(layoutPreset) {
             return 1;
     }
 }
+function resolveSceneMetricScale(objects, width, height, padding, spacingFactor, scaleModel) {
+    const orbitMetrics = [];
+    const bodyMetrics = [];
+    for (const object of objects) {
+        const radiusMetric = objectRadiusMetric(object);
+        if (radiusMetric !== null && radiusMetric > 0) {
+            bodyMetrics.push(radiusMetric);
+        }
+        const placement = object.placement;
+        if (!placement) {
+            continue;
+        }
+        if (placement.mode === "orbit") {
+            const orbitMetricValue = toDistanceMetric(placement.semiMajor ?? placement.distance ?? null);
+            if (orbitMetricValue !== null && orbitMetricValue > 0) {
+                orbitMetrics.push(orbitMetricValue);
+            }
+            continue;
+        }
+        if (placement.mode === "free") {
+            const freeMetric = toDistanceMetric(placement.distance ?? null);
+            if (freeMetric !== null && freeMetric > 0) {
+                orbitMetrics.push(freeMetric);
+            }
+        }
+    }
+    const maxDistanceMetric = Math.max(...orbitMetrics, 0);
+    const maxBodyMetric = Math.max(...bodyMetrics, 0);
+    const baseMetric = Math.max(maxDistanceMetric, maxBodyMetric * 6, 0);
+    const referenceMetric = baseMetric +
+        Math.max(Math.sqrt(baseMetric), maxBodyMetric * 2, maxDistanceMetric > 0 ? 0.25 : 0);
+    if (referenceMetric <= 0) {
+        return {
+            pixelsPerMetric: null,
+            hasExplicitScale: false,
+        };
+    }
+    const availableRadius = Math.max(Math.min(width, height) / 2 - padding - 24, 120) *
+        spacingFactor *
+        scaleModel.orbitDistanceMultiplier;
+    return {
+        pixelsPerMetric: availableRadius / referenceMetric,
+        hasExplicitScale: true,
+    };
+}
 function createSceneObject(position, scaleModel, relationships) {
     const { object, x, y, radius, sortKey, anchorX, anchorY } = position;
     const renderPriority = object.renderHints?.renderPriority ?? 0;
@@ -1064,7 +1116,7 @@ function parseViewpointGroups(value, document, relationships, objectMap) {
     return splitListValue(value).map((entry) => {
         if (document.schemaVersion === "2.1" ||
             document.schemaVersion === "2.5" ||
-            document.schemaVersion === "2.6.1" ||
+            document.schemaVersion === "2.6" ||
             document.groups.some((group) => group.id === entry)) {
             return entry;
         }
@@ -1198,7 +1250,7 @@ function placeObject(object, x, y, depth, positions, orbitDrafts, leaderDrafts,
         object,
         x,
         y,
-        radius: visualRadiusFor(object, depth, context.scaleModel),
+        radius: visualRadiusFor(object, depth, context.scaleModel, context.sceneMetricScale),
         sortKey: computeSortKey(x, y, depth),
     });
     placeOrbitingChildren(object, positions, orbitDrafts, leaderDrafts, context, depth + 1);
@@ -1209,7 +1261,7 @@ function placeOrbitingChildren(object, positions, orbitDrafts, leaderDrafts, con
         return;
     }
     const orbiting = [...(context.orbitChildren.get(object.id) ?? [])].sort(compareOrbiting);
-    const orbitMetricContext = computeOrbitMetricContext(orbiting, parent.radius, context.spacingFactor, context.scaleModel);
+    const orbitMetricContext = computeOrbitMetricContext(orbiting, parent.radius, context.spacingFactor, context.scaleModel, context.sceneMetricScale);
     const orbitRadiiPx = resolveOrbitRadiiPx(orbiting, orbitMetricContext);
     orbiting.forEach((child, index) => {
         const orbitGeometry = resolveOrbitGeometry(child, index, orbiting.length, parent, orbitMetricContext, orbitRadiiPx[index] ?? orbitMetricContext.innerPx, context);
@@ -1244,7 +1296,7 @@ function placeOrbitingChildren(object, positions, orbitDrafts, leaderDrafts, con
             object: child,
             x,
             y,
-            radius: visualRadiusFor(child, depth + 1, context.scaleModel),
+            radius: visualRadiusFor(child, depth + 1, context.scaleModel, context.sceneMetricScale),
             sortKey: computeSortKey(x, y, depth + 1),
             anchorX,
             anchorY,
@@ -1273,10 +1325,13 @@ function compareOrbiting(left, right) {
         return 1;
     return left.id.localeCompare(right.id);
 }
-function computeOrbitMetricContext(objects, parentRadius, spacingFactor, scaleModel) {
+function computeOrbitMetricContext(objects, parentRadius, spacingFactor, scaleModel, sceneMetricScale) {
     const metrics = objects.map((object) => orbitMetric(object));
     const presentMetrics = metrics.filter((value) => value !== null);
-    const innerPx = parentRadius + 56 * spacingFactor * scaleModel.orbitDistanceMultiplier;
+    const minimumGapPx = scaleModel.bodyScaleMode === "strict"
+        ? Math.max(2, 8 * spacingFactor * scaleModel.orbitDistanceMultiplier)
+        : (objects.length > 2 ? 54 : 64) * spacingFactor * scaleModel.orbitDistanceMultiplier * 0.42;
+    const innerPx = parentRadius + Math.max(minimumGapPx * 1.2, 24 * spacingFactor);
     const stepPx = (objects.length > 2 ? 54 : 64) * spacingFactor * scaleModel.orbitDistanceMultiplier;
     if (presentMetrics.length === 0) {
         return {
@@ -1287,7 +1342,8 @@ function computeOrbitMetricContext(objects, parentRadius, spacingFactor, scaleMo
             innerPx,
             stepPx,
             pixelSpread: Math.max(stepPx * Math.max(objects.length - 1, 1), stepPx),
-            minimumGapPx: stepPx * 0.42,
+            minimumGapPx,
+            pixelsPerMetric: sceneMetricScale.pixelsPerMetric,
         };
     }
     const minMetric = Math.min(...presentMetrics);
@@ -1301,7 +1357,8 @@ function computeOrbitMetricContext(objects, parentRadius, spacingFactor, scaleMo
         innerPx,
         stepPx,
         pixelSpread: Math.max(stepPx * Math.max(objects.length - 1, 1), stepPx),
-        minimumGapPx: stepPx * 0.42,
+        minimumGapPx,
+        pixelsPerMetric: sceneMetricScale.pixelsPerMetric,
     };
 }
 function resolveOrbitGeometry(object, index, count, parent, metricContext, orbitRadiusPx, context) {
@@ -1366,6 +1423,9 @@ function resolveOrbitGeometry(object, index, count, parent, metricContext, orbit
     };
 }
 function resolveOrbitRadiusPx(metric, metricContext) {
+    if (metricContext.pixelsPerMetric !== null) {
+        return metric * metricContext.pixelsPerMetric;
+    }
     return metricContext.innerPx + metricContext.stepPx * log2(Math.max(metric, 0) + 1);
 }
 function resolveOrbitRadiiPx(objects, metricContext) {
@@ -1404,6 +1464,12 @@ function resolveBandThickness(object, orbitRadius, metricContext, scaleModel) {
     const outerMetric = toDistanceMetric(toUnitValue(object.properties.outer));
     if (innerMetric !== null && outerMetric !== null) {
         const thicknessMetric = Math.abs(outerMetric - innerMetric);
+        if (metricContext.pixelsPerMetric !== null) {
+            const thicknessPx = thicknessMetric * metricContext.pixelsPerMetric;
+            return scaleModel.bodyScaleMode === "strict"
+                ? Math.max(thicknessPx * scaleModel.ringThicknessMultiplier, 1)
+                : clampNumber(Math.max(thicknessPx * scaleModel.ringThicknessMultiplier, 8), 8, 54);
+        }
         if (metricContext.metricSpread > 0) {
             return clampNumber((thicknessMetric / metricContext.metricSpread) *
                 metricContext.pixelSpread *
@@ -1698,8 +1764,8 @@ function deriveParentAnchor(objectId, positions, objectMap) {
     }
     return positions.get(object.placement.target);
 }
-function visualRadiusFor(object, depth, scaleModel) {
-    const explicitRadius = toVisualSizeMetric(object.properties.radius, scaleModel);
+function visualRadiusFor(object, depth, scaleModel, sceneMetricScale) {
+    const explicitRadius = toVisualSizeMetric(object.properties.radius, scaleModel, sceneMetricScale);
     if (explicitRadius !== null) {
         return explicitRadius;
     }
@@ -1766,18 +1832,31 @@ function toDistanceMetric(value) {
             return value.value;
     }
 }
-function freePlacementOffsetPx(distance, scaleModel) {
+function freePlacementOffsetPx(distance, scaleModel, sceneMetricScale) {
     const metric = toDistanceMetric(distance ?? null);
     if (metric === null || metric <= 0) {
         return 0;
     }
+    if (sceneMetricScale.pixelsPerMetric !== null) {
+        const scaled = metric * sceneMetricScale.pixelsPerMetric * scaleModel.freePlacementMultiplier;
+        return scaleModel.bodyScaleMode === "strict"
+            ? Math.max(scaled, 0)
+            : clampNumber(scaled, 0, 420);
+    }
     return clampNumber(metric * 96 * scaleModel.freePlacementMultiplier, 0, 420);
 }
-function toVisualSizeMetric(value, scaleModel) {
+function toVisualSizeMetric(value, scaleModel, sceneMetricScale) {
     const unitValue = toUnitValue(value);
     if (!unitValue) {
         return null;
     }
+    const physicalMetric = toDistanceMetric(unitValue);
+    if (sceneMetricScale.pixelsPerMetric !== null && physicalMetric !== null && physicalMetric > 0) {
+        const scaled = physicalMetric * sceneMetricScale.pixelsPerMetric * scaleModel.bodyRadiusMultiplier;
+        return scaleModel.bodyScaleMode === "strict"
+            ? Math.max(scaled, 0.1)
+            : clampNumber(Math.max(scaled, scaleModel.minBodyRadius), scaleModel.minBodyRadius, scaleModel.maxBodyRadius);
+    }
     let size;
     switch (unitValue.unit) {
         case "sol":
@@ -1795,6 +1874,9 @@ function toVisualSizeMetric(value, scaleModel) {
     }
     return clampNumber(size * scaleModel.bodyRadiusMultiplier, scaleModel.minBodyRadius, scaleModel.maxBodyRadius);
 }
+function objectRadiusMetric(object) {
+    return toDistanceMetric(toUnitValue(object.properties.radius));
+}
 function toUnitValue(value) {
     if (!value || typeof value !== "object" || !("value" in value)) {
         return null;

package/packages/core/dist/spatial-scene.js

@@ -12,6 +12,7 @@ export function renderDocumentToSpatialScene(document, options = {}) {
         projection: options.projection,
         camera: options.camera,
         scaleModel: options.scaleModel,
+        bodyScaleMode: options.bodyScaleMode,
         activeEventId: options.activeEventId,
     };
     const scene = renderDocumentToScene(document, renderOptions);

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

@@ -2,12 +2,13 @@ export type WorldOrbitObjectType = "system" | "star" | "planet" | "moon" | "belt
 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.1";
+export type WorldOrbitAtlasDocumentVersion = "2.0" | "2.1" | "2.5" | "2.6";
 export type WorldOrbitDraftDocumentVersion = "2.0-draft";
 export type WorldOrbitAnyDocumentVersion = WorldOrbitDocumentVersion | WorldOrbitAtlasDocumentVersion | WorldOrbitDraftDocumentVersion;
 export type ViewProjection = "topdown" | "isometric" | "orthographic" | "perspective";
 export type RenderProjectionFallback = "topdown" | "isometric";
 export type RenderPresetName = "diagram" | "presentation" | "atlas-card" | "markdown";
+export type BodyScaleMode = "readable" | "strict";
 export interface CoordinatePoint {
     x: number;
     y: number;
@@ -263,6 +264,7 @@ export interface RenderScaleModel {
     ringThicknessMultiplier: number;
     minBodyRadius: number;
     maxBodyRadius: number;
+    bodyScaleMode: BodyScaleMode;
 }
 export interface SceneRenderOptions {
     width?: number;
@@ -272,6 +274,7 @@ export interface SceneRenderOptions {
     projection?: "document" | ViewProjection;
     camera?: WorldOrbitViewCamera | null;
     scaleModel?: Partial<RenderScaleModel>;
+    bodyScaleMode?: BodyScaleMode;
     activeEventId?: string | null;
 }
 export interface SpatialScaleModel {

package/packages/editor/dist/editor.js

@@ -1,4 +1,4 @@
-import { cloneAtlasDocument, createEmptyAtlasDocument, formatDocument, getAtlasDocumentNode, loadWorldOrbitSourceWithDiagnostics, materializeAtlasDocument, removeAtlasDocumentNode, resolveAtlasDiagnostics, rotatePoint, upgradeDocumentToV2, validateAtlasDocumentWithDiagnostics, } from "@worldorbit/core";
+import { cloneAtlasDocument, createEmptyAtlasDocument, formatDocument, getAtlasDocumentNode, loadWorldOrbitSourceWithDiagnostics, materializeAtlasDocument, removeAtlasDocumentNode, renderDocumentToScene, resolveAtlasDiagnostics, rotatePoint, upgradeDocumentToV2, validateAtlasDocumentWithDiagnostics, } from "@worldorbit/core";
 import { renderWorldOrbitBlock } from "@worldorbit/markdown";
 import { createInteractiveViewer, } from "@worldorbit/viewer";
 import { getViewerVisibleBounds, invertViewerPoint } from "@worldorbit/viewer/viewer-state";
@@ -1250,7 +1250,7 @@ export function createWorldOrbitEditor(container, options = {}) {
                 break;
             case "orbit-radius":
                 if (details.object.placement?.mode === "orbit" && details.orbit) {
-                    nextDocument = updateOrbitRadius(atlasDocument, dragState.path, dragState.objectId, details, pointer, dragState.orbitRadiusContext ?? null);
+                    nextDocument = updateOrbitRadius(atlasDocument, dragState.path, dragState.objectId, viewer.getScene(), details, pointer, dragState.orbitRadiusContext ?? null);
                 }
                 break;
             case "at-reference":
@@ -2468,7 +2468,7 @@ function updateOrbitPhase(document, path, objectId, details, pointer) {
     };
     return next;
 }
-function updateOrbitRadius(document, path, objectId, details, pointer, dragContext) {
+function updateOrbitRadius(document, path, objectId, scene, details, pointer, dragContext) {
     const orbit = details.orbit;
     if (!orbit || details.object.placement?.mode !== "orbit" || !dragContext) {
         return document;
@@ -2476,25 +2476,54 @@ function updateOrbitRadius(document, path, objectId, details, pointer, dragConte
     const unrotated = rotatePoint(pointer, { x: orbit.cx, y: orbit.cy }, -orbit.rotationDeg);
     const nextDisplayedRadius = Math.max(Math.abs(unrotated.x - orbit.cx), 24);
     const nextBaseRadius = Math.max(nextDisplayedRadius - dragContext.radiusOffsetPx, dragContext.innerPx);
-    const nextMetric = orbitRadiusPxToMetric(nextBaseRadius, dragContext.innerPx, dragContext.stepPx);
+    const nextMetric = orbitRadiusPxToMetric(nextBaseRadius, dragContext.innerPx, dragContext.stepPx, dragContext.mode, dragContext.pixelsPerMetric);
     const next = cloneAtlasDocument(document);
     const placementOwner = findEditablePlacementOwner(next, path, objectId);
     if (!placementOwner || placementOwner.placement.mode !== "orbit") {
         return document;
     }
-    const currentValue = placementOwner.placement.semiMajor ??
-        placementOwner.placement.distance ?? {
+    const orbitPlacementOwner = placementOwner;
+    const currentValue = orbitPlacementOwner.placement.semiMajor ??
+        orbitPlacementOwner.placement.distance ?? {
         value: 1,
         unit: "au",
     };
     const scaled = distanceMetricToUnitValue(Math.max(nextMetric, 0), dragContext.preferredUnit ?? currentValue.unit);
+    applyOrbitDistanceValue(orbitPlacementOwner, scaled);
+    const targetDisplayedRadius = nextDisplayedRadius;
+    let correctedMetric = nextMetric;
+    for (let iteration = 0; iteration < 3; iteration += 1) {
+        const candidateScene = renderDocumentToScene(materializeAtlasDocument(next), {
+            width: scene.width,
+            height: scene.height,
+            padding: scene.padding,
+            preset: scene.renderPreset ?? undefined,
+            projection: scene.projection,
+            camera: scene.camera,
+            scaleModel: { ...scene.scaleModel },
+            bodyScaleMode: scene.scaleModel.bodyScaleMode,
+            activeEventId: scene.activeEventId,
+        });
+        const renderedOrbit = candidateScene.orbitVisuals.find((entry) => entry.objectId === objectId);
+        const renderedRadius = renderedOrbit?.kind === "circle"
+            ? renderedOrbit.radius ?? 0
+            : renderedOrbit?.rx ?? 0;
+        if (renderedRadius >= targetDisplayedRadius - 1) {
+            break;
+        }
+        const correctionFactor = targetDisplayedRadius / Math.max(renderedRadius, 1);
+        correctedMetric *= Math.max(correctionFactor, 1.02);
+        applyOrbitDistanceValue(orbitPlacementOwner, distanceMetricToUnitValue(Math.max(correctedMetric, 0), dragContext.preferredUnit ?? currentValue.unit));
+    }
+    return next;
+}
+function applyOrbitDistanceValue(placementOwner, value) {
     if (placementOwner.placement.semiMajor) {
-        placementOwner.placement.semiMajor = scaled;
+        placementOwner.placement.semiMajor = value;
     }
     else {
-        placementOwner.placement.distance = scaled;
+        placementOwner.placement.distance = value;
     }
-    return next;
 }
 function updateAtReference(document, path, objectId, scene, pointer) {
     const candidate = findNearestAtCandidate(scene, objectId, pointer);
@@ -2533,15 +2562,26 @@ function createOrbitRadiusDragContext(document, scene, details) {
         !entry.hidden).length;
     const spacingFactor = layoutPresetSpacingForScene(scene.layoutPreset);
     const stepPx = (siblingCount > 2 ? 54 : 64) * spacingFactor * scene.scaleModel.orbitDistanceMultiplier;
+    const minimumGapPx = scene.scaleModel.bodyScaleMode === "strict"
+        ? Math.max(2, 8 * spacingFactor * scene.scaleModel.orbitDistanceMultiplier)
+        : stepPx * 0.42;
     const innerPx = details.parent.radius +
-        56 * spacingFactor * scene.scaleModel.orbitDistanceMultiplier;
+        Math.max(minimumGapPx * 1.2, 24 * spacingFactor);
     const currentValue = details.object.placement.semiMajor ?? details.object.placement.distance ?? null;
     const currentMetric = unitValueToDistanceMetric(currentValue);
     const displayedRadius = details.orbit.kind === "circle" ? details.orbit.radius ?? 1 : details.orbit.rx ?? 1;
-    const baseRadius = orbitMetricToRadiusPx(currentMetric ?? 0, innerPx, stepPx);
+    const usesLinearScale = currentMetric !== null && currentMetric > 0;
+    const pixelsPerMetric = usesLinearScale
+        ? displayedRadius / Math.max(currentMetric, 0.0001)
+        : null;
+    const baseRadius = usesLinearScale
+        ? currentMetric * Math.max(pixelsPerMetric ?? 0, 0)
+        : orbitMetricToRadiusPx(currentMetric ?? 0, innerPx, stepPx);
     return {
+        mode: usesLinearScale ? "linear" : "log",
         innerPx,
         stepPx,
+        pixelsPerMetric,
         radiusOffsetPx: displayedRadius - baseRadius,
         preferredUnit: currentValue?.unit ?? null,
     };
@@ -3191,7 +3231,10 @@ function distanceMetricToUnitValue(metric, unit) {
 function orbitMetricToRadiusPx(metric, innerPx, stepPx) {
     return innerPx + stepPx * log2(Math.max(metric, 0) + 1);
 }
-function orbitRadiusPxToMetric(radiusPx, innerPx, stepPx) {
+function orbitRadiusPxToMetric(radiusPx, innerPx, stepPx, mode, pixelsPerMetric) {
+    if (mode === "linear" && pixelsPerMetric !== null && pixelsPerMetric > 0) {
+        return Math.max(radiusPx / pixelsPerMetric, 0);
+    }
     if (radiusPx <= innerPx) {
         return 0;
     }

package/packages/viewer/dist/atlas-state.js

@@ -72,6 +72,7 @@ export function createAtlasStateSnapshot(viewerState, renderOptions, filter, vie
             camera: renderOptions.camera ? { ...renderOptions.camera } : null,
             layers: renderOptions.layers ? { ...renderOptions.layers } : undefined,
             scaleModel: renderOptions.scaleModel ? { ...renderOptions.scaleModel } : undefined,
+            bodyScaleMode: renderOptions.bodyScaleMode,
             activeEventId: renderOptions.activeEventId ?? null,
             viewMode: renderOptions.viewMode ?? "2d",
         },
@@ -102,6 +103,7 @@ export function deserializeViewerAtlasState(serialized) {
             scaleModel: raw.renderOptions?.scaleModel
                 ? { ...raw.renderOptions.scaleModel }
                 : undefined,
+            bodyScaleMode: raw.renderOptions?.bodyScaleMode,
             activeEventId: raw.activeEventId ?? raw.renderOptions?.activeEventId ?? null,
             viewMode: raw.renderOptions?.viewMode ?? "2d",
         },
@@ -126,6 +128,7 @@ export function createViewerBookmark(name, label, atlasState) {
                 scaleModel: atlasState.renderOptions.scaleModel
                     ? { ...atlasState.renderOptions.scaleModel }
                     : undefined,
+                bodyScaleMode: atlasState.renderOptions.bodyScaleMode,
                 activeEventId: atlasState.renderOptions.activeEventId ?? null,
                 viewMode: atlasState.renderOptions.viewMode ?? "2d",
             },

package/packages/viewer/dist/types.d.ts

@@ -129,6 +129,7 @@ export interface ViewerAtlasState {
         camera?: WorldOrbitViewCamera | null;
         layers?: ViewerLayerOptions;
         scaleModel?: Partial<RenderScaleModel>;
+        bodyScaleMode?: SceneRenderOptions["bodyScaleMode"];
         activeEventId?: string | null;
         viewMode?: WorldOrbitViewMode;
         quality?: WorldOrbit3DQuality;

package/packages/viewer/dist/viewer.js

@@ -44,6 +44,7 @@ export function createInteractiveViewer(container, options) {
         padding: options.padding,
         preset: options.preset,
         projection: options.projection,
+        bodyScaleMode: options.bodyScaleMode,
         viewMode: options.viewMode ?? "2d",
         quality: options.quality ?? "balanced",
         style3d: options.style3d ?? "symbolic",
@@ -1595,6 +1596,7 @@ function hasSceneAffectingRenderOptions(options) {
         options.projection !== undefined ||
         options.camera !== undefined ||
         options.scaleModel !== undefined ||
+        options.bodyScaleMode !== undefined ||
         options.activeEventId !== undefined);
 }
 function resolveSourceRenderOptions(loaded, renderOptions) {