add on-graph 'text' to scatterpolargl

- follow-up from #2737
plotly · etpinard · Aug 15, 2018 · Aug 2, 2018 · Aug 9, 2018 · Aug 9, 2018
commit d3b36151d02219bf122fc7cd813b544ccdd6ac2a
diff --git a/src/traces/scatterpolargl/attributes.js b/src/traces/scatterpolargl/attributes.js
@@ -22,7 +22,7 @@ module.exports = {
     thetaunit: scatterPolarAttrs.thetaunit,
 
     text: scatterPolarAttrs.text,
-    // no hovertext
+    hovertext: scatterPolarAttrs.hovertext,
 
     line: scatterGlAttrs.line,
     connectgaps: scatterGlAttrs.connectgaps,
@@ -33,6 +33,9 @@ module.exports = {
     fill: scatterGlAttrs.fill,
     fillcolor: scatterGlAttrs.fillcolor,
 
+    textposition: scatterGlAttrs.textposition,
+    textfont: scatterGlAttrs.textfont,
+
     hoverinfo: scatterPolarAttrs.hoverinfo,
     // no hoveron
 

diff --git a/src/traces/scatterpolargl/defaults.js b/src/traces/scatterpolargl/defaults.js
@@ -14,6 +14,7 @@ var subTypes = require('../scatter/subtypes');
 var handleRThetaDefaults = require('../scatterpolar/defaults').handleRThetaDefaults;
 var handleMarkerDefaults = require('../scatter/marker_defaults');
 var handleLineDefaults = require('../scatter/line_defaults');
+var handleTextDefaults = require('../scatter/text_defaults');
 var handleFillColorDefaults = require('../scatter/fillcolor_defaults');
 var PTS_LINESONLY = require('../scatter/constants').PTS_LINESONLY;
 
@@ -33,6 +34,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     coerce('thetaunit');
     coerce('mode', len < PTS_LINESONLY ? 'lines+markers' : 'lines');
     coerce('text');
+    coerce('hovertext');
 
     if(subTypes.hasLines(traceOut)) {
         handleLineDefaults(traceIn, traceOut, defaultColor, layout, coerce);
@@ -43,6 +45,10 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
         handleMarkerDefaults(traceIn, traceOut, defaultColor, layout, coerce);
     }
 
+    if(subTypes.hasText(traceOut)) {
+        handleTextDefaults(traceIn, traceOut, layout, coerce);
+    }
+
     coerce('fill');
     if(traceOut.fill !== 'none') {
         handleFillColorDefaults(traceIn, traceOut, defaultColor, coerce);

diff --git a/src/traces/scatterpolargl/index.js b/src/traces/scatterpolargl/index.js
@@ -95,6 +95,7 @@ function plot(container, subplot, cdata) {
         if(options.marker && !scene.scatter2d) scene.scatter2d = true;
         if(options.line && !scene.line2d) scene.line2d = true;
         if((options.errorX || options.errorY) && !scene.error2d) scene.error2d = true;
+        if(options.text && !scene.glText) scene.glText = true;
 
         stash.tree = cluster(positions);
 
@@ -116,6 +117,9 @@ function plot(container, subplot, cdata) {
         scene.markerOptions.push(options.marker);
         scene.markerSelectedOptions.push(options.markerSel);
         scene.markerUnselectedOptions.push(options.markerUnsel);
+        scene.textOptions.push(options.text);
+        scene.textSelectedOptions.push(options.textSel);
+        scene.textUnselectedOptions.push(options.textUnsel);
         scene.count = cdata.length;
 
         // stash scene ref

diff --git a/test/image/baselines/glpolar_subplots.png b/test/image/baselines/glpolar_subplots.png
diff --git a/test/image/mocks/glpolar_subplots.json b/test/image/mocks/glpolar_subplots.json
@@ -0,0 +1,68 @@
+{
+  "data": [{
+    "type": "scatterpolargl",
+    "mode": "markers+lines+text",
+    "r": [1, 2, 3],
+    "theta": [0, 45, 180],
+    "text": ["A0", "B0", "C0"],
+    "hovertext": ["hover A0", "hover B0", "hover C0"],
+    "marker": {"symbol": "square", "size": 15},
+    "textfont": {
+      "color": ["red", "green", "blue"],
+      "size": 20
+    },
+    "textposition": ["top left", "bottom right", "bottom right"]
+  }, {
+    "type": "scatterpolargl",
+    "mode": "markers+lines+text",
+    "r": [1, 2, 3],
+    "theta": [-0, -45, -180],
+    "text": ["A1", "B1", "C1"],
+    "hovertext": ["hover A1", "hover B1", "hover C1"],
+    "marker": {
+        "symbol": "square",
+        "size": 15,
+        "color": [-1, 1, 2],
+        "showscale": true
+    },
+    "textfont": {
+      "color": "green",
+      "size": [20, 15, 10]
+    },
+    "textposition": "top left",
+    "subplot": "polar2"
+  }],
+
+  "layout": {
+    "showlegend": false,
+    "polar": {
+      "domain": {
+        "x": [0, 0.44]
+      },
+      "radialaxis": {
+        "showgrid": false,
+        "title": "1st subplot",
+        "titlefont": {
+          "size": 20,
+          "color": "blue"
+        },
+        "angle": -45
+      }
+    },
+    "polar2": {
+      "domain": {
+        "x": [0.56, 1]
+      },
+      "radialaxis": {
+        "range": [0, 4.7],
+        "showgrid": false,
+        "title": "2nd subplot",
+        "titlefont": {
+          "size": 10,
+          "color": "orange"
+        },
+        "angle": 45
+      }
+    }
+  }
+}