fix flyTo not zooming to exact given zoom (mapbox#6828)

pirxpilot · Jun 16, 2019 · a152d07 · a152d07
1 parent 9904cd2
commit a152d07
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/ui/camera.js b/src/ui/camera.js
@@ -823,7 +823,7 @@ class Camera extends Evented {
             // s: The distance traveled along the flight path, measured in ρ-screenfuls.
             const s = k * S;
             const scale = 1 / w(s);
-            tr.zoom = startZoom + tr.scaleZoom(scale);
+            tr.zoom = k === 1 ? zoom : startZoom + tr.scaleZoom(scale);
 
             if (this._rotating) {
                 tr.bearing = interpolate(startBearing, bearing, k);

diff --git a/test/unit/ui/camera.test.js b/test/unit/ui/camera.test.js
@@ -912,6 +912,13 @@ test('camera', (t) => {
             t.end();
         });
 
+        t.test('zooms to integer level without floating point errors', (t) => {
+            const camera = createCamera({zoom: 0.6});
+            camera.flyTo({ zoom: 2, animate: false });
+            t.equal(camera.getZoom(), 2);
+            t.end();
+        });
+
         t.test('rotates to specified bearing', (t) => {
             const camera = createCamera();
             camera.flyTo({ bearing: 90, animate: false });