fix #3831 - reset viewInitial stash on *geo.scope* updates

Author: etpinard

src/plots/geo/geo.js

@@ -42,6 +42,7 @@ function Geo(opts) {
     this.topojson = null;
 
     this.projection = null;
+    this.scope = null;
     this.viewInitial = null;
     this.fitScale = null;
     this.bounds = null;
@@ -133,9 +134,10 @@ proto.update = function(geoCalcData, fullLayout) {
         }
     }
 
-    if(!this.viewInitial) {
+    if(!this.viewInitial || this.scope !== geoLayout.scope) {
         this.saveViewInitial(geoLayout);
     }
+    this.scope = geoLayout.scope;
 
     this.updateBaseLayers(fullLayout, geoLayout);
     this.updateDims(fullLayout, geoLayout);

test/jasmine/tests/geo_test.js

@@ -1250,6 +1250,86 @@ describe('Test geo interactions', function() {
         .catch(failTest)
         .then(done);
     });
+
+    it('should reset viewInitial when update *scope*', function(done) {
+        var gd = createGraphDiv();
+
+        function _assertViewInitial(msg, exp) {
+            var viewInitial = gd._fullLayout.geo._subplot.viewInitial;
+
+            expect(Object.keys(viewInitial).length)
+                .toBe(Object.keys(exp).length, 'same # of viewInitial keys |' + msg);
+
+            for(var k in viewInitial) {
+                expect(viewInitial[k]).toBe(exp[k], k + ' |' + msg);
+            }
+        }
+
+        var figWorld = {
+            data: [{
+                type: 'choropleth',
+                locationmode: 'country names',
+                locations: ['canada', 'china', 'russia'],
+                z: ['10', '20', '15']
+            }],
+            layout: {geo: {scope: 'world'}}
+        };
+        var figUSA = {
+            data: [{
+                type: 'choropleth',
+                locationmode: 'USA-states',
+                locations: ['CA', 'CO', 'NY'],
+                z: ['10', '20', '15']
+            }],
+            layout: {geo: {scope: 'usa'}}
+        };
+        var figNA = {
+            data: [{
+                type: 'choropleth',
+                locationmode: 'country names',
+                locations: ['Canada', 'USA', 'Mexico'],
+                z: ['10', '20', '15']
+            }],
+            layout: {geo: {scope: 'north america'}}
+        };
+
+        Plotly.react(gd, figWorld)
+        .then(function() {
+            _assertViewInitial('world scope', {
+                'center.lon': 0,
+                'center.lat': 0,
+                'projection.scale': 1,
+                'projection.rotation.lon': 0
+            });
+        })
+        .then(function() { return Plotly.react(gd, figUSA); })
+        .then(function() {
+            _assertViewInitial('react to usa scope', {
+                'center.lon': -96.6,
+                'center.lat': 38.7,
+                'projection.scale': 1
+            });
+        })
+        .then(function() { return Plotly.react(gd, figNA); })
+        .then(function() {
+            _assertViewInitial('react to NA scope', {
+                'center.lon': -112.5,
+                'center.lat': 45,
+                'projection.scale': 1
+            });
+        })
+        .then(function() { return Plotly.react(gd, figWorld); })
+        .then(function() {
+            _assertViewInitial('react back to world scope', {
+                'center.lon': 0,
+                'center.lat': 0,
+                'projection.scale': 1,
+                'projection.rotation.lon': 0
+            });
+        })
+        .catch(failTest)
+        .then(done);
+    });
 });
 
 describe('Test event property of interactions on a geo plot:', function() {
@@ -1999,7 +2079,7 @@ describe('Test geo zoom/pan/drag interactions:', function() {
         .then(done);
     });
 
-    it('should guard againt undefined projection.invert result in some projections', function(done) {
+    it('should guard against undefined projection.invert result in some projections', function(done) {
         // e.g. aitoff
         var fig = Lib.extendDeep({}, require('@mocks/geo_aitoff-sinusoidal.json'));
         fig.layout.dragmode = 'pan';