adapt polar to clean-subplots improvements

- use new get-subplot-data tools
- adapt for new offset and selections in Axes.doTicks
- 2018 header

Author: etpinard

lib/scatterpolar.js

@@ -1,5 +1,5 @@
 /**
-* Copyright 2012-2017, Plotly, Inc.
+* Copyright 2012-2018, Plotly, Inc.
 * All rights reserved.
 *
 * This source code is licensed under the MIT license found in the

src/lib/angles.js

@@ -1,5 +1,5 @@
 /**
-* Copyright 2012-2017, Plotly, Inc.
+* Copyright 2012-2018, Plotly, Inc.
 * All rights reserved.
 *
 * This source code is licensed under the MIT license found in the

src/plots/cartesian/line_grid_defaults.js

@@ -1,5 +1,5 @@
 /**
-* Copyright 2012-2017, Plotly, Inc.
+* Copyright 2012-2018, Plotly, Inc.
 * All rights reserved.
 *
 * This source code is licensed under the MIT license found in the

src/plots/domain_attributes.js

@@ -1,5 +1,5 @@
 /**
-* Copyright 2012-2017, Plotly, Inc.
+* Copyright 2012-2018, Plotly, Inc.
 * All rights reserved.
 *
 * This source code is licensed under the MIT license found in the

src/plots/plots.js

@@ -2322,9 +2322,8 @@ plots.doCalcdata = function(gd, traces) {
         trace._arrayAttrs = PlotSchema.findArrayAttributes(trace);
     }
 
-    // TODO maybe move this to Axes.list ??
-    // or better yet, make a more general Axes.list
-    var polarIds = plots.getSubplotIds(fullLayout, 'polar');
+    // add polar axes to axis list
+    var polarIds = fullLayout._subplots.polar || [];
     for(i = 0; i < polarIds.length; i++) {
         axList.push(
             fullLayout[polarIds[i]].radialaxis,

src/plots/polar/constants.js

@@ -1,5 +1,5 @@
 /**
-* Copyright 2012-2017, Plotly, Inc.
+* Copyright 2012-2018, Plotly, Inc.
 * All rights reserved.
 *
 * This source code is licensed under the MIT license found in the

src/plots/polar/helpers.js

@@ -1,5 +1,5 @@
 /**
-* Copyright 2012-2017, Plotly, Inc.
+* Copyright 2012-2018, Plotly, Inc.
 * All rights reserved.
 *
 * This source code is licensed under the MIT license found in the

src/plots/polar/index.js

@@ -8,7 +8,7 @@
 
 'use strict';
 
-var Plots = require('../../plots/plots');
+var getSubplotCalcData = require('../get_data').getSubplotCalcData;
 var counterRegex = require('../../lib').counterRegex;
 
 var createPolar = require('./polar');
@@ -35,11 +35,11 @@ attributes[attr] = {
 function plot(gd) {
     var fullLayout = gd._fullLayout;
     var calcData = gd.calcdata;
-    var subplotIds = Plots.getSubplotIds(fullLayout, name);
+    var subplotIds = fullLayout._subplots[name];
 
     for(var i = 0; i < subplotIds.length; i++) {
         var id = subplotIds[i];
-        var subplotCalcData = Plots.getSubplotCalcData(calcData, name, id);
+        var subplotCalcData = getSubplotCalcData(calcData, name, id);
         var subplot = fullLayout[id]._subplot;
 
         if(!subplot) {
@@ -52,7 +52,7 @@ function plot(gd) {
 }
 
 function clean(newFullData, newFullLayout, oldFullData, oldFullLayout) {
-    var oldIds = Plots.getSubplotIds(oldFullLayout, name);
+    var oldIds = oldFullLayout._subplots[name] || [];
 
     for(var i = 0; i < oldIds.length; i++) {
         var id = oldIds[i];

src/plots/polar/layout_attributes.js

@@ -1,5 +1,5 @@
 /**
-* Copyright 2012-2017, Plotly, Inc.
+* Copyright 2012-2018, Plotly, Inc.
 * All rights reserved.
 *
 * This source code is licensed under the MIT license found in the

src/plots/polar/layout_defaults.js

@@ -1,5 +1,5 @@
 /**
-* Copyright 2012-2017, Plotly, Inc.
+* Copyright 2012-2018, Plotly, Inc.
 * All rights reserved.
 *
 * This source code is licensed under the MIT license found in the
@@ -10,9 +10,9 @@
 
 var Lib = require('../../lib');
 var Color = require('../../components/color');
-var Plots = require('../plots');
 var Registry = require('../../registry');
 var handleSubplotDefaults = require('../subplot_defaults');
+var getSubplotData = require('../get_data').getSubplotData;
 
 var handleTickValueDefaults = require('../cartesian/tick_value_defaults');
 var handleTickMarkDefaults = require('../cartesian/tick_mark_defaults');
@@ -35,7 +35,7 @@ function handleDefaults(contIn, contOut, coerce, opts) {
     var sector = coerce('sector');
 
     // could optimize, subplotData is not always needed!
-    var subplotData = Plots.getSubplotData(opts.fullData, constants.name, opts.id);
+    var subplotData = getSubplotData(opts.fullData, constants.name, opts.id);
     var layoutOut = opts.layoutOut;
     var axName;
 

src/plots/polar/legacy/index.js

@@ -1,5 +1,5 @@
 /**
-* Copyright 2012-2017, Plotly, Inc.
+* Copyright 2012-2018, Plotly, Inc.
 * All rights reserved.
 *
 * This source code is licensed under the MIT license found in the

src/plots/polar/polar.js

@@ -1,5 +1,5 @@
 /**
-* Copyright 2012-2017, Plotly, Inc.
+* Copyright 2012-2018, Plotly, Inc.
 * All rights reserved.
 *
 * This source code is licensed under the MIT license found in the
@@ -136,8 +136,12 @@ proto.updateLayers = function(fullLayout, polarLayout) {
                     layers.bgcircle = sel.append('path');
                     break;
                 case 'radial-grid':
+                    sel.style('fill', 'none');
+                    sel.append('g').classed('x', 1);
+                    break;
                 case 'angular-grid':
                     sel.style('fill', 'none');
+                    sel.append('g').classed('angular', 1);
                     break;
                 case 'radial-line':
                     sel.append('line').style('fill', 'none');
@@ -302,6 +306,11 @@ proto.updateRadialAxis = function(fullLayout, polarLayout) {
         ax.tickangle = 180;
     }
 
+    // easier to set rotate angle with custom translate function
+    ax._transfn = function(d) {
+        return 'translate(' + ax.l2p(d.x) + ',0)';
+    };
+
     // set special grid path function
     ax._gridpath = function(d) {
         var r = ax.r2p(d.x);

src/traces/scatterpolar/attributes.js

@@ -1,5 +1,5 @@
 /**
-* Copyright 2012-2017, Plotly, Inc.
+* Copyright 2012-2018, Plotly, Inc.
 * All rights reserved.
 *
 * This source code is licensed under the MIT license found in the

src/traces/scatterpolar/calc.js

@@ -1,5 +1,5 @@
 /**
-* Copyright 2012-2017, Plotly, Inc.
+* Copyright 2012-2018, Plotly, Inc.
 * All rights reserved.
 *
 * This source code is licensed under the MIT license found in the

src/traces/scatterpolar/defaults.js

@@ -1,5 +1,5 @@
 /**
-* Copyright 2012-2017, Plotly, Inc.
+* Copyright 2012-2018, Plotly, Inc.
 * All rights reserved.
 *
 * This source code is licensed under the MIT license found in the

src/traces/scatterpolar/hover.js

@@ -1,5 +1,5 @@
 /**
-* Copyright 2012-2017, Plotly, Inc.
+* Copyright 2012-2018, Plotly, Inc.
 * All rights reserved.
 *
 * This source code is licensed under the MIT license found in the

src/traces/scatterpolar/index.js

@@ -1,5 +1,5 @@
 /**
-* Copyright 2012-2017, Plotly, Inc.
+* Copyright 2012-2018, Plotly, Inc.
 * All rights reserved.
 *
 * This source code is licensed under the MIT license found in the

src/traces/scatterpolar/plot.js

@@ -1,5 +1,5 @@
 /**
-* Copyright 2012-2017, Plotly, Inc.
+* Copyright 2012-2018, Plotly, Inc.
 * All rights reserved.
 *
 * This source code is licensed under the MIT license found in the

test/jasmine/tests/polar_test.js

@@ -65,7 +65,8 @@ describe('Test polar plots defaults:', function() {
         }];
 
         layoutOut = {
-            font: {color: 'red'}
+            font: {color: 'red'},
+            _subplots: {polar: ['polar']}
         };
 
         Polar.supplyLayoutDefaults(layoutIn, layoutOut, fullData);
@@ -338,7 +339,7 @@ describe('Test relayout on polar subplots:', function() {
             return toggle(
                 'polar.angularaxis.showgrid',
                 [true, false], [8, 0],
-                '.angular-grid > path', assertCnt
+                '.angular-grid > .angular > path', assertCnt
             );
         })
         .then(function() {
@@ -418,6 +419,8 @@ describe('Test relayout on polar subplots:', function() {
     it('should clean up its framework, clip paths and info layers when getting deleted', function(done) {
         var gd = createGraphDiv();
         var fig = Lib.extendDeep({}, require('@mocks/polar_scatter.json'));
+        var traces = Lib.extendDeep([], fig.data);
+        var inds = traces.map(function(_, i) { return i; });
 
         function _assert(exp) {
             expect(d3.selectAll('g.polar').size()).toBe(exp.subplot, '# subplot layer');
@@ -433,12 +436,12 @@ describe('Test relayout on polar subplots:', function() {
         Plotly.plot(gd, fig).then(function() {
             _assert({subplot: 1, clip: 1, rtitle: 1});
 
-            return Plotly.restyle(gd, 'visible', false);
+            return Plotly.deleteTraces(gd, inds);
         })
         .then(function() {
             _assert({subplot: 0, clip: 0, rtitle: 0});
 
-            return Plotly.restyle(gd, 'visible', true);
+            return Plotly.addTraces(gd, traces);
         })
         .then(function() {
             _assert({subplot: 1, clip: 1, rtitle: 1});