spacemap 0.1.17 → 0.1.18

package/index.d.ts

@@ -1373,7 +1373,7 @@ export declare interface PanoramaEntry {
      *  `unknown` means the sphere sits at an arbitrary azimuth, so nothing
      *  may be drawn or written as a heading. The full set `export/panoramas.py`
      *  writes — a wider union would erase the literals and stop checking. */
-    orientation?: 'unknown' | 'caption-aligned' | 'matched to an archival sphere' | 'matched to a controlled mosaic';
+    orientation?: 'unknown' | 'caption-aligned' | 'matched to an archival sphere' | 'matched to a controlled mosaic' | 'matched to a terrain model' | 'fitted to the Sun';
     /** `estimated` where the sphere's angular bounds were fitted to a
      *  published flat image rather than read from an archive label. */
     geometry?: 'estimated';
@@ -1853,6 +1853,8 @@ export declare class SimClock {
     private prevScale;
     private stops;
     private settleTimer;
+    /** The promises of {@link jumpTo} that wait for a frame at their date. */
+    private arrivals;
     constructor(initialJd: number, live?: boolean);
     /* Excluded from this release type: tick */
     /* Excluded from this release type: setBoundaryStops */
@@ -1860,9 +1862,12 @@ export declare class SimClock {
     setTimeScale(magnitude: number): void;
     toggleDirection(): void;
     /* Excluded from this release type: setJD */
-    /** Seek, and mark it as a discrete jump so listeners can react to the one
-     *  move rather than to a stream of them. */
-    jumpTo(jd: number): void;
+    /** Move the clock to `jd` in one jump, so that listeners react to it once.
+     *  The promise resolves when a frame shows the bodies at that date. Until
+     *  the data of the date loads, the map shows the date before the jump, and
+     *  the measures answer for that date. */
+    jumpTo(jd: number): Promise<void>;
+    /* Excluded from this release type: placed */
     /** Rest the settled date on where the clock stands now. */
     private settle;
     /** The same, once a drag holds still. A clock still playing is left alone: it
@@ -1877,8 +1882,9 @@ export declare class SimClock {
     get playing(): boolean;
     /** The moment the map is showing. */
     get date(): Date;
-    /** Show another moment, as one deliberate move. */
-    setDate(date: Date): void;
+    /** Move the clock to `date` in one jump. The promise resolves as the promise
+     *  of {@link jumpTo} does. */
+    setDate(date: Date): Promise<void>;
 }
 
 /**
@@ -2018,9 +2024,17 @@ export declare class SpaceMap {
      *  the move a click on its label makes. Resolves when the camera comes
      *  round. */
     panTo(target: FeatureTarget): Promise<void>;
-    /** Put the camera somewhere at once, with no flight: what a page restoring a
-     *  stored view wants, where a flight from nowhere would read as a lurch. */
-    jumpTo(target: JumpTarget): this;
+    /**
+     * Put the camera at a place at once, with no flight. Use it to restore a
+     * stored view. A body that the map has not loaded loads first. The promise
+     * resolves one frame after the camera is in its place. It rejects when the
+     * data of the body does not load. A later move stops this move.
+     */
+    jumpTo(target: JumpTarget): Promise<void>;
+    /** Whether `id` is in the scene, with a place at the date it shows. */
+    private placedNow;
+    /** The placement of {@link jumpTo}, on a body in the scene. */
+    private snap;
     /** Where the camera is now. Null before the first frame, and while nothing
      *  is focused. */
     getCamera(): CameraState | null;

package/index.js

@@ -10378,6 +10378,30 @@ function applySouthTowardParent(obj, bodyPos, parentPos) {
 function applyUpVector(obj, dir) {
 	obj.quaternion.setFromUnitVectors(LOCAL_NORTH, dir);
 }
+function landedHeadingAt(headings, jd) {
+	let deg;
+	for (const h of headings ?? []) if (h.jd <= jd) deg = h.deg;
+	return deg;
+}
+var LOCAL_FRONT = new Vector3(0, 0, 1);
+var _up = new Vector3();
+var _front = new Vector3();
+var _north = new Vector3();
+var _east = new Vector3();
+var _target = new Vector3();
+var _cross = new Vector3();
+var _turn = new Quaternion();
+function turnToHeading(obj, north, headingDeg) {
+	_up.copy(LOCAL_NORTH).applyQuaternion(obj.quaternion);
+	_north.copy(north).addScaledVector(_up, -north.dot(_up)).normalize();
+	_east.crossVectors(_north, _up);
+	const h = headingDeg * DEG2RAD$5;
+	_target.copy(_north).multiplyScalar(Math.cos(h)).addScaledVector(_east, Math.sin(h));
+	_front.copy(LOCAL_FRONT).applyQuaternion(obj.quaternion);
+	_front.addScaledVector(_up, -_front.dot(_up)).normalize();
+	const angle = Math.atan2(_cross.crossVectors(_front, _target).dot(_up), _front.dot(_target));
+	obj.quaternion.premultiply(_turn.setFromAxisAngle(_up, angle));
+}
 var AXIS_VECTORS = {
 	"+x": new Vector3(1, 0, 0),
 	"-x": new Vector3(-1, 0, 0),
@@ -15770,6 +15794,7 @@ async function loadSpacecraftModel(bo, modelScene, ctx) {
 	try {
 		const detail = await fetchObjectDetail(bo.body.data.id, false);
 		bo.body.pointing = detail.global?.pointing;
+		bo.body.landedHeadings = landedHeadings(detail.global?.events?.items);
 		const attitudeManifest = detail.global?.attitude;
 		if (attitudeManifest && (bo.modelLoadEpoch ?? 0) === epoch) {
 			const probeId = bo.body.data.id.replace(/^probe-/, "");
@@ -15809,8 +15834,9 @@ async function loadSpacecraftModel(bo, modelScene, ctx) {
 		bo.model = root;
 		bo.modelName = slug;
 		setHaloLoading(bo, false);
-		if (meta.scale_meters) {
-			const spanKm = meta.scale_meters / 2e3;
+		const spanM = meta.exports[tier]?.scale_meters;
+		if (spanM) {
+			const spanKm = spanM / 2e3;
 			bo.body.data.radiusKm = spanKm * (meta.body_span_ratio ?? 1);
 			bo.radiusScene = kmToScene(effectiveRadiusKm(bo.body.data));
 			bo.modelUnitOverride = meta.body_span_ratio ? kmToScene(spanKm) : void 0;
@@ -15923,6 +15949,7 @@ function unloadBodyModel(bo) {
 	bo.model = null;
 	bo.modelName = void 0;
 	bo.body.pointing = void 0;
+	bo.body.landedHeadings = void 0;
 	bo.body.attitudeTrack = void 0;
 	bo.body.modelBaseFrame = void 0;
 	if (bo.mesh && restoreSphere) bo.mesh.visible = true;
@@ -15942,6 +15969,17 @@ function setHaloLoading(bo, loading) {
 		bo.loadingShown = void 0;
 	}
 }
+function landedHeadings(events) {
+	const out = [];
+	for (const e of events ?? []) {
+		const deg = e.type === "landing" ? e.site?.heading_deg : void 0;
+		if (deg !== void 0) out.push({
+			jd: e.jd,
+			deg
+		});
+	}
+	return out.length ? out : void 0;
+}
 function withBaseFrame(scene, q) {
 	if (!q) return scene;
 	const wrapper = new Group();
@@ -18713,6 +18751,7 @@ var SimClock = class {
 	prevScale = 1;
 	stops = null;
 	settleTimer = null;
+	arrivals = [];
 	constructor(initialJd, live = false) {
 		this.jd = initialJd;
 		this.settledJd = initialJd;
@@ -18769,6 +18808,19 @@ var SimClock = class {
 		this.setJD(jd);
 		this.jumps++;
 		this.settle();
+		const jumps = this.jumps;
+		return new Promise((resolve) => this.arrivals.push({
+			jumps,
+			resolve
+		}));
+	}
+	placed(jumps) {
+		if (this.arrivals.length === 0) return;
+		this.arrivals = this.arrivals.filter((arrival) => {
+			if (arrival.jumps > jumps) return true;
+			arrival.resolve();
+			return false;
+		});
 	}
 	settle() {
 		if (this.settleTimer !== null) clearTimeout(this.settleTimer);
@@ -18809,7 +18861,7 @@ var SimClock = class {
 		return jdToDate(this.jd);
 	}
 	setDate(date) {
-		this.jumpTo(dateToJD(date));
+		return this.jumpTo(dateToJD(date));
 	}
 };
 
@@ -24524,6 +24576,7 @@ var OutOfRangeNotifier = class {
 //#region src/lib/scene/position/landed-probe.ts
 var lastSeat = /* @__PURE__ */ new Map();
 var _upScene = new Vector3();
+var _northScene = new Vector3();
 function renderLandedProbe(d, probe, landed, jd, where, ctx, bodyObjects) {
 	const sample = landedPositionAt(landed, jd, landedOpenEnded(probe));
 	if (!sample) return null;
@@ -24553,13 +24606,15 @@ function renderLandedProbe(d, probe, landed, jd, where, ctx, bodyObjects) {
 	const quat = bodyQuaternion(landingBody.orientation, jd, landingBody.nutPrec);
 	const tmp = new Vector3(bx, by, bz).applyQuaternion(quat);
 	const up = eff ? _upScene.set(eff.normal[0], eff.normal[1], eff.normal[2]).applyQuaternion(quat) : null;
+	const north = _northScene.set(-Math.sin(latR) * Math.cos(lngR), Math.cos(latR), Math.sin(latR) * Math.sin(lngR)).applyQuaternion(quat);
 	d.parentId = bodyKey;
 	return {
 		x: bodyWorldPos[0] + kmToScene(tmp.x),
 		y: bodyWorldPos[1] + kmToScene(tmp.y),
 		z: bodyWorldPos[2] + kmToScene(tmp.z),
 		parentPos: bodyWorldPos,
-		up
+		up,
+		north
 	};
 }
 
@@ -24810,8 +24865,12 @@ var Placer = class {
 			const up = landedRender.up;
 			if (bo?.mesh) if (up) applyUpVector(bo.mesh, up);
 			else applySouthTowardParent(bo.mesh, pos, landedRender.parentPos);
-			if (bo?.model) if (up) applyUpVector(bo.model, up);
-			else applySouthTowardParent(bo.model, pos, landedRender.parentPos);
+			if (bo?.model) {
+				if (up) applyUpVector(bo.model, up);
+				else applySouthTowardParent(bo.model, pos, landedRender.parentPos);
+				const heading = landedHeadingAt(body.landedHeadings, jd);
+				if (heading !== void 0) turnToHeading(bo.model, landedRender.north, heading);
+			}
 			return pos;
 		}
 		const primary = resolveProbePrimary(located.probe, jd, located.fitCenterNaifId, ctx.chebStore ?? null, (id) => this.at(id, jd) !== null);
@@ -27733,6 +27792,7 @@ var SceneRenderer = class SceneRenderer {
 		this.lastRenderedCamPos.copy(this.camera.position);
 		this.lastRenderedCamQuat.copy(this.camera.quaternion);
 		this.applyJdUpdate(true);
+		if (!this.dateHeld() && !this.seekAwaitsData) this.clock.placed(this.seenJumps);
 		this.refreshTravelFocus();
 		this.callbacks.onFrame?.(this.sceneJd, renderedDtMs);
 		const controlsSettled = this.holdingCamera ? this.applyHeldCamera() : stepFocusAnimation(this.focus, this.camera, this.controls, () => this.repositionAll(), () => this.pointClouds.rebuildBasis());
@@ -31791,20 +31851,38 @@ var SpaceMap = class {
 	panTo(target) {
 		return this.toFeature(this.targetBody(target), target.feature, "pan");
 	}
-	jumpTo(target) {
+	async jumpTo(target) {
 		const body = this.targetBody(target);
+		if (this.placedNow(body) && target.facing === void 0 || this.placedNow(target.facing)) this.navigation++;
+		else {
+			const loading = this.goTo(body, {
+				clock: "keep",
+				camera: "none"
+			});
+			const token = this.navigation;
+			const arrival = await loading;
+			if (arrival.outcome === "failed") throw arrival.error;
+			if (arrival.outcome !== "placed" || token !== this.navigation) return;
+		}
+		this.snap(target, body);
+		return this.settled(0);
+	}
+	placedNow(id) {
+		const body = this.ctx.getBody(id);
+		return !!body && !!this.renderer?.placeOf(body);
+	}
+	snap(target, body) {
 		if (target.facing !== void 0) {
 			this.snapToBodyFacing(body, target.facing, target.elevationDeg ?? 0, this.framing(target, body));
-			return this;
+			return;
 		}
 		if (target.feature) {
 			const { featureId, lat, lon, diameterM } = target.feature;
 			this.focusOnFeature(body, featureId, lat, lon, diameterM, null, "snap");
-			return this;
+			return;
 		}
 		const camera = this.getCamera();
 		this.snapToBody(body, target.lat ?? camera?.lat ?? 45, target.lon ?? camera?.lon ?? 0, this.framing(target, body));
-		return this;
 	}
 	getCamera() {
 		const renderer = this.renderer;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "spacemap",
-	"version": "0.1.17",
+	"version": "0.1.18",
 	"description": "The map of the Solar System from spacemap.co, on your website!",
 	"keywords": ["solar system", "spacecraft", "orbits", "map", "three.js"],
 	"homepage": "https://spacemap.co",