Skip to content

Commit

Permalink
3.3 release to go with 1.2 of pivot
Browse files Browse the repository at this point in the history
  • Loading branch information
David Mesquita-Morris committed Sep 29, 2021
1 parent fcfc6fc commit 4da5e2c
Show file tree
Hide file tree
Showing 11 changed files with 56 additions and 70 deletions.
6 changes: 3 additions & 3 deletions docs/api/v3/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/902c870/src/index.ts#L82">index.ts:82</a></li>
<li>Defined in <a href="https://github.com/steelbreeze/landscape/blob/fcfc6fc/src/index.ts#L82">index.ts:82</a></li>
</ul>
</aside>
<div class="tsd-comment tsd-typography">
Expand Down Expand Up @@ -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/902c870/src/index.ts#L44">index.ts:44</a></li>
<li>Defined in <a href="https://github.com/steelbreeze/landscape/blob/fcfc6fc/src/index.ts#L44">index.ts:44</a></li>
</ul>
</aside>
<div class="tsd-comment tsd-typography">
Expand Down Expand Up @@ -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/902c870/src/index.ts#L30">index.ts:30</a></li>
<li>Defined in <a href="https://github.com/steelbreeze/landscape/blob/fcfc6fc/src/index.ts#L30">index.ts:30</a></li>
</ul>
</aside>
<div class="tsd-comment tsd-typography">
Expand Down
8 changes: 4 additions & 4 deletions docs/api/v3/interfaces/cell.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/902c870/src/index.ts#L20">index.ts:20</a></li>
<li>Defined in <a href="https://github.com/steelbreeze/landscape/blob/fcfc6fc/src/index.ts#L20">index.ts:20</a></li>
</ul>
</aside>
<div class="tsd-comment tsd-typography">
Expand All @@ -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/902c870/src/index.ts#L17">index.ts:17</a></li>
<li>Defined in <a href="https://github.com/steelbreeze/landscape/blob/fcfc6fc/src/index.ts#L17">index.ts:17</a></li>
</ul>
</aside>
<div class="tsd-comment tsd-typography">
Expand All @@ -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/902c870/src/index.ts#L11">index.ts:11</a></li>
<li>Defined in <a href="https://github.com/steelbreeze/landscape/blob/fcfc6fc/src/index.ts#L11">index.ts:11</a></li>
</ul>
</aside>
<div class="tsd-comment tsd-typography">
Expand All @@ -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/902c870/src/index.ts#L8">index.ts:8</a></li>
<li>Defined in <a href="https://github.com/steelbreeze/landscape/blob/fcfc6fc/src/index.ts#L8">index.ts:8</a></li>
</ul>
</aside>
<div class="tsd-comment tsd-typography">
Expand Down
4 changes: 2 additions & 2 deletions docs/api/v3/interfaces/key.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/902c870/src/index.ts#L11">index.ts:11</a></li>
<li>Defined in <a href="https://github.com/steelbreeze/landscape/blob/fcfc6fc/src/index.ts#L11">index.ts:11</a></li>
</ul>
</aside>
<div class="tsd-comment tsd-typography">
Expand All @@ -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/902c870/src/index.ts#L8">index.ts:8</a></li>
<li>Defined in <a href="https://github.com/steelbreeze/landscape/blob/fcfc6fc/src/index.ts#L8">index.ts:8</a></li>
</ul>
</aside>
<div class="tsd-comment tsd-typography">
Expand Down
2 changes: 1 addition & 1 deletion docs/dist/landscape.min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions docs/dynamic/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ <h4>Social</h4>
<script src="../dist/landscape.min.js"></script>
<script type="module">
import * as d3 from 'https://cdn.skypack.dev/d3-dsv@3?min';
import * as pivot from 'https://cdn.skypack.dev/@steelbreeze/pivot@1.1?min';
import * as pivot from 'https://cdn.skypack.dev/@steelbreeze/pivot@1.2?min';

const context = {
file: undefined,
Expand Down Expand Up @@ -432,7 +432,6 @@ <h4>Social</h4>
renderTable(tab);
}


function renderTable(tableData, elementId, className) {
const tableElement = document.createElement('table');
tableElement.id = 'landscapeTable';
Expand Down
13 changes: 0 additions & 13 deletions docs/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,6 @@ <h1>Outstanding work</h1>
</article>
</div>
</footer>
<script crossorigin="anonymous"
src="https://polyfill.io/v3/polyfill.min.js?features=Promise%2Cfetch%2Cperformance.now"></script>
<script src="./dist/d3-dsv.min.js"></script>
<script src="https://steelbreeze.net/pivot/dist/pivot.min.js"></script>
<script src="./dist/landscape.min.js"></script>
Expand Down Expand Up @@ -231,17 +229,6 @@ <h1>Outstanding work</h1>
y: pivot.deriveDimension(data, yAxisSelector.value, { sort: listSort(sortOrder[yAxisSelector.value]) })
};

/* // create a header dimension
const xAxisHeader = pivot.dimension([xAxisSelector.value], xAxisSelector.value, () => xAxisSelector.value);
const yAxisHeader = pivot.dimension([yAxisSelector.value], yAxisSelector.value, () => yAxisSelector.value);
// join the dimensions with their header dimensions
xAxis = pivot.join(xAxisHeader, xAxis);
yAxis = pivot.join(yAxisHeader, yAxis);
*/
//console.timeEnd('dimensions');
//console.time('cube');

// create the cube
cube = pivot.cube(data, axes);

Expand Down
12 changes: 6 additions & 6 deletions lib/node/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ function split(keys, axes, onX) {
// generate the cube cells
return cell(values[Math.floor(values.length * (ysi + xsi) / (xSplit * ySplit))]);
// generate the y axis row header cells
}, axes.y[iY].data.map(pair => axis(pair, 'y')));
}, axes.y[iY].map(criterion => axis(criterion, 'y')));
// generate the x axis column header rows
}, axes.x[0].data.map((_, iY) => {
}, axes.x[0].map((_, iY) => {
// iterate and expand the x axis
return expand(axes.x, xSplits, xPoint => {
// generate the x axis cells
return axis(xPoint.data[iY], 'x');
return axis(xPoint[iY], 'x');
// generate the x/y header
}, axes.y[0].data.map(() => axis({ key: '', value: '' }, 'xy')));
}, axes.y[0].map(() => axis({ key: '', value: '' }, 'xy')));
}));
}
exports.split = split;
Expand Down Expand Up @@ -120,6 +120,6 @@ function cell(key) {
* Creates a cell within a table for a column or row heading.
* @hidden
*/
function axis(pair, name) {
return cell({ text: pair.value, style: `axis ${name} ${pair.key}` });
function axis(criterion, name) {
return cell({ text: criterion.value, style: `axis ${name} ${criterion.key}` });
}
2 changes: 1 addition & 1 deletion lib/web/landscape.min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

60 changes: 30 additions & 30 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@steelbreeze/landscape",
"version": "3.2.1",
"version": "3.3.0",
"description": "Landscape map viewpoint visualisation",
"main": "lib/node/index.js",
"module": "lib/node/index.js",
Expand All @@ -12,7 +12,7 @@
"lib": "lib"
},
"dependencies": {
"@steelbreeze/pivot": "^1.1.0"
"@steelbreeze/pivot": "^1.2.0"
},
"devDependencies": {
"typedoc": "^0.20.36",
Expand Down
Loading

0 comments on commit 4da5e2c

Please sign in to comment.