diff --git a/package-lock.json b/package-lock.json index 7ff5a15252e..51d0fe33a4f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10040,9 +10040,9 @@ } }, "regl-line2d": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/regl-line2d/-/regl-line2d-2.1.2.tgz", - "integrity": "sha512-xV1wRhzjq6JcE3ojKdF+LF9mufIzYugMUH97X4QFohi3nYyobpRYU2FBaEDowUCvInnkNeLNzhj837nm50oKew==", + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/regl-line2d/-/regl-line2d-2.1.4.tgz", + "integrity": "sha512-m7c7y1H5QhlWVN++DjHdDvn/2sLdpBMd97GiGsnnXeE1oWboh6LGV7xNIcmodokc5B3AFR7W+izeFkSGThXg8g==", "requires": { "array-bounds": "1.0.1", "array-normalize": "1.1.3", @@ -10055,89 +10055,6 @@ "pick-by-alias": "1.2.0", "to-float32": "1.0.0", "update-diff": "1.1.0" - }, - "dependencies": { - "escodegen": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.0.tgz", - "integrity": "sha512-v0MYvNQ32bzwoG2OSFzWAkuahDQHK92JBN0pTAALJ4RIxEZe766QJPDR8Hqy7XNUy5K3fnVL76OqYAdc4TZEIw==", - "requires": { - "esprima": "3.1.3", - "estraverse": "4.2.0", - "esutils": "2.0.2", - "optionator": "0.8.2", - "source-map": "0.5.7" - } - }, - "esprima": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", - "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=" - }, - "estraverse": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", - "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=" - }, - "esutils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=" - }, - "glslify": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/glslify/-/glslify-6.1.0.tgz", - "integrity": "sha1-zf/P0qZXFyISjT0TNWwTbebOl0I=", - "requires": { - "bl": "1.2.1", - "concat-stream": "1.6.0", - "duplexify": "3.5.3", - "falafel": "2.1.0", - "from2": "2.3.0", - "glsl-resolve": "0.0.1", - "glsl-token-whitespace-trim": "1.0.0", - "glslify-bundle": "5.0.0", - "glslify-deps": "1.3.0", - "minimist": "1.2.0", - "resolve": "1.4.0", - "stack-trace": "0.0.9", - "static-eval": "1.1.1", - "tape": "4.8.0", - "through2": "2.0.3", - "xtend": "4.0.1" - } - }, - "glslify-bundle": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/glslify-bundle/-/glslify-bundle-5.0.0.tgz", - "integrity": "sha1-AlKtoe+d8wtmAAbguyH9EwtIbkI=", - "requires": { - "glsl-inject-defines": "1.0.3", - "glsl-token-defines": "1.0.0", - "glsl-token-depth": "1.1.2", - "glsl-token-descope": "1.0.2", - "glsl-token-scope": "1.1.2", - "glsl-token-string": "1.0.1", - "glsl-token-whitespace-trim": "1.0.0", - "glsl-tokenizer": "2.1.2", - "murmurhash-js": "1.0.0", - "shallow-copy": "0.0.1" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "optional": true - }, - "static-eval": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/static-eval/-/static-eval-1.1.1.tgz", - "integrity": "sha1-yoEwIQNUzxPZpyK8fpI3eEV7sZI=", - "requires": { - "escodegen": "1.9.0" - } - } } }, "regl-scatter2d": { diff --git a/package.json b/package.json index 4015757365e..1b5be44fd4d 100644 --- a/package.json +++ b/package.json @@ -99,7 +99,7 @@ "polybooljs": "^1.2.0", "regl": "^1.3.1", "regl-error2d": "^2.0.3", - "regl-line2d": "^2.1.2", + "regl-line2d": "^2.1.4", "regl-scatter2d": "^2.1.13", "right-now": "^1.0.0", "robust-orientation": "^1.1.3", diff --git a/test/image/baselines/gl2d_line_aligned.png b/test/image/baselines/gl2d_line_aligned.png new file mode 100644 index 00000000000..2d3752f23c6 Binary files /dev/null and b/test/image/baselines/gl2d_line_aligned.png differ diff --git a/test/image/mocks/gl2d_line_aligned.json b/test/image/mocks/gl2d_line_aligned.json new file mode 100644 index 00000000000..72629b34ebf --- /dev/null +++ b/test/image/mocks/gl2d_line_aligned.json @@ -0,0 +1,56 @@ +{ + "data": [ + { + "x" : [ 20, 20 ], + "y" : [ 40, 30 ], + "type" : "scattergl", + "mode" : "lines+markers", + "name" : "Same X-points scattergl" + }, + + { + "x" : [ 21, 21 ], + "y" : [ 40, 30 ], + "type" : "scatter", + "mode" : "lines+markers", + "name" : "Same X-points scatter" + }, + + { + "x" : [ 25, 30 ], + "y" : [ 25, 30 ], + "type" : "scattergl", + "mode" : "lines+markers", + "name" : "All Different scattergl" + }, + + { + "x" : [ 25, 30 ], + "y" : [ 30, 35 ], + "type" : "scatter", + "mode" : "lines+markers", + "name" : "All Different scatter" + }, + + { + "x" : [ 15, 20 ], + "y" : [ 23, 23 ], + "type" : "scattergl", + "mode" : "lines+markers", + "name" : "Same Y-points scattergl" + }, + + { + "x" : [ 15, 20 ], + "y" : [ 25, 25 ], + "type" : "scatter", + "mode" : "lines+markers", + "name" : "Same Y-points scatter" + } + ], + "layout": { + "showlegend": false, + "width": 800, + "height": 500 + } +}