make flyTo check if it can fly to worldCopies (#4459)

mapbox · Mar 22, 2017 · 9941dde · 9941dde
1 parent 50439e0
commit 9941dde
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 9 deletions.
diff --git a/src/geo/transform.js b/src/geo/transform.js
@@ -52,6 +52,10 @@ class Transform {
         this.zoom = Math.min(this.zoom, zoom);
     }
 
+    get renderWorldCopies() {
+        return this._renderWorldCopies;
+    }
+
     get worldSize() {
         return this.tileSize * this.scale;
     }

diff --git a/src/ui/camera.js b/src/ui/camera.js
@@ -667,7 +667,7 @@ class Camera extends Evented {
 
         // If a path crossing the antimeridian would be shorter, extend the final coordinate so that
         // interpolating between the two endpoints will cross it.
-        if (Math.abs(tr.center.lng) + Math.abs(center.lng) > 180) {
+        if (tr.renderWorldCopies && Math.abs(tr.center.lng) + Math.abs(center.lng) > 180) {
             if (tr.center.lng > 0 && center.lng < 0) {
                 center.lng += 360;
             } else if (tr.center.lng < 0 && center.lng > 0) {

diff --git a/test/unit/ui/camera.test.js b/test/unit/ui/camera.test.js
@@ -10,16 +10,13 @@ const fixedNum = fixed.Num;
 
 test('camera', (t) => {
     function createCamera(options) {
-        const transform = new Transform(0, 20);
-        transform.resize(512, 512);
-
-        const camera = new Camera(transform, {});
+        options = options || {};
 
-        if (options) {
-            camera.jumpTo(options);
-        }
+        const transform = new Transform(0, 20, options.renderWorldCopies);
+        transform.resize(512, 512);
 
-        return camera;
+        return new Camera(transform, {})
+            .jumpTo(options);
     }
 
     t.test('#jumpTo', (t) => {
@@ -1011,6 +1008,44 @@ test('camera', (t) => {
             camera.flyTo({ center: [170, 0], duration: 10 });
         });
 
+        t.test('does not pan eastward across the antimeridian if no world copies', (t) => {
+            const camera = createCamera({renderWorldCopies: false});
+            camera.setCenter([170, 0]);
+            let crossedAntimeridian;
+
+            camera.on('move', () => {
+                if (camera.getCenter().lng > 170) {
+                    crossedAntimeridian = true;
+                }
+            });
+
+            camera.on('moveend', () => {
+                t.notOk(crossedAntimeridian);
+                t.end();
+            });
+
+            camera.flyTo({ center: [-170, 0], duration: 10 });
+        });
+
+        t.test('does not pan westward across the antimeridian if no world copies', (t) => {
+            const camera = createCamera({renderWorldCopies: false});
+            camera.setCenter([-170, 0]);
+            let crossedAntimeridian;
+
+            camera.on('move', () => {
+                if (camera.getCenter().lng < -170) {
+                    crossedAntimeridian = true;
+                }
+            });
+
+            camera.on('moveend', () => {
+                t.notOk(crossedAntimeridian);
+                t.end();
+            });
+
+            camera.flyTo({ center: [170, 0], duration: 10 });
+        });
+
         t.test('peaks at the specified zoom level', (t) => {
             const camera = createCamera({zoom: 20});
             const minZoom = 1;