Skip to content

Commit 346f661

Browse files
committed
Fixes for compilation
1 parent 3b1c25a commit 346f661

File tree

4 files changed

+12
-19
lines changed

4 files changed

+12
-19
lines changed

pages/dev/concepts/eODP/+Page.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ function ColumnMapPanel(props) {
9696
return h(ColumnMap, {
9797
margin: 0,
9898
color: "dodgerblue",
99-
apiRoute: "/defs/columns",
10099
filterColumns(col) {
101100
return col.properties.t_units > 0;
102101
},

pages/dev/concepts/eODP/column-picker.ts

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
11
import { geoCentroid, geoStereographic, geoNaturalEarth1 } from "d3-geo";
2-
import { ResizableMapFrame } from "@macrostrat/column-views";
2+
import {
3+
ResizableMapFrame,
4+
useMacrostratColumns,
5+
} from "@macrostrat/column-views";
36
import {
47
ColumnKeyboardNavigation,
58
ColumnFeatures,
6-
useColumnData,
9+
useMacrostratColumns,
710
CurrentColumn,
811
} from "@macrostrat/column-views";
912
import { useMemo, forwardRef } from "react";
10-
import { Tabs, Tab } from "@blueprintjs/core";
1113
import hyper from "@macrostrat/hyper";
1214
import styles from "./age-model.module.styl";
15+
1316
const h = hyper.styled(styles);
1417

15-
function useFilteredColumns({ apiRoute, status_code, project_id }) {
18+
function useFilteredColumns({ project_id }) {
1619
// Filter columns by whether they contain any units
17-
const features = useColumnData({ apiRoute, status_code, project_id });
20+
const features = useMacrostratColumns(project_id, true);
1821

1922
return useMemo(() => {
2023
let completedColumns = [];
@@ -35,7 +38,7 @@ const ColumnMapView = forwardRef((props, ref) => {
3538
const { currentColumn, setCurrentColumn, children, ...rest } = props;
3639
const center = geoCentroid(currentColumn);
3740

38-
const { apiRoute = "/columns", status_code, project_id, color } = props;
41+
const { project_id, color } = props;
3942

4043
const col_id = currentColumn?.properties?.col_id;
4144

pages/dev/concepts/eODP/column.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,20 @@ import {
55
ColumnLayoutContext,
66
ColumnAxisType,
77
NotesColumn,
8+
AgeAxis,
89
} from "@macrostrat/column-components";
910
import { useContext } from "react";
1011
import {
1112
AnnotatedUnitsColumn,
12-
AgeAxis,
1313
MacrostratColumnProvider,
1414
} from "@macrostrat/column-views";
1515
import { IUnit } from "@macrostrat/column-views";
16-
import {
17-
TrackedLabeledUnit,
18-
getUnitHeightRange,
19-
} from "@macrostrat/column-views";
16+
import { TrackedLabeledUnit } from "@macrostrat/column-views";
2017
import { useAPIResult } from "@macrostrat/ui-components";
2118
import { useColumnNav } from "@macrostrat/column-views";
2219
import {
2320
AgeModelColumn,
2421
AgeModelDataset,
25-
ReconstructedColumnAgeDataset,
2622
useColumnAgeModel,
2723
} from "./age-model-column";
2824
// import "@macrostrat/timescale/dist/timescale.css";

pages/dev/concepts/multiscale-figure/src/section.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
import h from "@macrostrat/hyper";
2+
import { ColumnSVG, useColumn, AgeAxis } from "@macrostrat/column-components";
23
import {
3-
ColumnProvider,
4-
ColumnSVG,
5-
useColumn,
6-
} from "@macrostrat/column-components";
7-
import {
8-
AgeAxis,
94
IUnit,
105
preprocessUnits,
116
MacrostratColumnProvider,

0 commit comments

Comments
 (0)