Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

wip: stateful layers #58

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

wip: stateful layers #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 28 additions & 28 deletions examples/point/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { StaticMap, MapContext, NavigationControl } from "react-map-gl";
import DeckGL, { Layer, PickingInfo } from "deck.gl/typed";
import { GeoArrowScatterplotLayer } from "@geoarrow/deck.gl-layers";
import * as arrow from "apache-arrow";
import type { Loader, LoaderWithParser } from "@loaders.gl/loader-utils";

const GEOARROW_POINT_DATA =
"http://localhost:8080/2019-01-01_performance_mobile_tiles.feather";
Expand All @@ -24,43 +25,42 @@ const NAV_CONTROL_STYLE = {
left: 10,
};

const GeoArrowIPCLoader: LoaderWithParser = {
name: "geoarrow-ipc",
id: "geoarrow-ipc",
module: "arrow",
version: "latest",
worker: false,
options: {},
extensions: ["feather", "arrow"],
mimeTypes: [],
binary: true,
parse: async (arrayBuffer) => {
return arrow.tableFromIPC(arrayBuffer);
},
};

function Root() {
const onClick = (info: PickingInfo) => {
if (info.object) {
console.log(JSON.stringify(info.object.toJSON()));
}
};

const [table, setTable] = useState<arrow.Table | null>(null);

useEffect(() => {
// declare the data fetching function
const fetchData = async () => {
const data = await fetch(GEOARROW_POINT_DATA);
const buffer = await data.arrayBuffer();
const table = arrow.tableFromIPC(buffer);
setTable(table);
};

if (!table) {
fetchData().catch(console.error);
}
});

const layers: Layer[] = [];

table &&
layers.push(
new GeoArrowScatterplotLayer({
id: "geoarrow-points",
data: table,
getFillColor: table.getChild("colors")!,
radiusMinPixels: 1.5,
getPointRadius: 10,
pointRadiusMinPixels: 0.8,
pickable: true,
})
);
layers.push(
new GeoArrowScatterplotLayer({
id: "geoarrow-points",
data: GEOARROW_POINT_DATA,
getFillColor: ((table: arrow.Table) => table.getChild("colors")!),
radiusMinPixels: 1.5,
getPointRadius: 10,
pointRadiusMinPixels: 0.8,
pickable: true,
loaders: [GeoArrowIPCLoader],
})
);

return (
<DeckGL
Expand Down
45 changes: 41 additions & 4 deletions src/scatterplot-layer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@ import {
DefaultProps,
GetPickingInfoParams,
Layer,
LayerContext,
LayersList,
Unit,
UpdateParameters,
} from "@deck.gl/core/typed";
import { ScatterplotLayer } from "@deck.gl/layers/typed";
import type { ScatterplotLayerProps } from "@deck.gl/layers/typed";
Expand Down Expand Up @@ -36,7 +38,7 @@ export type GeoArrowScatterplotLayerProps = _GeoArrowScatterplotLayerProps &

/** Properties added by GeoArrowScatterplotLayer */
type _GeoArrowScatterplotLayerProps = {
data: arrow.Table;
data: arrow.Table | string;

/**
* The units of the radius, one of `'meters'`, `'common'`, and `'pixels'`.
Expand Down Expand Up @@ -121,6 +123,7 @@ type _GeoArrowScatterplotLayerProps = {
* @default [0, 0, 0, 255]
*/
getFillColor?:
| ((table: arrow.Table) => arrow.Vector<arrow.FixedSizeList<arrow.Uint8>>)
| arrow.Vector<arrow.FixedSizeList<arrow.Uint8>>
| Accessor<arrow.Table, Color>;
/**
Expand Down Expand Up @@ -170,6 +173,40 @@ export class GeoArrowScatterplotLayer<
static defaultProps = defaultProps;
static layerName = "GeoArrowScatterplotLayer";

declare state: CompositeLayer["state"] & {
table: arrow.Table | null;
}

initializeState(_context: LayerContext): void {
this.state = {
table: null,
};
}

async updateData() {
const { data, fetch, loadOptions, loaders } = this.props;

if (this.props.data instanceof arrow.Table) {
console.log("set state data");
this.setState({ table: this.props.data });
} else if (typeof data === "string") {
const newData = await fetch(data, {
propName: "data",
layer: this,
loaders,
loadOptions,
});
this.setState({table: newData});
}
}

updateState({ props, changeFlags }: UpdateParameters<this>): void {
console.log("updateState");
if (changeFlags.dataChanged) {
this.updateData();
}
}

getPickingInfo({
info,
sourceLayer,
Expand Down Expand Up @@ -207,7 +244,7 @@ export class GeoArrowScatterplotLayer<
}

renderLayers(): Layer<{}> | LayersList | null {
const { data: table } = this.props;
const { table } = this.state;

const pointVector = getGeometryVector(table, EXTENSION_NAME.POINT);
if (pointVector !== null) {
Expand Down Expand Up @@ -237,7 +274,7 @@ export class GeoArrowScatterplotLayer<
_renderLayersPoint(
geometryColumn: PointVector
): Layer<{}> | LayersList | null {
const { data: table } = this.props;
const { table } = this.state;

if (this.props._validate) {
const vectorAccessors: arrow.Vector[] = [geometryColumn];
Expand Down Expand Up @@ -335,7 +372,7 @@ export class GeoArrowScatterplotLayer<
_renderLayersMultiPoint(
geometryColumn: MultiPointVector
): Layer<{}> | LayersList | null {
const { data: table } = this.props;
const { table } = this.state;

// TODO: validate that if nested, accessor props have the same nesting
// structure as the main geometry column.
Expand Down