Skip to content

Simplify data structure used to collect multisource encoding update #4687

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

Merged
merged 2 commits into from
Sep 19, 2023
Merged

Simplify data structure used to collect multisource encoding update #4687

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e86f0f
Simplify data structure used to collect multisource encoding update
mattseddon Sep 19, 2023
7e66973
Merge branch 'main' into simplify-data-structure
julieg18 Sep 19, 2023
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
43 changes: 12 additions & 31 deletions extension/src/plots/multiSource/collect.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,31 +119,15 @@ const collectMultiSourceValues = (variations: Variations): Values => {
return values
}

const sortDifferentVariations = (
differentVariations: { field: string; variations: number }[],
expectedOrder: string[]
): { field: string; variations: number }[] => {
differentVariations.sort(
(
{ field: aField, variations: aVariations },
{ field: bField, variations: bVariations }
) =>
aVariations === bVariations
? expectedOrder.indexOf(aField) - expectedOrder.indexOf(bField)
: aVariations - bVariations
)
return differentVariations
}

const groupVariations = (
variations: Variations,
values: Values
): {
lessValuesThanVariations: { field: string; variations: number }[]
lessValuesThanVariations: string[]
valuesMatchVariations: string[]
} => {
const valuesMatchVariations: string[] = []
const lessValuesThanVariations: { field: string; variations: number }[] = []
const lessValuesThanVariations: string[] = []

for (const [field, valueSet] of Object.entries(values)) {
if (valueSet.size === 1) {
Expand All @@ -153,14 +137,14 @@ const groupVariations = (
valuesMatchVariations.push(field)
continue
}
lessValuesThanVariations.push({ field, variations: valueSet.size })
lessValuesThanVariations.push(field)
}

const expectedOrder = ['filename', 'field']
return {
lessValuesThanVariations: sortDifferentVariations(
lessValuesThanVariations: sortCollectedArray(
lessValuesThanVariations,
expectedOrder
(a, b) => expectedOrder.indexOf(a) - expectedOrder.indexOf(b)
),
valuesMatchVariations: sortCollectedArray(
valuesMatchVariations,
Expand Down Expand Up @@ -224,7 +208,7 @@ const collectMergedStrokeDashEncoding = (
const collectEncodingFromValues = <T extends typeof Shape | typeof StrokeDash>(
scaleRange: T,
values: Values,
lessValuesThanVariations: { field: string; variations: number }[]
lessValuesThanVariations: string[]
): { field: string; scale: { range: T[number][]; domain: string[] } } => {
const scale: { range: T[number][]; domain: string[] } = {
domain: [],
Expand All @@ -233,10 +217,9 @@ const collectEncodingFromValues = <T extends typeof Shape | typeof StrokeDash>(
const filenameOrField = lessValuesThanVariations.shift()
let idx = 0
const field = new Set<string>()
if (filenameOrField?.field) {
for (const value of values[filenameOrField.field as 'filename' | 'field'] ||
[]) {
field.add(filenameOrField.field)
if (filenameOrField) {
for (const value of values[filenameOrField as 'filename' | 'field'] || []) {
field.add(filenameOrField)
scale.domain.push(value)
scale.range.push(scaleRange[idx])
scale.domain.sort()
Expand All @@ -250,7 +233,7 @@ const collectUnmergedStrokeDashEncoding = (
acc: MultiSourceEncoding,
path: string,
values: Values,
lessValuesThanVariations: { field: string; variations: number }[]
lessValuesThanVariations: string[]
): void => {
acc[path] = {
strokeDash: collectEncodingFromValues(
Expand All @@ -265,16 +248,14 @@ const collectUnmergedShapeEncoding = (
acc: MultiSourceEncoding,
path: string,
values: Values,
lessValuesThanVariations: { field: string; variations: number }[]
lessValuesThanVariations: string[]
): void => {
acc[path] = {
...acc[path],
shape: collectEncodingFromValues(Shape, values, lessValuesThanVariations)
}
}

// this is how we can collect the encoding for multi-source plots
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[F] This was not meant to be committed.

// we need to pass in the anchors that we want to fill as well
const collectPathMultiSourceEncoding = (
acc: MultiSourceEncoding,
path: string,
Expand All @@ -290,7 +271,7 @@ const collectPathMultiSourceEncoding = (
if (valuesMatchVariations.length > 0) {
const keysToCombined = [
...valuesMatchVariations,
...lessValuesThanVariations.map(({ field }) => field)
...lessValuesThanVariations
]
collectMergedStrokeDashEncoding(acc, path, variations, keysToCombined)
return
Expand Down