diff --git a/src/marks/hexgrid.js b/src/marks/hexgrid.js index ecc4355a7a..b3d131e375 100644 --- a/src/marks/hexgrid.js +++ b/src/marks/hexgrid.js @@ -1,7 +1,7 @@ import {create} from "../context.js"; import {Mark} from "../mark.js"; import {number, singleton} from "../options.js"; -import {applyChannelStyles, applyDirectStyles, applyIndirectStyles, applyTransform, offset} from "../style.js"; +import {applyChannelStyles, applyDirectStyles, applyIndirectStyles, applyTransform} from "../style.js"; import {sqrt4_3} from "../symbol.js"; import {ox, oy} from "../transforms/hexbin.js"; @@ -47,7 +47,7 @@ export class Hexgrid extends Mark { return create("svg:g", context) .datum(0) .call(applyIndirectStyles, this, dimensions, context) - .call(applyTransform, this, {}, offset + ox, offset + oy) + .call(applyTransform, this, {}, ox, oy) .call((g) => g.append("path").call(applyDirectStyles, this).call(applyChannelStyles, this, channels).attr("d", d)) .node(); } diff --git a/src/transforms/hexbin.js b/src/transforms/hexbin.js index 54e409d0aa..51078eb708 100644 --- a/src/transforms/hexbin.js +++ b/src/transforms/hexbin.js @@ -1,5 +1,6 @@ import {map, number, valueof} from "../options.js"; import {applyPosition} from "../projection.js"; +import {offset} from "../style.js"; import {sqrt3} from "../symbol.js"; import {initializer} from "./basic.js"; import {hasOutput, maybeGroup, maybeGroupOutputs, maybeSubgroup} from "./group.js"; @@ -9,8 +10,8 @@ import {hasOutput, maybeGroup, maybeGroupOutputs, maybeSubgroup} from "./group.j // to be rounded up into a floating bin to the right of the plot. Therefore, // rather than centering the origin hexagon around ⟨0,0⟩ in screen coordinates, // we offset slightly to ⟨0.5,0⟩. The hexgrid mark uses the same origin. -export const ox = 0.5, - oy = 0; +export const ox = 0.5 - offset; +export const oy = -offset; export function hexbin(outputs = {fill: "count"}, {binWidth, ...options} = {}) { const {z} = options; diff --git a/test/output/hexbin.svg b/test/output/hexbin.svg index a2a2505ea3..998736b518 100644 --- a/test/output/hexbin.svg +++ b/test/output/hexbin.svg @@ -14,57 +14,57 @@ } - 34 - 36 - 38 - 40 - 42 - 44 - 46 - 48 - 50 - 52 - 54 - 56 - 58 + 34 + 36 + 38 + 40 + 42 + 44 + 46 + 48 + 50 + 52 + 54 + 56 + 58 ↑ culmen_length_mm - 14 - 15 - 16 - 17 - 18 - 19 - 20 - 21 + 14 + 15 + 16 + 17 + 18 + 19 + 20 + 21 culmen_depth_mm → @@ -73,201 +73,201 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/output/hexbinFillX.svg b/test/output/hexbinFillX.svg index fd80f6f95d..7eee58ac01 100644 --- a/test/output/hexbinFillX.svg +++ b/test/output/hexbinFillX.svg @@ -14,57 +14,57 @@ } - 34 - 36 - 38 - 40 - 42 - 44 - 46 - 48 - 50 - 52 - 54 - 56 - 58 + 34 + 36 + 38 + 40 + 42 + 44 + 46 + 48 + 50 + 52 + 54 + 56 + 58 ↑ culmen_length_mm - 14 - 15 - 16 - 17 - 18 - 19 - 20 - 21 + 14 + 15 + 16 + 17 + 18 + 19 + 20 + 21 culmen_depth_mm → @@ -73,201 +73,201 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/output/hexbinIdentityReduce.svg b/test/output/hexbinIdentityReduce.svg index df736b9267..a3c4a9c8ba 100644 --- a/test/output/hexbinIdentityReduce.svg +++ b/test/output/hexbinIdentityReduce.svg @@ -14,61 +14,61 @@ } - 2,800 - 3,000 - 3,200 - 3,400 + 2,800 + 3,000 + 3,200 + 3,400 3,600 - 3,800 - 4,000 - 4,200 - 4,400 - 4,600 - 4,800 - 5,000 - 5,200 + 3,800 + 4,000 + 4,200 + 4,400 + 4,600 + 4,800 + 5,000 + 5,200 5,400 - 5,600 - 5,800 - 6,000 - 6,200 + 5,600 + 5,800 + 6,000 + 6,200 ↑ body_mass_g - 35 - 40 - 45 - 50 - 55 + 35 + 40 + 45 + 50 + 55 culmen_length_mm → @@ -77,321 +77,321 @@ - + - A - A - A - A - A - A,A - A - A - A - A - A - A,C - A - A - A - A - A - A - A,G - A - A,A - A - A,A - A - A - A - A - A - A - A - A,A - A - A,A - A,A - A - A - A - A - A - A - A - A - A - A - A - A,A - A,A - A - A - A - A - A - A - A - A - A - A,A - A - A,A - A - A - A - A - A - A - A - A - A,A - A,A - A - A - A - A,A - A - A - A - A - A - A - A - A - A - A,A,A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - A - C - C - C - C,C - C - C - C - C - C - C - C - C - C - C - C,C - C - C - C - C - C - C - C - C - C - C - C - C - C - C - C - C - C,C - C - C - C - C - C - C - C - C - C - C - C - C - C - C - C - C - C - C - C - C - C - C - C - C - C - C - C - C - C - C - C - C - G - G,G,G - G - G - G - G - G,G - G - G - G - G - G - G - G - G - G - G - G,G - G - G - G,G - G - G - G - G - G - G - G - G - G - G,G - G - G - G - G - G - G - G - G - G - G - G,G - G - G - G - G - G - G,G,G - G - G - G - G - G - G - G - G - G - G - G - G - G - G - G - G - G - G - G - G - G - G - G - G - G - G - G - G,G - G - G - G - G - G - G - G - G - G - G - G - G,G - G - G - G - G - G - G - G,G - G - G - G - G - G - G - G - G - G - G - G - G - G - G - G + A + A + A + A + A + A,A + A + A + A + A + A + A,C + A + A + A + A + A + A + A,G + A + A,A + A + A,A + A + A + A + A + A + A + A + A,A + A + A,A + A,A + A + A + A + A + A + A + A + A + A + A + A + A,A + A,A + A + A + A + A + A + A + A + A + A + A,A + A + A,A + A + A + A + A + A + A + A + A + A,A + A,A + A + A + A + A,A + A + A + A + A + A + A + A + A + A + A,A,A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + A + C + C + C + C,C + C + C + C + C + C + C + C + C + C + C + C,C + C + C + C + C + C + C + C + C + C + C + C + C + C + C + C + C + C,C + C + C + C + C + C + C + C + C + C + C + C + C + C + C + C + C + C + C + C + C + C + C + C + C + C + C + C + C + C + C + C + C + G + G,G,G + G + G + G + G + G,G + G + G + G + G + G + G + G + G + G + G + G,G + G + G + G,G + G + G + G + G + G + G + G + G + G + G,G + G + G + G + G + G + G + G + G + G + G + G,G + G + G + G + G + G + G,G,G + G + G + G + G + G + G + G + G + G + G + G + G + G + G + G + G + G + G + G + G + G + G + G + G + G + G + G + G,G + G + G + G + G + G + G + G + G + G + G + G + G,G + G + G + G + G + G + G + G,G + G + G + G + G + G + G + G + G + G + G + G + G + G + G + G \ No newline at end of file diff --git a/test/output/hexbinR.html b/test/output/hexbinR.html index 5ade25928a..b5a5a32c7f 100644 --- a/test/output/hexbinR.html +++ b/test/output/hexbinR.html @@ -60,20 +60,20 @@ - 35 - 40 - 45 - 50 - 55 + 35 + 40 + 45 + 50 + 55 @@ -81,42 +81,42 @@ - 14 - 16 + 14 + 16 18 - 20 + 20 - 14 - 16 + 14 + 16 18 - 20 + 20 - 14 - 16 + 14 + 16 18 - 20 + 20 @@ -132,173 +132,173 @@ - + - + - + - 9 - 8 - 8 - 8 - 6 - 6 - 6 - 5 - 5 - 5 - 5 - 4 - 4 - 4 - 3 - 3 - 3 - 3 - 3 - 3 - 3 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 + 9 + 8 + 8 + 8 + 6 + 6 + 6 + 5 + 5 + 5 + 5 + 4 + 4 + 4 + 3 + 3 + 3 + 3 + 3 + 3 + 3 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 - 11 - 9 - 8 - 7 - 5 - 5 - 5 - 4 - 4 - 4 - 4 - 4 - 4 - 4 - 4 - 3 - 3 - 3 - 3 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 + 11 + 9 + 8 + 7 + 5 + 5 + 5 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 3 + 3 + 3 + 3 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 - 2 - 1 - 1 - 1 - 1 - 1 - 1 - 1 + 2 + 1 + 1 + 1 + 1 + 1 + 1 + 1 \ No newline at end of file diff --git a/test/output/hexbinText.svg b/test/output/hexbinText.svg index e91aee982e..f3bde25f14 100644 --- a/test/output/hexbinText.svg +++ b/test/output/hexbinText.svg @@ -26,20 +26,20 @@ - 35 - 40 - 45 - 50 - 55 + 35 + 40 + 45 + 50 + 55 @@ -47,42 +47,42 @@ - 14 - 16 - 18 - 20 + 14 + 16 + 18 + 20 - 14 - 16 - 18 - 20 + 14 + 16 + 18 + 20 - 14 - 16 - 18 - 20 + 14 + 16 + 18 + 20 @@ -98,289 +98,289 @@ - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - 4 - 5 - 2 - 6 - 1 - 7 - 3 - 2 - 4 - 6 - 3 - 8 - 1 - 7 - 4 - 3 - 1 - 2 - 1 - 2 - 1 - 1 - 5 - 1 - 2 - 2 - 1 - 5 - 1 - 3 - 2 - 1 - 2 - 1 - 2 - 2 - 1 - 1 - 1 - 1 - 4 - 7 - 7 - 3 - 1 - 10 - 3 - 1 - 2 - 4 - 6 - 2 - 3 - 1 - 1 - 1 - 1 + 4 + 5 + 2 + 6 + 1 + 7 + 3 + 2 + 4 + 6 + 3 + 8 + 1 + 7 + 4 + 3 + 1 + 2 + 1 + 2 + 1 + 1 + 5 + 1 + 2 + 2 + 1 + 5 + 1 + 3 + 2 + 1 + 2 + 1 + 2 + 2 + 1 + 1 + 1 + 1 + 4 + 7 + 7 + 3 + 1 + 10 + 3 + 1 + 2 + 4 + 6 + 2 + 3 + 1 + 1 + 1 + 1 - 16 - 1 - 5 - 2 - 1 - 3 - 1 - 3 - 3 - 1 - 1 - 1 - 1 - 5 - 3 - 7 - 4 - 2 - 1 - 3 - 1 - 2 - 1 - 1 - 1 - 3 - 6 - 7 - 4 - 4 - 1 - 1 - 1 - 3 - 1 - 1 - 2 - 1 - 1 - 1 - 6 - 6 - 2 - 4 - 3 - 7 - 8 - 7 - 2 - 1 - 1 - 1 - 1 - 1 - 1 - 2 - 2 - 1 - 2 - 1 - 1 - 1 + 16 + 1 + 5 + 2 + 1 + 3 + 1 + 3 + 3 + 1 + 1 + 1 + 1 + 5 + 3 + 7 + 4 + 2 + 1 + 3 + 1 + 2 + 1 + 1 + 1 + 3 + 6 + 7 + 4 + 4 + 1 + 1 + 1 + 3 + 1 + 1 + 2 + 1 + 1 + 1 + 6 + 6 + 2 + 4 + 3 + 7 + 8 + 7 + 2 + 1 + 1 + 1 + 1 + 1 + 1 + 2 + 2 + 1 + 2 + 1 + 1 + 1 - 1 - 1 - 2 - 1 - 1 - 1 - 1 - 1 + 1 + 1 + 2 + 1 + 1 + 1 + 1 + 1 \ No newline at end of file diff --git a/test/output/hexbinZ.html b/test/output/hexbinZ.html index 747c7a9d86..3ad5a700f4 100644 --- a/test/output/hexbinZ.html +++ b/test/output/hexbinZ.html @@ -48,38 +48,38 @@ 3,000 - 3,500 - 4,000 + 3,500 + 4,000 4,500 - 5,000 - 5,500 - 6,000 + 5,000 + 5,500 + 6,000 ↑ body_mass_g - 35 - 40 - 45 - 50 - 55 + 35 + 40 + 45 + 50 + 55 culmen_length_mm → @@ -88,193 +88,193 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/output/hexbinZNull.svg b/test/output/hexbinZNull.svg index 1ad7df392c..ace79e221e 100644 --- a/test/output/hexbinZNull.svg +++ b/test/output/hexbinZNull.svg @@ -15,56 +15,56 @@ 34 - 36 - 38 - 40 - 42 - 44 - 46 - 48 - 50 - 52 - 54 - 56 - 58 + 36 + 38 + 40 + 42 + 44 + 46 + 48 + 50 + 52 + 54 + 56 + 58 ↑ culmen_length_mm - 14 - 15 - 16 + 14 + 15 + 16 17 - 18 - 19 + 18 + 19 20 - 21 + 21 culmen_depth_mm → @@ -73,200 +73,200 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file