Use reverse func to calculate cell value

steelbreeze · May 27, 2022 · c0a87d2 · c0a87d2
1 parent 40694aa
commit c0a87d2
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/docs/dist/landscape.min.js b/docs/dist/landscape.min.js
diff --git a/lib/node/index.js b/lib/node/index.js
@@ -37,20 +37,20 @@ exports.table = table;
  * @param onY A flag to indicate that cells should be merged on the y axis.
  */
 const merge = (cells, onX, onY) => {
-    reverse(cells, (iY, row) => reverse(row, iX => onY && iY && mergeCells(cells[iY - 1][iX], 'cols', 'rows', row, iX) || onX && iX && mergeCells(row[iX - 1], 'rows', 'cols', row, iX)));
+    reverse(cells, (iY, row) => reverse(row, (iX, cell) => onY && iY && mergeCells(cells[iY - 1][iX], cell, 'cols', 'rows', row, iX) || onX && iX && mergeCells(row[iX - 1], cell, 'rows', 'cols', row, iX)));
 };
 exports.merge = merge;
 /**
  * Merge two adjacent cells if they are equivalent
  * @hidden
  */
-const mergeCells = (next, compareKey, mergeKey, row, iX) => {
-    let result = equals(next, row[iX], compareKey);
-    if (result) {
-        next[mergeKey] += row[iX][mergeKey];
+const mergeCells = (next, cell, compareKey, mergeKey, row, iX) => {
+    if (equals(next, cell, compareKey)) {
+        next[mergeKey] += cell[mergeKey];
         row.splice(iX, 1);
+        return true;
     }
-    return result;
+    return false;
 };
 /**
  * Transform an array of rows into an array of cells.

diff --git a/lib/web/landscape.min.js b/lib/web/landscape.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@steelbreeze/landscape",
-  "version": "3.8.7",
+  "version": "3.8.8",
   "description": "Landscape map viewpoint visualisation",
   "main": "lib/node/index.js",
   "module": "lib/node/index.js",

diff --git a/src/index.ts b/src/index.ts
@@ -69,8 +69,8 @@ export const table = <TRow>(cube: Cube<TRow>, axes: Axes<TRow>, getElement: Call
  */
 export const merge = (cells: Array<Array<Cell>>, onX: boolean, onY: boolean): void => {
 	reverse(cells, (iY, row) =>
-		reverse(row, iX =>
-			onY && iY && mergeCells(cells[iY - 1][iX], 'cols', 'rows', row, iX) || onX && iX && mergeCells(row[iX - 1], 'rows', 'cols', row, iX)
+		reverse(row, (iX, cell) =>
+			onY && iY && mergeCells(cells[iY - 1][iX], cell, 'cols', 'rows', row, iX) || onX && iX && mergeCells(row[iX - 1], cell, 'rows', 'cols', row, iX)
 		)
 	);
 }
@@ -79,9 +79,9 @@ export const merge = (cells: Array<Array<Cell>>, onX: boolean, onY: boolean): vo
  * Merge two adjacent cells if they are equivalent
  * @hidden
  */
-const mergeCells = (next: Cell, compareKey: keyof Layout, mergeKey: keyof Layout, row: Array<Cell>, iX: number): boolean => {
-	if (equals(next, row[iX], compareKey)) {
-		next[mergeKey] += row[iX][mergeKey];
+const mergeCells = (next: Cell, cell: Cell, compareKey: keyof Layout, mergeKey: keyof Layout, row: Array<Cell>, iX: number): boolean => {
+	if (equals(next, cell, compareKey)) {
+		next[mergeKey] += cell[mergeKey];
 		row.splice(iX, 1);
 
 		return true;