Skip to content

Commit

Permalink
feat: expose datum as part of GeometryValue (opensearch-project#822)
Browse files Browse the repository at this point in the history
  • Loading branch information
@markov00
markov00 authored Sep 29, 2020
1 parent 5222c40 commit e582bd6
Show file tree
Hide file tree
Showing 16 changed files with 129 additions and 8 deletions.
1 change: 1 addition & 0 deletions packages/osd-charts/api/charts.api.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -645,6 +645,7 @@ export interface GeometryValue {
//
// (undocumented)
accessor: BandedAccessorType;
datum: any;
// (undocumented)
mark: number | null;
// (undocumented)
Expand Down
18 changes: 18 additions & 0 deletions packages/osd-charts/src/chart_types/xy_chart/rendering/rendering.areas.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ describe('Rendering points - areas', () => {
x: 0,
y: 10,
mark: null,
datum: [0, 10],
},
transform: {
x: 25,
Expand All @@ -199,6 +200,7 @@ describe('Rendering points - areas', () => {
x: 1,
y: 5,
mark: null,
datum: [1, 5],
},
transform: {
x: 25,
Expand Down Expand Up @@ -329,6 +331,7 @@ describe('Rendering points - areas', () => {
x: 0,
y: 10,
mark: null,
datum: [0, 10],
},
transform: {
x: 25,
Expand All @@ -353,6 +356,7 @@ describe('Rendering points - areas', () => {
x: 1,
y: 5,
mark: null,
datum: [1, 5],
},
transform: {
x: 25,
Expand Down Expand Up @@ -385,6 +389,7 @@ describe('Rendering points - areas', () => {
x: 0,
y: 20,
mark: null,
datum: [0, 20],
},
transform: {
x: 25,
Expand All @@ -409,6 +414,7 @@ describe('Rendering points - areas', () => {
x: 1,
y: 10,
mark: null,
datum: [1, 10],
},
transform: {
x: 25,
Expand Down Expand Up @@ -495,6 +501,7 @@ describe('Rendering points - areas', () => {
x: 0,
y: 10,
mark: null,
datum: [0, 10],
},
transform: {
x: 0,
Expand All @@ -519,6 +526,7 @@ describe('Rendering points - areas', () => {
x: 1,
y: 5,
mark: null,
datum: [1, 5],
},
transform: {
x: 0,
Expand Down Expand Up @@ -648,6 +656,7 @@ describe('Rendering points - areas', () => {
x: 0,
y: 10,
mark: null,
datum: [0, 10],
},
transform: {
x: 0,
Expand All @@ -672,6 +681,7 @@ describe('Rendering points - areas', () => {
x: 1,
y: 5,
mark: null,
datum: [1, 5],
},
transform: {
x: 0,
Expand Down Expand Up @@ -704,6 +714,7 @@ describe('Rendering points - areas', () => {
x: 0,
y: 20,
mark: null,
datum: [0, 20],
},
transform: {
x: 0,
Expand All @@ -728,6 +739,7 @@ describe('Rendering points - areas', () => {
x: 1,
y: 10,
mark: null,
datum: [1, 10],
},
transform: {
x: 0,
Expand Down Expand Up @@ -814,6 +826,7 @@ describe('Rendering points - areas', () => {
x: 1546300800000,
y: 10,
mark: null,
datum: [1546300800000, 10],
},
transform: {
x: 0,
Expand All @@ -838,6 +851,7 @@ describe('Rendering points - areas', () => {
x: 1546387200000,
y: 5,
mark: null,
datum: [1546387200000, 5],
},
transform: {
x: 0,
Expand Down Expand Up @@ -952,6 +966,7 @@ describe('Rendering points - areas', () => {
x: 1546300800000,
y: 10,
mark: null,
datum: [1546300800000, 10],
},
transform: {
x: 0,
Expand All @@ -976,6 +991,7 @@ describe('Rendering points - areas', () => {
x: 1546387200000,
y: 5,
mark: null,
datum: [1546387200000, 5],
},
transform: {
x: 0,
Expand Down Expand Up @@ -1008,6 +1024,7 @@ describe('Rendering points - areas', () => {
x: 1546300800000,
y: 20,
mark: null,
datum: [1546300800000, 20],
},
transform: {
x: 0,
Expand All @@ -1032,6 +1049,7 @@ describe('Rendering points - areas', () => {
x: 1546387200000,
y: 10,
mark: null,
datum: [1546387200000, 10],
},
transform: {
x: 0,
Expand Down
14 changes: 14 additions & 0 deletions packages/osd-charts/src/chart_types/xy_chart/rendering/rendering.bands.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ describe('Rendering bands - areas', () => {
x: 0,
y: 2,
mark: null,
datum: [0, 2, 10],
},
transform: {
x: 25,
Expand All @@ -200,6 +201,7 @@ describe('Rendering bands - areas', () => {
x: 0,
y: 10,
mark: null,
datum: [0, 2, 10],
},
transform: {
x: 25,
Expand All @@ -223,6 +225,7 @@ describe('Rendering bands - areas', () => {
x: 1,
y: 3,
mark: null,
datum: [1, 3, 5],
},
styleOverrides: undefined,
transform: {
Expand All @@ -248,6 +251,7 @@ describe('Rendering bands - areas', () => {
x: 1,
y: 5,
mark: null,
datum: [1, 3, 5],
},
transform: {
x: 25,
Expand Down Expand Up @@ -334,6 +338,7 @@ describe('Rendering bands - areas', () => {
x: 0,
y: 10,
mark: null,
datum: [0, 2, 10],
},
transform: {
x: 25,
Expand All @@ -351,6 +356,7 @@ describe('Rendering bands - areas', () => {
x: 0,
y: 2,
mark: null,
datum: [0, 2, 10],
},
}),
);
Expand All @@ -361,6 +367,7 @@ describe('Rendering bands - areas', () => {
x: 0,
y: 10,
mark: null,
datum: [0, 2, 10],
},
}),
);
Expand All @@ -373,6 +380,7 @@ describe('Rendering bands - areas', () => {
x: 2,
y: 3,
mark: null,
datum: [2, 3, 5],
},
}),
);
Expand All @@ -385,6 +393,7 @@ describe('Rendering bands - areas', () => {
x: 2,
y: 5,
mark: null,
datum: [2, 3, 5],
},
}),
);
Expand All @@ -397,6 +406,7 @@ describe('Rendering bands - areas', () => {
x: 3,
y: 3,
mark: null,
datum: [3, 3, 5],
},
}),
);
Expand All @@ -409,6 +419,7 @@ describe('Rendering bands - areas', () => {
x: 3,
y: 5,
mark: null,
datum: [3, 3, 5],
},
}),
);
Expand Down Expand Up @@ -463,6 +474,7 @@ describe('Rendering bands - areas', () => {
x: 0,
y: 10,
mark: null,
datum: [0, 2, 10],
},
seriesIdentifier: {
specId: SPEC_ID,
Expand Down Expand Up @@ -502,6 +514,7 @@ describe('Rendering bands - areas', () => {
x: 2,
y: 5,
mark: null,
datum: [2, 3, 5],
},
seriesIdentifier: {
specId: SPEC_ID,
Expand Down Expand Up @@ -541,6 +554,7 @@ describe('Rendering bands - areas', () => {
x: 3,
y: 8,
mark: null,
datum: [3, 4, 8],
},
seriesIdentifier: {
specId: SPEC_ID,
Expand Down
Loading

0 comments on commit e582bd6

Please sign in to comment.