diff --git a/draftlogs/8125_fix.md b/draftlogs/8125_fix.md new file mode 100644 index 00000000000..96233a48310 --- /dev/null +++ b/draftlogs/8125_fix.md @@ -0,0 +1 @@ + - Fix normalization of `contours.value` for interval constraints in `contour` and `contourcarpet` [[#8125](https://github.com/plotly/plotly.js/pull/8125)], with thanks to @Lexachoc for the contribution! diff --git a/src/traces/contour/constraint_defaults.js b/src/traces/contour/constraint_defaults.js index 2b0178d940f..a55590e9aa7 100644 --- a/src/traces/contour/constraint_defaults.js +++ b/src/traces/contour/constraint_defaults.js @@ -56,18 +56,23 @@ function handleConstraintValueDefaults(coerce, contours) { zvalue = parseFloat(contours.value); contours.value = [zvalue, zvalue + 1]; } - } else if(contours.value.length > 2) { - contours.value = contours.value.slice(2); - } else if(contours.length === 0) { - contours.value = [0, 1]; - } else if(contours.length < 2) { - zvalue = parseFloat(contours.value[0]); - contours.value = [zvalue, zvalue + 1]; + } else { - contours.value = [ - parseFloat(contours.value[0]), - parseFloat(contours.value[1]) - ]; + switch(contours.value.length) { + case 0: + contours.value = [0, 1]; + break; + case 1: + zvalue = parseFloat(contours.value[0]); + contours.value = [zvalue, zvalue + 1]; + break; + default: + // Keep only the first two values + contours.value = [ + parseFloat(contours.value[0]), + parseFloat(contours.value[1]) + ]; + } } } else { // Requires a single scalar: diff --git a/test/jasmine/tests/contour_test.js b/test/jasmine/tests/contour_test.js index ae098a30702..4b45ba2b01d 100644 --- a/test/jasmine/tests/contour_test.js +++ b/test/jasmine/tests/contour_test.js @@ -115,6 +115,49 @@ describe('contour defaults', function() { expect(traceOut.xcalendar).toBe('coptic'); expect(traceOut.ycalendar).toBe('ethiopian'); }); + + it('should coerce constraint interval values to two numbers', function() { + var specs = [ + { + value: [], + expected: [0, 1] + }, + { + value: [5], + expected: [5, 6] + }, + { + value: ['10.5', '20.25', '30.75'], + expected: [10.5, 20.25] + }, + { + value: [1.25, 2.75], + expected: [1.25, 2.75] + }, + { + value: new Float64Array([1.5, 2.5, 3.5]), + expected: [1.5, 2.5] + } + ]; + + specs.forEach(function(spec) { + traceIn = { + type: 'contour', + z: [[0, 1], [2, 3]], + contours: { + type: 'constraint', + operation: '[]', + value: spec.value + } + }; + + traceOut = {}; + + supplyDefaults(traceIn, traceOut, defaultColor, layout); + + expect(traceOut.contours.value).toEqual(spec.expected); + }); + }); }); describe('contour makeColorMap', function() {