Fix function name

Perlkonig · Perlkonig · commit 5e250e6744d0 · 2026-02-27T10:15:06.000-07:00
diff --git a/src/boards/cairoCatalan.ts b/src/boards/cairoCatalan.ts
@@ -1,4 +1,4 @@
-import { BoardReturn, getCellFill } from ".";
+import { BoardReturn, getBoardFill } from ".";
 import { centroid } from "../common/plotting";
 import { GridPoints, IPoint, IPolyPolygon, snubsquare } from "../grids";
 import { RendererBase } from "../renderers/_base";
@@ -100,7 +100,7 @@ export const cairoCatalan = (ctx: RendererBase): BoardReturn => {
         blocked = [...(ctx.json.board.blocked as Blocked)];
     }
 
-    const [hexFill, hexOpacity] = getCellFill(ctx);
+    const [hexFill, hexOpacity] = getBoardFill(ctx);
     for (let iRow = 0; iRow < height; iRow++) {
         for (let iCol = 0; iCol < width; iCol++) {
             if (blocked !== undefined) {
diff --git a/src/boards/cairoCollinear.ts b/src/boards/cairoCollinear.ts
@@ -2,7 +2,7 @@ import { Symbol as SVGSymbol } from "@svgdotjs/svg.js";
 import { cairo, IPoint, IPolyPolygon } from "../grids";
 import { RendererBase } from "../renderers/_base";
 import { BoardBasic } from "../schemas/schema";
-import { BoardReturn, getCellFill } from ".";
+import { BoardReturn, getBoardFill } from ".";
 
 export const cairoCollinear = (ctx: RendererBase): BoardReturn => {
     if ( (ctx.json === undefined) || (ctx.rootSvg === undefined) ) {
@@ -56,7 +56,7 @@ export const cairoCollinear = (ctx: RendererBase): BoardReturn => {
     const half = cellsize / 2;
     const quarter = cellsize / 4;
     const widest = half + quarter;
-    const [hexFill, hexOpacity] = getCellFill(ctx, "white");
+    const [hexFill, hexOpacity] = getBoardFill(ctx, "white");
 
     const pentN = ctx.rootSvg.defs().symbol().id("pentagon-symbol-N").viewbox(0 - widest - 1, 0 - half - 1, (cellsize * 1.5) + 2, cellsize + 2);
     const ptsN: IPoint[] = [{x: 0, y: 0 - half}, {x: widest, y: 0 - quarter}, {x: half, y: half}, {x: 0 - half, y: half}, {x: 0 - widest, y: 0 - quarter}];
diff --git a/src/boards/cobweb.ts b/src/boards/cobweb.ts
@@ -1,7 +1,7 @@
 import { Element as SVGElement, StrokeData } from "@svgdotjs/svg.js";
 import { RendererBase } from "../renderers/_base";
 import { ICobwebArgs, cobweb as cobwebGrid, cobwebLabels, cobwebPolys } from "../grids/cobweb";
-import { BoardReturn, getCellFill } from ".";
+import { BoardReturn, getBoardFill } from ".";
 
 export const cobweb = (ctx: RendererBase): BoardReturn => {
     if ( (ctx.json === undefined) || (ctx.rootSvg === undefined) ) {
@@ -46,7 +46,7 @@ export const cobweb = (ctx: RendererBase): BoardReturn => {
     const gridlines = board.group().id("gridlines");
 
     // apply boardFill before the first markers
-    const [hexFill, hexOpacity] = getCellFill(ctx, "white");
+    const [hexFill, hexOpacity] = getBoardFill(ctx, "white");
     for (let y = 0; y < polys.length; y++) {
         const slice = polys[y];
         for (let x = 0; x < slice.length; x++) {
diff --git a/src/boards/conhex.ts b/src/boards/conhex.ts
@@ -1,4 +1,4 @@
-import { BoardReturn, getCellFill } from ".";
+import { BoardReturn, getBoardFill } from ".";
 import { matrixRectRotN90 } from "../common/plotting";
 import { GridPoints, IPoint, IPolyPolygon, rectOfRects } from "../grids";
 import { RendererBase } from "../renderers/_base";
@@ -82,7 +82,7 @@ export const conhex = (ctx: RendererBase): BoardReturn => {
         blocked = [...(ctx.json.board.blocked as Blocked)];
     }
 
-    const [hexFill, hexOpacity] = getCellFill(ctx, "white");
+    const [hexFill, hexOpacity] = getBoardFill(ctx, "white");
     for (let row = 0; row < cells.length; row++) {
         for (let col = 0; col < cells[row].length; col++) {
             if (blocked !== undefined && blocked.find(obj => obj.col === col && obj.row === row) !== undefined) {
diff --git a/src/boards/conicalHex.ts b/src/boards/conicalHex.ts
@@ -1,4 +1,4 @@
-import { BoardReturn, getCellFill } from ".";
+import { BoardReturn, getBoardFill } from ".";
 import { conicalHex as conicalHexGrid, genConicalHexPolys } from "../grids";
 import { RendererBase } from "../renderers/_base";
 
@@ -50,7 +50,7 @@ export const conicalHex = (ctx: RendererBase): BoardReturn => {
     const gridlines = board.group().id("hexes");
 
     // boardFill has to happen before the first markers
-    const [hexFill, hexOpacity] = getCellFill(ctx, "white");
+    const [hexFill, hexOpacity] = getBoardFill(ctx, "white");
     for (let iRow = 0; iRow < grid.length; iRow++) {
         const row = polys[iRow];
         for (let iCol = 0; iCol < row.length; iCol++) {
diff --git a/src/boards/hexOfCir.ts b/src/boards/hexOfCir.ts
@@ -1,4 +1,4 @@
-import { BoardReturn, getCellFill } from ".";
+import { BoardReturn, getBoardFill } from ".";
 import { IPolyCircle, hexOfCir as hexOfCirGrid } from "../grids";
 import { RendererBase } from "../renderers/_base";
 
@@ -60,7 +60,7 @@ export const hexOfCir = (ctx: RendererBase, opts?: {noSvg: boolean}): BoardRetur
     }
 
     // boardFill before first markers
-    const [hexFill, hexOpacity] = getCellFill(ctx);
+    const [hexFill, hexOpacity] = getBoardFill(ctx);
     const circleFilled = ctx.rootSvg.defs().symbol().id("circle-symbol-filled").viewbox(0, 0, cellsize, cellsize);
     circleFilled.circle(cellsize)
         .fill({color: hexFill, opacity: hexOpacity})
diff --git a/src/boards/hexOfHex.ts b/src/boards/hexOfHex.ts
@@ -1,4 +1,4 @@
-import { BoardReturn, getCellFill } from ".";
+import { BoardReturn, getBoardFill } from ".";
 import { IPoint, IPolyPolygon, hexOfHex as hexOfHexGrid } from "../grids";
 import { RendererBase } from "../renderers/_base";
 
@@ -78,7 +78,7 @@ export const hexOfHex = (ctx: RendererBase, opts?: {noSvg: boolean}): BoardRetur
     if ( (ctx.json.board.blocked !== undefined) && (ctx.json.board.blocked !== null)  && (Array.isArray(ctx.json.board.blocked)) && (ctx.json.board.blocked.length > 0) ){
         blocked = [...(ctx.json.board.blocked as Blocked)];
     }
-    const [hexFill, hexOpacity] = getCellFill(ctx, "white");
+    const [hexFill, hexOpacity] = getBoardFill(ctx, "white");
     const hexFilled = ctx.rootSvg.defs().symbol().id("hex-symbol-filled").viewbox(-3.3493649053890344, 0, 50, 50);
     hexFilled.polygon(pts.map(pt => `${pt.x},${pt.y}`).join(" "))
         .fill({color: hexFill, opacity: hexOpacity}).id("hex-symbol-poly-filled")
diff --git a/src/boards/hexOfTriF.ts b/src/boards/hexOfTriF.ts
@@ -3,7 +3,7 @@ import { GridPoints, IPoint, Poly } from "../grids";
 import { RendererBase } from "../renderers/_base";
 import { centroid } from "../common/plotting";
 import { hexOfTri as hexOfTriGrid } from "../grids";
-import { BoardReturn, getCellFill } from ".";
+import { BoardReturn, getBoardFill } from ".";
 
 export const hexOfTriF = (ctx: RendererBase): BoardReturn => {
     if ( (ctx.json === undefined) || (ctx.rootSvg === undefined) ) {
@@ -121,7 +121,7 @@ export const hexOfTriF = (ctx: RendererBase): BoardReturn => {
     if ( (ctx.json.board.blocked !== undefined) && (ctx.json.board.blocked !== null)  && (Array.isArray(ctx.json.board.blocked)) && (ctx.json.board.blocked.length > 0) ){
         blocked = [...(ctx.json.board.blocked as Blocked)];
     }
-    const [cellFill, cellOpacity] = getCellFill(ctx, "white");
+    const [cellFill, cellOpacity] = getBoardFill(ctx, "white");
     for (let y = 0; y < polys.length; y++) {
         const slice = polys[y];
         for (let x = 0; x < slice.length; x++) {
diff --git a/src/boards/hexSlanted.ts b/src/boards/hexSlanted.ts
@@ -1,7 +1,7 @@
 import { BoardBasic } from "../schemas/schema";
 import { IPoint, IPolyPolygon, hexSlanted as hexSlantedGrid} from "../grids";
 import { RendererBase } from "../renderers/_base";
-import { BoardReturn, getCellFill } from ".";
+import { BoardReturn, getBoardFill } from ".";
 
 export const hexSlanted = (ctx: RendererBase): BoardReturn => {
     if ( (ctx.json === undefined) || (ctx.rootSvg === undefined) ) {
@@ -63,7 +63,7 @@ export const hexSlanted = (ctx: RendererBase): BoardReturn => {
     if ( (boardTyped.blocked !== undefined) && (boardTyped.blocked !== null) && (Array.isArray(boardTyped.blocked)) && (boardTyped.blocked.length > 0) ){
         blocked = [...(boardTyped.blocked as Blocked)];
     }
-    const [hexFill, hexOpacity] = getCellFill(ctx, "white");
+    const [hexFill, hexOpacity] = getBoardFill(ctx, "white");
     hexFilled.polygon(pts.map(pt => `${pt.x},${pt.y}`).join(" "))
        .fill({color: hexFill, opacity: hexOpacity}).id("hex-symbol-poly-filled")
        .stroke("none");
diff --git a/src/boards/index.ts b/src/boards/index.ts
@@ -96,7 +96,7 @@ export const pts2id = (a: [number,number], b: [number,number]): string => {
 }
 
 // helpers for getting settings consistently across the boards
-export const getCellFill = (ctx: RendererBase, defColour: string|undefined = undefined, defOpacity = 0): [string|undefined, number] => {
+export const getBoardFill = (ctx: RendererBase, defColour: string|undefined = undefined, defOpacity = 0): [string|undefined, number] => {
     if (ctx.json === undefined || ctx.json.board === null) {
         throw new Error(`Context object in an invalid state.`);
     }
diff --git a/src/boards/moon.ts b/src/boards/moon.ts
@@ -2,7 +2,7 @@ import { StrokeData } from "@svgdotjs/svg.js";
 import { GridPoints, IPolyPolygon } from "../grids";
 import { RendererBase } from "../renderers/_base";
 import { centroid } from "../common/plotting";
-import { BoardReturn, getCellFill } from ".";
+import { BoardReturn, getBoardFill } from ".";
 
 /**
  * This generator creates a moon squad board, which is a standard hexhex5 with the centre cell
@@ -39,7 +39,7 @@ export const moon = (ctx: RendererBase): BoardReturn => {
     const gridlines = board.group().id("gridlines");
 
     // boardFill before first markers
-    const [hexFill, hexOpacity] = getCellFill(ctx, "white");
+    const [hexFill, hexOpacity] = getBoardFill(ctx, "white");
     for (let y = 0; y < polys.length; y++) {
         const row = polys[y];
         for (let x = 0; x < row.length; x++) {
diff --git a/src/boards/pyramidHex.ts b/src/boards/pyramidHex.ts
@@ -1,4 +1,4 @@
-import { BoardReturn, getCellFill } from ".";
+import { BoardReturn, getBoardFill } from ".";
 import { genPyramidHexPolys, pyramidHex as pyramidHexGrid } from "../grids";
 import { RendererBase } from "../renderers/_base";
 
@@ -38,7 +38,7 @@ export const pyramidHex = (ctx: RendererBase): BoardReturn => {
     const gridlines = board.group().id("hexes");
 
     // boardFill before first markers
-    const [hexFill, hexOpacity] = getCellFill(ctx, "white");
+    const [hexFill, hexOpacity] = getBoardFill(ctx, "white");
     for (let iRow = 0; iRow < grid.length; iRow++) {
         const row = polys[iRow];
         for (let iCol = 0; iCol < row.length; iCol++) {
diff --git a/src/boards/rectOfHex.ts b/src/boards/rectOfHex.ts
@@ -1,5 +1,5 @@
 import { centroid } from "../common/plotting";
-import { BoardReturn, edges2corners, getCellFill, pts2id } from ".";
+import { BoardReturn, edges2corners, getBoardFill, pts2id } from ".";
 import { GridPoints, IPoint, IPolyPolygon } from "../grids";
 import { RendererBase } from "../renderers/_base";
 import { Grid, defineHex, Orientation, HexOffset, rectangle } from "honeycomb-grid";
@@ -85,7 +85,7 @@ export const rectOfHex = (ctx: RendererBase): BoardReturn => {
     if ( (ctx.json.board.blocked !== undefined) && (ctx.json.board.blocked !== null) && (Array.isArray(ctx.json.board.blocked)) && (ctx.json.board.blocked.length > 0) ){
         blocked = [...(ctx.json.board.blocked as Blocked)];
     }
-    const [hexFill, hexOpacity] = getCellFill(ctx, "white");
+    const [hexFill, hexOpacity] = getBoardFill(ctx, "white");
     const corners = grid.getHex({col: 0, row: 0})!.corners;
     const vbx = Math.min(...corners.map(pt => pt.x));
     const vby = Math.min(...corners.map(pt => pt.y));
diff --git a/src/boards/snubSquareCells.ts b/src/boards/snubSquareCells.ts
@@ -2,7 +2,7 @@ import { BoardBasic } from "../schemas/schema";
 import { centroid } from "../common/plotting";
 import { IPolyPolygon, snubsquare, SnubStart } from "../grids";
 import { RendererBase } from "../renderers/_base";
-import { BoardReturn, getCellFill } from ".";
+import { BoardReturn, getBoardFill } from ".";
 
 export const snubSquareCells = (ctx: RendererBase): BoardReturn => {
     if ( (ctx.json === undefined) || (ctx.rootSvg === undefined) ) {
@@ -164,7 +164,7 @@ export const snubSquareCells = (ctx: RendererBase): BoardReturn => {
     if ( (ctx.json.board.blocked !== undefined) && (ctx.json.board.blocked !== null)  && (Array.isArray(ctx.json.board.blocked)) && (ctx.json.board.blocked.length > 0) ){
         blocked = [...(ctx.json.board.blocked as Blocked)];
     }
-    const [cellFill, cellOpacity] = getCellFill(ctx, "white");
+    const [cellFill, cellOpacity] = getBoardFill(ctx, "white");
     for (let row = 0; row < polys.length; row++) {
         for (let col = 0; col < polys[row].length; col++) {
             const isBlocked = blocked?.find(e => e.row === row && e.col === col) !== undefined;
diff --git a/src/boards/sowing.ts b/src/boards/sowing.ts
@@ -2,7 +2,7 @@ import { Element as SVGElement } from "@svgdotjs/svg.js";
 import { IPoint, rectOfRects } from "../grids";
 import { MarkerOutline } from "../schemas/schema";
 import { RendererBase } from "../renderers/_base";
-import { BoardReturn, getCellFill } from ".";
+import { BoardReturn, getBoardFill } from ".";
 
 export const sowing = (ctx: RendererBase): BoardReturn => {
     if ( (ctx.json === undefined) || (ctx.rootSvg === undefined) ) {
@@ -255,7 +255,7 @@ export const sowing = (ctx: RendererBase): BoardReturn => {
 
     // Draw exterior grid lines
     // Draw square around entire board
-    const [cellFill, cellOpacity] = getCellFill(ctx, ctx.options.colourContext.background);
+    const [cellFill, cellOpacity] = getBoardFill(ctx, ctx.options.colourContext.background);
     gridlines.rect(width * cellsize, height * cellsize)
         .move(0 - (cellsize / 2), 0 - (cellsize / 2))
         .fill({color: cellFill, opacity: cellOpacity})
diff --git a/src/boards/squares.ts b/src/boards/squares.ts
@@ -4,7 +4,7 @@ import { RendererBase } from "../renderers/_base";
 import { rotatePoint, shortenLine } from "../common/plotting";
 import tinycolor from "tinycolor2";
 import { MarkerOutline } from "../schemas/schema";
-import { BoardReturn, CompassDirection, getCellFill, IBuffer } from ".";
+import { BoardReturn, CompassDirection, getBoardFill, IBuffer } from ".";
 
 export const squares = (ctx: RendererBase, opts?: {noSvg: boolean}): BoardReturn => {
     if ( (ctx.json === undefined) || (ctx.rootSvg === undefined) ) {
@@ -103,7 +103,7 @@ export const squares = (ctx: RendererBase, opts?: {noSvg: boolean}): BoardReturn
     if ( (ctx.json.board.blocked !== undefined) && (ctx.json.board.blocked !== null)  && (Array.isArray(ctx.json.board.blocked)) && (ctx.json.board.blocked.length > 0) ){
         blocked = [...(ctx.json.board.blocked as Blocked)];
     }
-    const [cellFill, cellOpacity] = getCellFill(ctx, ctx.options.colourContext.background);
+    const [cellFill, cellOpacity] = getBoardFill(ctx, ctx.options.colourContext.background);
     const tileFilled = ctx.rootSvg.defs().symbol().id("tile-filled").viewbox(0, 0, cellsize, cellsize);
     tileFilled.rect(cellsize, cellsize)
         .move(0, 0)
diff --git a/src/boards/squaresDiamonds.ts b/src/boards/squaresDiamonds.ts
@@ -1,4 +1,4 @@
-import { BoardReturn, getCellFill } from ".";
+import { BoardReturn, getBoardFill } from ".";
 import { centroid } from "../common/plotting";
 import { GridPoints, IPolyPolygon, rectOfRects } from "../grids";
 import { RendererBase } from "../renderers/_base";
@@ -146,7 +146,7 @@ export const squaresDiamonds = (ctx: RendererBase): BoardReturn => {
     if ( (ctx.json.board.blocked !== undefined) && (ctx.json.board.blocked !== null) && (Array.isArray(ctx.json.board.blocked)) && (ctx.json.board.blocked.length > 0) ){
         blocked = [...(ctx.json.board.blocked as Blocked)];
     }
-    const [cellFill, cellOpacity] = getCellFill(ctx, "white");
+    const [cellFill, cellOpacity] = getBoardFill(ctx, "white");
     for (let row = 0; row < polys.length; row++) {
         for (let col = 0; col < polys[row].length; col++) {
             const isBlocked = blocked?.find(entry => entry.row === row && entry.col === col) !== undefined;
diff --git a/src/renderers/_base.ts b/src/renderers/_base.ts
@@ -9,7 +9,7 @@ import { glyph2uid, x2uid } from "../common/glyph2uid";
 import tinycolor from "tinycolor2";
 import { unionPolys } from "../common/polys";
 import { hex2rgb, rgb2hex, afterOpacity, lighten } from "../common/colours";
-import { CompassDirection, edges2corners, getCellFill } from "../boards";
+import { CompassDirection, edges2corners, getBoardFill } from "../boards";
 // import { customAlphabet } from 'nanoid'
 // const nanoid = customAlphabet('abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789', 10);
 
@@ -3668,7 +3668,7 @@ export abstract class RendererBase {
             if ( ("backFill" in this.json.board) && (this.json.board.backFill !== undefined) && (this.json.board.backFill !== null) ) {
                 backFillObj = this.json.board.backFill as BackFill;
             }
-            const [fillColour, fillOpacity] = getCellFill(this, undefined);
+            const [fillColour, fillOpacity] = getBoardFill(this, undefined);
 
             // if there is no backFill object and no requested board colour, then don't try again
             if (backFillObj === undefined && fillColour === undefined) {
diff --git a/src/renderers/conhex.ts b/src/renderers/conhex.ts
@@ -4,7 +4,7 @@ import { APRenderRep } from "../schemas/schema";
 import { IRendererOptionsIn, RendererBase } from "./_base";
 import { usePieceAt } from "../common/plotting";
 import { IPoint, rectOfRects, IPolyCircle } from "../grids";
-import { getCellFill, getConhexCells } from "../boards";
+import { getBoardFill, getConhexCells } from "../boards";
 
 /**
  * Generates the pattern of 0s and 1s that denote whether
@@ -213,7 +213,7 @@ export class ConhexRenderer extends RendererBase {
             }
         }
 
-        const [cellFill, cellOpacity] = getCellFill(this, this.options.colourContext.background);
+        const [cellFill, cellOpacity] = getBoardFill(this, this.options.colourContext.background);
 
         // place cells and give them a base, empty fill
         for (let row = 0; row < cells.length; row++) {

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ export const pts2id = (a: [number,number], b: [number,number]): string => {`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`// helpers for getting settings consistently across the boards`
`99`		`-export const getCellFill = (ctx: RendererBase, defColour: string\|undefined = undefined, defOpacity = 0): [string\|undefined, number] => {`
	`99`	`+export const getBoardFill = (ctx: RendererBase, defColour: string\|undefined = undefined, defOpacity = 0): [string\|undefined, number] => {`
`100`	`100`	`if (ctx.json === undefined \|\| ctx.json.board === null) {`
`101`	`101`	throw new Error(`Context object in an invalid state.`);
`102`	`102`	`}`