move override logic from template to supply default

Author: archmoj

src/plots/geo/layout_defaults.js

@@ -46,6 +46,26 @@ function handleGeoDefaults(geoLayoutIn, geoLayoutOut, coerce, opts) {
     var isClipped = geoLayoutOut._isClipped = !!constants.lonaxisSpan[projType];
 
     var visible = coerce('visible');
+    if(visible === false) {
+        // should override template.layout.geo.show* - see issue 4482
+
+        // make a copy
+        var newTemplate = Lib.extendDeep({}, geoLayoutOut._template);
+
+        // override show*
+        newTemplate.showcoastlines = false;
+        newTemplate.showcountries = false;
+        newTemplate.showframe = false;
+        newTemplate.showlakes = false;
+        newTemplate.showland = false;
+        newTemplate.showocean = false;
+        newTemplate.showrivers = false;
+        newTemplate.showsubunits = false;
+
+        // set ref to copy
+        geoLayoutOut._template = newTemplate;
+    }
+
     var show;
 
     for(var i = 0; i < axesNames.length; i++) {

src/plots/plots.js

@@ -1446,29 +1446,6 @@ plots.supplyLayoutGlobalDefaults = function(layoutIn, layoutOut, formatObj) {
 
     var template = layoutIn.template;
     if(Lib.isPlainObject(template)) {
-        if( // geo.visible false should override template.layout.geo.show* - see issue 4482
-            layoutIn.geo &&
-            layoutIn.geo.visible === false &&
-            template.layout &&
-            template.layout.geo
-        ) {
-            // make a copy
-            var newTemplate = Lib.extendDeep({}, template);
-
-            // override show*
-            newTemplate.layout.geo.showcoastlines = false;
-            newTemplate.layout.geo.showcountries = false;
-            newTemplate.layout.geo.showframe = false;
-            newTemplate.layout.geo.showlakes = false;
-            newTemplate.layout.geo.showland = false;
-            newTemplate.layout.geo.showocean = false;
-            newTemplate.layout.geo.showrivers = false;
-            newTemplate.layout.geo.showsubunits = false;
-
-            // set ref to copy
-            template = newTemplate;
-        }
-
         layoutOut.template = template;
         layoutOut._template = template.layout;
         layoutOut._dataTemplate = template.data;

test/jasmine/tests/geo_test.js

@@ -624,7 +624,7 @@ describe('Test Geo layout defaults', function() {
         });
     });
 
-    describe('geo.visible should override show* defaults', function() {
+    describe('geo.visible should override show* defaults even with template any show* is true', function() {
         var keys = [
             'lonaxis.showgrid',
             'lataxis.showgrid',
@@ -652,6 +652,20 @@ describe('Test Geo layout defaults', function() {
 
         it('- base case', function() {
             layoutIn = {
+                template: {
+                    layout: {
+                        geo: {
+                            showcoastlines: true,
+                            showcountries: true,
+                            showframe: true,
+                            showland: true,
+                            showlakes: true,
+                            showocean: true,
+                            showrivers: true,
+                            showsubunits: true
+                        }
+                    }
+                },
                 geo: { visible: false }
             };
 
@@ -688,51 +702,6 @@ describe('Test Geo layout defaults', function() {
     });
 });
 
-describe('geo visible false', function() {
-    var gd;
-
-    beforeEach(function() { gd = createGraphDiv(); });
-
-    afterEach(destroyGraphDiv);
-
-    it('should override template.layout.geo.show*', function(done) {
-        var keys = [
-            'showcoastlines',
-            'showcountries',
-            'showframe',
-            'showland',
-            'showlakes',
-            'showocean',
-            'showrivers',
-            'showsubunits'
-        ];
-
-        var layout = {
-            geo: { visible: false },
-            template: {
-                layout: {
-                    geo: {}
-                }
-            }
-        };
-
-        keys.forEach(function(k) {
-            layout.template.layout.geo[k] = true;
-        });
-
-        var data = [{ lon: [0], lat: [0], type: 'scattergeo' }];
-
-        Plotly.plot(gd, data, layout)
-        .then(function() {
-            keys.forEach(function(k) {
-                expect(gd._fullLayout.template.layout.geo[k]).toBe(false, k);
-            });
-        })
-        .catch(failTest)
-        .then(done);
-    });
-});
-
 describe('geojson / topojson utils', function() {
     function _locationToFeature(topojson, loc, locationmode) {
         var trace = { locationmode: locationmode };