spacemap 0.1.24 → 0.1.25

package/index.d.ts

@@ -240,6 +240,15 @@ export declare interface ClockState {
     live: boolean;
 }
 
+/** The nearest the camera comes to a body, in km. Both change as the body's
+ *  relief and finer imagery load. */
+export declare interface ClosestApproach {
+    /** From the body's centre to its ground under the camera. */
+    groundKm: number;
+    /** How far over that ground the camera stops. */
+    clearanceKm: number;
+}
+
 /** What both maps take: where to put it, where its data comes from, and what
  *  language to read it in. */
 declare interface CommonOptions {
@@ -2176,6 +2185,10 @@ export declare class SpaceMap {
     setLimits(limits: CameraLimits): this;
     /** The limits as they stand. */
     getLimits(): CameraLimits;
+    /** How near the map lets the camera come to what it orbits, where the
+     *  camera is now, whatever {@link SpaceMap.setLimits} adds. Null while
+     *  nothing is focused. */
+    getClosestApproach(): ClosestApproach | null;
     private applyLimits;
     private applyGestures;
     /* Excluded from this release type: setStarSelectEnabled */

package/index.js

@@ -17623,19 +17623,60 @@ function isModelBearing(body) {
 var modelLoader = new GLTFLoader();
 modelLoader.setMeshoptDecoder(MeshoptDecoder);
 var _loader = modelLoader;
-var _bundleMetaCache = /* @__PURE__ */ new Map();
-function fetchBundleMeta(slug) {
-	let p = _bundleMetaCache.get(slug);
-	if (!p) {
-		p = fetch(versionedUrl(`/v1/models/${slug}/metadata.json`, "models")).then((r) => r.json());
-		_bundleMetaCache.set(slug, p);
-		p.catch(() => _bundleMetaCache.delete(slug));
+function modelUrl(slug, tier) {
+	return versionedUrl(`/v1/models/${slug}/${tier}.glb`, "models");
+}
+async function loadModelBundle(slug, tier) {
+	const first = await loadTier(slug, tier);
+	if (!first || textureAllowed(first.meta.exports[tier]?.distribution)) return first;
+	disposeGltf(first.gltf.scene);
+	const other = tier === "high" ? "low" : "high";
+	if (!first.meta.tiers?.includes(other)) return null;
+	if (!textureAllowed(first.meta.exports[other]?.distribution)) return null;
+	const second = await loadTier(slug, other);
+	if (!second || textureAllowed(second.meta.exports[other]?.distribution)) return second;
+	disposeGltf(second.gltf.scene);
+	return null;
+}
+async function loadTier(slug, tier) {
+	const gltf = await _loader.loadAsync(modelUrl(slug, tier));
+	const meta = (gltf.asset?.extras)?.spacemap;
+	if (!meta?.exports?.high) {
+		disposeGltf(gltf.scene);
+		console.warn(`models/${slug}/${tier}.glb carries no payload`);
+		return null;
 	}
-	return p;
+	return {
+		gltf,
+		meta,
+		tier
+	};
+}
+var _tiers;
+function fetchModelTiers() {
+	if (!_tiers) {
+		const p = fetch(versionedUrl("/v1/models/tiers.json", "models")).then((r) => {
+			if (!r.ok) throw new Error(`models/tiers.json: ${r.status}`);
+			return r.json();
+		}).then((d) => d.bundles ?? {}).catch((e) => {
+			console.warn("models/tiers.json did not load:", e);
+			if (_tiers === p) _tiers = void 0;
+			return {};
+		});
+		_tiers = p;
+	}
+	return _tiers;
+}
+async function bundleTiers(slug) {
+	return (await fetchModelTiers())[slug];
 }
-function allowedTier(meta) {
-	if (textureAllowed(meta.exports.high.distribution)) return "high";
-	if (meta.exports.low && textureAllowed(meta.exports.low.distribution)) return "low";
+function tierAllowed(tiers, tier) {
+	const info = tiers[tier];
+	return !!info && textureAllowed(info.distribution);
+}
+function allowedTier(tiers) {
+	if (!tiers) return "high";
+	return ["high", "low"].find((tier) => tierAllowed(tiers, tier));
 }
 function shapeModelCredit(meta) {
 	return meta.credit ?? meta.exports.high.credit;
@@ -17700,13 +17741,13 @@ async function loadSpacecraftModel(bo, modelScene, ctx) {
 		if ((bo.modelLoadEpoch ?? 0) !== epoch) return;
 		if (bo.mesh) bo.mesh.visible = false;
 		setHaloLoading(bo, true);
-		const meta = await fetchBundleMeta(slug);
-		const tier = allowedTier(meta);
-		if (!tier) {
+		const wanted = allowedTier(await bundleTiers(slug));
+		const loaded = wanted && await loadModelBundle(slug, wanted);
+		if (!loaded) {
 			bo.noPhysical = "model";
 			return;
 		}
-		const gltf = await _loader.loadAsync(versionedUrl(`/v1/models/${slug}/${tier}.glb`, "models"));
+		const { gltf, meta, tier } = loaded;
 		if ((bo.modelLoadEpoch ?? 0) !== epoch || !bo.mesh) {
 			disposeGltf(gltf.scene);
 			return;
@@ -17758,20 +17799,9 @@ async function loadNaturalBodyModel(bo, ctx) {
 			return;
 		}
 		if (detail.global?.orientation && !bo.body.orientation) applyBodyOrientation(bo.body, detail.global.orientation, detail.global.nut_prec, ctx);
-		const metaPromise = fetchBundleMeta(slug);
-		const gltf = await _loader.loadAsync(versionedUrl(`/v1/models/${slug}/high.glb`, "models"));
-		if ((bo.modelLoadEpoch ?? 0) !== epoch) {
-			disposeGltf(gltf.scene);
-			return;
-		}
-		let meta;
-		try {
-			meta = await metaPromise;
-		} catch (e) {
-			disposeGltf(gltf.scene);
-			console.warn(`Failed to load shape-model metadata for ${slug}:`, e);
-			return;
-		}
+		const loaded = await loadModelBundle(slug, "high");
+		if (!loaded) return;
+		const { gltf, meta } = loaded;
 		if ((bo.modelLoadEpoch ?? 0) !== epoch) {
 			disposeGltf(gltf.scene);
 			return;
@@ -37261,6 +37291,7 @@ var TIGHT_FAR_RELEASE = 2.3;
 var SUN_PROXY_FAR_FRACTION = .9;
 var _sunLiftDir = new Vector3();
 var _lookDir = new Vector3();
+var _groundDir = new Vector3();
 var SPIN_FOLLOW_NONE = 2;
 var _spinNow = new Quaternion();
 var _spinStep = new Quaternion();
@@ -38673,6 +38704,15 @@ var SceneRenderer = class SceneRenderer {
 		const cam = this.camera;
 		return !(cam.position.distanceToSquared(pos) <= cam.position.lengthSq() * 1e-10 && 8 * (1 - Math.abs(cam.quaternion.dot(quat))) <= 1e-8);
 	}
+	groundUnderCamera() {
+		const body = this.focusController?.current;
+		if (!body) return null;
+		const down = _groundDir.copy(this.controls.orbitPosition).normalize();
+		return {
+			groundKm: this.motionGround.radiusKm(body, down) ?? effectiveRadiusKm(body.data),
+			clearanceKm: this.motionGround.clearanceKm(body)
+		};
+	}
 	lookSurfaceRadius = (direction) => {
 		const focused = this.focusController.current;
 		if (this.holdingCamera || this.focus.aim || !focused) return null;
@@ -42348,6 +42388,9 @@ var SpaceMap = class {
 	getLimits() {
 		return { ...this.limits };
 	}
+	getClosestApproach() {
+		return this.renderer?.groundUnderCamera() ?? null;
+	}
 	applyLimits() {
 		const l = this.limits;
 		const band = {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "spacemap",
-	"version": "0.1.24",
+	"version": "0.1.25",
 	"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",