Fix/remaining issues camera inside terrain

src/geo/transform.ts

@@ -538,12 +538,15 @@ export class Transform {
         const requiredWorldSize = requiredPixelPerMeter / mercatorZfromAltitude(1, center.lat);
         // Since worldSize = this.tileSize * scale:
         const requiredScale = requiredWorldSize / this.tileSize;
-        const zoom = this.scaleZoom(requiredScale);
-
-        // update matrices
-        this._elevation = elevation;
-        this._center = center;
-        this.zoom = zoom;
+        try {
+            const zoom = this.scaleZoom(requiredScale);
+            // update matrices
+            this._elevation = elevation;
+            this._center = center;
+            this.zoom = zoom;
+        } catch (_e) {
+            console.error(`Could not recalculate zoom. requiredScale: ${requiredScale}`);
+        }
     }
 
     setLocationAtPoint(lnglat: LngLat, point: Point) {

src/ui/camera.ts

@@ -1085,7 +1085,9 @@
 
     _finalizeElevation() {
         this._elevationFreeze = false;
-        this.transform.recalculateZoom(this.terrain);
+        const tr = this._getTransformForUpdate();
+        tr.recalculateZoom(this.terrain);
+        this._applyUpdatedTransform(tr);
     }
 
     /**
@@ -1101,7 +1103,7 @@
         if (!this.transformCameraUpdate && !this.terrain) return this.transform;
 
         if (!this._requestedCameraState) {
             this._requestedCameraState = this.transform.clone();
         }
         return this._requestedCameraState;
     }
@@ -1119,7 +1121,9 @@
      */
     _elevateCameraIfInsideTerrain(tr: Transform) : { pitch?: number; zoom?: number } {
         const camera = tr.getCameraPosition();
-        const minAltitude = this.terrain.getElevationForLngLatZoom(camera.lngLat, tr.zoom);
+        const surfacePadding = Math.min(500, 20 * (25 - tr.zoom));
+        const minAltitude = this.terrain.getElevationForLngLatZoom(
+            camera.lngLat, tr.zoom) + surfacePadding;
         if (camera.altitude < minAltitude) {
             const newCamera = this.calculateCameraOptionsFromTo(
                 camera.lngLat, minAltitude, tr.center, tr.elevation);