Merge pull request #91 from redbearsam/feature/colorize

replace colour references with color
finos · Mar 12, 2019 · d5709ed · d5709ed
2 parents 84eb792 + 133e0d9
commit d5709ed
Show file tree

Hide file tree

Showing 18 changed files with 219 additions and 219 deletions.
diff --git a/packages/perspective-viewer-d3fc/src/js/charts/area.js b/packages/perspective-viewer-d3fc/src/js/charts/area.js
@@ -10,9 +10,9 @@ import * as fc from "d3fc";
 import * as crossAxis from "../axis/crossAxis";
 import * as mainAxis from "../axis/mainAxis";
 import {areaSeries} from "../series/areaSeries";
-import {seriesColours} from "../series/seriesColours";
+import {seriesColors} from "../series/seriesColors";
 import {splitAndBaseData} from "../data/splitAndBaseData";
-import {colourLegend} from "../legend/legend";
+import {colorLegend} from "../legend/legend";
 import {filterData} from "../legend/filter";
 import {withGridLines} from "../gridlines/gridlines";
 
@@ -23,12 +23,12 @@ import nearbyTip from "../tooltip/nearbyTip";
 function areaChart(container, settings) {
     const data = splitAndBaseData(settings, filterData(settings));
 
-    const colour = seriesColours(settings);
-    const legend = colourLegend()
+    const color = seriesColors(settings);
+    const legend = colorLegend()
         .settings(settings)
-        .scale(colour);
+        .scale(color);
 
-    const series = fc.seriesSvgRepeat().series(areaSeries(settings, colour).orient("vertical"));
+    const series = fc.seriesSvgRepeat().series(areaSeries(settings, color).orient("vertical"));
 
     const xDomain = crossAxis.domain(settings)(data);
     const xScale = crossAxis.scale(settings);
@@ -70,7 +70,7 @@ function areaChart(container, settings) {
         .settings(settings)
         .xScale(xScale)
         .yScale(yScale)
-        .colour(colour)
+        .color(color)
         .data(data);
     container.call(toolTip);
 

diff --git a/packages/perspective-viewer-d3fc/src/js/charts/bar.js b/packages/perspective-viewer-d3fc/src/js/charts/bar.js
@@ -10,9 +10,9 @@ import * as fc from "d3fc";
 import * as crossAxis from "../axis/crossAxis";
 import * as mainAxis from "../axis/mainAxis";
 import {barSeries} from "../series/barSeries";
-import {seriesColours} from "../series/seriesColours";
+import {seriesColors} from "../series/seriesColors";
 import {groupAndStackData} from "../data/groupData";
-import {colourLegend} from "../legend/legend";
+import {colorLegend} from "../legend/legend";
 import {filterData} from "../legend/filter";
 import {withGridLines} from "../gridlines/gridlines";
 
@@ -21,18 +21,18 @@ import zoomableChart from "../zoom/zoomableChart";
 
 function barChart(container, settings) {
     const data = groupAndStackData(settings, filterData(settings));
-    const colour = seriesColours(settings);
+    const color = seriesColors(settings);
 
-    const legend = colourLegend()
+    const legend = colorLegend()
         .settings(settings)
-        .scale(colour);
+        .scale(color);
 
     const series = fc
         .seriesSvgMulti()
         .mapping((data, index) => data[index])
         .series(
             data.map(() =>
-                barSeries(settings, colour)
+                barSeries(settings, color)
                     .align("left")
                     .orient("horizontal")
             )

diff --git a/packages/perspective-viewer-d3fc/src/js/charts/column.js b/packages/perspective-viewer-d3fc/src/js/charts/column.js
@@ -10,28 +10,28 @@ import * as fc from "d3fc";
 import * as crossAxis from "../axis/crossAxis";
 import * as mainAxis from "../axis/mainAxis";
 import {barSeries} from "../series/barSeries";
-import {seriesColours} from "../series/seriesColours";
+import {seriesColors} from "../series/seriesColors";
 import {groupAndStackData} from "../data/groupData";
-import {colourLegend} from "../legend/legend";
+import {colorLegend} from "../legend/legend";
 import {filterData} from "../legend/filter";
 import {withGridLines} from "../gridlines/gridlines";
 import {hardLimitZeroPadding} from "../d3fc/padding/hardLimitZero";
 import zoomableChart from "../zoom/zoomableChart";
 
 function columnChart(container, settings) {
     const data = groupAndStackData(settings, filterData(settings));
-    const colour = seriesColours(settings);
+    const color = seriesColors(settings);
 
-    const legend = colourLegend()
+    const legend = colorLegend()
         .settings(settings)
-        .scale(colour);
+        .scale(color);
 
     const series = fc
         .seriesSvgMulti()
         .mapping((data, index) => data[index])
         .series(
             data.map(() =>
-                barSeries(settings, colour)
+                barSeries(settings, color)
                     .align("left")
                     .orient("vertical")
             )

diff --git a/packages/perspective-viewer-d3fc/src/js/charts/heatmap.js b/packages/perspective-viewer-d3fc/src/js/charts/heatmap.js
@@ -9,20 +9,20 @@
 import * as fc from "d3fc";
 import * as crossAxis from "../axis/crossAxis";
 import {heatmapSeries} from "../series/heatmapSeries";
-import {seriesColourRange} from "../series/seriesRange";
+import {seriesColorRange} from "../series/seriesRange";
 import {heatmapData} from "../data/heatmapData";
 import {filterData} from "../legend/filter";
 import {withGridLines} from "../gridlines/gridlines";
-import {colourRangeLegend} from "../legend/colourRangeLegend";
+import {colorRangeLegend} from "../legend/colorRangeLegend";
 import zoomableChart from "../zoom/zoomableChart";
 
 function heatmapChart(container, settings) {
     const data = heatmapData(settings, filterData(settings));
 
-    const colour = seriesColourRange(settings, data, "colorValue");
-    const series = heatmapSeries(settings, colour);
+    const color = seriesColorRange(settings, data, "colorValue");
+    const series = heatmapSeries(settings, color);
 
-    const legend = colourRangeLegend().scale(colour);
+    const legend = colorRangeLegend().scale(color);
 
     const xDomain = crossAxis.domain(settings)(data);
     const xScale = crossAxis.scale(settings);

diff --git a/packages/perspective-viewer-d3fc/src/js/charts/line.js b/packages/perspective-viewer-d3fc/src/js/charts/line.js
@@ -9,10 +9,10 @@
 import * as fc from "d3fc";
 import * as crossAxis from "../axis/crossAxis";
 import * as mainAxis from "../axis/mainAxis";
-import {seriesColours} from "../series/seriesColours";
+import {seriesColors} from "../series/seriesColors";
 import {lineSeries} from "../series/lineSeries";
 import {splitData} from "../data/splitData";
-import {colourLegend} from "../legend/legend";
+import {colorLegend} from "../legend/legend";
 import {filterData} from "../legend/filter";
 import {withGridLines} from "../gridlines/gridlines";
 
@@ -22,13 +22,13 @@ import nearbyTip from "../tooltip/nearbyTip";
 
 function lineChart(container, settings) {
     const data = splitData(settings, filterData(settings));
-    const colour = seriesColours(settings);
+    const color = seriesColors(settings);
 
-    const legend = colourLegend()
+    const legend = colorLegend()
         .settings(settings)
-        .scale(colour);
+        .scale(color);
 
-    const series = fc.seriesSvgRepeat().series(lineSeries(settings, colour).orient("vertical"));
+    const series = fc.seriesSvgRepeat().series(lineSeries(settings, color).orient("vertical"));
 
     const paddingStrategy = hardLimitZeroPadding()
         .pad([0.1, 0.1])
@@ -68,7 +68,7 @@ function lineChart(container, settings) {
         .settings(settings)
         .xScale(xScale)
         .yScale(yScale)
-        .colour(colour)
+        .color(color)
         .data(data);
     container.call(toolTip);
 

diff --git a/packages/perspective-viewer-d3fc/src/js/charts/xy-scatter.js b/packages/perspective-viewer-d3fc/src/js/charts/xy-scatter.js
@@ -10,10 +10,10 @@ import * as fc from "d3fc";
 import * as mainAxis from "../axis/mainAxis";
 import {pointSeriesCanvas, symbolTypeFromGroups} from "../series/pointSeriesCanvas";
 import {pointData} from "../data/pointData";
-import {seriesColoursFromGroups} from "../series/seriesColours";
-import {seriesLinearRange, seriesColourRange} from "../series/seriesRange";
+import {seriesColorsFromGroups} from "../series/seriesColors";
+import {seriesLinearRange, seriesColorRange} from "../series/seriesRange";
 import {symbolLegend} from "../legend/legend";
-import {colourRangeLegend} from "../legend/colourRangeLegend";
+import {colorRangeLegend} from "../legend/colorRangeLegend";
 import {filterDataByGroup} from "../legend/filter";
 import {withCanvasGridLines} from "../gridlines/gridlines";
 import {hardLimitZeroPadding} from "../d3fc/padding/hardLimitZero";
@@ -23,28 +23,28 @@ import nearbyTip from "../tooltip/nearbyTip";
 function xyScatter(container, settings) {
     const data = pointData(settings, filterDataByGroup(settings));
     const symbols = symbolTypeFromGroups(settings);
-    const useGroupColours = settings.mainValues.length <= 2;
-    let colour = null;
+    const useGroupColors = settings.mainValues.length <= 2;
+    let color = null;
     let legend = null;
 
-    if (useGroupColours) {
-        colour = seriesColoursFromGroups(settings);
+    if (useGroupColors) {
+        color = seriesColorsFromGroups(settings);
 
         legend = symbolLegend()
             .settings(settings)
             .scale(symbols)
-            .colour(useGroupColours ? colour : null);
+            .color(useGroupColors ? color : null);
     } else {
-        colour = seriesColourRange(settings, data, "colorValue");
-        legend = colourRangeLegend().scale(colour);
+        color = seriesColorRange(settings, data, "colorValue");
+        legend = colorRangeLegend().scale(color);
     }
 
     const size = settings.mainValues.length > 3 ? seriesLinearRange(settings, data, "size").range([10, 10000]) : null;
 
     const series = fc
         .seriesCanvasMulti()
         .mapping((data, index) => data[index])
-        .series(data.map(series => pointSeriesCanvas(settings, series.key, size, colour, symbols)));
+        .series(data.map(series => pointSeriesCanvas(settings, series.key, size, color, symbols)));
 
     const domainDefault = () => mainAxis.domain(settings).paddingStrategy(hardLimitZeroPadding().pad([0.1, 0.1]));
 
@@ -77,7 +77,7 @@ function xyScatter(container, settings) {
         .xValueName("x")
         .yValueName("y")
         .yScale(yScale)
-        .colour(useGroupColours && colour)
+        .color(useGroupColors && color)
         .data(data);
     container.call(toolTip);
 

diff --git a/packages/perspective-viewer-d3fc/src/js/charts/y-scatter.js b/packages/perspective-viewer-d3fc/src/js/charts/y-scatter.js
@@ -9,7 +9,7 @@
 import * as fc from "d3fc";
 import * as crossAxis from "../axis/crossAxis";
 import * as mainAxis from "../axis/mainAxis";
-import {seriesColours} from "../series/seriesColours";
+import {seriesColors} from "../series/seriesColors";
 import {categoryPointSeries, symbolType} from "../series/categoryPointSeries";
 import {groupData} from "../data/groupData";
 import {symbolLegend} from "../legend/legend";
@@ -21,17 +21,17 @@ import zoomableChart from "../zoom/zoomableChart";
 function yScatter(container, settings) {
     const data = groupData(settings, filterData(settings));
     const symbols = symbolType(settings);
-    const colour = seriesColours(settings);
+    const color = seriesColors(settings);
 
     const legend = symbolLegend()
         .settings(settings)
         .scale(symbols)
-        .colour(colour);
+        .color(color);
 
     const series = fc
         .seriesSvgMulti()
         .mapping((data, index) => data[index])
-        .series(data.map(series => categoryPointSeries(settings, series.key, colour, symbols)));
+        .series(data.map(series => categoryPointSeries(settings, series.key, color, symbols)));
 
     const paddingStrategy = hardLimitZeroPadding()
         .pad([0.05, 0.05])