Skip to content

Commit 931c06b

Browse files
committed
Add X/Y Density, Maps, remove @perspective-dev/viewer-openlayers, plugin_config_schema
Signed-off-by: Andrew Stein <steinlink@gmail.com>
1 parent 503ded3 commit 931c06b

218 files changed

Lines changed: 11370 additions & 5747 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/build.yaml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ jobs:
152152
- name: WebAssembly Build
153153
run: pnpm run build --ci
154154
env:
155-
PACKAGE: "server,client,viewer,viewer-datagrid,viewer-charts,viewer-openlayers,workspace,react"
155+
PACKAGE: "server,client,viewer,viewer-datagrid,viewer-charts,workspace,react"
156156
# PSP_USE_CCACHE: 1
157157

158158
- uses: actions/upload-artifact@v4
@@ -166,7 +166,6 @@ jobs:
166166
rust/perspective-viewer/src
167167
packages/viewer-charts/dist
168168
packages/viewer-datagrid/dist
169-
packages/viewer-openlayers/dist
170169
packages/workspace/dist
171170
packages/react/dist
172171
@@ -652,7 +651,7 @@ jobs:
652651
id: run_tests
653652
run: pnpm run test -- --fetch-snapshots
654653
env:
655-
PACKAGE: "server,client,viewer,viewer-datagrid,viewer-charts,viewer-openlayers,workspace,react"
654+
PACKAGE: "server,client,viewer,viewer-datagrid,viewer-charts,workspace,react"
656655
PSP_SNAPSHOT_REPO: ${{ vars.PSP_SNAPSHOT_REPO }}
657656
PSP_SNAPSHOT_TOKEN: ${{ secrets.PSP_SNAPSHOT_TOKEN }}
658657
PSP_SNAPSHOT_REF: ${{ github.head_ref || github.ref_name }}
@@ -1030,9 +1029,6 @@ jobs:
10301029
- run: pnpm pack --pack-destination=../..
10311030
working-directory: ./packages/viewer-charts
10321031

1033-
- run: pnpm pack --pack-destination=../..
1034-
working-directory: ./packages/viewer-openlayers
1035-
10361032
- run: pnpm pack --pack-destination=../..
10371033
working-directory: ./packages/workspace
10381034

docs/md/how_to/javascript/installation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ installed separately. All Plugins are optional - but a `<perspective-viewer>`
4242
without Plugins would be rather boring!
4343

4444
```bash
45-
$ npm add @perspective-dev/viewer-charts @perspective-dev/viewer-datagrid @perspective-dev/viewer-openlayers
45+
$ npm add @perspective-dev/viewer-charts @perspective-dev/viewer-datagrid
4646
```
4747

4848
## Node.js

docs/src/components/gallery.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
1212

1313
import EXAMPLES from "../data/features.js";
14-
import { SUPERSTORE_TABLE } from "../data/superstore.js";
14+
import { WORKER, SUPERSTORE_TABLE } from "../data/superstore.js";
1515
import { getColorMode, getPerspectiveTheme } from "./theme.js";
1616

1717
function showOverlay(index: number) {
@@ -31,9 +31,10 @@ function showOverlay(index: number) {
3131
document.body.appendChild(overlay);
3232

3333
SUPERSTORE_TABLE.then((table: any) => {
34-
viewer.load(table);
34+
viewer.load(WORKER);
3535
viewer.restore({
3636
plugin: "Datagrid",
37+
table: "superstore",
3738
group_by: [],
3839
expressions: {},
3940
split_by: [],
@@ -61,9 +62,7 @@ export async function initGallery(container: HTMLElement) {
6162
img.alt = "Perspective feature gallery";
6263
img.src = `/features/montage${isDark ? "_dark" : "_light"}.png`;
6364
img.addEventListener("click", (event: MouseEvent) => {
64-
const col = Math.floor(
65-
(event.offsetX / img.offsetWidth) * map.columns,
66-
);
65+
const col = Math.floor((event.offsetX / img.offsetWidth) * map.columns);
6766
const row = Math.floor((event.offsetY / img.offsetHeight) * rows);
6867
const tileIndex = row * map.columns + col;
6968
const featureIndex = map.order[tileIndex];

docs/src/data/superstore.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,12 @@ import { worker } from "./worker.js";
1414
// @ts-ignore
1515
import SUPERSTORE_URL from "superstore-arrow/superstore.lz4.arrow";
1616

17+
export const WORKER = worker();
18+
1719
export const SUPERSTORE_TABLE = (async function () {
18-
const w = await worker();
1920
const req = await fetch(SUPERSTORE_URL);
2021
const arrow = await req.arrayBuffer();
21-
return await w.table(arrow.slice());
22+
return await WORKER.then((w) =>
23+
w.table(arrow.slice(), { name: "superstore" }),
24+
);
2225
})();

docs/test/js/examples.spec.mts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,6 @@ test.describe("Examples", () => {
6767
let selector = "";
6868
if (new_config.plugin === "Datagrid") {
6969
selector = "perspective-viewer-datagrid";
70-
} else if (new_config.plugin === "Map Scatter") {
71-
selector = "perspective-viewer-openlayers-scatter";
7270
} else {
7371
const plugin = new_config.plugin
7472
.replace(/[-\/\s]/gi, "")

eslint.config.mjs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ export default tseslint.config(
2424
"packages/jupyterlab/**/*",
2525
// "packages/viewer-charts/**/*",
2626
// "packages/viewer-datagrid/**/*",
27-
"packages/viewer-openlayers/**/*",
2827
"packages/workspace/**/*",
2928
"packages/react/**/*",
3029

examples/blocks/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"@perspective-dev/viewer": "workspace:",
1717
"@perspective-dev/viewer-charts": "workspace:",
1818
"@perspective-dev/viewer-datagrid": "workspace:",
19-
"@perspective-dev/viewer-openlayers": "workspace:",
2019
"@perspective-dev/workspace": "workspace:",
2120
"superstore-arrow": "catalog:"
2221
},

examples/blocks/src/evictions/index.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import "/node_modules/@perspective-dev/viewer/dist/cdn/perspective-viewer.js";
1111
import "/node_modules/@perspective-dev/viewer-datagrid/dist/cdn/perspective-viewer-datagrid.js";
1212
import "/node_modules/@perspective-dev/viewer-charts/dist/cdn/perspective-viewer-charts.js";
13-
import "/node_modules/@perspective-dev/viewer-openlayers/dist/cdn/perspective-viewer-openlayers.js";
1413

1514
import { worker } from "/node_modules/@perspective-dev/client/dist/cdn/perspective.js";
1615

examples/blocks/src/file/file.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import "/node_modules/@perspective-dev/viewer/dist/cdn/perspective-viewer.js";
1414
import "/node_modules/@perspective-dev/viewer-datagrid/dist/cdn/perspective-viewer-datagrid.js";
1515
import "/node_modules/@perspective-dev/viewer-charts/dist/cdn/perspective-viewer-charts.js";
16-
import "/node_modules/@perspective-dev/viewer-openlayers/dist/cdn/perspective-viewer-openlayers.js";
1716

1817
import perspective from "/node_modules/@perspective-dev/client/dist/cdn/perspective.js";
1918

examples/blocks/src/nypd/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import "/node_modules/@perspective-dev/viewer/dist/cdn/perspective-viewer.js";
1414
import "/node_modules/@perspective-dev/workspace/dist/cdn/perspective-workspace.js";
1515
import "/node_modules/@perspective-dev/viewer-datagrid/dist/cdn/perspective-viewer-datagrid.js";
1616
import "/node_modules/@perspective-dev/viewer-charts/dist/cdn/perspective-viewer-charts.js";
17-
import "/node_modules/@perspective-dev/viewer-openlayers/dist/cdn/perspective-viewer-openlayers.js";
1817

1918
import perspective from "/node_modules/@perspective-dev/client/dist/cdn/perspective.js";
2019

0 commit comments

Comments
 (0)