@opendata-ai/openchart-engine 7.11.0 → 8.0.0-rc.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.d.ts +123 -7
- package/dist/index.js +16159 -10024
- package/dist/index.js.map +1 -1
- package/package.json +11 -4
- package/src/__tests__/__snapshots__/compile-snapshot.test.ts.snap +170 -56
- package/src/__tests__/annotation-behavior.test.ts +721 -0
- package/src/__tests__/axes.test.ts +50 -3
- package/src/__tests__/compile-chart.test.ts +30 -0
- package/src/__tests__/compile-footnotes.test.ts +277 -0
- package/src/__tests__/compile-layer.test.ts +120 -1
- package/src/__tests__/helpers/invariants.ts +54 -20
- package/src/__tests__/known-bugs.test.ts +455 -2
- package/src/__tests__/legend.test.ts +69 -4
- package/src/__tests__/ranking-recipes.test.ts +260 -0
- package/src/__tests__/scales.test.ts +9 -3
- package/src/__tests__/series-search.test.ts +92 -0
- package/src/__tests__/spec-sugar.test.ts +801 -0
- package/src/__tests__/you-draw-it.test.ts +160 -0
- package/src/annotations/__tests__/compute.test.ts +207 -92
- package/src/annotations/__tests__/geometry.test.ts +66 -0
- package/src/annotations/__tests__/resolve-text.test.ts +527 -27
- package/src/annotations/__tests__/rich-text.test.ts +91 -0
- package/src/annotations/__tests__/thinning.test.ts +148 -0
- package/src/annotations/collisions.ts +130 -84
- package/src/annotations/compute.ts +83 -85
- package/src/annotations/constants.ts +116 -6
- package/src/annotations/geometry.ts +222 -77
- package/src/annotations/move.ts +135 -0
- package/src/annotations/placement.ts +62 -14
- package/src/annotations/resolve-range.ts +2 -0
- package/src/annotations/resolve-refline.ts +2 -0
- package/src/annotations/resolve-text.ts +312 -111
- package/src/annotations/rich-text.ts +65 -0
- package/src/annotations/thinning.ts +84 -10
- package/src/barlist/compile-barlist.ts +16 -6
- package/src/charts/_shared/format-label-value.ts +9 -8
- package/src/charts/bar/__tests__/compute.test.ts +57 -10
- package/src/charts/bar/__tests__/labels.test.ts +5 -4
- package/src/charts/bar/compute.ts +2 -6
- package/src/charts/bar/index.ts +8 -1
- package/src/charts/bar/labels.ts +3 -3
- package/src/charts/beeswarm/__tests__/compute.test.ts +280 -0
- package/src/charts/beeswarm/__tests__/dodge.test.ts +148 -0
- package/src/charts/beeswarm/compute.ts +203 -0
- package/src/charts/beeswarm/dodge.ts +155 -0
- package/src/charts/beeswarm/index.ts +32 -0
- package/src/charts/builtin.ts +12 -1
- package/src/charts/calendar/__tests__/compute.test.ts +417 -0
- package/src/charts/calendar/compute.ts +319 -0
- package/src/charts/calendar/index.ts +32 -0
- package/src/charts/column/__tests__/compute.test.ts +21 -7
- package/src/charts/column/__tests__/labels.test.ts +76 -1
- package/src/charts/column/compute.ts +2 -6
- package/src/charts/column/index.ts +10 -2
- package/src/charts/column/labels.ts +95 -21
- package/src/charts/dot/index.ts +8 -1
- package/src/charts/dot/labels.ts +3 -3
- package/src/charts/line/__tests__/compute.test.ts +15 -19
- package/src/charts/line/area.ts +8 -23
- package/src/charts/line/compute.ts +32 -2
- package/src/charts/parliament/__tests__/compute.test.ts +411 -0
- package/src/charts/parliament/compute.ts +313 -0
- package/src/charts/parliament/index.ts +32 -0
- package/src/charts/pie/__tests__/compute.test.ts +103 -0
- package/src/charts/pie/compute.ts +63 -8
- package/src/charts/pie/labels.ts +1 -0
- package/src/charts/range/__tests__/compute.test.ts +486 -0
- package/src/charts/range/compute.ts +273 -0
- package/src/charts/range/index.ts +82 -0
- package/src/charts/range/labels.ts +169 -0
- package/src/charts/rect/__tests__/compute.test.ts +120 -0
- package/src/charts/rect/index.ts +127 -0
- package/src/charts/scatter/compute.ts +7 -21
- package/src/charts/text/__tests__/compute.test.ts +307 -0
- package/src/charts/text/index.ts +44 -7
- package/src/charts/tick/__tests__/compute.test.ts +75 -0
- package/src/charts/tick/index.ts +7 -4
- package/src/charts/utils.ts +5 -3
- package/src/charts/waffle/__tests__/compute.test.ts +305 -0
- package/src/charts/waffle/compute.ts +197 -0
- package/src/charts/waffle/index.ts +31 -0
- package/src/compile/__tests__/color-scale-reverse.test.ts +89 -0
- package/src/compile/__tests__/data-clip.test.ts +68 -0
- package/src/compile/__tests__/fill-patterns.test.ts +154 -0
- package/src/compile/__tests__/size-scale.test.ts +108 -0
- package/src/compile/color-scale-range.ts +54 -33
- package/src/compile/data-clip.ts +21 -6
- package/src/compile/fill-patterns.ts +74 -0
- package/src/compile/layer.ts +117 -21
- package/src/compile/size-scale.ts +139 -0
- package/src/compile/spec-sugar.ts +758 -0
- package/src/compile/you-draw-it.ts +123 -0
- package/src/compile.ts +310 -103
- package/src/compiler/__tests__/a11y-warnings.test.ts +148 -0
- package/src/compiler/__tests__/fixtures/vl-parity/axis-null.json +19 -0
- package/src/compiler/__tests__/fixtures/vl-parity/color-value.json +20 -0
- package/src/compiler/__tests__/fixtures/vl-parity/count-aggregate.json +22 -0
- package/src/compiler/__tests__/fixtures/vl-parity/data-values.json +19 -0
- package/src/compiler/__tests__/fixtures/vl-parity/layer-axis-null.json +14 -0
- package/src/compiler/__tests__/fixtures/vl-parity/layer-count.json +34 -0
- package/src/compiler/__tests__/fixtures/vl-parity/layer-data-values.json +22 -0
- package/src/compiler/__tests__/fixtures/vl-parity/layer-legend-null.json +41 -0
- package/src/compiler/__tests__/fixtures/vl-parity/layer-scheme.json +38 -0
- package/src/compiler/__tests__/fixtures/vl-parity/layer-sort.json +28 -0
- package/src/compiler/__tests__/fixtures/vl-parity/layer-theta.json +28 -0
- package/src/compiler/__tests__/fixtures/vl-parity/layer-title.json +30 -0
- package/src/compiler/__tests__/fixtures/vl-parity/layer-value-def.json +29 -0
- package/src/compiler/__tests__/fixtures/vl-parity/legend-null.json +32 -0
- package/src/compiler/__tests__/fixtures/vl-parity/scheme.json +25 -0
- package/src/compiler/__tests__/fixtures/vl-parity/sort-by-value.json +19 -0
- package/src/compiler/__tests__/fixtures/vl-parity/theta-arc.json +19 -0
- package/src/compiler/__tests__/fixtures/vl-parity/title-subtitle.json +21 -0
- package/src/compiler/__tests__/fixtures/vl-parity/width-height.json +23 -0
- package/src/compiler/__tests__/normalize.test.ts +65 -1
- package/src/compiler/__tests__/validate-did-you-mean.test.ts +86 -0
- package/src/compiler/__tests__/validate-near-miss.test.ts +89 -0
- package/src/compiler/__tests__/validate.test.ts +156 -0
- package/src/compiler/__tests__/vl-parity.test.ts +68 -0
- package/src/compiler/a11y-warnings.ts +110 -0
- package/src/compiler/normalize.ts +150 -7
- package/src/compiler/types.ts +11 -0
- package/src/compiler/validate.ts +664 -18
- package/src/endpoint-labels/__tests__/compute.test.ts +88 -0
- package/src/endpoint-labels/compute.ts +40 -12
- package/src/endpoint-labels/format.ts +45 -15
- package/src/endpoint-labels/predict.ts +50 -36
- package/src/format/__tests__/field-format.test.ts +164 -0
- package/src/format/field-format.ts +27 -0
- package/src/geo/__tests__/compile-map.test.ts +621 -0
- package/src/geo/compile-map.ts +856 -0
- package/src/geo/join.ts +115 -0
- package/src/geo/projections.ts +45 -0
- package/src/geo/types.ts +24 -0
- package/src/graphs/__tests__/compile-graph.test.ts +25 -0
- package/src/graphs/compile-graph.ts +27 -18
- package/src/index.ts +20 -2
- package/src/layout/axes/ticks.ts +59 -10
- package/src/layout/axes.ts +30 -2
- package/src/layout/dimensions.ts +139 -83
- package/src/layout/facet.ts +14 -3
- package/src/layout/plan.ts +83 -33
- package/src/layout/scales.ts +132 -15
- package/src/legend/__tests__/continuous.test.ts +318 -0
- package/src/legend/__tests__/size.test.ts +348 -0
- package/src/legend/__tests__/suppression.test.ts +17 -1
- package/src/legend/compute.ts +119 -13
- package/src/legend/continuous.ts +327 -0
- package/src/legend/size.ts +407 -0
- package/src/legend/suppression.ts +8 -7
- package/src/sankey/compile-sankey.ts +31 -19
- package/src/tables/format-cells.ts +16 -7
- package/src/tilemap/__tests__/compile-tilemap.test.ts +39 -0
- package/src/tilemap/compile-tilemap.ts +24 -7
- package/src/tooltips/__tests__/compute.test.ts +2 -2
- package/src/tooltips/compute.ts +422 -41
- package/src/transforms/__tests__/conditional.test.ts +18 -0
- package/src/transforms/aggregate.ts +2 -1
|
@@ -0,0 +1,313 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Parliament (hemicycle) chart mark computation.
|
|
3
|
+
*
|
|
4
|
+
* Seat dots packed into concentric semicircular arcs, party-grouped left to
|
|
5
|
+
* right, with a majority-threshold line. Election/legislature results are a
|
|
6
|
+
* part-to-whole count (seats per party) that the standard bar/pie machinery
|
|
7
|
+
* can't lay out, so this module owns the seat-packing geometry.
|
|
8
|
+
*
|
|
9
|
+
* Emits existing mark types (no bespoke layout): one `PointMark` per seat,
|
|
10
|
+
* one `RuleMarkLayout` for the majority line, and one `TextMarkLayout` for the
|
|
11
|
+
* "N to win" label. Riding the existing chart pipeline gets scales, legend,
|
|
12
|
+
* tooltips, a11y, dark mode, and animation for free (parliament is axisless,
|
|
13
|
+
* so `isAxislessMark` skips axes/gridlines just like arc and waffle).
|
|
14
|
+
*
|
|
15
|
+
* Seat layout algorithm (deterministic, published approach): pick the smallest
|
|
16
|
+
* number of concentric rows R such that N seats fit given a minimum seat-to-row
|
|
17
|
+
* gap ratio, distribute seats across rows proportional to each row's arc
|
|
18
|
+
* length (outer rows hold more), place each row's seats at even angles across
|
|
19
|
+
* the top semicircle (180deg on the left to 0deg on the right), then sort all
|
|
20
|
+
* seats left-to-right and assign parties to consecutive blocks in data order.
|
|
21
|
+
*/
|
|
22
|
+
|
|
23
|
+
import type {
|
|
24
|
+
DataRow,
|
|
25
|
+
Encoding,
|
|
26
|
+
LayoutStrategy,
|
|
27
|
+
Mark,
|
|
28
|
+
MarkAria,
|
|
29
|
+
PointMark,
|
|
30
|
+
Rect,
|
|
31
|
+
ResolvedTheme,
|
|
32
|
+
RuleMarkLayout,
|
|
33
|
+
TextMarkLayout,
|
|
34
|
+
} from '@opendata-ai/openchart-core';
|
|
35
|
+
import { formatPercent } from '@opendata-ai/openchart-core';
|
|
36
|
+
|
|
37
|
+
import { serializeKeyValue } from '../../compiler/keys';
|
|
38
|
+
import type { NormalizedChartSpec } from '../../compiler/types';
|
|
39
|
+
import type { ResolvedScales } from '../../layout/scales';
|
|
40
|
+
import { getColor } from '../utils';
|
|
41
|
+
|
|
42
|
+
// ---------------------------------------------------------------------------
|
|
43
|
+
// Constants
|
|
44
|
+
// ---------------------------------------------------------------------------
|
|
45
|
+
|
|
46
|
+
/** Fraction of the seat pitch used as the gap between adjacent seat dots. */
|
|
47
|
+
const SEAT_GAP_FRACTION = 0.4;
|
|
48
|
+
|
|
49
|
+
/** Inner-radius fraction of the outer radius (the hollow center of the arc). */
|
|
50
|
+
const INNER_RADIUS_FRACTION = 0.4;
|
|
51
|
+
|
|
52
|
+
/** Maximum number of concentric rows we will pack into. */
|
|
53
|
+
const MAX_ROWS = 40;
|
|
54
|
+
|
|
55
|
+
// ---------------------------------------------------------------------------
|
|
56
|
+
// Seat-packing geometry
|
|
57
|
+
// ---------------------------------------------------------------------------
|
|
58
|
+
|
|
59
|
+
/** A single packed seat position (before party assignment). */
|
|
60
|
+
interface SeatSlot {
|
|
61
|
+
/** Angle in radians measured across the top semicircle (PI = left, 0 = right). */
|
|
62
|
+
angle: number;
|
|
63
|
+
/** Radius from the hemicycle center. */
|
|
64
|
+
radius: number;
|
|
65
|
+
/** Row index (0 = innermost). */
|
|
66
|
+
row: number;
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
/**
|
|
70
|
+
* Choose the number of concentric rows for `seats` seats.
|
|
71
|
+
*
|
|
72
|
+
* More seats need more rows to stay legible. We grow the row count until the
|
|
73
|
+
* seats-per-innermost-row stays under a density cap derived from the ring
|
|
74
|
+
* geometry, capped at MAX_ROWS. Deterministic: same seat count always yields
|
|
75
|
+
* the same row count.
|
|
76
|
+
*/
|
|
77
|
+
function chooseRowCount(seats: number): number {
|
|
78
|
+
if (seats <= 0) return 0;
|
|
79
|
+
// The classic hemicycle heuristic: rows grow ~ with sqrt of seat count so
|
|
80
|
+
// dot size stays roughly constant as the assembly grows.
|
|
81
|
+
const rows = Math.max(1, Math.round(Math.sqrt(seats / 3)));
|
|
82
|
+
return Math.min(MAX_ROWS, rows);
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
/**
|
|
86
|
+
* Pack `seats` seat slots into `rows` concentric semicircular rows.
|
|
87
|
+
*
|
|
88
|
+
* Seats are distributed across rows proportional to each row's radius (arc
|
|
89
|
+
* length), then placed at even angular steps across the top semicircle. The
|
|
90
|
+
* returned slots are sorted left-to-right (descending angle) so party blocks
|
|
91
|
+
* assign to contiguous seats.
|
|
92
|
+
*/
|
|
93
|
+
function packSeats(seats: number, rows: number): SeatSlot[] {
|
|
94
|
+
if (seats <= 0 || rows <= 0) return [];
|
|
95
|
+
|
|
96
|
+
// Row radii are evenly spaced from inner to outer in normalized [0,1] units.
|
|
97
|
+
// With a single row, place it midway between inner and outer.
|
|
98
|
+
const rowRadii: number[] = [];
|
|
99
|
+
for (let i = 0; i < rows; i++) {
|
|
100
|
+
const t = rows === 1 ? 0.5 : i / (rows - 1);
|
|
101
|
+
rowRadii.push(INNER_RADIUS_FRACTION + t * (1 - INNER_RADIUS_FRACTION));
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
// Distribute seats across rows proportional to radius (arc length), using
|
|
105
|
+
// largest-remainder so the counts sum exactly to `seats`.
|
|
106
|
+
const radiusSum = rowRadii.reduce((s, r) => s + r, 0);
|
|
107
|
+
const rawCounts = rowRadii.map((r) => (r / radiusSum) * seats);
|
|
108
|
+
const rowCounts = rawCounts.map((c) => Math.floor(c));
|
|
109
|
+
let allocated = rowCounts.reduce((s, c) => s + c, 0);
|
|
110
|
+
const remainders = rawCounts
|
|
111
|
+
.map((c, i) => ({ rem: c - Math.floor(c), i }))
|
|
112
|
+
.sort((a, b) => b.rem - a.rem || a.i - b.i);
|
|
113
|
+
for (let k = 0; allocated < seats; k++, allocated++) {
|
|
114
|
+
rowCounts[remainders[k % remainders.length].i] += 1;
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
const slots: SeatSlot[] = [];
|
|
118
|
+
for (let row = 0; row < rows; row++) {
|
|
119
|
+
const count = rowCounts[row];
|
|
120
|
+
if (count <= 0) continue;
|
|
121
|
+
const radius = rowRadii[row];
|
|
122
|
+
// Place seats at even angular steps from PI (left) to 0 (right). A single
|
|
123
|
+
// seat in a row sits at the top (PI/2).
|
|
124
|
+
for (let s = 0; s < count; s++) {
|
|
125
|
+
const t = count === 1 ? 0.5 : s / (count - 1);
|
|
126
|
+
const angle = Math.PI - t * Math.PI;
|
|
127
|
+
slots.push({ angle, radius, row });
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
|
|
131
|
+
// Sort left-to-right: descending angle (PI first), ties broken outer-row
|
|
132
|
+
// first so blocks read cleanly top-to-bottom within a column.
|
|
133
|
+
slots.sort((a, b) => b.angle - a.angle || b.radius - a.radius);
|
|
134
|
+
return slots;
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
// ---------------------------------------------------------------------------
|
|
138
|
+
// Majority computation
|
|
139
|
+
// ---------------------------------------------------------------------------
|
|
140
|
+
|
|
141
|
+
/** Resolve the majority-line seat threshold and label from the mark options. */
|
|
142
|
+
function resolveMajority(
|
|
143
|
+
totalSeats: number,
|
|
144
|
+
majorityLine: boolean | { seats?: number; label?: string } | undefined,
|
|
145
|
+
): { seats: number; label: string } | null {
|
|
146
|
+
if (majorityLine === false) return null;
|
|
147
|
+
const defaultSeats = Math.floor(totalSeats / 2) + 1;
|
|
148
|
+
if (majorityLine == null || majorityLine === true) {
|
|
149
|
+
return { seats: defaultSeats, label: `${defaultSeats} to win` };
|
|
150
|
+
}
|
|
151
|
+
// An explicit `seats` must land inside the chamber (1..totalSeats). `{ seats: 0 }`
|
|
152
|
+
// or a negative/oversized value would draw the majority marker off the seat
|
|
153
|
+
// arc where it reads as nothing, so fall back to the default. The user-facing
|
|
154
|
+
// warning for this fires once from normalize (warnParliamentMajorityRange),
|
|
155
|
+
// which owns the shared warnings channel; this clamp is the defensive backstop
|
|
156
|
+
// for direct compute calls.
|
|
157
|
+
let seats = majorityLine.seats ?? defaultSeats;
|
|
158
|
+
if (!Number.isFinite(seats) || seats < 1 || seats > totalSeats) {
|
|
159
|
+
seats = defaultSeats;
|
|
160
|
+
}
|
|
161
|
+
return { seats, label: majorityLine.label ?? `${seats} to win` };
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
// ---------------------------------------------------------------------------
|
|
165
|
+
// Public API
|
|
166
|
+
// ---------------------------------------------------------------------------
|
|
167
|
+
|
|
168
|
+
/**
|
|
169
|
+
* Compute parliament (hemicycle) marks from a normalized chart spec.
|
|
170
|
+
*
|
|
171
|
+
* Categories (parties) come from the color field in data order (matching pie
|
|
172
|
+
* and the legend); the seat count from the quantitative y channel (theta
|
|
173
|
+
* pre-aliased to y). Emits seat PointMarks in left-to-right order (driving the
|
|
174
|
+
* entrance-stagger sweep), then the majority RuleMark and its label TextMark.
|
|
175
|
+
*/
|
|
176
|
+
export function computeParliamentMarks(
|
|
177
|
+
spec: NormalizedChartSpec,
|
|
178
|
+
scales: ResolvedScales,
|
|
179
|
+
chartArea: Rect,
|
|
180
|
+
_strategy: LayoutStrategy,
|
|
181
|
+
theme: ResolvedTheme,
|
|
182
|
+
): Mark[] {
|
|
183
|
+
const encoding = spec.encoding as Encoding;
|
|
184
|
+
|
|
185
|
+
const valueChannel = encoding.y ?? encoding.x;
|
|
186
|
+
const colorField = encoding.color && 'field' in encoding.color ? encoding.color.field : undefined;
|
|
187
|
+
if (!valueChannel || !colorField) return [];
|
|
188
|
+
|
|
189
|
+
// Aggregate seats by party, preserving data order (drives seat order, color
|
|
190
|
+
// assignment, and the legend, which derives the same order from data).
|
|
191
|
+
const partyTotals = new Map<string, number>();
|
|
192
|
+
const partyRows = new Map<string, DataRow>();
|
|
193
|
+
for (const row of spec.data) {
|
|
194
|
+
const party = String(row[colorField] ?? '');
|
|
195
|
+
const val = Number(row[valueChannel.field] ?? 0);
|
|
196
|
+
if (!Number.isFinite(val) || val < 0) continue;
|
|
197
|
+
partyTotals.set(party, (partyTotals.get(party) ?? 0) + Math.round(val));
|
|
198
|
+
if (!partyRows.has(party)) partyRows.set(party, row);
|
|
199
|
+
}
|
|
200
|
+
|
|
201
|
+
const parties = [...partyTotals.keys()];
|
|
202
|
+
const totalSeats = parties.reduce((s, p) => s + (partyTotals.get(p) ?? 0), 0);
|
|
203
|
+
if (parties.length === 0 || totalSeats <= 0) return [];
|
|
204
|
+
|
|
205
|
+
const rows = chooseRowCount(totalSeats);
|
|
206
|
+
const slots = packSeats(totalSeats, rows);
|
|
207
|
+
if (slots.length === 0) return [];
|
|
208
|
+
|
|
209
|
+
// Geometry: fit the hemicycle (a half-disc, so width = 2*R, height = R plus
|
|
210
|
+
// one seat radius of headroom) into the chart area and center it.
|
|
211
|
+
const seatRadiusOpt = spec.markDef.seatRadius;
|
|
212
|
+
|
|
213
|
+
// Angular seat pitch from the densest (innermost) occupied row bounds the dot
|
|
214
|
+
// size so seats in the tightest row don't overlap.
|
|
215
|
+
const outerRadius = Math.min(chartArea.width / 2, chartArea.height);
|
|
216
|
+
const innerR = outerRadius * INNER_RADIUS_FRACTION;
|
|
217
|
+
// Seats per innermost row ~ slots on the smallest radius. Derive a max dot
|
|
218
|
+
// radius from the innermost row's arc-length per seat.
|
|
219
|
+
const innerRowCount = slots.filter((s) => s.row === 0).length || 1;
|
|
220
|
+
const innerArcPerSeat = (Math.PI * innerR) / Math.max(1, innerRowCount);
|
|
221
|
+
const ringGap = rows > 1 ? (outerRadius - innerR) / (rows - 1) : outerRadius - innerR;
|
|
222
|
+
const autoSeatRadius = (Math.min(innerArcPerSeat, ringGap) / 2) * (1 - SEAT_GAP_FRACTION);
|
|
223
|
+
const seatRadius =
|
|
224
|
+
typeof seatRadiusOpt === 'number' && seatRadiusOpt > 0
|
|
225
|
+
? seatRadiusOpt
|
|
226
|
+
: Math.max(1.5, autoSeatRadius);
|
|
227
|
+
|
|
228
|
+
const centerX = chartArea.x + chartArea.width / 2;
|
|
229
|
+
// Anchor the flat base near the bottom of the area, leaving a seat radius of
|
|
230
|
+
// headroom below so the bottom row's dots aren't clipped.
|
|
231
|
+
const centerY = chartArea.y + chartArea.height - seatRadius;
|
|
232
|
+
|
|
233
|
+
// Assign parties to contiguous seat blocks in data order.
|
|
234
|
+
const marks: Mark[] = [];
|
|
235
|
+
let slotIndex = 0;
|
|
236
|
+
let animationIndex = 0;
|
|
237
|
+
for (const party of parties) {
|
|
238
|
+
const count = partyTotals.get(party) ?? 0;
|
|
239
|
+
if (count <= 0) continue;
|
|
240
|
+
const row = partyRows.get(party)!;
|
|
241
|
+
const shareStr = totalSeats > 0 ? formatPercent(count / totalSeats) : '0%';
|
|
242
|
+
const fill = getColor(scales, party);
|
|
243
|
+
const partyKey = serializeKeyValue(party);
|
|
244
|
+
|
|
245
|
+
for (let k = 0; k < count && slotIndex < slots.length; k++, slotIndex++, animationIndex++) {
|
|
246
|
+
const slot = slots[slotIndex];
|
|
247
|
+
// slot.radius is normalized [INNER_RADIUS_FRACTION, 1]; scale to pixels.
|
|
248
|
+
const pixelRadius = slot.radius * outerRadius;
|
|
249
|
+
const cx = centerX + Math.cos(slot.angle) * pixelRadius;
|
|
250
|
+
const cy = centerY - Math.sin(slot.angle) * pixelRadius;
|
|
251
|
+
|
|
252
|
+
// One SR stop per party: the first seat carries the label, the rest are
|
|
253
|
+
// decorative duplicates (435 seats would drown screen reader users).
|
|
254
|
+
const aria: MarkAria =
|
|
255
|
+
k === 0
|
|
256
|
+
? { label: `${party}: ${count} seats (${shareStr})` }
|
|
257
|
+
: { label: `${party} seat`, decorative: true };
|
|
258
|
+
|
|
259
|
+
const seat: PointMark = {
|
|
260
|
+
type: 'point',
|
|
261
|
+
key: `${partyKey}|${k}`,
|
|
262
|
+
cx,
|
|
263
|
+
cy,
|
|
264
|
+
r: seatRadius,
|
|
265
|
+
fill,
|
|
266
|
+
stroke: 'none',
|
|
267
|
+
strokeWidth: 0,
|
|
268
|
+
data: row as Record<string, unknown>,
|
|
269
|
+
aria,
|
|
270
|
+
animationIndex,
|
|
271
|
+
};
|
|
272
|
+
marks.push(seat);
|
|
273
|
+
}
|
|
274
|
+
}
|
|
275
|
+
|
|
276
|
+
// Majority-threshold line + label.
|
|
277
|
+
const majority = resolveMajority(totalSeats, spec.markDef.majorityLine);
|
|
278
|
+
if (majority && majority.seats > 0 && majority.seats <= totalSeats) {
|
|
279
|
+
const lineTop = centerY - outerRadius - seatRadius;
|
|
280
|
+
const line: RuleMarkLayout = {
|
|
281
|
+
type: 'rule',
|
|
282
|
+
key: 'oc-majority-line',
|
|
283
|
+
x1: centerX,
|
|
284
|
+
y1: lineTop,
|
|
285
|
+
x2: centerX,
|
|
286
|
+
y2: centerY + seatRadius,
|
|
287
|
+
stroke: theme.colors.text,
|
|
288
|
+
strokeWidth: 1.5,
|
|
289
|
+
strokeDasharray: '4 3',
|
|
290
|
+
opacity: 0.7,
|
|
291
|
+
data: { majority: majority.seats } as Record<string, unknown>,
|
|
292
|
+
aria: { label: `Majority threshold: ${majority.seats} seats`, decorative: true },
|
|
293
|
+
};
|
|
294
|
+
marks.push(line);
|
|
295
|
+
|
|
296
|
+
const label: TextMarkLayout = {
|
|
297
|
+
type: 'textMark',
|
|
298
|
+
key: 'oc-majority-label',
|
|
299
|
+
x: centerX,
|
|
300
|
+
y: Math.max(chartArea.y + theme.fonts.sizes.small, lineTop - 6),
|
|
301
|
+
text: majority.label,
|
|
302
|
+
fill: theme.colors.text,
|
|
303
|
+
fontSize: theme.fonts.sizes.small,
|
|
304
|
+
fontWeight: theme.fonts.weights.semibold,
|
|
305
|
+
textAnchor: 'middle',
|
|
306
|
+
data: { majority: majority.seats } as Record<string, unknown>,
|
|
307
|
+
aria: { label: `${majority.seats} seats needed for a majority`, decorative: true },
|
|
308
|
+
};
|
|
309
|
+
marks.push(label);
|
|
310
|
+
}
|
|
311
|
+
|
|
312
|
+
return marks;
|
|
313
|
+
}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Parliament (hemicycle) chart module.
|
|
3
|
+
*
|
|
4
|
+
* Exports the parliament renderer. Parliament marks emit existing mark types
|
|
5
|
+
* (PointMark seats + a RuleMarkLayout majority line + a TextMarkLayout label),
|
|
6
|
+
* so they render through the existing point/rule/text mark paths with no
|
|
7
|
+
* bespoke renderer or layout type.
|
|
8
|
+
*/
|
|
9
|
+
|
|
10
|
+
import type { Mark } from '@opendata-ai/openchart-core';
|
|
11
|
+
import type { ChartRenderer } from '../registry';
|
|
12
|
+
import { computeParliamentMarks } from './compute';
|
|
13
|
+
|
|
14
|
+
// ---------------------------------------------------------------------------
|
|
15
|
+
// Parliament chart renderer
|
|
16
|
+
// ---------------------------------------------------------------------------
|
|
17
|
+
|
|
18
|
+
/**
|
|
19
|
+
* Parliament chart renderer.
|
|
20
|
+
*
|
|
21
|
+
* Produces one seat dot per seat (party-grouped, left to right) plus the
|
|
22
|
+
* majority-threshold line and its label.
|
|
23
|
+
*/
|
|
24
|
+
export const parliamentRenderer: ChartRenderer = (spec, scales, chartArea, strategy, theme) => {
|
|
25
|
+
return computeParliamentMarks(spec, scales, chartArea, strategy, theme) as Mark[];
|
|
26
|
+
};
|
|
27
|
+
|
|
28
|
+
// ---------------------------------------------------------------------------
|
|
29
|
+
// Public exports
|
|
30
|
+
// ---------------------------------------------------------------------------
|
|
31
|
+
|
|
32
|
+
export { computeParliamentMarks } from './compute';
|
|
@@ -209,6 +209,109 @@ describe('computePieMarks', () => {
|
|
|
209
209
|
});
|
|
210
210
|
});
|
|
211
211
|
|
|
212
|
+
describe('angle range (startAngle/endAngle)', () => {
|
|
213
|
+
function makeHalfDonutSpec(): NormalizedChartSpec {
|
|
214
|
+
return {
|
|
215
|
+
markType: 'arc',
|
|
216
|
+
markDef: {
|
|
217
|
+
type: 'arc',
|
|
218
|
+
innerRadius: 0.5,
|
|
219
|
+
startAngle: -Math.PI / 2,
|
|
220
|
+
endAngle: Math.PI / 2,
|
|
221
|
+
},
|
|
222
|
+
data: [
|
|
223
|
+
{ party: 'Dem', seats: 213 },
|
|
224
|
+
{ party: 'GOP', seats: 222 },
|
|
225
|
+
],
|
|
226
|
+
encoding: {
|
|
227
|
+
y: { field: 'seats', type: 'quantitative' },
|
|
228
|
+
color: { field: 'party', type: 'nominal' },
|
|
229
|
+
},
|
|
230
|
+
chrome: {},
|
|
231
|
+
annotations: [],
|
|
232
|
+
responsive: true,
|
|
233
|
+
theme: {},
|
|
234
|
+
darkMode: 'off',
|
|
235
|
+
labels: { density: 'auto', format: '' },
|
|
236
|
+
};
|
|
237
|
+
}
|
|
238
|
+
|
|
239
|
+
it('defaults to a full circle when startAngle/endAngle are unset', () => {
|
|
240
|
+
const spec = makeBasicPieSpec();
|
|
241
|
+
const scales = computeScales(spec, chartArea, spec.data);
|
|
242
|
+
const marks = computePieMarks(spec, scales, chartArea, fullStrategy, false);
|
|
243
|
+
|
|
244
|
+
const totalSweep = marks.reduce((sum, m) => sum + (m.endAngle - m.startAngle), 0);
|
|
245
|
+
expect(totalSweep).toBeCloseTo(Math.PI * 2, 1);
|
|
246
|
+
});
|
|
247
|
+
|
|
248
|
+
it('restricts the total sweep to the requested half-donut range', () => {
|
|
249
|
+
const spec = makeHalfDonutSpec();
|
|
250
|
+
const scales = computeScales(spec, chartArea, spec.data);
|
|
251
|
+
const marks = computePieMarks(spec, scales, chartArea, fullStrategy, true);
|
|
252
|
+
|
|
253
|
+
const minStart = Math.min(...marks.map((m) => m.startAngle));
|
|
254
|
+
const maxEnd = Math.max(...marks.map((m) => m.endAngle));
|
|
255
|
+
expect(minStart).toBeCloseTo(-Math.PI / 2, 1);
|
|
256
|
+
expect(maxEnd).toBeCloseTo(Math.PI / 2, 1);
|
|
257
|
+
});
|
|
258
|
+
|
|
259
|
+
it('half-donut slices still sum proportionally to their seat share', () => {
|
|
260
|
+
const spec = makeHalfDonutSpec();
|
|
261
|
+
const scales = computeScales(spec, chartArea, spec.data);
|
|
262
|
+
const marks = computePieMarks(spec, scales, chartArea, fullStrategy, true);
|
|
263
|
+
|
|
264
|
+
const gopMark = marks.find((m) => m.aria.label.includes('GOP'));
|
|
265
|
+
const demMark = marks.find((m) => m.aria.label.includes('Dem'));
|
|
266
|
+
expect(gopMark).toBeDefined();
|
|
267
|
+
expect(demMark).toBeDefined();
|
|
268
|
+
// 222 seats > 213 seats, so GOP's sweep should be larger.
|
|
269
|
+
const gopSweep = gopMark!.endAngle - gopMark!.startAngle;
|
|
270
|
+
const demSweep = demMark!.endAngle - demMark!.startAngle;
|
|
271
|
+
expect(gopSweep).toBeGreaterThan(demSweep);
|
|
272
|
+
});
|
|
273
|
+
|
|
274
|
+
it('half-donut arcs fit within the chart area (non-empty paths, positive radii)', () => {
|
|
275
|
+
const spec = makeHalfDonutSpec();
|
|
276
|
+
const scales = computeScales(spec, chartArea, spec.data);
|
|
277
|
+
const marks = computePieMarks(spec, scales, chartArea, fullStrategy, true);
|
|
278
|
+
|
|
279
|
+
for (const mark of marks) {
|
|
280
|
+
expect(mark.path).toBeTruthy();
|
|
281
|
+
expect(mark.outerRadius).toBeGreaterThan(0);
|
|
282
|
+
expect(mark.innerRadius).toBeGreaterThan(0);
|
|
283
|
+
}
|
|
284
|
+
});
|
|
285
|
+
|
|
286
|
+
it('half-donut swept geometry stays within the chart area bounds', () => {
|
|
287
|
+
const spec = makeHalfDonutSpec();
|
|
288
|
+
const scales = computeScales(spec, chartArea, spec.data);
|
|
289
|
+
const marks = computePieMarks(spec, scales, chartArea, fullStrategy, true);
|
|
290
|
+
|
|
291
|
+
const left = chartArea.x;
|
|
292
|
+
const right = chartArea.x + chartArea.width;
|
|
293
|
+
const top = chartArea.y;
|
|
294
|
+
const bottom = chartArea.y + chartArea.height;
|
|
295
|
+
|
|
296
|
+
// The -PI/2..PI/2 sweep spans the TOP half-disc: its bounding box is
|
|
297
|
+
// x in [-R, R], y in [-R, 0] relative to center (up is -y here). So the
|
|
298
|
+
// swept extremes are center.x ± R horizontally and [center.y - R,
|
|
299
|
+
// center.y] vertically. All must land inside the chart area.
|
|
300
|
+
for (const mark of marks) {
|
|
301
|
+
const r = mark.outerRadius;
|
|
302
|
+
expect(mark.center.x - r).toBeGreaterThanOrEqual(left - 0.5);
|
|
303
|
+
expect(mark.center.x + r).toBeLessThanOrEqual(right + 0.5);
|
|
304
|
+
expect(mark.center.y - r).toBeGreaterThanOrEqual(top - 0.5);
|
|
305
|
+
expect(mark.center.y).toBeLessThanOrEqual(bottom + 0.5);
|
|
306
|
+
// Centroids (label anchors) must also fall inside the area.
|
|
307
|
+
expect(mark.centroid.x).toBeGreaterThanOrEqual(left);
|
|
308
|
+
expect(mark.centroid.x).toBeLessThanOrEqual(right);
|
|
309
|
+
expect(mark.centroid.y).toBeGreaterThanOrEqual(top);
|
|
310
|
+
expect(mark.centroid.y).toBeLessThanOrEqual(bottom);
|
|
311
|
+
}
|
|
312
|
+
});
|
|
313
|
+
});
|
|
314
|
+
|
|
212
315
|
describe('edge cases', () => {
|
|
213
316
|
it('returns empty array when no value encoding', () => {
|
|
214
317
|
const spec: NormalizedChartSpec = {
|
|
@@ -16,7 +16,7 @@ import type {
|
|
|
16
16
|
MarkAria,
|
|
17
17
|
Rect,
|
|
18
18
|
} from '@opendata-ai/openchart-core';
|
|
19
|
-
import { isConditionalDef, isGradientDef } from '@opendata-ai/openchart-core';
|
|
19
|
+
import { formatPercent, isConditionalDef, isGradientDef } from '@opendata-ai/openchart-core';
|
|
20
20
|
import type { PieArcDatum } from 'd3-shape';
|
|
21
21
|
import { arc as d3Arc, pie as d3Pie } from 'd3-shape';
|
|
22
22
|
|
|
@@ -87,6 +87,46 @@ function groupSmallSlices(slices: SliceData[], threshold: number): SliceData[] {
|
|
|
87
87
|
return big;
|
|
88
88
|
}
|
|
89
89
|
|
|
90
|
+
/**
|
|
91
|
+
* Bounding box (in unit-radius coordinates) of a circular arc sweep from
|
|
92
|
+
* startAngle to endAngle, following d3's angle convention: 0 is straight up,
|
|
93
|
+
* increasing clockwise. Used to fit and center a partial pie/donut sweep
|
|
94
|
+
* (e.g. a half-donut) within the available chart area, since a restricted
|
|
95
|
+
* sweep's bounding box is smaller than the full circle's.
|
|
96
|
+
*/
|
|
97
|
+
function computeSweepBounds(
|
|
98
|
+
startAngle: number,
|
|
99
|
+
endAngle: number,
|
|
100
|
+
): { minX: number; maxX: number; minY: number; maxY: number } {
|
|
101
|
+
// Sample the sweep endpoints plus the four cardinal directions (up, right,
|
|
102
|
+
// down, left) that fall within [startAngle, endAngle], since those are the
|
|
103
|
+
// only points where x or y can reach an extremum on a circle.
|
|
104
|
+
const points: Array<{ x: number; y: number }> = [
|
|
105
|
+
{ x: Math.sin(startAngle), y: -Math.cos(startAngle) },
|
|
106
|
+
{ x: Math.sin(endAngle), y: -Math.cos(endAngle) },
|
|
107
|
+
];
|
|
108
|
+
|
|
109
|
+
const cardinals = [0, Math.PI / 2, Math.PI, (3 * Math.PI) / 2];
|
|
110
|
+
const span = endAngle - startAngle;
|
|
111
|
+
for (const cardinal of cardinals) {
|
|
112
|
+
// Normalize the cardinal angle to the first occurrence at or after
|
|
113
|
+
// startAngle, then check whether it still falls within the swept range.
|
|
114
|
+
const normalized = cardinal + Math.ceil((startAngle - cardinal) / (Math.PI * 2)) * Math.PI * 2;
|
|
115
|
+
if (normalized <= startAngle + span) {
|
|
116
|
+
points.push({ x: Math.sin(normalized), y: -Math.cos(normalized) });
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
const xs = points.map((p) => p.x);
|
|
121
|
+
const ys = points.map((p) => p.y);
|
|
122
|
+
return {
|
|
123
|
+
minX: Math.min(...xs),
|
|
124
|
+
maxX: Math.max(...xs),
|
|
125
|
+
minY: Math.min(...ys),
|
|
126
|
+
maxY: Math.max(...ys),
|
|
127
|
+
};
|
|
128
|
+
}
|
|
129
|
+
|
|
90
130
|
// ---------------------------------------------------------------------------
|
|
91
131
|
// Public API
|
|
92
132
|
// ---------------------------------------------------------------------------
|
|
@@ -108,6 +148,8 @@ export function computePieMarks(
|
|
|
108
148
|
isDonut = false,
|
|
109
149
|
): ArcMark[] {
|
|
110
150
|
const encoding = spec.encoding as Encoding;
|
|
151
|
+
const startAngle = spec.markDef.startAngle ?? 0;
|
|
152
|
+
const endAngle = spec.markDef.endAngle ?? Math.PI * 2;
|
|
111
153
|
|
|
112
154
|
// For pie/donut charts, we need a value field (typically y or x) and
|
|
113
155
|
// a category field (typically color). The value field provides the slice sizes.
|
|
@@ -176,16 +218,29 @@ export function computePieMarks(
|
|
|
176
218
|
const pieGenerator = d3Pie<SliceData>()
|
|
177
219
|
.value((d) => d.value)
|
|
178
220
|
.sort(null) // Already sorted
|
|
179
|
-
.padAngle(0.01)
|
|
221
|
+
.padAngle(0.01)
|
|
222
|
+
.startAngle(startAngle)
|
|
223
|
+
.endAngle(endAngle);
|
|
180
224
|
|
|
181
225
|
const arcs = pieGenerator(slices);
|
|
182
226
|
|
|
183
|
-
// Compute arc dimensions
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
227
|
+
// Compute arc dimensions. A partial sweep (startAngle/endAngle narrower
|
|
228
|
+
// than a full circle) has a bounding box smaller than the full circle, so
|
|
229
|
+
// fit the radius and center to the actual sweep rather than the chart
|
|
230
|
+
// area's full width/height — otherwise a half-donut would render at half
|
|
231
|
+
// scale with wasted empty space below it.
|
|
232
|
+
const sweepBounds = computeSweepBounds(startAngle, endAngle);
|
|
233
|
+
const sweepWidth = sweepBounds.maxX - sweepBounds.minX;
|
|
234
|
+
const sweepHeight = sweepBounds.maxY - sweepBounds.minY;
|
|
235
|
+
const outerRadius = Math.min(chartArea.width / sweepWidth, chartArea.height / sweepHeight) * 0.85;
|
|
187
236
|
const innerRadius = isDonut ? outerRadius * 0.6 : 0;
|
|
188
237
|
|
|
238
|
+
// Center the sweep's bounding box within the chart area.
|
|
239
|
+
const centerX =
|
|
240
|
+
chartArea.x + chartArea.width / 2 - ((sweepBounds.minX + sweepBounds.maxX) / 2) * outerRadius;
|
|
241
|
+
const centerY =
|
|
242
|
+
chartArea.y + chartArea.height / 2 - ((sweepBounds.minY + sweepBounds.maxY) / 2) * outerRadius;
|
|
243
|
+
|
|
189
244
|
const arcGenerator = d3Arc<PieArcDatum<SliceData>>()
|
|
190
245
|
.innerRadius(innerRadius)
|
|
191
246
|
.outerRadius(outerRadius);
|
|
@@ -227,10 +282,10 @@ export function computePieMarks(
|
|
|
227
282
|
// Compute centroid (for label positioning), offset to chart center
|
|
228
283
|
const centroidResult = arcGenerator.centroid(arcDatum);
|
|
229
284
|
|
|
230
|
-
const
|
|
285
|
+
const percentStr = total > 0 ? formatPercent(slice.value / total) : '0%';
|
|
231
286
|
|
|
232
287
|
const aria: MarkAria = {
|
|
233
|
-
label: `${slice.label}: ${slice.value} (${
|
|
288
|
+
label: `${slice.label}: ${slice.value} (${percentStr})`,
|
|
234
289
|
};
|
|
235
290
|
|
|
236
291
|
marks.push({
|