Merge pull request #592 from nextstrain/legend

Removing legend duplicates, Add some month labels
nextstrain · Jul 9, 2018 · d8242fc · d8242fc
2 parents 493f958 + b21121d
commit d8242fc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/components/tree/legend/legend.js b/src/components/tree/legend/legend.js
@@ -136,8 +136,11 @@ class Legend extends React.Component {
     if (this.props.colorBy === "clade_membership") {
       return label; /* unchanged */
     } else if (this.props.colorBy === "num_date") {
-      const vals = this.props.colorScale.legendValues;
-      if (vals[vals.length - 1] - vals[0] > 10) {
+      const legendValues = this.props.colorScale.legendValues;
+      if (
+        (legendValues[legendValues.length-1] - legendValues[0] > 10) && /* range spans more than 10 years */
+        (legendValues[legendValues.length-1] - parseInt(label, 10) >= 10) /* current label (value) is more than 10 years from the most recent */
+      ) {
         return parseInt(label, 10);
       }
       const [yyyy, mm, dd] = numericToCalendar(label).split('-'); // eslint-disable-line

diff --git a/src/util/colorScale.js b/src/util/colorScale.js
@@ -173,7 +173,8 @@ export const calcColorScale = (colorBy, controls, tree, treeToo, metadata) => {
           const spaceBetween = parseInt(vals.length / (n - 1), 10);
           for (let i = 0; i < (n-1); i++) domain.push(vals[spaceBetween*i]);
           domain.push(vals[vals.length-1]);
-          range = colors[n+1];
+          domain = [...new Set(domain)]; /* filter to unique values only */
+          range = colors[domain.length]; /* use the right number of colours */
           break;
         default:
           range = colors[9];