Skip to content

Commit 598a62c

Browse files
kylebarronkylebarron
authored
Update repo to match fork's layout (#135)
* Move files * Update repo layout to match fork * fix test import * easier import
1 parent 25fdeaf commit 598a62c

18 files changed

+162
-88
lines changed

‎src/constants.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// deck.gl-community
2+
// SPDX-License-Identifier: MIT
3+
// Copyright (c) vis.gl contributors
4+
15
/**
26
* Enum holding GeoArrow extension type names
37
*/

‎src/index.ts

Lines changed: 36 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,38 @@
1-
export { GeoArrowArcLayer } from "./arc-layer.js";
2-
export { GeoArrowColumnLayer } from "./column-layer.js";
3-
export { GeoArrowH3HexagonLayer as _GeoArrowH3HexagonLayer } from "./h3-hexagon-layer.js";
4-
export { GeoArrowHeatmapLayer } from "./heatmap-layer.js";
5-
export { GeoArrowPathLayer } from "./path-layer.js";
6-
export { GeoArrowPointCloudLayer } from "./point-cloud-layer.js";
7-
export { GeoArrowPolygonLayer } from "./polygon-layer.js";
8-
export { GeoArrowScatterplotLayer } from "./scatterplot-layer.js";
9-
export { GeoArrowSolidPolygonLayer } from "./solid-polygon-layer.js";
10-
export { GeoArrowTextLayer as _GeoArrowTextLayer } from "./text-layer.js";
11-
export { GeoArrowTripsLayer } from "./trips-layer.js";
12-
13-
export type { GeoArrowArcLayerProps } from "./arc-layer.js";
14-
export type { GeoArrowColumnLayerProps } from "./column-layer.js";
15-
export type { GeoArrowH3HexagonLayerProps as _GeoArrowH3HexagonLayerProps } from "./h3-hexagon-layer.js";
16-
export type { GeoArrowHeatmapLayerProps } from "./heatmap-layer.js";
17-
export type { GeoArrowPathLayerProps } from "./path-layer.js";
18-
export type { GeoArrowPointCloudLayerProps } from "./point-cloud-layer.js";
19-
export type { GeoArrowPolygonLayerProps } from "./polygon-layer.js";
20-
export type { GeoArrowScatterplotLayerProps } from "./scatterplot-layer.js";
21-
export type { GeoArrowSolidPolygonLayerProps } from "./solid-polygon-layer.js";
22-
export type { GeoArrowTextLayerProps as _GeoArrowTextLayerProps } from "./text-layer.js";
23-
export type { GeoArrowTripsLayerProps } from "./trips-layer.js";
1+
// deck.gl-community
2+
// SPDX-License-Identifier: MIT
3+
// Copyright (c) vis.gl contributors
4+
5+
export type { GeoArrowArcLayerProps } from "./layers/arc-layer";
6+
export { GeoArrowArcLayer } from "./layers/arc-layer";
7+
8+
export type { GeoArrowColumnLayerProps } from "./layers/column-layer";
9+
export { GeoArrowColumnLayer } from "./layers/column-layer";
10+
11+
export type { GeoArrowH3HexagonLayerProps as _GeoArrowH3HexagonLayerProps } from "./layers/h3-hexagon-layer";
12+
export { GeoArrowH3HexagonLayer as _GeoArrowH3HexagonLayer } from "./layers/h3-hexagon-layer";
13+
14+
export type { GeoArrowHeatmapLayerProps } from "./layers/heatmap-layer";
15+
export { GeoArrowHeatmapLayer } from "./layers/heatmap-layer";
16+
17+
export type { GeoArrowPathLayerProps } from "./layers/path-layer";
18+
export { GeoArrowPathLayer } from "./layers/path-layer";
19+
20+
export type { GeoArrowPointCloudLayerProps } from "./layers/point-cloud-layer";
21+
export { GeoArrowPointCloudLayer } from "./layers/point-cloud-layer";
22+
23+
export type { GeoArrowPolygonLayerProps } from "./layers/polygon-layer";
24+
export { GeoArrowPolygonLayer } from "./layers/polygon-layer";
25+
26+
export type { GeoArrowScatterplotLayerProps } from "./layers/scatterplot-layer";
27+
export { GeoArrowScatterplotLayer } from "./layers/scatterplot-layer";
28+
29+
export type { GeoArrowSolidPolygonLayerProps } from "./layers/solid-polygon-layer";
30+
export { GeoArrowSolidPolygonLayer } from "./layers/solid-polygon-layer";
31+
32+
export type { GeoArrowTextLayerProps as _GeoArrowTextLayerProps } from "./layers/text-layer";
33+
export { GeoArrowTextLayer as _GeoArrowTextLayer } from "./layers/text-layer";
34+
35+
export type { GeoArrowTripsLayerProps } from "./layers/trips-layer";
36+
export { GeoArrowTripsLayer } from "./layers/trips-layer";
2437

2538
export type { GeoArrowPickingInfo } from "./types.js";

‎src/arc-layer.ts renamed to ‎src/layers/arc-layer.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// deck.gl-community
2+
// SPDX-License-Identifier: MIT
3+
// Copyright (c) vis.gl contributors
4+
15
import {
26
CompositeLayer,
37
CompositeLayerProps,
@@ -11,15 +15,15 @@ import { ArcLayer } from "@deck.gl/layers";
1115
import type { ArcLayerProps } from "@deck.gl/layers";
1216
import * as arrow from "apache-arrow";
1317
import * as ga from "@geoarrow/geoarrow-js";
14-
import { assignAccessor, extractAccessorsFromProps } from "./utils.js";
18+
import { assignAccessor, extractAccessorsFromProps } from "../utils/utils";
1519
import { child } from "@geoarrow/geoarrow-js";
1620
import {
1721
GeoArrowExtraPickingProps,
1822
computeChunkOffsets,
1923
getPickingInfo,
20-
} from "./picking.js";
21-
import { ColorAccessor, FloatAccessor, GeoArrowPickingInfo } from "./types.js";
22-
import { validateAccessors } from "./validate.js";
24+
} from "../utils/picking";
25+
import { ColorAccessor, FloatAccessor, GeoArrowPickingInfo } from "../types";
26+
import { validateAccessors } from "../utils/validate";
2327

2428
/** All properties supported by GeoArrowArcLayer */
2529
export type GeoArrowArcLayerProps = Omit<

‎src/column-layer.ts renamed to ‎src/layers/column-layer.ts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// deck.gl-community
2+
// SPDX-License-Identifier: MIT
3+
// Copyright (c) vis.gl contributors
4+
15
import {
26
CompositeLayer,
37
CompositeLayerProps,
@@ -14,16 +18,16 @@ import {
1418
assignAccessor,
1519
extractAccessorsFromProps,
1620
getGeometryVector,
17-
} from "./utils.js";
21+
} from "../utils/utils";
1822
import * as ga from "@geoarrow/geoarrow-js";
19-
import { ColorAccessor, FloatAccessor, GeoArrowPickingInfo } from "./types.js";
20-
import { EXTENSION_NAME } from "./constants.js";
23+
import { ColorAccessor, FloatAccessor, GeoArrowPickingInfo } from "../types";
24+
import { EXTENSION_NAME } from "../constants";
2125
import {
2226
GeoArrowExtraPickingProps,
2327
computeChunkOffsets,
2428
getPickingInfo,
25-
} from "./picking.js";
26-
import { validateAccessors } from "./validate.js";
29+
} from "../utils/picking";
30+
import { validateAccessors } from "../utils/validate";
2731

2832
/** All properties supported by GeoArrowColumnLayer */
2933
export type GeoArrowColumnLayerProps = Omit<

‎src/h3-hexagon-layer.ts renamed to ‎src/layers/h3-hexagon-layer.ts

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// deck.gl-community
2+
// SPDX-License-Identifier: MIT
3+
// Copyright (c) vis.gl contributors
4+
15
import {
26
CompositeLayer,
37
CompositeLayerProps,
@@ -6,17 +10,18 @@ import {
610
Layer,
711
LayersList,
812
} from "@deck.gl/core";
9-
import { H3HexagonLayer } from "@deck.gl/geo-layers";
1013
import type { H3HexagonLayerProps } from "@deck.gl/geo-layers";
14+
import { H3HexagonLayer } from "@deck.gl/geo-layers";
1115
import * as arrow from "apache-arrow";
12-
import { assignAccessor, extractAccessorsFromProps } from "./utils.js";
13-
import { GeoArrowPickingInfo } from "./types.js";
16+
17+
import { GeoArrowPickingInfo } from "../types";
18+
import { assignAccessor, extractAccessorsFromProps } from "../utils/utils";
1419
import {
1520
GeoArrowExtraPickingProps,
1621
computeChunkOffsets,
1722
getPickingInfo,
18-
} from "./picking.js";
19-
import { validateAccessors } from "./validate.js";
23+
} from "../utils/picking";
24+
import { validateAccessors } from "../utils/validate";
2025

2126
/** All properties supported by GeoArrowH3HexagonLayer */
2227
export type GeoArrowH3HexagonLayerProps = Omit<

‎src/heatmap-layer.ts renamed to ‎src/layers/heatmap-layer.ts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// deck.gl-community
2+
// SPDX-License-Identifier: MIT
3+
// Copyright (c) vis.gl contributors
4+
15
import {
26
CompositeLayer,
37
CompositeLayerProps,
@@ -14,11 +18,11 @@ import {
1418
assignAccessor,
1519
extractAccessorsFromProps,
1620
getGeometryVector,
17-
} from "./utils.js";
18-
import { FloatAccessor } from "./types.js";
19-
import { EXTENSION_NAME } from "./constants.js";
20-
import { validateAccessors } from "./validate.js";
21-
import { computeChunkOffsets } from "./picking.js";
21+
} from "../utils/utils";
22+
import { FloatAccessor } from "../types";
23+
import { EXTENSION_NAME } from "../constants";
24+
import { validateAccessors } from "../utils/validate";
25+
import { computeChunkOffsets } from "../utils/picking";
2226

2327
/** All properties supported by GeoArrowHeatmapLayer */
2428
export type GeoArrowHeatmapLayerProps = Omit<

‎src/path-layer.ts renamed to ‎src/layers/path-layer.ts

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1+
// deck.gl-community
2+
// SPDX-License-Identifier: MIT
3+
// Copyright (c) vis.gl contributors
4+
15
import {
2-
Accessor,
36
CompositeLayer,
47
CompositeLayerProps,
58
DefaultProps,
@@ -18,15 +21,15 @@ import {
1821
getGeometryVector,
1922
getMultiLineStringResolvedOffsets,
2023
invertOffsets,
21-
} from "./utils.js";
24+
} from "../utils/utils";
2225
import {
2326
GeoArrowExtraPickingProps,
2427
computeChunkOffsets,
2528
getPickingInfo,
26-
} from "./picking.js";
27-
import { ColorAccessor, FloatAccessor, GeoArrowPickingInfo } from "./types.js";
28-
import { EXTENSION_NAME } from "./constants.js";
29-
import { validateAccessors } from "./validate.js";
29+
} from "../utils/picking";
30+
import { ColorAccessor, FloatAccessor, GeoArrowPickingInfo } from "../types";
31+
import { EXTENSION_NAME } from "../constants";
32+
import { validateAccessors } from "../utils/validate";
3033

3134
/** All properties supported by GeoArrowPathLayer */
3235
export type GeoArrowPathLayerProps = Omit<
@@ -276,7 +279,6 @@ export class GeoArrowPathLayer<
276279
//
277280
// Note: this is ringOffsets, not geomOffsets because we're rendering
278281
// the individual paths on the map.
279-
// @ts-ignore
280282
startIndices: ringOffsets,
281283
attributes: {
282284
getPath: { value: flatCoordinateArray, size: nDim },

‎src/point-cloud-layer.ts renamed to ‎src/layers/point-cloud-layer.ts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// deck.gl-community
2+
// SPDX-License-Identifier: MIT
3+
// Copyright (c) vis.gl contributors
4+
15
import {
26
CompositeLayer,
37
CompositeLayerProps,
@@ -17,15 +21,15 @@ import {
1721
assignAccessor,
1822
extractAccessorsFromProps,
1923
getGeometryVector,
20-
} from "./utils.js";
24+
} from "../utils/utils";
2125
import {
2226
GeoArrowExtraPickingProps,
2327
computeChunkOffsets,
2428
getPickingInfo,
25-
} from "./picking.js";
26-
import { ColorAccessor, GeoArrowPickingInfo, NormalAccessor } from "./types.js";
27-
import { EXTENSION_NAME } from "./constants.js";
28-
import { validateAccessors } from "./validate.js";
29+
} from "../utils/picking";
30+
import { ColorAccessor, GeoArrowPickingInfo, NormalAccessor } from "../types";
31+
import { EXTENSION_NAME } from "../constants";
32+
import { validateAccessors } from "../utils/validate";
2933

3034
/* All properties supported by GeoArrowPointCloudLayer */
3135
export type GeoArrowPointCloudLayerProps = Omit<

‎src/polygon-layer.ts renamed to ‎src/layers/polygon-layer.ts

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// deck.gl-community
2+
// SPDX-License-Identifier: MIT
3+
// Copyright (c) vis.gl contributors
4+
15
import {
26
CompositeLayer,
37
CompositeLayerProps,
@@ -11,12 +15,12 @@ import { PolygonLayer } from "@deck.gl/layers";
1115
import type { PolygonLayerProps } from "@deck.gl/layers";
1216
import * as arrow from "apache-arrow";
1317
import * as ga from "@geoarrow/geoarrow-js";
14-
import { getGeometryVector } from "./utils.js";
15-
import { GeoArrowExtraPickingProps, getPickingInfo } from "./picking.js";
16-
import { ColorAccessor, FloatAccessor, GeoArrowPickingInfo } from "./types.js";
17-
import { EXTENSION_NAME } from "./constants.js";
18-
import { GeoArrowSolidPolygonLayer } from "./solid-polygon-layer.js";
19-
import { GeoArrowPathLayer } from "./path-layer.js";
18+
import { getGeometryVector } from "../utils/utils";
19+
import { GeoArrowExtraPickingProps, getPickingInfo } from "../utils/picking";
20+
import { ColorAccessor, FloatAccessor, GeoArrowPickingInfo } from "../types";
21+
import { EXTENSION_NAME } from "../constants";
22+
import { GeoArrowSolidPolygonLayer } from "./solid-polygon-layer";
23+
import { GeoArrowPathLayer } from "./path-layer";
2024

2125
/**
2226
* Get the exterior of a PolygonVector or PolygonData as a MultiLineString

‎src/scatterplot-layer.ts renamed to ‎src/layers/scatterplot-layer.ts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// deck.gl-community
2+
// SPDX-License-Identifier: MIT
3+
// Copyright (c) vis.gl contributors
4+
15
import {
26
CompositeLayer,
37
CompositeLayerProps,
@@ -16,15 +20,15 @@ import {
1620
extractAccessorsFromProps,
1721
getGeometryVector,
1822
invertOffsets,
19-
} from "./utils.js";
23+
} from "../utils/utils";
2024
import {
2125
GeoArrowExtraPickingProps,
2226
computeChunkOffsets,
2327
getPickingInfo,
24-
} from "./picking.js";
25-
import { ColorAccessor, FloatAccessor, GeoArrowPickingInfo } from "./types.js";
26-
import { EXTENSION_NAME } from "./constants.js";
27-
import { validateAccessors } from "./validate.js";
28+
} from "../utils/picking";
29+
import { ColorAccessor, FloatAccessor, GeoArrowPickingInfo } from "../types";
30+
import { EXTENSION_NAME } from "../constants";
31+
import { validateAccessors } from "../utils/validate";
2832

2933
/** All properties supported by GeoArrowScatterplotLayer */
3034
export type GeoArrowScatterplotLayerProps = Omit<

0 commit comments

Comments
 (0)