@@ -1164,9 +1164,9 @@ describe('calculated data and points', function() {
1164
1164
var expectedAgg = [ [ 'a' , Math . sqrt ( data [ 0 ] * data2 [ 0 ] ) ] , [ 'b' , Math . sqrt ( data [ 1 ] * data2 [ 1 ] ) ] , [ 'c' , Math . sqrt ( data [ 2 ] * data2 [ 2 ] ) ] ] ;
1165
1165
// TODO: how to actually calc these? what do these even mean?
1166
1166
if ( type === 'histogram' ) expectedAgg = [ [ 'a' , 2 ] , [ 'b' , 1 ] , [ 'c' , 1 ] ] ;
1167
- if ( type === 'histogram2d' ) expectedAgg = [ [ 'a' , 2 / 3 ] , [ 'b' , 1 / 3 ] , [ 'c' , 1 / 3 ] ] ;
1168
- if ( type === 'contour' || type === 'heatmap' ) expectedAgg = [ [ 'a' , Math . pow ( expectedAgg [ 0 ] [ 1 ] , 1 / 3 ) ] , [ 'b' , Math . pow ( expectedAgg [ 1 ] [ 1 ] , 1 / 3 ) ] , [ 'c' , Math . pow ( expectedAgg [ 2 ] [ 1 ] , 1 / 3 ) ] ] ;
1169
- if ( type === 'histogram2dcontour' ) expectedAgg = [ [ 'a' , 2 / 4 ] , [ 'b' , 1 / 4 ] , [ 'c' , 1 / 4 ] ] ;
1167
+ if ( type === 'histogram2d' ) expectedAgg = [ [ 'a' , 0 ] , [ 'b' , 0 ] , [ 'c' , 0 ] ] ;
1168
+ if ( type === 'contour' || type === 'heatmap' ) expectedAgg = [ [ 'a' , 0 ] , [ 'b' , 0 ] , [ 'c' , 0 ] ] ;
1169
+ if ( type === 'histogram2dcontour' ) expectedAgg = [ [ 'a' , 0 ] , [ 'b' , 0 ] , [ 'c' , 0 ] ] ;
1170
1170
1171
1171
checkAggregatedValue ( baseMock , expectedAgg , false , done ) ;
1172
1172
} ) ;
0 commit comments