@ifc-lite/viewer 1.19.1 → 1.21.0

package/dist/assets/{sandbox-tccwm5Bo.js → sandbox-DPD1ROr0.js}

@@ -1,5 +1,5 @@
-const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["assets/index-D8Epw-e7.js","assets/cesium-DUOzBlqv.js","assets/arrow-CZ5kQ26f.js","assets/cesium-ADbP7waU.css","assets/exporters-xbXqEDlO.js","assets/bcf-4K724hw0.js","assets/zip-DBEtpeu6.js","assets/drawing-2d-DoxKMqbO.js","assets/lens-CSASnhAL.js","assets/server-client-LoWPK1N2.js","assets/ids-2WdONLlu.js","assets/three-CDRZThFA.js","assets/index-BXeEKqJG.css","assets/browser-C5TFR7sH.js"])))=>i.map(i=>d[i]);
-import { P as _, Q as qe, E as Ge, g as hn, e as pn, i as vt, n as Nt, _ as Re, __tla as __tla_0 } from "./exporters-xbXqEDlO.js";
+const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["assets/index-DVNSvEMh.js","assets/cesium-DUOzBlqv.js","assets/arrow-CZ5kQ26f.js","assets/cesium-ADbP7waU.css","assets/exporters-u0sz2Upj.js","assets/bcf-4K724hw0.js","assets/zip-DBEtpeu6.js","assets/drawing-2d-Bjy8YPrg.js","assets/lens-CSASnhAL.js","assets/server-client-DP8fMPY9.js","assets/ids-B7AXEv7h.js","assets/three-CDRZThFA.js","assets/index-CSWgTe1s.css","assets/browser-C5TFR7sH.js"])))=>i.map(i=>d[i]);
+import { P as _, Q as qe, E as Ge, q as hn, r as pn, s as vt, t as Nt, _ as Re, __tla as __tla_0 } from "./exporters-u0sz2Upj.js";
 import { g as Q } from "./bcf-4K724hw0.js";
 import { h as ut, B as fn } from "./lens-CSASnhAL.js";
 let Wi, Hi, Mi, Jt, gi, _i, Ki, Ji, Vi, zi, An, Qi, Xi, qi, Ui, ji, Gi, vn, Bi, Zi, er, Ts, tr, Yi, bi, Si, nr;
@@ -1218,7 +1218,7 @@ let __tla = Promise.all([
                     t.Elevation
                 ]
             });
-            return this.line(e, "IFCBUILDINGSTOREY", `'${s}',#${this.ownerHistoryId},'${y(i)}',${r},$,$,#${a},$,.ELEMENT.,${o}`), this.storeyIds.push(e), this.storeyElements.set(e, []), this.storeyPlacements.set(e, a), this.entities.push({
+            return this.line(e, "IFCBUILDINGSTOREY", `'${s}',#${this.ownerHistoryId},'${y(i)}',${r},$,#${a},$,$,.ELEMENT.,${o}`), this.storeyIds.push(e), this.storeyElements.set(e, []), this.storeyPlacements.set(e, a), this.entities.push({
                 expressId: e,
                 type: "IfcBuildingStorey",
                 Name: i
@@ -9472,7 +9472,7 @@ Attempted to suspend at:`);
         let t = Je(await n), [e, s, { QuickJSWASMModule: i }] = await Promise.all([
             t.importModuleLoader().then(Je),
             t.importFFI(),
-            Re(()=>import("./index-D8Epw-e7.js").then(async (m)=>{
+            Re(()=>import("./index-DVNSvEMh.js").then(async (m)=>{
                     await m.__tla;
                     return m;
                 }).then((a)=>a.m), __vite__mapDeps([0,1,2,3,4,5,6,7,8,9,10,11,12])).then(Je)

package/dist/assets/{server-client-LoWPK1N2.js → server-client-DP8fMPY9.js}

@@ -1,4 +1,4 @@
-import { _ as de, __tla as __tla_0 } from "./exporters-xbXqEDlO.js";
+import { _ as de, __tla as __tla_0 } from "./exporters-u0sz2Upj.js";
 let We, je;
 let __tla = Promise.all([
     (()=>{

package/dist/assets/{wasm-bridge-BsJGgPMs.js → wasm-bridge-CErti6zX.js}

@@ -1 +1 @@
-import{I as f,a as m}from"./exporters-xbXqEDlO.js";import"./bcf-4K724hw0.js";import"./zip-DBEtpeu6.js";import"./cesium-DUOzBlqv.js";import"./arrow-CZ5kQ26f.js";class b{bridge;initialized=!1;constructor(){this.bridge=new f}async init(){this.initialized||(await this.bridge.init(),this.initialized=!0)}isInitialized(){return this.initialized}toIfcContent(e){return typeof e=="string"?e:new TextDecoder().decode(e)}async processGeometry(e){this.initialized||await this.init(),performance.now();const i=new m(this.bridge.getApi(),this.toIfcContent(e)),r=i.collectMeshes(),s=i.getBuildingRotation();performance.now();let o=0,n=0;for(const a of r)o+=a.positions.length/3,n+=a.indices.length/3;return{meshes:r,totalVertices:o,totalTriangles:n,coordinateInfo:{originShift:{x:0,y:0,z:0},originalBounds:{min:{x:0,y:0,z:0},max:{x:0,y:0,z:0}},shiftedBounds:{min:{x:0,y:0,z:0},max:{x:0,y:0,z:0}},hasLargeCoordinates:!1,buildingRotation:s}}}async processGeometryStreaming(e,i){this.initialized||await this.init();const r=performance.now(),s=new m(this.bridge.getApi(),this.toIfcContent(e));let o=0,n=0,c=0;try{for await(const t of s.collectMeshesStreaming(50)){if(t&&typeof t=="object"&&"type"in t&&t.type==="colorUpdate")continue;const l=t;o+=l.length;for(const g of l)n+=g.positions.length/3,c+=g.indices.length/3;i.onBatch?.({meshes:l,progress:{processed:o,total:o,currentType:"processing"}})}}catch(t){throw i.onError?.(t instanceof Error?t:new Error(String(t))),t}const d=performance.now()-r,h={totalMeshes:o,totalVertices:n,totalTriangles:c,parseTimeMs:d*.3,geometryTimeMs:d*.7};return i.onComplete?.(h),h}getApi(){return this.bridge.getApi()}}export{b as WasmBridge};
+import{I as f,u as m}from"./exporters-u0sz2Upj.js";import"./bcf-4K724hw0.js";import"./zip-DBEtpeu6.js";import"./cesium-DUOzBlqv.js";import"./arrow-CZ5kQ26f.js";class b{bridge;initialized=!1;constructor(){this.bridge=new f}async init(){this.initialized||(await this.bridge.init(),this.initialized=!0)}isInitialized(){return this.initialized}toIfcContent(e){return typeof e=="string"?e:new TextDecoder().decode(e)}async processGeometry(e){this.initialized||await this.init(),performance.now();const i=new m(this.bridge.getApi(),this.toIfcContent(e)),r=i.collectMeshes(),s=i.getBuildingRotation();performance.now();let o=0,n=0;for(const a of r)o+=a.positions.length/3,n+=a.indices.length/3;return{meshes:r,totalVertices:o,totalTriangles:n,coordinateInfo:{originShift:{x:0,y:0,z:0},originalBounds:{min:{x:0,y:0,z:0},max:{x:0,y:0,z:0}},shiftedBounds:{min:{x:0,y:0,z:0},max:{x:0,y:0,z:0}},hasLargeCoordinates:!1,buildingRotation:s}}}async processGeometryStreaming(e,i){this.initialized||await this.init();const r=performance.now(),s=new m(this.bridge.getApi(),this.toIfcContent(e));let o=0,n=0,c=0;try{for await(const t of s.collectMeshesStreaming(50)){if(t&&typeof t=="object"&&"type"in t&&t.type==="colorUpdate")continue;const l=t;o+=l.length;for(const g of l)n+=g.positions.length/3,c+=g.indices.length/3;i.onBatch?.({meshes:l,progress:{processed:o,total:o,currentType:"processing"}})}}catch(t){throw i.onError?.(t instanceof Error?t:new Error(String(t))),t}const d=performance.now()-r,h={totalMeshes:o,totalVertices:n,totalTriangles:c,parseTimeMs:d*.3,geometryTimeMs:d*.7};return i.onComplete?.(h),h}getApi(){return this.bridge.getApi()}}export{b as WasmBridge};

package/dist/assets/workerHelpers-CBbWSJmd.js

@@ -0,0 +1,36 @@
+let a;
+let __tla = (async ()=>{
+    function o(r, t) {
+        return new Promise((e)=>{
+            r.addEventListener("message", function s({ data: n }) {
+                n?.type === t && (r.removeEventListener("message", s), e(n));
+            });
+        });
+    }
+    o(self, "wasm_bindgen_worker_init").then(async ({ init: r, receiver: t })=>{
+        const e = await import("./ifc-lite-DfZHk36-.js");
+        await e.default(r), postMessage({
+            type: "wasm_bindgen_worker_ready"
+        }), e.wbg_rayon_start_worker(t);
+    });
+    a = async function(r, t, e) {
+        if (e.numThreads() === 0) throw new Error("num_threads must be > 0.");
+        const s = {
+            type: "wasm_bindgen_worker_init",
+            init: {
+                module_or_path: r,
+                memory: t
+            },
+            receiver: e.receiver()
+        };
+        await Promise.all(Array.from({
+            length: e.numThreads()
+        }, async ()=>{
+            const n = new Worker(self.location.href, {
+                type: "module"
+            });
+            return n.postMessage(s), await o(n, "wasm_bindgen_worker_ready"), n;
+        })), e.build();
+    };
+})();
+export { a as s, __tla };

package/dist/index.html

@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
   <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover">
   <title>IFClite Viewer</title>
   <script>
     // Apply theme before first paint to prevent flash of wrong theme.
@@ -50,20 +50,20 @@
   <meta name="theme-color" content="#7aa2f7">
   <meta name="msapplication-TileColor" content="#1a1b26">
   <meta name="msapplication-TileImage" content="/favicon-192x192-cropped.png">
-  <script type="module" crossorigin src="/assets/index-D8Epw-e7.js"></script>
+  <script type="module" crossorigin src="/assets/index-DVNSvEMh.js"></script>
   <link rel="modulepreload" crossorigin href="/assets/arrow-CZ5kQ26f.js">
   <link rel="modulepreload" crossorigin href="/assets/cesium-DUOzBlqv.js">
   <link rel="modulepreload" crossorigin href="/assets/zip-DBEtpeu6.js">
   <link rel="modulepreload" crossorigin href="/assets/bcf-4K724hw0.js">
-  <link rel="modulepreload" crossorigin href="/assets/exporters-xbXqEDlO.js">
+  <link rel="modulepreload" crossorigin href="/assets/exporters-u0sz2Upj.js">
   <link rel="modulepreload" crossorigin href="/assets/lens-CSASnhAL.js">
-  <link rel="modulepreload" crossorigin href="/assets/sandbox-tccwm5Bo.js">
-  <link rel="modulepreload" crossorigin href="/assets/drawing-2d-DoxKMqbO.js">
-  <link rel="modulepreload" crossorigin href="/assets/server-client-LoWPK1N2.js">
-  <link rel="modulepreload" crossorigin href="/assets/ids-2WdONLlu.js">
+  <link rel="modulepreload" crossorigin href="/assets/sandbox-DPD1ROr0.js">
+  <link rel="modulepreload" crossorigin href="/assets/drawing-2d-Bjy8YPrg.js">
+  <link rel="modulepreload" crossorigin href="/assets/server-client-DP8fMPY9.js">
+  <link rel="modulepreload" crossorigin href="/assets/ids-B7AXEv7h.js">
   <link rel="modulepreload" crossorigin href="/assets/three-CDRZThFA.js">
   <link rel="stylesheet" crossorigin href="/assets/cesium-ADbP7waU.css">
-  <link rel="stylesheet" crossorigin href="/assets/index-BXeEKqJG.css">
+  <link rel="stylesheet" crossorigin href="/assets/index-CSWgTe1s.css">
 </head>
 <body>
   <div id="root"></div>

package/index.html

@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
   <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover">
   <title>IFClite Viewer</title>
   <script>
     // Apply theme before first paint to prevent flash of wrong theme.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ifc-lite/viewer",
-  "version": "1.19.1",
+  "version": "1.21.0",
   "description": "IFC-Lite viewer application",
   "type": "module",
   "dependencies": {
@@ -51,25 +51,25 @@
     "zustand": "^4.4.0",
     "@ifc-lite/bcf": "^1.15.3",
     "@ifc-lite/cache": "^1.14.5",
-    "@ifc-lite/data": "^1.15.2",
-    "@ifc-lite/drawing-2d": "^1.15.3",
+    "@ifc-lite/data": "^1.17.0",
+    "@ifc-lite/drawing-2d": "^1.16.0",
     "@ifc-lite/encoding": "^1.14.6",
     "@ifc-lite/export": "^1.18.0",
-    "@ifc-lite/geometry": "^1.17.0",
-    "@ifc-lite/ids": "^1.14.11",
+    "@ifc-lite/geometry": "^1.18.1",
+    "@ifc-lite/ids": "^1.15.1",
     "@ifc-lite/lens": "^1.14.4",
-    "@ifc-lite/lists": "^1.14.10",
+    "@ifc-lite/lists": "^1.14.12",
     "@ifc-lite/mcp": "^0.2.0",
     "@ifc-lite/mutations": "^1.15.0",
-    "@ifc-lite/parser": "^2.3.0",
-    "@ifc-lite/pointcloud": "^0.2.0",
+    "@ifc-lite/parser": "^2.4.0",
+    "@ifc-lite/pointcloud": "^0.3.0",
     "@ifc-lite/query": "^1.14.7",
-    "@ifc-lite/renderer": "^1.18.0",
+    "@ifc-lite/renderer": "^1.20.0",
     "@ifc-lite/sandbox": "^1.15.0",
     "@ifc-lite/sdk": "^1.15.0",
     "@ifc-lite/server-client": "^1.15.3",
     "@ifc-lite/spatial": "^1.14.5",
-    "@ifc-lite/wasm": "^1.16.8"
+    "@ifc-lite/wasm": "^1.16.10"
   },
   "devDependencies": {
     "@tailwindcss/postcss": "^4.1.18",

package/src/components/viewer/BasketPresentationDock.tsx

@@ -46,6 +46,7 @@ export function BasketPresentationDock() {
   const basketViews = useViewerStore((s) => s.basketViews);
   const activeBasketViewId = useViewerStore((s) => s.activeBasketViewId);
   const basketPresentationVisible = useViewerStore((s) => s.basketPresentationVisible);
+  const isMobile = useViewerStore((s) => s.isMobile);
 
   const showPinboard = useViewerStore((s) => s.showPinboard);
   const clearIsolation = useViewerStore((s) => s.clearIsolation);
@@ -165,6 +166,8 @@ export function BasketPresentationDock() {
     setBasketViewTransitionMs(viewId, Math.round(seconds * 1000));
   }, [setBasketViewTransitionMs]);
 
+  if (isMobile) return null;
+
   if (!basketPresentationVisible) {
     return (
       <div className="absolute bottom-4 left-1/2 -translate-x-1/2 z-30 pointer-events-none">

package/src/components/viewer/CesiumOverlay.tsx

@@ -26,6 +26,8 @@ import type { MapConversion, ProjectedCRS } from '@ifc-lite/parser';
 import type { CoordinateInfo, GeometryResult } from '@ifc-lite/geometry';
 import { getGlobalRenderer } from '@/hooks/useBCF';
 import { createCesiumBridge, type CesiumBridge } from '@/lib/geo/cesium-bridge';
+import { findClampAnchorY } from '@/lib/geo/clamp-anchor';
+import { getEffectiveHorizontalScale } from '@/lib/geo/effective-georef';
 
 // Lazy-loaded Cesium module and CSS
 let cesiumPromise: Promise<typeof import('cesium')> | null = null;
@@ -167,11 +169,16 @@ function buildModelMatrix(
   Cesium: typeof import('cesium'),
   bridge: CesiumBridge,
   mapConversion: MapConversion | undefined,
+  projectedCRS: ProjectedCRS | undefined,
   coordinateInfo: CoordinateInfo | undefined,
-  clamp: boolean,
-  terrainH: number | null,
+  lengthUnitScale: number,
 ) {
-  const hScale = mapConversion?.scale ?? 1.0;
+  // GLB vertices are in viewer-space metres (geometry engine converts during
+  // extraction). IfcMapConversion.Scale is defined per IFC spec relative to
+  // the project length unit, so applying it raw to metre-converted geometry
+  // double-scales the model — see issue #595. Use the effective scale.
+  const mapUnitScale = projectedCRS?.mapUnitScale ?? lengthUnitScale;
+  const hScale = getEffectiveHorizontalScale(mapConversion?.scale, mapUnitScale, lengthUnitScale);
   const absc = mapConversion?.xAxisAbscissa ?? 1.0;
   const ordi = mapConversion?.xAxisOrdinate ?? 0.0;
   const bounds = coordinateInfo?.originalBounds;
@@ -180,15 +187,11 @@ function buildModelMatrix(
   const mvy = bounds ? (bounds.min.y + bounds.max.y) / 2 : 0;
   const mvz = bounds ? (bounds.min.z + bounds.max.z) / 2 : 0;
 
-  let placementHeight = bridge.modelOrigin.height;
-  if (clamp && terrainH !== null) {
-    const minY = bounds?.min.y ?? 0;
-    const bottomOffset = mvy - minY; // already in metres
-    placementHeight = terrainH + bottomOffset;
-  }
-
+  // bridge.modelOrigin.height is the placement altitude — Effect 2 already
+  // baked terrain clamping (when applicable) into it before constructing the
+  // bridge, so there's no per-frame clamp adjustment to make here.
   const origin = Cesium.Cartesian3.fromDegrees(
-    bridge.modelOrigin.longitude, bridge.modelOrigin.latitude, placementHeight,
+    bridge.modelOrigin.longitude, bridge.modelOrigin.latitude, bridge.modelOrigin.height,
   );
   const enuToEcef = Cesium.Transforms.eastNorthUpToFixedFrame(origin);
   // No lengthUnitScale here — viewer-space GLB vertices are already in metres.
@@ -212,6 +215,10 @@ export interface CesiumOverlayProps {
   geometryResult?: GeometryResult | null;
   /** IFC project length unit → metres (e.g. 0.001 for mm models). Default 1. */
   lengthUnitScale?: number;
+  /** IfcBuildingStorey elevations (express id → metres, viewer-Y aligned).
+   *  Used to clamp the model's ground-floor storey to terrain instead of
+   *  the lowest geometry vertex (which can be a basement or foundation). */
+  storeyElevations?: Map<number, number>;
 }
 
 export function CesiumOverlay({
@@ -220,6 +227,7 @@ export function CesiumOverlay({
   coordinateInfo,
   geometryResult,
   lengthUnitScale = 1,
+  storeyElevations,
 }: CesiumOverlayProps) {
   const containerRef = useRef<HTMLDivElement>(null);
   const viewerRef = useRef<InstanceType<typeof import('cesium').Viewer> | null>(null);
@@ -235,25 +243,23 @@ export function CesiumOverlay({
   const ionToken = useViewerStore((s) => s.cesiumIonToken);
   const terrainEnabled = useViewerStore((s) => s.cesiumTerrainEnabled);
   const terrainClamp = useViewerStore((s) => s.cesiumTerrainClamp);
-  const setCesiumTerrainClamp = useViewerStore((s) => s.setCesiumTerrainClamp);
   const terrainHeight = useViewerStore((s) => s.cesiumTerrainHeight);
   const setCesiumTerrainHeight = useViewerStore((s) => s.setCesiumTerrainHeight);
   const setCesiumTerrainClipY = useViewerStore((s) => s.setCesiumTerrainClipY);
   const setCesiumGlbLoaded = useViewerStore((s) => s.setCesiumGlbLoaded);
 
-  // Use refs so the camera sync loop always reads the latest values
-  const terrainClampRef = useRef(terrainClamp);
-  const terrainHeightRef = useRef(terrainHeight);
-  terrainClampRef.current = terrainClamp;
-  terrainHeightRef.current = terrainHeight;
-
-  // Track whether we've auto-clamped to terrain (only once, so user can still uncheck)
-  const autoClampedRef = useRef(false);
-
   // Track the Cesium model (IFC geometry loaded as glTF for correct world positioning)
   const cesiumModelRef = useRef<{ modelMatrix: any; destroy?: () => void } | null>(null);
   const glbCacheRef = useRef<{ meshCount: number; glb: Uint8Array } | null>(null);
 
+  // Last-known placement altitude (in metres) used to keep the user's WORLD
+  // camera position stable across bridge rebuilds. When the user toggles the
+  // clamp or edits OrthogonalHeight, the model placement changes and the
+  // entire viewer→ECEF frame translates with it; we offset the IFC viewer's
+  // camera Y by the inverse so the user perceives the model moving instead
+  // of the camera being dragged along.
+  const prevPlacementRef = useRef<number | null>(null);
+
   // ─── Effect 1: Create/destroy the Cesium viewer (heavy, rare) ───────────
   // Only depends on cesiumEnabled, ionToken, terrainEnabled, dataSource.
   // NOT on mapConversion/projectedCRS — those are handled by Effect 2.
@@ -296,10 +302,14 @@ export function CesiumOverlay({
 
         if (cancelled) { viewer.destroy(); return; }
 
-        // Disable Cesium's user input — the IFC viewer controls the camera.
-        // Keep collision detection off since we set the camera programmatically.
+        // Disable Cesium's user input — the IFC viewer drives the camera,
+        // and any input Cesium intercepts (even a stray wheel/touch event
+        // past pointer-events:none) interferes with our orbit/zoom and
+        // produces "stuck to terrain" symptoms. enableInputs is the
+        // master kill-switch; the per-mode flags below are belt-and-braces.
         const scene = viewer.scene;
         const sscc = scene.screenSpaceCameraController;
+        sscc.enableInputs = false;
         sscc.enableRotate = false;
         sscc.enableTranslate = false;
         sscc.enableZoom = false;
@@ -386,122 +396,150 @@ export function CesiumOverlay({
     };
   }, [cesiumEnabled, ionToken, terrainEnabled, dataSource]);
 
-  // ─── Effect 2: Rebuild coordinate bridge when georef changes (fast) ─────
-  // This is the live-edit handler. When the user changes EPSG, eastings,
-  // northings, rotation, etc., we rebuild the bridge and fly to the new spot.
+  // ─── Effect 2: Build the coordinate bridge with terrain-aware placement ─
+  // Precomputes the model placement (terrain-clamped if applicable) BEFORE
+  // building the bridge that the GLB and camera will share. This way the
+  // model loads into Cesium at its final altitude — no post-load shifting,
+  // no camera/model frame divergence, no compensation gymnastics.
+  //
+  // Sequence:
+  //   1. Build a tentative bridge to recover the model's WGS84 lat/lon.
+  //   2. Query terrain at that lat/lon (sync first, async with retry next).
+  //   3. Decide whether to clamp (user toggle OR model authored below terrain).
+  //   4. Rebuild the bridge with placementHeight baked into its enuToEcef
+  //      origin so model matrix and camera frame share a single altitude.
+  //   5. Push terrain-derived state (height, clip Y, clamp toggle) and
+  //      install the bridge.
   useEffect(() => {
     if (status !== 'ready' || !mapConversion || !projectedCRS) {
       bridgeRef.current = null;
+      prevPlacementRef.current = null;
       return;
     }
 
     let cancelled = false;
 
     (async () => {
-      const bridge = await createCesiumBridge(mapConversion, projectedCRS, coordinateInfo, lengthUnitScale);
-      if (cancelled) return;
+      const Cesium = cesiumModule;
+      const viewer = viewerRef.current;
+      if (!Cesium || !viewer) return;
 
-      if (!bridge) {
+      const tentative = await createCesiumBridge(
+        mapConversion, projectedCRS, coordinateInfo, lengthUnitScale,
+      );
+      if (cancelled) return;
+      if (!tentative) {
         bridgeRef.current = null;
         return;
       }
 
-      const prevBridge = bridgeRef.current;
-      bridgeRef.current = bridge;
-      autoClampedRef.current = false; // reset for new bridge
-      // Bump version so terrain query effect re-runs now that bridge is ready
-      setBridgeVersion((v) => v + 1);
-
-      // Fly to the new model location (smooth animation)
-      const viewer = viewerRef.current;
-      const Cesium = cesiumModule;
-      if (viewer && Cesium) {
-        const { modelOrigin } = bridge;
-
-        const isFirstPosition = !prevBridge;
-        const target = Cesium.Cartesian3.fromDegrees(
-          modelOrigin.longitude, modelOrigin.latitude, modelOrigin.height,
+      // Query terrain at the model's location. queryTerrainHeight tries
+      // Cesium's sync sources first (globe.getHeight, scene.sampleHeight),
+      // then Open-Meteo as a fast network fallback that works even with
+      // Google Photorealistic 3D Tiles (where there's no Cesium terrain
+      // provider for getHeight to read). Cached per-session.
+      const t0 = performance.now();
+      let terrainH: number | null = null;
+      try { terrainH = await tentative.queryTerrainHeight(Cesium, viewer); }
+      catch (err) { console.warn('[CesiumOverlay] terrain query failed:', err); }
+      if (cancelled) return;
+      const terrainMs = performance.now() - t0;
+
+      const bounds = coordinateInfo?.originalBounds;
+      const mvy = bounds ? (bounds.min.y + bounds.max.y) / 2 : 0;
+      const minY = bounds?.min.y ?? 0;
+      // Clamp anchor: viewer-Y of the storey nearest elevation 0 (typical
+      // ground floor), falling back to bounds.min.y. Without this, basements
+      // and foundations drag the model deep below terrain.
+      const clampAnchorY = findClampAnchorY(bounds, storeyElevations);
+      const anchorOffset = mvy - clampAnchorY;
+      const ifcOHeight = tentative.modelOrigin.height;
+      // Clamp is purely the user's choice. We do NOT auto-clamp on top of
+      // the user's setting — that would reactivate the toggle the moment
+      // the user disables it (since terrain is almost always above sea-level
+      // OrthogonalHeights, the auto condition would re-fire forever and the
+      // checkbox becomes un-uncheckable).
+      const placementHeight =
+        terrainClamp && terrainH !== null
+          ? terrainH + anchorOffset
+          : ifcOHeight;
+
+      console.debug(
+        `[CesiumOverlay] placement decision: terrain=${terrainH?.toFixed(2) ?? 'null'}m`
+        + ` ifcOHeight=${ifcOHeight.toFixed(2)}m anchorY=${clampAnchorY.toFixed(2)}m`
+        + ` (minY=${minY.toFixed(2)}m, ${storeyElevations?.size ?? 0} storeys)`
+        + ` clamp=${terrainClamp} placement=${placementHeight.toFixed(2)}m`
+        + ` (terrain query: ${terrainMs.toFixed(0)}ms)`
+      );
+
+      // Build the final bridge with the placement baked in (or reuse the
+      // tentative one when the placement matches its IFC-derived origin).
+      let bridge = tentative;
+      if (Math.abs(placementHeight - ifcOHeight) > 1e-6) {
+        const final = await createCesiumBridge(
+          mapConversion, projectedCRS, coordinateInfo, lengthUnitScale,
+          placementHeight,
         );
-
-        if (isFirstPosition) {
-          // First time: fly to the model location.
-          // On first load terrain tiles may not be ready, so globe.getHeight
-          // can return undefined. Use flyTo which handles terrain automatically,
-          // targeting a safe altitude above the model origin.
-          const safeHeight = Math.max(modelOrigin.height, 100);
-          viewer.camera.flyTo({
-            destination: Cesium.Cartesian3.fromDegrees(
-              modelOrigin.longitude, modelOrigin.latitude, safeHeight + 500,
-            ),
-            orientation: {
-              heading: 0,
-              pitch: Cesium.Math.toRadians(-45),
-              roll: 0,
-            },
-            duration: 0, // instant
-          });
-        } else if (prevBridge) {
-          // Georef edit: just re-render, the camera sync loop will pick
-          // up the new bridge on the next frame. No dramatic fly animation.
-          viewer.scene.requestRender();
+        if (cancelled) return;
+        if (!final) {
+          bridgeRef.current = null;
+          return;
         }
+        bridge = final;
       }
-    })();
-
-    return () => { cancelled = true; };
-  }, [status, mapConversion, projectedCRS, coordinateInfo, lengthUnitScale]);
-
-  // ─── Effect 2b: Query terrain height when bridge is ready ───────────────
-  // Also re-queries when terrainClamp is toggled on (in case first query failed)
-  useEffect(() => {
-    if (status !== 'ready') return;
-    const bridge = bridgeRef.current;
-    const viewer = viewerRef.current;
-    const Cesium = cesiumModule;
-    if (!bridge || !viewer || !Cesium) return;
 
-    let cancelled = false;
+      if (terrainH !== null) {
+        setCesiumTerrainHeight(terrainH);
+        // terrainClipY stays in viewer-space; it represents the world terrain
+        // altitude expressed in the bridge's frame so a clip plane at that Y
+        // matches the terrain surface. Use the clamp anchor (ground floor)
+        // rather than minY so the clip plane matches the user's ground level
+        // rather than the basement floor.
+        const terrainClipY = clampAnchorY + (terrainH - ifcOHeight);
+        setCesiumTerrainClipY(terrainClipY);
+      } else {
+        // Failed re-query (offline, API down) — clear stale store fields so
+        // the clip plane doesn't drift relative to the new bridge.
+        setCesiumTerrainHeight(null);
+        setCesiumTerrainClipY(null);
+      }
 
-    // Query immediately, then retry after a delay if terrain tiles weren't loaded yet
-    // Compute model center Y in viewer space for terrain clip offset
-    const bounds = coordinateInfo?.originalBounds;
-    const modelVY = bounds ? (bounds.min.y + bounds.max.y) / 2 : 0;
-    const modelMinY = bounds ? bounds.min.y : 0;
-
-    const doQuery = () => {
-      bridge.queryTerrainHeight(Cesium, viewer).then((h) => {
-        if (!cancelled && h !== null) {
-          setCesiumTerrainHeight(h);
-          // Compute terrain clip Y in viewer space (both h and modelOrigin.height are metres,
-          // bounds are also in metres since the geometry engine converts during extraction)
-          const terrainClipY = modelMinY + (h - bridge.modelOrigin.height);
-          setCesiumTerrainClipY(terrainClipY);
-
-          // Auto-enable terrain clamping if the model is significantly below terrain
-          // (only once — don't override if the user has manually toggled)
-          if (!autoClampedRef.current && h > bridge.modelOrigin.height + 5) {
-            autoClampedRef.current = true;
-            setCesiumTerrainClamp(true);
-            // Fly camera to the clamped position so the model is visible
-            viewer.camera.flyTo({
-              destination: Cesium.Cartesian3.fromDegrees(
-                bridge.modelOrigin.longitude, bridge.modelOrigin.latitude, h + 500,
-              ),
-              orientation: { heading: 0, pitch: Cesium.Math.toRadians(-45), roll: 0 },
-              duration: 0,
-            });
+      // World-camera stability: when this rebuild changes the placement
+      // altitude (clamp toggled, OrthogonalHeight edited), shift the IFC
+      // viewer-space camera Y by the inverse delta so the user's WORLD
+      // camera ECEF position stays put. Without this, the entire frame
+      // translates with the model and edits feel like the camera is
+      // moving instead of the model — exactly what the user reported.
+      const prevPlacement = prevPlacementRef.current;
+      prevPlacementRef.current = placementHeight;
+      if (prevPlacement !== null) {
+        const dh = placementHeight - prevPlacement;
+        // 5 cm threshold — rejects float jitter from cached terrain reads
+        // re-flowing through the same effect, while a real placement edit
+        // (clamp toggle, OrthogonalHeight change) is always far larger.
+        if (Math.abs(dh) > 0.05) {
+          const renderer = getGlobalRenderer();
+          if (renderer) {
+            const cam = renderer.getCamera();
+            const pos = cam.getPosition();
+            cam.setPosition(pos.x, pos.y - dh, pos.z);
+            console.debug(
+              `[CesiumOverlay] placement Δh=${dh.toFixed(2)}m → shifted IFC camera Y by ${(-dh).toFixed(2)}m to hold world camera`,
+            );
           }
         }
-      });
-    };
+      }
 
-    // First attempt
-    doQuery();
-    // Retry after 5s in case terrain tiles were still loading
-    const retryTimer = setTimeout(doQuery, 5000);
+      bridgeRef.current = bridge;
+      setBridgeVersion((v) => v + 1);
+    })();
 
-    return () => { cancelled = true; clearTimeout(retryTimer); };
-  }, [status, terrainEnabled, terrainClamp, bridgeVersion]);
+    return () => { cancelled = true; };
+    // terrainEnabled and ionToken intentionally omitted — Effect 1 already
+    // owns those (it destroys/recreates the viewer when they change), and
+    // listing them here would cause a redundant bridge rebuild while the
+    // viewer is being torn down.
+  }, [status, mapConversion, projectedCRS, coordinateInfo, lengthUnitScale, terrainClamp, storeyElevations]);
 
   // ─── Effect 2c: Load GLB into Cesium (only when geometry changes) ───────
   // This is the heavy operation — only re-runs when geometry actually changes.
@@ -545,7 +583,7 @@ export function CesiumOverlay({
         if (cancelled) return;
 
         // Build initial model matrix
-        const modelMatrix = buildModelMatrix(Cesium, bridge, mapConversion, coordinateInfo, terrainClampRef.current, terrainHeightRef.current);
+        const modelMatrix = buildModelMatrix(Cesium, bridge, mapConversion, projectedCRS, coordinateInfo, lengthUnitScale);
 
         const blob = new Blob([glbBytes as BlobPart], { type: 'model/gltf-binary' });
         const glbUrl = URL.createObjectURL(blob);
@@ -601,10 +639,15 @@ export function CesiumOverlay({
     const Cesium = cesiumModule;
     if (!model || !bridge || !viewer || !Cesium) return;
 
-    const newMatrix = buildModelMatrix(Cesium, bridge, mapConversion, coordinateInfo, terrainClamp, terrainHeight);
+    const newMatrix = buildModelMatrix(Cesium, bridge, mapConversion, projectedCRS, coordinateInfo, lengthUnitScale);
     model.modelMatrix = newMatrix;
     viewer.scene.requestRender();
-  }, [terrainClamp, terrainHeight, mapConversion, coordinateInfo, lengthUnitScale]);
+    // Depend on bridgeVersion so the matrix is rebuilt with the *new* bridge
+    // after async createCesiumBridge replaces it. Placement (terrain clamp)
+    // is now baked into bridge.modelOrigin.height by Effect 2, so terrain
+    // clamp/height changes drive a bridge rebuild instead of a per-frame
+    // matrix recomputation here.
+  }, [mapConversion, projectedCRS, coordinateInfo, lengthUnitScale, bridgeVersion]);
 
   // ─── Effect 3: Camera sync loop ─────────────────────────────────────────
   useEffect(() => {
@@ -632,7 +675,9 @@ export function CesiumOverlay({
       const camUp = camera.getUp();
       const fov = camera.getFOV();
 
-      // Sync Cesium camera (no terrain offset — model matrix handles clamping)
+      // bridge.modelOrigin.height already has the placement baked in (terrain
+      // clamp resolved at bridge creation by Effect 2), so the camera frame
+      // and the model matrix share the same enuToEcef origin altitude.
       bridge.syncCamera(Cesium, viewer, camPos, camTarget, camUp, fov);
 
       rafRef.current = requestAnimationFrame(syncCamera);