Skip to content

Fix off by one error in flattenUniqueSort #863

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
Aug 19, 2016
Merged

Fix off by one error in flattenUniqueSort #863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21d813e
Fix off by one error in flattenUniqueSort
Aug 18, 2016
cc3012a
Add regression test
Aug 19, 2016
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
2 changes: 1 addition & 1 deletion src/plots/cartesian/ordered_categories.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ function flattenUniqueSort(axisLetter, sortFunction, data) {
insertionIndex = bisector(categoryArray, category);

// skip loop on already encountered values
if(insertionIndex < categoryArray.length - 1 && categoryArray[insertionIndex] === category) continue;
if(insertionIndex < categoryArray.length && categoryArray[insertionIndex] === category) continue;

// insert value
categoryArray.splice(insertionIndex, 0, category);
Expand Down
12 changes: 12 additions & 0 deletions test/jasmine/tests/calcdata_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,18 @@ describe('calculated data and points', function() {
expect(gd.calcdata[0][3]).toEqual(jasmine.objectContaining({x: 0, y: 13}));
expect(gd.calcdata[0][4]).toEqual(jasmine.objectContaining({x: 2, y: 14}));
});

it('should combine duplicate categories', function() {
Plotly.plot(gd, [{x: [ '1', '1'], y: [10, 20]}], { xaxis: {
type: 'category',
categoryorder: 'category ascending'
}});

expect(gd.calcdata[0][0]).toEqual(jasmine.objectContaining({x: 0, y: 10}));
expect(gd.calcdata[0][1]).toEqual(jasmine.objectContaining({x: 0, y: 20}));

expect(gd._fullLayout.xaxis._categories).toEqual(['1']);
});
});

describe('explicit category ordering', function() {
Expand Down