Use Pair interface from Pivot

docs/api/v3/index.html

@@ -89,7 +89,7 @@ <h3>merge</h3>
 						<li class="tsd-description">
 							<aside class="tsd-sources">
 								<ul>
-									<li>Defined in <a href="https://github.com/steelbreeze/landscape/blob/fcfc6fc/src/index.ts#L82">index.ts:82</a></li>
+									<li>Defined in <a href="https://github.com/steelbreeze/landscape/blob/4da5e2c/src/index.ts#L80">index.ts:80</a></li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -132,7 +132,7 @@ <h3>split</h3>
 						<li class="tsd-description">
 							<aside class="tsd-sources">
 								<ul>
-									<li>Defined in <a href="https://github.com/steelbreeze/landscape/blob/fcfc6fc/src/index.ts#L44">index.ts:44</a></li>
+									<li>Defined in <a href="https://github.com/steelbreeze/landscape/blob/4da5e2c/src/index.ts#L42">index.ts:42</a></li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -178,7 +178,7 @@ <h3>table</h3>
 						<li class="tsd-description">
 							<aside class="tsd-sources">
 								<ul>
-									<li>Defined in <a href="https://github.com/steelbreeze/landscape/blob/fcfc6fc/src/index.ts#L30">index.ts:30</a></li>
+									<li>Defined in <a href="https://github.com/steelbreeze/landscape/blob/4da5e2c/src/index.ts#L28">index.ts:28</a></li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">

docs/api/v3/interfaces/cell.html

@@ -107,7 +107,7 @@ <h3>cols</h3>
 					<div class="tsd-signature tsd-kind-icon">cols<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">number</span></div>
 					<aside class="tsd-sources">
 						<ul>
-							<li>Defined in <a href="https://github.com/steelbreeze/landscape/blob/fcfc6fc/src/index.ts#L20">index.ts:20</a></li>
+							<li>Defined in <a href="https://github.com/steelbreeze/landscape/blob/4da5e2c/src/index.ts#L18">index.ts:18</a></li>
 						</ul>
 					</aside>
 					<div class="tsd-comment tsd-typography">
@@ -122,7 +122,7 @@ <h3>rows</h3>
 					<div class="tsd-signature tsd-kind-icon">rows<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">number</span></div>
 					<aside class="tsd-sources">
 						<ul>
-							<li>Defined in <a href="https://github.com/steelbreeze/landscape/blob/fcfc6fc/src/index.ts#L17">index.ts:17</a></li>
+							<li>Defined in <a href="https://github.com/steelbreeze/landscape/blob/4da5e2c/src/index.ts#L15">index.ts:15</a></li>
 						</ul>
 					</aside>
 					<div class="tsd-comment tsd-typography">
@@ -138,7 +138,7 @@ <h3>style</h3>
 					<aside class="tsd-sources">
 						<p>Inherited from <a href="key.html">Key</a>.<a href="key.html#style">style</a></p>
 						<ul>
-							<li>Defined in <a href="https://github.com/steelbreeze/landscape/blob/fcfc6fc/src/index.ts#L11">index.ts:11</a></li>
+							<li>Defined in <a href="https://github.com/steelbreeze/landscape/blob/4da5e2c/src/index.ts#L9">index.ts:9</a></li>
 						</ul>
 					</aside>
 					<div class="tsd-comment tsd-typography">
@@ -154,7 +154,7 @@ <h3>text</h3>
 					<aside class="tsd-sources">
 						<p>Inherited from <a href="key.html">Key</a>.<a href="key.html#text">text</a></p>
 						<ul>
-							<li>Defined in <a href="https://github.com/steelbreeze/landscape/blob/fcfc6fc/src/index.ts#L8">index.ts:8</a></li>
+							<li>Defined in <a href="https://github.com/steelbreeze/landscape/blob/4da5e2c/src/index.ts#L6">index.ts:6</a></li>
 						</ul>
 					</aside>
 					<div class="tsd-comment tsd-typography">

docs/api/v3/interfaces/key.html

@@ -105,7 +105,7 @@ <h3>style</h3>
 					<div class="tsd-signature tsd-kind-icon">style<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">string</span></div>
 					<aside class="tsd-sources">
 						<ul>
-							<li>Defined in <a href="https://github.com/steelbreeze/landscape/blob/fcfc6fc/src/index.ts#L11">index.ts:11</a></li>
+							<li>Defined in <a href="https://github.com/steelbreeze/landscape/blob/4da5e2c/src/index.ts#L9">index.ts:9</a></li>
 						</ul>
 					</aside>
 					<div class="tsd-comment tsd-typography">
@@ -120,7 +120,7 @@ <h3>text</h3>
 					<div class="tsd-signature tsd-kind-icon">text<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">string</span></div>
 					<aside class="tsd-sources">
 						<ul>
-							<li>Defined in <a href="https://github.com/steelbreeze/landscape/blob/fcfc6fc/src/index.ts#L8">index.ts:8</a></li>
+							<li>Defined in <a href="https://github.com/steelbreeze/landscape/blob/4da5e2c/src/index.ts#L6">index.ts:6</a></li>
 						</ul>
 					</aside>
 					<div class="tsd-comment tsd-typography">

lib/node/index.js

@@ -120,6 +120,6 @@ function cell(key) {
  * Creates a cell within a table for a column or row heading.
  * @hidden
  */
-function axis(criterion, name) {
-    return cell({ text: criterion.value, style: `axis ${name} ${criterion.key}` });
+function axis(pair, name) {
+    return cell({ text: pair.value, style: `axis ${name} ${pair.key}` });
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steelbreeze/landscape",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "description": "Landscape map viewpoint visualisation",
   "main": "lib/node/index.js",
   "module": "lib/node/index.js",
@@ -12,7 +12,7 @@
     "lib": "lib"
   },
   "dependencies": {
-    "@steelbreeze/pivot": "^1.2.0"
+    "@steelbreeze/pivot": "^1.2.3"
   },
   "devDependencies": {
     "typedoc": "^0.20.36",

src/index.ts

@@ -1,6 +1,4 @@
-// @steelbreeze/landscape
-// Copyright (c) 2019-21 David Mesquita-Morris
-import { Axes, Cube, Func1, Func2, Row } from '@steelbreeze/pivot';
+import { Axes, Cube, Func1, Func2, Pair, Row } from '@steelbreeze/pivot';
 
 /** The final text and class name to use when rendering cells in a table. */
 export interface Key {
@@ -159,6 +157,6 @@ function cell(key: Key): Cell {
  * Creates a cell within a table for a column or row heading.
  * @hidden 
  */
-function axis(criterion: { key: string, value: string }, name: string): Cell {
-	return cell({ text: criterion.value, style: `axis ${name} ${criterion.key}` });
+function axis(pair: Pair, name: string): Cell {
+	return cell({ text: pair.value, style: `axis ${name} ${pair.key}` });
 }