Merge 76080eb into 7006abe

visgl · Jul 4, 2019 · b63cb2d · b63cb2d
2 parents 7006abe + 76080eb
commit b63cb2d
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 2 deletions.
diff --git a/modules/3d-tiles/src/tileset/tileset-3d.js b/modules/3d-tiles/src/tileset/tileset-3d.js
@@ -9,6 +9,35 @@ import Tileset3DTraverser from './tileset-3d-traverser';
 
 // import Tileset3DCache from './tileset-3d-cache';
 
+// TODO move to Math library?
+const WGS84_RADIUS_X = 6378137.0;
+const WGS84_RADIUS_Y = 6378137.0;
+const WGS84_RADIUS_Z = 6356752.3142451793;
+
+function getZoom(boundingVolume) {
+  const {halfAxes, radius, width, height} = boundingVolume;
+
+  if (halfAxes) {
+    // OrientedBoundingBox
+    const [x, , , , y, , , , z] = halfAxes;
+    const zoomX = Math.log2(WGS84_RADIUS_X / x / 2);
+    const zoomY = Math.log2(WGS84_RADIUS_Y / y / 2);
+    const zoomZ = Math.log2(WGS84_RADIUS_Z / z / 2);
+    return (zoomX + zoomY + zoomZ) / 3;
+  } else if (radius) {
+    // BoundingSphere
+    return Math.log2(WGS84_RADIUS_Z / radius);
+  } else if (height && width) {
+    // BoundingRectangle
+    const zoomX = Math.log2(WGS84_RADIUS_X / width);
+    const zoomY = Math.log2(WGS84_RADIUS_Y / height);
+
+    return (zoomX + zoomY) / 2;
+  }
+
+  return 18;
+}
+
 const DEFAULT_OPTIONS = {
   basePath: '',
 
@@ -448,7 +477,8 @@ export default class Tileset3D {
     result = result || new Vector3();
     result.copy(center);
     Ellipsoid.WGS84.cartesianToCartographic(result, result);
-    result[2] = 18;
+
+    result[2] = getZoom(root.boundingVolume);
     return result;
   }
 

diff --git a/website/package.json b/website/package.json
@@ -27,7 +27,7 @@
     "@luma.gl/constants": "^7.1.1",
     "@luma.gl/core": "^7.1.1",
     "@luma.gl/webgl": "^7.1.1",
-    "@probe.gl/stats-widget": "^3.0.1",
+    "@probe.gl/stats-widget": "^3.1.0-alpha.2",
     "react": "^16.6.0",
     "react-dom": "^16.6.0",
     "react-map-gl": "^5.0.0",