From d0ad1ea653cc6f368277308d5b60e2982adec0e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Rivi=C3=A8re?= Date: Sat, 4 Apr 2026 15:50:40 +0200 Subject: [PATCH 1/6] cleaner area line option --- src/marks/area.d.ts | 7 ++++-- src/marks/area.js | 54 ++++++++++++++++++++++++---------------- test/plots/aapl-close.ts | 4 +-- 3 files changed, 39 insertions(+), 26 deletions(-) diff --git a/src/marks/area.d.ts b/src/marks/area.d.ts index 34d71c63e9..ccf471e8d0 100644 --- a/src/marks/area.d.ts +++ b/src/marks/area.d.ts @@ -1,11 +1,12 @@ import type {ChannelValue, ChannelValueDenseBinSpec, ChannelValueSpec} from "../channel.js"; import type {CurveOptions} from "../curve.js"; import type {Data, MarkOptions, RenderableMark} from "../mark.js"; +import type {MarkerOptions} from "../marker.js"; import type {BinOptions, BinReducer} from "../transforms/bin.js"; import type {StackOptions} from "../transforms/stack.js"; /** Options for the area, areaX, and areaY marks. */ -export interface AreaOptions extends MarkOptions, StackOptions, CurveOptions { +export interface AreaOptions extends MarkOptions, StackOptions, CurveOptions, MarkerOptions { /** * The required primary (starting, often left) horizontal position channel, * representing the area’s baseline, typically bound to the *x* scale. For @@ -45,7 +46,9 @@ export interface AreaOptions extends MarkOptions, StackOptions, CurveOptions { /** * Whether a line should be drawn connecting the points with coordinates *x2*, - * *y2*; the **stroke** then applies to that line and defaults to *currentColor*. + * *y2*; the **stroke** then applies to that line and defaults to + * *currentColor*, and **fillOpacity** defaults to 0.3. Marker options are + * applied to the line path. */ line?: boolean; } diff --git a/src/marks/area.js b/src/marks/area.js index feaf688c6b..7f62735550 100644 --- a/src/marks/area.js +++ b/src/marks/area.js @@ -2,12 +2,16 @@ import {area as shapeArea, line as shapeLine} from "d3"; import {create} from "../context.js"; import {maybeCurve} from "../curve.js"; import {Mark} from "../mark.js"; +import {applyGroupedMarkers, markers} from "../marker.js"; import {first, maybeZ, second} from "../options.js"; import {applyDirectStyles, applyIndirectStyles, applyTransform, applyGroupedChannelStyles} from "../style.js"; import {groupIndex, offset} from "../style.js"; import {maybeDenseIntervalX, maybeDenseIntervalY} from "../transforms/bin.js"; import {maybeStackX, maybeStackY} from "../transforms/stack.js"; +const noStroke = {stroke: null, strokeWidth: null, strokeOpacity: null, strokeLinejoin: null, strokeLinecap: null, strokeMiterlimit: null, strokeDasharray: null, strokeDashoffset: null}; // prettier-ignore +const noFill = {fill: null, fillOpacity: null}; + const defaults = { ariaLabel: "area", strokeWidth: 1, @@ -29,47 +33,47 @@ export class Area extends Mark { z: {value: maybeZ(options), optional: true} }, options, - line ? {...defaults, stroke: "currentColor", strokeWidth: 1.5} : defaults + line ? {...defaults, stroke: "currentColor", strokeWidth: 1.5, fillOpacity: 0.3} : defaults ); this.z = z; this.curve = maybeCurve(curve, tension); this.line = !!line; + if (this.line) markers(this, options); } filter(index) { return index; } render(index, scales, channels, dimensions, context) { const {x1: X1, y1: Y1, x2: X2 = X1, y2: Y2 = Y1} = channels; + const areaShape = shapeArea() + .curve(this.curve) + .defined((i) => i >= 0) + .x0((i) => X1[i]) + .y0((i) => Y1[i]) + .x1((i) => X2[i]) + .y1((i) => Y2[i]); return create("svg:g", context) - .call(applyIndirectStyles, this, dimensions, context) + .call(this.line ? () => {} : applyIndirectStyles, this, dimensions, context) .call(applyTransform, this, scales, 0, 0) .call((g) => { - let enter = g + const enter = g .selectAll() .data(groupIndex(index, [X1, Y1, X2, Y2], this, channels)) .enter(); - if (this.line) enter = enter.append("g"); - const area = enter - .append("path") - .call(applyDirectStyles, this) - .call(applyGroupedChannelStyles, this, channels) - .attr( - "d", - shapeArea() - .curve(this.curve) - .defined((i) => i >= 0) - .x0((i) => X1[i]) - .y0((i) => Y1[i]) - .x1((i) => X2[i]) - .y1((i) => Y2[i]) - ); if (this.line) { - area.attr("stroke", "none"); - enter + const group = enter.append("g"); + group .append("path") .call(applyDirectStyles, this) - .call(applyGroupedChannelStyles, this, channels) - .attr("fill", "none") + .call(applyIndirectStyles, {...this, ...noStroke}, dimensions, context) + .call(applyGroupedChannelStyles, this, {...channels, ...noStroke}) + .attr("d", areaShape); + group + .append("path") + .call(applyDirectStyles, this) + .call(applyIndirectStyles, {...this, ...noFill}, dimensions, context) + .call(applyGroupedChannelStyles, this, {...channels, ...noFill}) + .call(applyGroupedMarkers, this, channels, context) .attr("transform", offset ? `translate(${offset},${offset})` : null) .attr( "d", @@ -79,6 +83,12 @@ export class Area extends Mark { .x((i) => X2[i]) .y((i) => Y2[i]) ); + } else { + enter + .append("path") + .call(applyDirectStyles, this) + .call(applyGroupedChannelStyles, this, channels) + .attr("d", areaShape); } }) .node(); diff --git a/test/plots/aapl-close.ts b/test/plots/aapl-close.ts index 33e4cdbe61..35957069f1 100644 --- a/test/plots/aapl-close.ts +++ b/test/plots/aapl-close.ts @@ -14,7 +14,7 @@ test(async function aaplCloseLine() { const aapl = (await d3.csv("data/aapl.csv", d3.autoType)).slice(-120); return Plot.plot({ y: {grid: true}, - marks: [Plot.areaY(aapl, {x: "Date", y: "Close", fillOpacity: 0.1, line: true, stroke: "red"}), Plot.ruleY([0])] + marks: [Plot.areaY(aapl, {x: "Date", y: "Close", line: true, stroke: "red"}), Plot.ruleY([0])] }); }); @@ -36,7 +36,7 @@ test(async function aaplCloseClip() { clip: true, x: {domain: [new Date(Date.UTC(2015, 0, 1)), new Date(Date.UTC(2015, 3, 1))]}, y: {grid: true}, - marks: [Plot.areaY(aapl, {x: "Date", y: "Close", fillOpacity: 0.1, line: true}), Plot.ruleY([0], {clip: false})] + marks: [Plot.areaY(aapl, {x: "Date", y: "Close", line: true}), Plot.ruleY([0], {clip: false})] }); }); From 715af789df696647e01159475ecbbc423f2fef56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Rivi=C3=A8re?= Date: Sat, 4 Apr 2026 17:09:08 +0200 Subject: [PATCH 2/6] fill: "none", add a test --- src/marks/area.js | 1 + test/output/areaLine.svg | 57 ++++++++++++++++++++++++++++++++++++++++ test/plots/area-line.ts | 14 ++++++++++ test/plots/index.ts | 1 + 4 files changed, 73 insertions(+) create mode 100644 test/output/areaLine.svg create mode 100644 test/plots/area-line.ts diff --git a/src/marks/area.js b/src/marks/area.js index 7f62735550..fe789101df 100644 --- a/src/marks/area.js +++ b/src/marks/area.js @@ -71,6 +71,7 @@ export class Area extends Mark { group .append("path") .call(applyDirectStyles, this) + .attr("fill", "none") .call(applyIndirectStyles, {...this, ...noFill}, dimensions, context) .call(applyGroupedChannelStyles, this, {...channels, ...noFill}) .call(applyGroupedMarkers, this, channels, context) diff --git a/test/output/areaLine.svg b/test/output/areaLine.svg new file mode 100644 index 0000000000..474dabe49f --- /dev/null +++ b/test/output/areaLine.svg @@ -0,0 +1,57 @@ + + + + + 0 + 2 + 4 + 6 + 8 + + + + 0 + 2 + 4 + 6 + 8 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/plots/area-line.ts b/test/plots/area-line.ts new file mode 100644 index 0000000000..dcb5499912 --- /dev/null +++ b/test/plots/area-line.ts @@ -0,0 +1,14 @@ +import * as Plot from "@observablehq/plot"; +import {test} from "test/plot"; + +test(function areaLine() { + return Plot.plot({ + width: 300, + height: 200, + insetTop: 10, + marks: [ + Plot.frame(), + Plot.areaY([1, 3, 2, 5, 8, 6, 4, 7, 9, 3], {line: true, stroke: "steelblue", strokeWidth: 2, fill: "steelblue", marker: "circle", markerEnd: "arrow"}) + ] + }); +}); diff --git a/test/plots/index.ts b/test/plots/index.ts index 1e6f376920..0ecc7fc287 100644 --- a/test/plots/index.ts +++ b/test/plots/index.ts @@ -10,6 +10,7 @@ import "./aapl-volume-rect.js"; import "./aapl-volume.js"; import "./anscombe-quartet.js"; import "./arc.js"; +import "./area-line.js"; import "./armadillo.js"; import "./arrow.js"; import "./arrow-dates.js"; From 08ac12b73f8dc65656af7f48641deecf99b03214 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Rivi=C3=A8re?= Date: Sat, 4 Apr 2026 17:11:48 +0200 Subject: [PATCH 3/6] update test snapshots --- test/output/aaplClose.svg | 6 +- test/output/aaplCloseClip.svg | 9 +- test/output/aaplCloseLine.svg | 6 +- test/output/availability.svg | 6 +- test/output/downloads.svg | 6 +- test/output/musicRevenue.svg | 94 +++++++------- test/output/ridgeline.svg | 230 +++++++++++++++++----------------- test/output/timeAxisLocal.svg | 16 +-- 8 files changed, 184 insertions(+), 189 deletions(-) diff --git a/test/output/aaplClose.svg b/test/output/aaplClose.svg index 03de000d1e..013a63d7c2 100644 --- a/test/output/aaplClose.svg +++ b/test/output/aaplClose.svg @@ -66,10 +66,10 @@ 2017 2018 - + - - + + diff --git a/test/output/aaplCloseClip.svg b/test/output/aaplCloseClip.svg index 090be022ae..4f2a5527b0 100644 --- a/test/output/aaplCloseClip.svg +++ b/test/output/aaplCloseClip.svg @@ -85,13 +85,8 @@ - - - - - - - + + diff --git a/test/output/aaplCloseLine.svg b/test/output/aaplCloseLine.svg index 7bda0a87f4..4b26408fdb 100644 --- a/test/output/aaplCloseLine.svg +++ b/test/output/aaplCloseLine.svg @@ -68,10 +68,10 @@ Apr May - + - - + + diff --git a/test/output/availability.svg b/test/output/availability.svg index 0192d6d85d..94ff096f77 100644 --- a/test/output/availability.svg +++ b/test/output/availability.svg @@ -48,10 +48,10 @@ Jan2021 Apr - + - - + + diff --git a/test/output/downloads.svg b/test/output/downloads.svg index 0c00636cca..950d5c0ada 100644 --- a/test/output/downloads.svg +++ b/test/output/downloads.svg @@ -63,10 +63,10 @@ - + - - + + \ No newline at end of file diff --git a/test/output/musicRevenue.svg b/test/output/musicRevenue.svg index 4441b59835..507d43e423 100644 --- a/test/output/musicRevenue.svg +++ b/test/output/musicRevenue.svg @@ -80,143 +80,143 @@ 2010 2015 - + - 8 - Track + <path aria-label="area" fill-opacity="0.3" fill="#3ca951" d="M40,189.819L52.6,192.692L65.201,193.262L77.801,178.039L90.436,139.038L103.037,116.665L115.637,167.593L128.238,191.35L140.873,195.217L153.473,219.666L166.073,218.011L178.674,203.203L191.309,207.905L203.909,200.715L216.51,174.181L229.11,158.618L241.745,157.818L254.346,139.323L266.946,140.034L279.546,112.85L292.181,92.031L304.782,44.439L317.382,46.792L329.983,50.622L342.618,65.183L355.218,33.695L367.819,20L380.419,37.442L393.054,59.56L405.654,89.596L418.255,112.423L430.855,108.719L443.49,118.411L456.091,136.792L468.691,164.585L481.292,207.021L493.927,224.065L506.527,241.403L519.127,243.173L531.728,247.832L544.363,249.255L556.963,256.939L569.564,256.801L582.164,243.755L594.799,226.524L607.4,213.234L620,196.234L620,196.234L607.4,213.234L594.799,226.524L582.164,243.755L569.564,256.801L556.963,256.939L544.363,249.255L531.728,247.832L519.127,243.173L506.527,241.403L493.927,224.065L481.292,207.021L468.691,164.585L456.091,136.792L443.49,118.411L430.855,108.719L418.255,112.423L405.654,89.596L393.054,59.56L380.419,37.442L367.819,20L355.218,33.695L342.618,65.183L329.983,50.622L317.382,46.792L304.782,44.439L292.181,92.031L279.546,112.85L266.946,140.034L254.346,139.323L241.745,157.818L229.11,158.618L216.51,174.181L203.909,200.715L191.309,207.905L178.674,203.203L166.073,218.011L153.473,221.157L140.873,208.984L128.238,216.92L115.637,205.277L103.037,174.796L90.436,192.543L77.801,225.692L65.201,236.586L52.6,237.23L40,233.851Z"><title>8 - Track Tape - 8 - Track + <path fill="none" aria-label="area" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,189.819L52.6,192.692L65.201,193.262L77.801,178.039L90.436,139.038L103.037,116.665L115.637,167.593L128.238,191.35L140.873,195.217L153.473,219.666L166.073,218.011L178.674,203.203L191.309,207.905L203.909,200.715L216.51,174.181L229.11,158.618L241.745,157.818L254.346,139.323L266.946,140.034L279.546,112.85L292.181,92.031L304.782,44.439L317.382,46.792L329.983,50.622L342.618,65.183L355.218,33.695L367.819,20L380.419,37.442L393.054,59.56L405.654,89.596L418.255,112.423L430.855,108.719L443.49,118.411L456.091,136.792L468.691,164.585L481.292,207.021L493.927,224.065L506.527,241.403L519.127,243.173L531.728,247.832L544.363,249.255L556.963,256.939L569.564,256.801L582.164,243.755L594.799,226.524L607.4,213.234L620,196.234"><title>8 - Track Tape - CD + <path aria-label="area" fill-opacity="0.3" fill="#4269d0" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,369.31L178.674,366.025L191.309,355.528L203.909,336.071L216.51,313.915L229.11,299.371L241.745,282.846L254.346,259.147L266.946,239.204L279.546,213.729L292.181,183.941L304.782,135.417L317.382,118.216L329.983,110.834L342.618,114.948L355.218,77.531L367.819,53.398L380.419,56.649L393.054,71.004L405.654,95.739L418.255,116.493L430.855,110.367L443.49,119.463L456.091,137.525L468.691,165.397L481.292,208.209L493.927,225.358L506.527,243.128L519.127,245.439L531.728,250.769L544.363,252.964L556.963,261.211L569.564,262.542L582.164,249.761L594.799,232.984L607.4,219.995L620,204.125L620,213.735L607.4,231.115L594.799,250.229L582.164,268.598L569.564,286.916L556.963,291.209L544.363,289.707L531.728,294.052L519.127,300.551L506.527,305.272L493.927,305.841L481.292,309.808L468.691,309.123L456.091,323.398L443.49,334.824L430.855,352.63L418.255,360.566L405.654,363.402L393.054,362.433L380.419,363.455L367.819,360.96L355.218,357.54L342.618,361.932L329.983,363.984L317.382,364.221L304.782,363.766L292.181,364.098L279.546,365.515L266.946,366.533L254.346,364.729L241.745,366.279L229.11,370L216.51,370L203.909,370L191.309,370L178.674,370L166.073,370L153.473,370L140.873,370L128.238,370L115.637,370L103.037,370L90.436,370L77.801,370L65.201,370L52.6,370L40,370Z"><title>CD Disc - CD + <path fill="none" aria-label="area" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,369.31L178.674,366.025L191.309,355.528L203.909,336.071L216.51,313.915L229.11,299.371L241.745,282.846L254.346,259.147L266.946,239.204L279.546,213.729L292.181,183.941L304.782,135.417L317.382,118.216L329.983,110.834L342.618,114.948L355.218,77.531L367.819,53.398L380.419,56.649L393.054,71.004L405.654,95.739L418.255,116.493L430.855,110.367L443.49,119.463L456.091,137.525L468.691,165.397L481.292,208.209L493.927,225.358L506.527,243.128L519.127,245.439L531.728,250.769L544.363,252.964L556.963,261.211L569.564,262.542L582.164,249.761L594.799,232.984L607.4,219.995L620,204.125"><title>CD Disc - CD Single + <path aria-label="area" fill-opacity="0.3" fill="#4269d0" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,369.31L178.674,366.025L191.309,355.528L203.909,336.071L216.51,313.915L229.11,299.039L241.745,282.824L254.346,258.964L266.946,238.174L279.546,212.444L292.181,182.674L304.782,133.903L317.382,115.307L329.983,106.143L342.618,108.155L355.218,72.302L367.819,48.061L380.419,53.336L393.054,69.211L405.654,95.303L418.255,115.71L430.855,110.05L443.49,119.24L456.091,137.373L468.691,165.161L481.292,208.144L493.927,225.3L506.527,243.075L519.127,245.377L531.728,250.713L544.363,252.922L556.963,261.15L569.564,262.522L582.164,249.757L594.799,232.96L607.4,219.993L620,204.122L620,204.125L607.4,219.995L594.799,232.984L582.164,249.761L569.564,262.542L556.963,261.211L544.363,252.964L531.728,250.769L519.127,245.439L506.527,243.128L493.927,225.358L481.292,208.209L468.691,165.397L456.091,137.525L443.49,119.463L430.855,110.367L418.255,116.493L405.654,95.739L393.054,71.004L380.419,56.649L367.819,53.398L355.218,77.531L342.618,114.948L329.983,110.834L317.382,118.216L304.782,135.417L292.181,183.941L279.546,213.729L266.946,239.204L254.346,259.147L241.745,282.846L229.11,299.371L216.51,313.915L203.909,336.071L191.309,355.528L178.674,366.025L166.073,369.31L153.473,370L140.873,370L128.238,370L115.637,370L103.037,370L90.436,370L77.801,370L65.201,370L52.6,370L40,370Z"><title>CD Single Disc - CD Single + <path fill="none" aria-label="area" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,369.31L178.674,366.025L191.309,355.528L203.909,336.071L216.51,313.915L229.11,299.039L241.745,282.824L254.346,258.964L266.946,238.174L279.546,212.444L292.181,182.674L304.782,133.903L317.382,115.307L329.983,106.143L342.618,108.155L355.218,72.302L367.819,48.061L380.419,53.336L393.054,69.211L405.654,95.303L418.255,115.71L430.855,110.05L443.49,119.24L456.091,137.373L468.691,165.161L481.292,208.144L493.927,225.3L506.527,243.075L519.127,245.377L531.728,250.713L544.363,252.922L556.963,261.15L569.564,262.522L582.164,249.757L594.799,232.96L607.4,219.993L620,204.122"><title>CD Single Disc - Cassette + <path aria-label="area" fill-opacity="0.3" fill="#3ca951" d="M40,363.157L52.6,362.928L65.201,362.658L77.801,359.763L90.436,353.533L103.037,342.419L115.637,338.027L128.238,335.794L140.873,323.255L153.473,312.64L166.073,296.618L178.674,274.294L191.309,265.925L203.909,244.894L216.51,209.248L229.11,182.701L241.745,168.674L254.346,144.856L266.946,142.773L279.546,115.127L292.181,93.741L304.782,46.192L317.382,48.676L329.983,52.77L342.618,66.9L355.218,35.159L367.819,21.433L380.419,38.696L393.054,60.888L405.654,90.605L418.255,113.362L430.855,109.548L443.49,118.972L456.091,137.299L468.691,165.104L481.292,208.128L493.927,225.3L506.527,243.075L519.127,245.377L531.728,250.713L544.363,252.922L556.963,261.15L569.564,262.522L582.164,249.757L594.799,232.96L607.4,219.993L620,204.122L620,204.122L607.4,219.993L594.799,232.96L582.164,249.757L569.564,262.522L556.963,261.15L544.363,252.922L531.728,250.713L519.127,245.377L506.527,243.075L493.927,225.3L481.292,208.144L468.691,165.161L456.091,137.373L443.49,119.24L430.855,110.05L418.255,115.71L405.654,95.267L393.054,69.092L380.419,53.23L367.819,46.909L355.218,69.986L342.618,104.83L329.983,101.319L317.382,109.108L304.782,126.487L292.181,174.415L279.546,203.929L266.946,231.411L254.346,251.075L241.745,276.549L229.11,297.103L216.51,313.412L203.909,336.071L191.309,355.528L178.674,366.025L166.073,369.31L153.473,370L140.873,370L128.238,370L115.637,370L103.037,370L90.436,370L77.801,370L65.201,370L52.6,370L40,370Z"><title>Cassette Tape - Cassette + <path fill="none" aria-label="area" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,363.157L52.6,362.928L65.201,362.658L77.801,359.763L90.436,353.533L103.037,342.419L115.637,338.027L128.238,335.794L140.873,323.255L153.473,312.64L166.073,296.618L178.674,274.294L191.309,265.925L203.909,244.894L216.51,209.248L229.11,182.701L241.745,168.674L254.346,144.856L266.946,142.773L279.546,115.127L292.181,93.741L304.782,46.192L317.382,48.676L329.983,52.77L342.618,66.9L355.218,35.159L367.819,21.433L380.419,38.696L393.054,60.888L405.654,90.605L418.255,113.362L430.855,109.548L443.49,118.972L456.091,137.299L468.691,165.104L481.292,208.128L493.927,225.3L506.527,243.075L519.127,245.377L531.728,250.713L544.363,252.922L556.963,261.15L569.564,262.522L582.164,249.757L594.799,232.96L607.4,219.993L620,204.122"><title>Cassette Tape - Cassette Single + <path aria-label="area" fill-opacity="0.3" fill="#3ca951" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,369.31L178.674,366.025L191.309,355.528L203.909,336.071L216.51,313.412L229.11,297.103L241.745,276.549L254.346,251.075L266.946,231.411L279.546,203.929L292.181,174.415L304.782,126.487L317.382,109.108L329.983,101.319L342.618,104.83L355.218,69.986L367.819,46.909L380.419,53.23L393.054,69.092L405.654,95.267L418.255,115.71L430.855,110.05L443.49,119.24L456.091,137.373L468.691,165.161L481.292,208.144L493.927,225.3L506.527,243.075L519.127,245.377L531.728,250.713L544.363,252.922L556.963,261.15L569.564,262.522L582.164,249.757L594.799,232.96L607.4,219.993L620,204.122L620,204.122L607.4,219.993L594.799,232.96L582.164,249.757L569.564,262.522L556.963,261.15L544.363,252.922L531.728,250.713L519.127,245.377L506.527,243.075L493.927,225.3L481.292,208.144L468.691,165.161L456.091,137.373L443.49,119.24L430.855,110.05L418.255,115.71L405.654,95.303L393.054,69.211L380.419,53.336L367.819,48.061L355.218,72.302L342.618,108.155L329.983,106.143L317.382,115.307L304.782,133.903L292.181,182.674L279.546,212.444L266.946,238.174L254.346,258.964L241.745,282.824L229.11,299.039L216.51,313.915L203.909,336.071L191.309,355.528L178.674,366.025L166.073,369.31L153.473,370L140.873,370L128.238,370L115.637,370L103.037,370L90.436,370L77.801,370L65.201,370L52.6,370L40,370Z"><title>Cassette Single Tape - Cassette Single + <path fill="none" aria-label="area" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,369.31L178.674,366.025L191.309,355.528L203.909,336.071L216.51,313.412L229.11,297.103L241.745,276.549L254.346,251.075L266.946,231.411L279.546,203.929L292.181,174.415L304.782,126.487L317.382,109.108L329.983,101.319L342.618,104.83L355.218,69.986L367.819,46.909L380.419,53.23L393.054,69.092L405.654,95.267L418.255,115.71L430.855,110.05L443.49,119.24L456.091,137.373L468.691,165.161L481.292,208.144L493.927,225.3L506.527,243.075L519.127,245.377L531.728,250.713L544.363,252.922L556.963,261.15L569.564,262.522L582.164,249.757L594.799,232.96L607.4,219.993L620,204.122"><title>Cassette Single Tape - DVD Audio + <path aria-label="area" fill-opacity="0.3" fill="#ff725c" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,369.865L405.654,369.811L418.255,369.826L430.855,365.833L443.49,347.357L456.091,332.453L468.691,318.544L481.292,314.086L493.927,309.792L506.527,308.56L519.127,303.261L531.728,296.106L544.363,291.548L556.963,292.736L569.564,288.122L582.164,269.566L594.799,250.873L607.4,231.567L620,214.175L620,214.191L607.4,231.62L594.799,250.916L582.164,269.613L569.564,288.213L556.963,292.773L544.363,291.556L531.728,296.11L519.127,303.266L506.527,308.576L493.927,309.822L481.292,314.108L468.691,318.598L456.091,332.501L443.49,347.586L430.855,365.97L418.255,370L405.654,370L393.054,370L380.419,370L367.819,370L355.218,370L342.618,370L329.983,370L317.382,370L304.782,370L292.181,370L279.546,370L266.946,370L254.346,370L241.745,370L229.11,370L216.51,370L203.909,370L191.309,370L178.674,370L166.073,370L153.473,370L140.873,370L128.238,370L115.637,370L103.037,370L90.436,370L77.801,370L65.201,370L52.6,370L40,370Z"><title>DVD Audio Other - DVD Audio + <path fill="none" aria-label="area" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,369.865L405.654,369.811L418.255,369.826L430.855,365.833L443.49,347.357L456.091,332.453L468.691,318.544L481.292,314.086L493.927,309.792L506.527,308.56L519.127,303.261L531.728,296.106L544.363,291.548L556.963,292.736L569.564,288.122L582.164,269.566L594.799,250.873L607.4,231.567L620,214.175"><title>DVD Audio Other - Download Album + <path aria-label="area" fill-opacity="0.3" fill="#efb118" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,368.891L443.49,363.75L456.091,359.789L468.691,355.196L481.292,352.235L493.927,345.64L506.527,342.082L519.127,335.858L531.728,327.716L544.363,320.635L556.963,317.054L569.564,309.297L582.164,285.667L594.799,262.644L607.4,239.892L620,221.067L620,227.237L607.4,247.848L594.799,273.548L582.164,300.136L569.564,327.252L556.963,335.934L544.363,341.781L531.728,348.696L519.127,354.89L506.527,358.077L493.927,359.51L481.292,364.032L468.691,364.789L456.091,365.26L443.49,366.528L430.855,369.854L418.255,370L405.654,370L393.054,370L380.419,370L367.819,370L355.218,370L342.618,370L329.983,370L317.382,370L304.782,370L292.181,370L279.546,370L266.946,370L254.346,370L241.745,370L229.11,370L216.51,370L203.909,370L191.309,370L178.674,370L166.073,370L153.473,370L140.873,370L128.238,370L115.637,370L103.037,370L90.436,370L77.801,370L65.201,370L52.6,370L40,370Z"><title>Download Album Download - Download Album + <path fill="none" aria-label="area" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,368.891L443.49,363.75L456.091,359.789L468.691,355.196L481.292,352.235L493.927,345.64L506.527,342.082L519.127,335.858L531.728,327.716L544.363,320.635L556.963,317.054L569.564,309.297L582.164,285.667L594.799,262.644L607.4,239.892L620,221.067"><title>Download Album Download - Download Music Video + <path aria-label="area" fill-opacity="0.3" fill="#efb118" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,365.97L443.49,356.217L456.091,347.846L468.691,338.961L481.292,332.252L493.927,322.919L506.527,316.79L519.127,308.176L531.728,298.652L544.363,293.238L556.963,293.892L569.564,289.134L582.164,270.552L594.799,251.495L607.4,232.017L620,214.527L620,214.556L607.4,232.053L594.799,251.54L582.164,270.623L569.564,289.242L556.963,294.122L544.363,293.525L531.728,299.015L519.127,308.751L506.527,317.461L493.927,323.681L481.292,333.019L468.691,339.505L456.091,348.237L443.49,356.292L430.855,365.97L418.255,370L405.654,370L393.054,370L380.419,370L367.819,370L355.218,370L342.618,370L329.983,370L317.382,370L304.782,370L292.181,370L279.546,370L266.946,370L254.346,370L241.745,370L229.11,370L216.51,370L203.909,370L191.309,370L178.674,370L166.073,370L153.473,370L140.873,370L128.238,370L115.637,370L103.037,370L90.436,370L77.801,370L65.201,370L52.6,370L40,370Z"><title>Download Music Video Download - Download Music Video + <path fill="none" aria-label="area" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,365.97L443.49,356.217L456.091,347.846L468.691,338.961L481.292,332.252L493.927,322.919L506.527,316.79L519.127,308.176L531.728,298.652L544.363,293.238L556.963,293.892L569.564,289.134L582.164,270.552L594.799,251.495L607.4,232.017L620,214.527"><title>Download Music Video Download - Download Single + <path aria-label="area" fill-opacity="0.3" fill="#efb118" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,365.97L443.49,356.313L456.091,348.275L468.691,339.555L481.292,333.068L493.927,323.799L506.527,317.579L519.127,308.799L531.728,299.078L544.363,293.632L556.963,294.165L569.564,289.304L582.164,270.672L594.799,251.577L607.4,232.084L620,214.58L620,221.067L607.4,239.892L594.799,262.644L582.164,285.667L569.564,309.297L556.963,317.054L544.363,320.635L531.728,327.716L519.127,335.858L506.527,342.082L493.927,345.64L481.292,352.235L468.691,355.196L456.091,359.789L443.49,363.75L430.855,368.891L418.255,370L405.654,370L393.054,370L380.419,370L367.819,370L355.218,370L342.618,370L329.983,370L317.382,370L304.782,370L292.181,370L279.546,370L266.946,370L254.346,370L241.745,370L229.11,370L216.51,370L203.909,370L191.309,370L178.674,370L166.073,370L153.473,370L140.873,370L128.238,370L115.637,370L103.037,370L90.436,370L77.801,370L65.201,370L52.6,370L40,370Z"><title>Download Single Download - Download Single + <path fill="none" aria-label="area" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,365.97L443.49,356.313L456.091,348.275L468.691,339.555L481.292,333.068L493.927,323.799L506.527,317.579L519.127,308.799L531.728,299.078L544.363,293.632L556.963,294.165L569.564,289.304L582.164,270.672L594.799,251.577L607.4,232.084L620,214.58"><title>Download Single Download - Kiosk + <path aria-label="area" fill-opacity="0.3" fill="#ff725c" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,365.97L443.49,356.292L456.091,348.237L468.691,339.505L481.292,333.019L493.927,323.681L506.527,317.461L519.127,308.751L531.728,299.015L544.363,293.525L556.963,294.122L569.564,289.242L582.164,270.623L594.799,251.54L607.4,232.053L620,214.556L620,214.58L607.4,232.084L594.799,251.577L582.164,270.672L569.564,289.304L556.963,294.165L544.363,293.632L531.728,299.078L519.127,308.799L506.527,317.579L493.927,323.799L481.292,333.068L468.691,339.555L456.091,348.275L443.49,356.313L430.855,365.97L418.255,370L405.654,370L393.054,370L380.419,370L367.819,370L355.218,370L342.618,370L329.983,370L317.382,370L304.782,370L292.181,370L279.546,370L266.946,370L254.346,370L241.745,370L229.11,370L216.51,370L203.909,370L191.309,370L178.674,370L166.073,370L153.473,370L140.873,370L128.238,370L115.637,370L103.037,370L90.436,370L77.801,370L65.201,370L52.6,370L40,370Z"><title>Kiosk Other - Kiosk + <path fill="none" aria-label="area" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,365.97L443.49,356.292L456.091,348.237L468.691,339.505L481.292,333.019L493.927,323.681L506.527,317.461L519.127,308.751L531.728,299.015L544.363,293.525L556.963,294.122L569.564,289.242L582.164,270.623L594.799,251.54L607.4,232.053L620,214.556"><title>Kiosk Other - LP/EP + <path aria-label="area" fill-opacity="0.3" fill="#ff8ab7" d="M40,233.851L52.6,237.23L65.201,236.586L77.801,225.692L90.436,192.543L103.037,174.796L115.637,205.277L128.238,216.92L140.873,208.984L153.473,221.157L166.073,218.011L178.674,203.203L191.309,207.905L203.909,200.715L216.51,174.181L229.11,158.618L241.745,157.818L254.346,139.323L266.946,140.034L279.546,112.85L292.181,92.031L304.782,44.439L317.382,46.792L329.983,50.622L342.618,65.183L355.218,33.695L367.819,20L380.419,37.442L393.054,59.56L405.654,89.596L418.255,112.423L430.855,108.719L443.49,118.411L456.091,136.792L468.691,164.585L481.292,207.021L493.927,224.065L506.527,241.403L519.127,243.173L531.728,247.832L544.363,249.255L556.963,256.939L569.564,256.801L582.164,243.755L594.799,226.524L607.4,213.234L620,196.234L620,204.016L607.4,219.908L594.799,232.861L582.164,249.676L569.564,262.425L556.963,261.057L544.363,252.871L531.728,250.63L519.127,245.295L506.527,243.033L493.927,225.253L481.292,208.074L468.691,165.026L456.091,137.103L443.49,118.702L430.855,109.127L418.255,112.894L405.654,90.052L393.054,60.179L380.419,38.085L367.819,20.763L355.218,34.529L342.618,66.013L329.983,51.559L317.382,47.451L304.782,44.919L292.181,92.324L279.546,113.234L266.946,140.897L254.346,141.969L241.745,164.921L229.11,176.604L216.51,202.093L203.909,236.573L191.309,255.484L178.674,262.8L166.073,285.809L153.473,300.915L140.873,311.978L128.238,323.664L115.637,318.554L103.037,326.457L90.436,337.363L77.801,342.541L65.201,346.941L52.6,347.196L40,346.048Z"><title>LP/EP Vinyl - LP/EP + <path fill="none" aria-label="area" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,233.851L52.6,237.23L65.201,236.586L77.801,225.692L90.436,192.543L103.037,174.796L115.637,205.277L128.238,216.92L140.873,208.984L153.473,221.157L166.073,218.011L178.674,203.203L191.309,207.905L203.909,200.715L216.51,174.181L229.11,158.618L241.745,157.818L254.346,139.323L266.946,140.034L279.546,112.85L292.181,92.031L304.782,44.439L317.382,46.792L329.983,50.622L342.618,65.183L355.218,33.695L367.819,20L380.419,37.442L393.054,59.56L405.654,89.596L418.255,112.423L430.855,108.719L443.49,118.411L456.091,136.792L468.691,164.585L481.292,207.021L493.927,224.065L506.527,241.403L519.127,243.173L531.728,247.832L544.363,249.255L556.963,256.939L569.564,256.801L582.164,243.755L594.799,226.524L607.4,213.234L620,196.234"><title>LP/EP Vinyl - Limited Tier Paid Subscription + <path aria-label="area" fill-opacity="0.3" fill="#6cc5b0" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,370L443.49,366.946L456.091,365.911L468.691,365.487L481.292,365.889L493.927,366.157L506.527,366.106L519.127,363.573L531.728,360.06L544.363,355.169L556.963,352.199L569.564,344.214L582.164,319.792L594.799,292.237L607.4,271.566L620,249.686L620,262.658L607.4,283.461L594.799,301.887L582.164,324.179L569.564,344.214L556.963,352.199L544.363,355.169L531.728,360.06L519.127,363.573L506.527,366.106L493.927,366.157L481.292,365.889L468.691,365.487L456.091,365.911L443.49,366.946L430.855,370L418.255,370L405.654,370L393.054,370L380.419,370L367.819,370L355.218,370L342.618,370L329.983,370L317.382,370L304.782,370L292.181,370L279.546,370L266.946,370L254.346,370L241.745,370L229.11,370L216.51,370L203.909,370L191.309,370L178.674,370L166.073,370L153.473,370L140.873,370L128.238,370L115.637,370L103.037,370L90.436,370L77.801,370L65.201,370L52.6,370L40,370Z"><title>Limited Tier Paid Subscription Streaming - Limited Tier Paid Subscription + <path fill="none" aria-label="area" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,370L443.49,366.946L456.091,365.911L468.691,365.487L481.292,365.889L493.927,366.157L506.527,366.106L519.127,363.573L531.728,360.06L544.363,355.169L556.963,352.199L569.564,344.214L582.164,319.792L594.799,292.237L607.4,271.566L620,249.686"><title>Limited Tier Paid Subscription Streaming - Music Video (Physical) + <path aria-label="area" fill-opacity="0.3" fill="#ff725c" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,366.279L254.346,364.729L266.946,366.533L279.546,365.515L292.181,364.098L304.782,363.766L317.382,364.221L329.983,363.984L342.618,361.932L355.218,357.54L367.819,360.96L380.419,363.455L393.054,362.433L405.654,363.402L418.255,361.137L430.855,352.981L443.49,335.029L456.091,323.507L468.691,309.193L481.292,309.865L493.927,305.886L506.527,305.304L519.127,300.577L531.728,294.076L544.363,289.724L556.963,291.221L569.564,286.934L582.164,268.618L594.799,250.243L607.4,231.128L620,213.742L620,214.175L607.4,231.567L594.799,250.873L582.164,269.566L569.564,288.122L556.963,292.736L544.363,291.548L531.728,296.106L519.127,303.261L506.527,308.56L493.927,309.792L481.292,314.086L468.691,318.544L456.091,332.453L443.49,347.357L430.855,365.833L418.255,369.826L405.654,369.811L393.054,369.865L380.419,370L367.819,370L355.218,370L342.618,370L329.983,370L317.382,370L304.782,370L292.181,370L279.546,370L266.946,370L254.346,370L241.745,370L229.11,370L216.51,370L203.909,370L191.309,370L178.674,370L166.073,370L153.473,370L140.873,370L128.238,370L115.637,370L103.037,370L90.436,370L77.801,370L65.201,370L52.6,370L40,370Z"><title>Music Video (Physical) Other - Music Video (Physical) + <path fill="none" aria-label="area" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,366.279L254.346,364.729L266.946,366.533L279.546,365.515L292.181,364.098L304.782,363.766L317.382,364.221L329.983,363.984L342.618,361.932L355.218,357.54L367.819,360.96L380.419,363.455L393.054,362.433L405.654,363.402L418.255,361.137L430.855,352.981L443.49,335.029L456.091,323.507L468.691,309.193L481.292,309.865L493.927,305.886L506.527,305.304L519.127,300.577L531.728,294.076L544.363,289.724L556.963,291.221L569.564,286.934L582.164,268.618L594.799,250.243L607.4,231.128L620,213.742"><title>Music Video (Physical) Other - On-Demand Streaming (Ad-Supported) + <path aria-label="area" fill-opacity="0.3" fill="#6cc5b0" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,370L443.49,366.946L456.091,365.911L468.691,365.487L481.292,365.889L493.927,366.157L506.527,366.106L519.127,363.573L531.728,360.06L544.363,355.169L556.963,352.199L569.564,344.214L582.164,324.179L594.799,301.887L607.4,283.461L620,262.658L620,276.86L607.4,295.554L594.799,312.629L582.164,332.331L569.564,350.488L556.963,356.992L544.363,358.959L531.728,363.037L519.127,365.596L506.527,366.106L493.927,366.157L481.292,365.889L468.691,365.487L456.091,365.911L443.49,366.946L430.855,370L418.255,370L405.654,370L393.054,370L380.419,370L367.819,370L355.218,370L342.618,370L329.983,370L317.382,370L304.782,370L292.181,370L279.546,370L266.946,370L254.346,370L241.745,370L229.11,370L216.51,370L203.909,370L191.309,370L178.674,370L166.073,370L153.473,370L140.873,370L128.238,370L115.637,370L103.037,370L90.436,370L77.801,370L65.201,370L52.6,370L40,370Z"><title>On-Demand Streaming (Ad-Supported) Streaming - On-Demand Streaming (Ad-Supported) + <path fill="none" aria-label="area" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,370L443.49,366.946L456.091,365.911L468.691,365.487L481.292,365.889L493.927,366.157L506.527,366.106L519.127,363.573L531.728,360.06L544.363,355.169L556.963,352.199L569.564,344.214L582.164,324.179L594.799,301.887L607.4,283.461L620,262.658"><title>On-Demand Streaming (Ad-Supported) Streaming - Other Ad-Supported Streaming + <path aria-label="area" fill-opacity="0.3" fill="#6cc5b0" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,369.854L443.49,366.528L456.091,365.26L468.691,364.789L481.292,364.032L493.927,359.51L506.527,358.077L519.127,354.89L531.728,348.696L544.363,341.781L556.963,335.934L569.564,327.252L582.164,300.136L594.799,273.548L607.4,247.848L620,227.237L620,231.163L607.4,251.85L594.799,277.818L582.164,301.49L569.564,327.252L556.963,335.934L544.363,341.781L531.728,348.696L519.127,354.89L506.527,358.077L493.927,359.51L481.292,364.032L468.691,364.789L456.091,365.26L443.49,366.528L430.855,369.854L418.255,370L405.654,370L393.054,370L380.419,370L367.819,370L355.218,370L342.618,370L329.983,370L317.382,370L304.782,370L292.181,370L279.546,370L266.946,370L254.346,370L241.745,370L229.11,370L216.51,370L203.909,370L191.309,370L178.674,370L166.073,370L153.473,370L140.873,370L128.238,370L115.637,370L103.037,370L90.436,370L77.801,370L65.201,370L52.6,370L40,370Z"><title>Other Ad-Supported Streaming Streaming - Other Ad-Supported Streaming + <path fill="none" aria-label="area" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,369.854L443.49,366.528L456.091,365.26L468.691,364.789L481.292,364.032L493.927,359.51L506.527,358.077L519.127,354.89L531.728,348.696L544.363,341.781L556.963,335.934L569.564,327.252L582.164,300.136L594.799,273.548L607.4,247.848L620,227.237"><title>Other Ad-Supported Streaming Streaming - Other Digital + <path aria-label="area" fill-opacity="0.3" fill="#efb118" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,370L443.49,366.946L456.091,365.911L468.691,365.487L481.292,365.889L493.927,366.157L506.527,366.106L519.127,365.596L531.728,363.037L544.363,358.959L556.963,356.992L569.564,350.488L582.164,332.331L594.799,312.629L607.4,295.554L620,276.86L620,277.196L607.4,295.87L594.799,312.904L582.164,332.617L569.564,350.488L556.963,356.992L544.363,358.959L531.728,363.037L519.127,365.596L506.527,366.106L493.927,366.157L481.292,365.889L468.691,365.487L456.091,365.911L443.49,366.946L430.855,370L418.255,370L405.654,370L393.054,370L380.419,370L367.819,370L355.218,370L342.618,370L329.983,370L317.382,370L304.782,370L292.181,370L279.546,370L266.946,370L254.346,370L241.745,370L229.11,370L216.51,370L203.909,370L191.309,370L178.674,370L166.073,370L153.473,370L140.873,370L128.238,370L115.637,370L103.037,370L90.436,370L77.801,370L65.201,370L52.6,370L40,370Z"><title>Other Digital Download - Other Digital + <path fill="none" aria-label="area" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,370L443.49,366.946L456.091,365.911L468.691,365.487L481.292,365.889L493.927,366.157L506.527,366.106L519.127,365.596L531.728,363.037L544.363,358.959L556.963,356.992L569.564,350.488L582.164,332.331L594.799,312.629L607.4,295.554L620,276.86"><title>Other Digital Download - Other Tapes + <path aria-label="area" fill-opacity="0.3" fill="#3ca951" d="M40,188.414L52.6,191.614L65.201,192.504L77.801,177.68L90.436,139.038L103.037,116.665L115.637,167.593L128.238,191.35L140.873,195.217L153.473,219.666L166.073,218.011L178.674,203.203L191.309,207.905L203.909,200.715L216.51,174.181L229.11,158.618L241.745,157.818L254.346,139.323L266.946,140.034L279.546,112.85L292.181,92.031L304.782,44.439L317.382,46.792L329.983,50.622L342.618,65.183L355.218,33.695L367.819,20L380.419,37.442L393.054,59.56L405.654,89.596L418.255,112.423L430.855,108.719L443.49,118.411L456.091,136.792L468.691,164.585L481.292,207.021L493.927,224.065L506.527,241.403L519.127,243.173L531.728,247.832L544.363,249.255L556.963,256.939L569.564,256.801L582.164,243.755L594.799,226.524L607.4,213.234L620,196.234L620,196.234L607.4,213.234L594.799,226.524L582.164,243.755L569.564,256.801L556.963,256.939L544.363,249.255L531.728,247.832L519.127,243.173L506.527,241.403L493.927,224.065L481.292,207.021L468.691,164.585L456.091,136.792L443.49,118.411L430.855,108.719L418.255,112.423L405.654,89.596L393.054,59.56L380.419,37.442L367.819,20L355.218,33.695L342.618,65.183L329.983,50.622L317.382,46.792L304.782,44.439L292.181,92.031L279.546,112.85L266.946,140.034L254.346,139.323L241.745,157.818L229.11,158.618L216.51,174.181L203.909,200.715L191.309,207.905L178.674,203.203L166.073,218.011L153.473,219.666L140.873,195.217L128.238,191.35L115.637,167.593L103.037,116.665L90.436,139.038L77.801,178.039L65.201,193.262L52.6,192.692L40,189.819Z"><title>Other Tapes Tape - Other Tapes + <path fill="none" aria-label="area" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,188.414L52.6,191.614L65.201,192.504L77.801,177.68L90.436,139.038L103.037,116.665L115.637,167.593L128.238,191.35L140.873,195.217L153.473,219.666L166.073,218.011L178.674,203.203L191.309,207.905L203.909,200.715L216.51,174.181L229.11,158.618L241.745,157.818L254.346,139.323L266.946,140.034L279.546,112.85L292.181,92.031L304.782,44.439L317.382,46.792L329.983,50.622L342.618,65.183L355.218,33.695L367.819,20L380.419,37.442L393.054,59.56L405.654,89.596L418.255,112.423L430.855,108.719L443.49,118.411L456.091,136.792L468.691,164.585L481.292,207.021L493.927,224.065L506.527,241.403L519.127,243.173L531.728,247.832L544.363,249.255L556.963,256.939L569.564,256.801L582.164,243.755L594.799,226.524L607.4,213.234L620,196.234"><title>Other Tapes Tape - Paid Subscription + <path aria-label="area" fill-opacity="0.3" fill="#6cc5b0" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,370L443.49,366.946L456.091,365.911L468.691,365.487L481.292,365.889L493.927,366.157L506.527,366.106L519.127,365.596L531.728,363.037L544.363,358.959L556.963,356.992L569.564,350.488L582.164,332.617L594.799,312.904L607.4,295.87L620,277.196L620,370L607.4,370L594.799,370L582.164,370L569.564,370L556.963,370L544.363,370L531.728,370L519.127,370L506.527,370L493.927,370L481.292,370L468.691,370L456.091,370L443.49,370L430.855,370L418.255,370L405.654,370L393.054,370L380.419,370L367.819,370L355.218,370L342.618,370L329.983,370L317.382,370L304.782,370L292.181,370L279.546,370L266.946,370L254.346,370L241.745,370L229.11,370L216.51,370L203.909,370L191.309,370L178.674,370L166.073,370L153.473,370L140.873,370L128.238,370L115.637,370L103.037,370L90.436,370L77.801,370L65.201,370L52.6,370L40,370Z"><title>Paid Subscription Streaming - Paid Subscription + <path fill="none" aria-label="area" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,370L443.49,366.946L456.091,365.911L468.691,365.487L481.292,365.889L493.927,366.157L506.527,366.106L519.127,365.596L531.728,363.037L544.363,358.959L556.963,356.992L569.564,350.488L582.164,332.617L594.799,312.904L607.4,295.87L620,277.196"><title>Paid Subscription Streaming - Ringtones & Ringbacks + <path aria-label="area" fill-opacity="0.3" fill="#efb118" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,365.97L443.49,347.586L456.091,332.501L468.691,318.598L481.292,314.108L493.927,309.822L506.527,308.576L519.127,303.266L531.728,296.11L544.363,291.556L556.963,292.773L569.564,288.213L582.164,269.613L594.799,250.916L607.4,231.62L620,214.191L620,214.527L607.4,232.017L594.799,251.495L582.164,270.552L569.564,289.134L556.963,293.892L544.363,293.238L531.728,298.652L519.127,308.176L506.527,316.79L493.927,322.919L481.292,332.252L468.691,338.961L456.091,347.846L443.49,356.217L430.855,365.97L418.255,370L405.654,370L393.054,370L380.419,370L367.819,370L355.218,370L342.618,370L329.983,370L317.382,370L304.782,370L292.181,370L279.546,370L266.946,370L254.346,370L241.745,370L229.11,370L216.51,370L203.909,370L191.309,370L178.674,370L166.073,370L153.473,370L140.873,370L128.238,370L115.637,370L103.037,370L90.436,370L77.801,370L65.201,370L52.6,370L40,370Z"><title>Ringtones & Ringbacks Download - Ringtones & Ringbacks + <path fill="none" aria-label="area" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,365.97L443.49,347.586L456.091,332.501L468.691,318.598L481.292,314.108L493.927,309.822L506.527,308.576L519.127,303.266L531.728,296.11L544.363,291.556L556.963,292.773L569.564,288.213L582.164,269.613L594.799,250.916L607.4,231.62L620,214.191"><title>Ringtones & Ringbacks Download - SACD + <path aria-label="area" fill-opacity="0.3" fill="#4269d0" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,366.279L254.346,364.729L266.946,366.533L279.546,365.515L292.181,364.098L304.782,363.766L317.382,364.221L329.983,363.984L342.618,361.932L355.218,357.54L367.819,360.96L380.419,363.455L393.054,362.433L405.654,363.402L418.255,360.566L430.855,352.63L443.49,334.824L456.091,323.398L468.691,309.123L481.292,309.808L493.927,305.841L506.527,305.272L519.127,300.551L531.728,294.052L544.363,289.707L556.963,291.209L569.564,286.916L582.164,268.598L594.799,250.229L607.4,231.115L620,213.735L620,213.742L607.4,231.128L594.799,250.243L582.164,268.618L569.564,286.934L556.963,291.221L544.363,289.724L531.728,294.076L519.127,300.577L506.527,305.304L493.927,305.886L481.292,309.865L468.691,309.193L456.091,323.507L443.49,335.029L430.855,352.981L418.255,361.137L405.654,363.402L393.054,362.433L380.419,363.455L367.819,360.96L355.218,357.54L342.618,361.932L329.983,363.984L317.382,364.221L304.782,363.766L292.181,364.098L279.546,365.515L266.946,366.533L254.346,364.729L241.745,366.279L229.11,370L216.51,370L203.909,370L191.309,370L178.674,370L166.073,370L153.473,370L140.873,370L128.238,370L115.637,370L103.037,370L90.436,370L77.801,370L65.201,370L52.6,370L40,370Z"><title>SACD Disc - SACD + <path fill="none" aria-label="area" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,366.279L254.346,364.729L266.946,366.533L279.546,365.515L292.181,364.098L304.782,363.766L317.382,364.221L329.983,363.984L342.618,361.932L355.218,357.54L367.819,360.96L380.419,363.455L393.054,362.433L405.654,363.402L418.255,360.566L430.855,352.63L443.49,334.824L456.091,323.398L468.691,309.123L481.292,309.808L493.927,305.841L506.527,305.272L519.127,300.551L531.728,294.052L544.363,289.707L556.963,291.209L569.564,286.916L582.164,268.598L594.799,250.229L607.4,231.115L620,213.735"><title>SACD Disc - SoundExchange Distributions + <path aria-label="area" fill-opacity="0.3" fill="#6cc5b0" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,369.854L443.49,366.528L456.091,365.26L468.691,364.789L481.292,364.032L493.927,359.51L506.527,358.077L519.127,354.89L531.728,348.696L544.363,341.781L556.963,335.934L569.564,327.252L582.164,301.49L594.799,277.818L607.4,251.85L620,231.163L620,245.366L607.4,267.021L594.799,288.452L582.164,316.213L569.564,340.791L556.963,348.995L544.363,351.913L531.728,356.741L519.127,360.08L506.527,362.646L493.927,362.408L481.292,365.889L468.691,365.487L456.091,365.911L443.49,366.946L430.855,370L418.255,370L405.654,370L393.054,370L380.419,370L367.819,370L355.218,370L342.618,370L329.983,370L317.382,370L304.782,370L292.181,370L279.546,370L266.946,370L254.346,370L241.745,370L229.11,370L216.51,370L203.909,370L191.309,370L178.674,370L166.073,370L153.473,370L140.873,370L128.238,370L115.637,370L103.037,370L90.436,370L77.801,370L65.201,370L52.6,370L40,370Z"><title>SoundExchange Distributions Streaming - SoundExchange Distributions + <path fill="none" aria-label="area" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,369.854L443.49,366.528L456.091,365.26L468.691,364.789L481.292,364.032L493.927,359.51L506.527,358.077L519.127,354.89L531.728,348.696L544.363,341.781L556.963,335.934L569.564,327.252L582.164,301.49L594.799,277.818L607.4,251.85L620,231.163"><title>SoundExchange Distributions Streaming - Synchronization + <path aria-label="area" fill-opacity="0.3" fill="#ff725c" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,370L443.49,366.946L456.091,365.911L468.691,365.487L481.292,365.889L493.927,362.408L506.527,362.646L519.127,360.08L531.728,356.741L544.363,351.913L556.963,348.995L569.564,340.791L582.164,316.213L594.799,288.452L607.4,267.021L620,245.366L620,249.686L607.4,271.566L594.799,292.237L582.164,319.792L569.564,344.214L556.963,352.199L544.363,355.169L531.728,360.06L519.127,363.573L506.527,366.106L493.927,366.157L481.292,365.889L468.691,365.487L456.091,365.911L443.49,366.946L430.855,370L418.255,370L405.654,370L393.054,370L380.419,370L367.819,370L355.218,370L342.618,370L329.983,370L317.382,370L304.782,370L292.181,370L279.546,370L266.946,370L254.346,370L241.745,370L229.11,370L216.51,370L203.909,370L191.309,370L178.674,370L166.073,370L153.473,370L140.873,370L128.238,370L115.637,370L103.037,370L90.436,370L77.801,370L65.201,370L52.6,370L40,370Z"><title>Synchronization Other - Synchronization + <path fill="none" aria-label="area" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,370L443.49,366.946L456.091,365.911L468.691,365.487L481.292,365.889L493.927,362.408L506.527,362.646L519.127,360.08L531.728,356.741L544.363,351.913L556.963,348.995L569.564,340.791L582.164,316.213L594.799,288.452L607.4,267.021L620,245.366"><title>Synchronization Other - Vinyl Single + <path aria-label="area" fill-opacity="0.3" fill="#ff8ab7" d="M40,346.048L52.6,347.196L65.201,346.941L77.801,342.541L90.436,337.363L103.037,326.457L115.637,318.554L128.238,323.664L140.873,311.978L153.473,300.915L166.073,285.809L178.674,262.8L191.309,255.484L203.909,236.573L216.51,202.093L229.11,176.604L241.745,164.921L254.346,141.969L266.946,140.897L279.546,113.234L292.181,92.324L304.782,44.919L317.382,47.451L329.983,51.559L342.618,66.013L355.218,34.529L367.819,20.763L380.419,38.085L393.054,60.179L405.654,90.052L418.255,112.894L430.855,109.127L443.49,118.702L456.091,137.103L468.691,165.026L481.292,208.074L493.927,225.253L506.527,243.033L519.127,245.295L531.728,250.63L544.363,252.871L556.963,261.057L569.564,262.425L582.164,249.676L594.799,232.861L607.4,219.908L620,204.016L620,204.122L607.4,219.993L594.799,232.96L582.164,249.757L569.564,262.522L556.963,261.15L544.363,252.922L531.728,250.713L519.127,245.377L506.527,243.075L493.927,225.3L481.292,208.128L468.691,165.104L456.091,137.299L443.49,118.972L430.855,109.548L418.255,113.362L405.654,90.605L393.054,60.888L380.419,38.696L367.819,21.433L355.218,35.159L342.618,66.9L329.983,52.77L317.382,48.676L304.782,46.192L292.181,93.741L279.546,115.127L266.946,142.773L254.346,144.856L241.745,168.674L229.11,182.701L216.51,209.248L203.909,244.894L191.309,265.925L178.674,274.294L166.073,296.618L153.473,312.64L140.873,323.255L128.238,335.794L115.637,338.027L103.037,342.419L90.436,353.533L77.801,359.763L65.201,362.658L52.6,362.928L40,363.157Z"><title>Vinyl Single Vinyl - Vinyl Single + <path fill="none" aria-label="area" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,346.048L52.6,347.196L65.201,346.941L77.801,342.541L90.436,337.363L103.037,326.457L115.637,318.554L128.238,323.664L140.873,311.978L153.473,300.915L166.073,285.809L178.674,262.8L191.309,255.484L203.909,236.573L216.51,202.093L229.11,176.604L241.745,164.921L254.346,141.969L266.946,140.897L279.546,113.234L292.181,92.324L304.782,44.919L317.382,47.451L329.983,51.559L342.618,66.013L355.218,34.529L367.819,20.763L380.419,38.085L393.054,60.179L405.654,90.052L418.255,112.894L430.855,109.127L443.49,118.702L456.091,137.103L468.691,165.026L481.292,208.074L493.927,225.253L506.527,243.033L519.127,245.295L531.728,250.63L544.363,252.871L556.963,261.057L569.564,262.425L582.164,249.676L594.799,232.861L607.4,219.908L620,204.016"><title>Vinyl Single Vinyl diff --git a/test/output/ridgeline.svg b/test/output/ridgeline.svg index ace4941f82..378528a92c 100644 --- a/test/output/ridgeline.svg +++ b/test/output/ridgeline.svg @@ -161,233 +161,233 @@ 12 PM - - + + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + diff --git a/test/output/timeAxisLocal.svg b/test/output/timeAxisLocal.svg index 64f9de3b06..5294919953 100644 --- a/test/output/timeAxisLocal.svg +++ b/test/output/timeAxisLocal.svg @@ -24,14 +24,14 @@ - 8:30AM - 9:00 - 9:30 - 10:00 - 10:30 - 11:00 - 11:30 - 12:00PM + 5:30PM + 6:00 + 6:30 + 7:00 + 7:30 + 8:00 + 8:30 + 9:00 From cfe15c821718291b83fcc21c394b24d1048999d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Rivi=C3=A8re?= Date: Sat, 4 Apr 2026 17:42:40 +0200 Subject: [PATCH 4/6] tests --- test/output/availability.svg | 2 +- test/output/downloads.svg | 2 +- test/output/musicRevenue.svg | 46 +++++++++++----------- test/output/ridgeline.svg | 76 ++++++++++++++++++------------------ test/plots/area-line.ts | 9 ++++- test/plots/availability.ts | 10 ++++- test/plots/downloads.ts | 1 - test/plots/music-revenue.ts | 1 + test/plots/ridgeline.ts | 1 + 9 files changed, 82 insertions(+), 66 deletions(-) diff --git a/test/output/availability.svg b/test/output/availability.svg index 94ff096f77..d84428fe67 100644 --- a/test/output/availability.svg +++ b/test/output/availability.svg @@ -50,7 +50,7 @@ - + diff --git a/test/output/downloads.svg b/test/output/downloads.svg index 950d5c0ada..9b73b3d3af 100644 --- a/test/output/downloads.svg +++ b/test/output/downloads.svg @@ -65,7 +65,7 @@ - + diff --git a/test/output/musicRevenue.svg b/test/output/musicRevenue.svg index 507d43e423..a086ee332f 100644 --- a/test/output/musicRevenue.svg +++ b/test/output/musicRevenue.svg @@ -82,139 +82,139 @@ - 8 - Track + <path aria-label="area" fill="#3ca951" d="M40,189.819L52.6,192.692L65.201,193.262L77.801,178.039L90.436,139.038L103.037,116.665L115.637,167.593L128.238,191.35L140.873,195.217L153.473,219.666L166.073,218.011L178.674,203.203L191.309,207.905L203.909,200.715L216.51,174.181L229.11,158.618L241.745,157.818L254.346,139.323L266.946,140.034L279.546,112.85L292.181,92.031L304.782,44.439L317.382,46.792L329.983,50.622L342.618,65.183L355.218,33.695L367.819,20L380.419,37.442L393.054,59.56L405.654,89.596L418.255,112.423L430.855,108.719L443.49,118.411L456.091,136.792L468.691,164.585L481.292,207.021L493.927,224.065L506.527,241.403L519.127,243.173L531.728,247.832L544.363,249.255L556.963,256.939L569.564,256.801L582.164,243.755L594.799,226.524L607.4,213.234L620,196.234L620,196.234L607.4,213.234L594.799,226.524L582.164,243.755L569.564,256.801L556.963,256.939L544.363,249.255L531.728,247.832L519.127,243.173L506.527,241.403L493.927,224.065L481.292,207.021L468.691,164.585L456.091,136.792L443.49,118.411L430.855,108.719L418.255,112.423L405.654,89.596L393.054,59.56L380.419,37.442L367.819,20L355.218,33.695L342.618,65.183L329.983,50.622L317.382,46.792L304.782,44.439L292.181,92.031L279.546,112.85L266.946,140.034L254.346,139.323L241.745,157.818L229.11,158.618L216.51,174.181L203.909,200.715L191.309,207.905L178.674,203.203L166.073,218.011L153.473,221.157L140.873,208.984L128.238,216.92L115.637,205.277L103.037,174.796L90.436,192.543L77.801,225.692L65.201,236.586L52.6,237.23L40,233.851Z"><title>8 - Track Tape 8 - Track Tape - CD + <path aria-label="area" fill="#4269d0" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,369.31L178.674,366.025L191.309,355.528L203.909,336.071L216.51,313.915L229.11,299.371L241.745,282.846L254.346,259.147L266.946,239.204L279.546,213.729L292.181,183.941L304.782,135.417L317.382,118.216L329.983,110.834L342.618,114.948L355.218,77.531L367.819,53.398L380.419,56.649L393.054,71.004L405.654,95.739L418.255,116.493L430.855,110.367L443.49,119.463L456.091,137.525L468.691,165.397L481.292,208.209L493.927,225.358L506.527,243.128L519.127,245.439L531.728,250.769L544.363,252.964L556.963,261.211L569.564,262.542L582.164,249.761L594.799,232.984L607.4,219.995L620,204.125L620,213.735L607.4,231.115L594.799,250.229L582.164,268.598L569.564,286.916L556.963,291.209L544.363,289.707L531.728,294.052L519.127,300.551L506.527,305.272L493.927,305.841L481.292,309.808L468.691,309.123L456.091,323.398L443.49,334.824L430.855,352.63L418.255,360.566L405.654,363.402L393.054,362.433L380.419,363.455L367.819,360.96L355.218,357.54L342.618,361.932L329.983,363.984L317.382,364.221L304.782,363.766L292.181,364.098L279.546,365.515L266.946,366.533L254.346,364.729L241.745,366.279L229.11,370L216.51,370L203.909,370L191.309,370L178.674,370L166.073,370L153.473,370L140.873,370L128.238,370L115.637,370L103.037,370L90.436,370L77.801,370L65.201,370L52.6,370L40,370Z"><title>CD Disc CD Disc - CD Single + <path aria-label="area" fill="#4269d0" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,369.31L178.674,366.025L191.309,355.528L203.909,336.071L216.51,313.915L229.11,299.039L241.745,282.824L254.346,258.964L266.946,238.174L279.546,212.444L292.181,182.674L304.782,133.903L317.382,115.307L329.983,106.143L342.618,108.155L355.218,72.302L367.819,48.061L380.419,53.336L393.054,69.211L405.654,95.303L418.255,115.71L430.855,110.05L443.49,119.24L456.091,137.373L468.691,165.161L481.292,208.144L493.927,225.3L506.527,243.075L519.127,245.377L531.728,250.713L544.363,252.922L556.963,261.15L569.564,262.522L582.164,249.757L594.799,232.96L607.4,219.993L620,204.122L620,204.125L607.4,219.995L594.799,232.984L582.164,249.761L569.564,262.542L556.963,261.211L544.363,252.964L531.728,250.769L519.127,245.439L506.527,243.128L493.927,225.358L481.292,208.209L468.691,165.397L456.091,137.525L443.49,119.463L430.855,110.367L418.255,116.493L405.654,95.739L393.054,71.004L380.419,56.649L367.819,53.398L355.218,77.531L342.618,114.948L329.983,110.834L317.382,118.216L304.782,135.417L292.181,183.941L279.546,213.729L266.946,239.204L254.346,259.147L241.745,282.846L229.11,299.371L216.51,313.915L203.909,336.071L191.309,355.528L178.674,366.025L166.073,369.31L153.473,370L140.873,370L128.238,370L115.637,370L103.037,370L90.436,370L77.801,370L65.201,370L52.6,370L40,370Z"><title>CD Single Disc CD Single Disc - Cassette + <path aria-label="area" fill="#3ca951" d="M40,363.157L52.6,362.928L65.201,362.658L77.801,359.763L90.436,353.533L103.037,342.419L115.637,338.027L128.238,335.794L140.873,323.255L153.473,312.64L166.073,296.618L178.674,274.294L191.309,265.925L203.909,244.894L216.51,209.248L229.11,182.701L241.745,168.674L254.346,144.856L266.946,142.773L279.546,115.127L292.181,93.741L304.782,46.192L317.382,48.676L329.983,52.77L342.618,66.9L355.218,35.159L367.819,21.433L380.419,38.696L393.054,60.888L405.654,90.605L418.255,113.362L430.855,109.548L443.49,118.972L456.091,137.299L468.691,165.104L481.292,208.128L493.927,225.3L506.527,243.075L519.127,245.377L531.728,250.713L544.363,252.922L556.963,261.15L569.564,262.522L582.164,249.757L594.799,232.96L607.4,219.993L620,204.122L620,204.122L607.4,219.993L594.799,232.96L582.164,249.757L569.564,262.522L556.963,261.15L544.363,252.922L531.728,250.713L519.127,245.377L506.527,243.075L493.927,225.3L481.292,208.144L468.691,165.161L456.091,137.373L443.49,119.24L430.855,110.05L418.255,115.71L405.654,95.267L393.054,69.092L380.419,53.23L367.819,46.909L355.218,69.986L342.618,104.83L329.983,101.319L317.382,109.108L304.782,126.487L292.181,174.415L279.546,203.929L266.946,231.411L254.346,251.075L241.745,276.549L229.11,297.103L216.51,313.412L203.909,336.071L191.309,355.528L178.674,366.025L166.073,369.31L153.473,370L140.873,370L128.238,370L115.637,370L103.037,370L90.436,370L77.801,370L65.201,370L52.6,370L40,370Z"><title>Cassette Tape Cassette Tape - Cassette Single + <path aria-label="area" fill="#3ca951" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,369.31L178.674,366.025L191.309,355.528L203.909,336.071L216.51,313.412L229.11,297.103L241.745,276.549L254.346,251.075L266.946,231.411L279.546,203.929L292.181,174.415L304.782,126.487L317.382,109.108L329.983,101.319L342.618,104.83L355.218,69.986L367.819,46.909L380.419,53.23L393.054,69.092L405.654,95.267L418.255,115.71L430.855,110.05L443.49,119.24L456.091,137.373L468.691,165.161L481.292,208.144L493.927,225.3L506.527,243.075L519.127,245.377L531.728,250.713L544.363,252.922L556.963,261.15L569.564,262.522L582.164,249.757L594.799,232.96L607.4,219.993L620,204.122L620,204.122L607.4,219.993L594.799,232.96L582.164,249.757L569.564,262.522L556.963,261.15L544.363,252.922L531.728,250.713L519.127,245.377L506.527,243.075L493.927,225.3L481.292,208.144L468.691,165.161L456.091,137.373L443.49,119.24L430.855,110.05L418.255,115.71L405.654,95.303L393.054,69.211L380.419,53.336L367.819,48.061L355.218,72.302L342.618,108.155L329.983,106.143L317.382,115.307L304.782,133.903L292.181,182.674L279.546,212.444L266.946,238.174L254.346,258.964L241.745,282.824L229.11,299.039L216.51,313.915L203.909,336.071L191.309,355.528L178.674,366.025L166.073,369.31L153.473,370L140.873,370L128.238,370L115.637,370L103.037,370L90.436,370L77.801,370L65.201,370L52.6,370L40,370Z"><title>Cassette Single Tape Cassette Single Tape - DVD Audio + <path aria-label="area" fill="#ff725c" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,369.865L405.654,369.811L418.255,369.826L430.855,365.833L443.49,347.357L456.091,332.453L468.691,318.544L481.292,314.086L493.927,309.792L506.527,308.56L519.127,303.261L531.728,296.106L544.363,291.548L556.963,292.736L569.564,288.122L582.164,269.566L594.799,250.873L607.4,231.567L620,214.175L620,214.191L607.4,231.62L594.799,250.916L582.164,269.613L569.564,288.213L556.963,292.773L544.363,291.556L531.728,296.11L519.127,303.266L506.527,308.576L493.927,309.822L481.292,314.108L468.691,318.598L456.091,332.501L443.49,347.586L430.855,365.97L418.255,370L405.654,370L393.054,370L380.419,370L367.819,370L355.218,370L342.618,370L329.983,370L317.382,370L304.782,370L292.181,370L279.546,370L266.946,370L254.346,370L241.745,370L229.11,370L216.51,370L203.909,370L191.309,370L178.674,370L166.073,370L153.473,370L140.873,370L128.238,370L115.637,370L103.037,370L90.436,370L77.801,370L65.201,370L52.6,370L40,370Z"><title>DVD Audio Other DVD Audio Other - Download Album + <path aria-label="area" fill="#efb118" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,368.891L443.49,363.75L456.091,359.789L468.691,355.196L481.292,352.235L493.927,345.64L506.527,342.082L519.127,335.858L531.728,327.716L544.363,320.635L556.963,317.054L569.564,309.297L582.164,285.667L594.799,262.644L607.4,239.892L620,221.067L620,227.237L607.4,247.848L594.799,273.548L582.164,300.136L569.564,327.252L556.963,335.934L544.363,341.781L531.728,348.696L519.127,354.89L506.527,358.077L493.927,359.51L481.292,364.032L468.691,364.789L456.091,365.26L443.49,366.528L430.855,369.854L418.255,370L405.654,370L393.054,370L380.419,370L367.819,370L355.218,370L342.618,370L329.983,370L317.382,370L304.782,370L292.181,370L279.546,370L266.946,370L254.346,370L241.745,370L229.11,370L216.51,370L203.909,370L191.309,370L178.674,370L166.073,370L153.473,370L140.873,370L128.238,370L115.637,370L103.037,370L90.436,370L77.801,370L65.201,370L52.6,370L40,370Z"><title>Download Album Download Download Album Download - Download Music Video + <path aria-label="area" fill="#efb118" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,365.97L443.49,356.217L456.091,347.846L468.691,338.961L481.292,332.252L493.927,322.919L506.527,316.79L519.127,308.176L531.728,298.652L544.363,293.238L556.963,293.892L569.564,289.134L582.164,270.552L594.799,251.495L607.4,232.017L620,214.527L620,214.556L607.4,232.053L594.799,251.54L582.164,270.623L569.564,289.242L556.963,294.122L544.363,293.525L531.728,299.015L519.127,308.751L506.527,317.461L493.927,323.681L481.292,333.019L468.691,339.505L456.091,348.237L443.49,356.292L430.855,365.97L418.255,370L405.654,370L393.054,370L380.419,370L367.819,370L355.218,370L342.618,370L329.983,370L317.382,370L304.782,370L292.181,370L279.546,370L266.946,370L254.346,370L241.745,370L229.11,370L216.51,370L203.909,370L191.309,370L178.674,370L166.073,370L153.473,370L140.873,370L128.238,370L115.637,370L103.037,370L90.436,370L77.801,370L65.201,370L52.6,370L40,370Z"><title>Download Music Video Download Download Music Video Download - Download Single + <path aria-label="area" fill="#efb118" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,365.97L443.49,356.313L456.091,348.275L468.691,339.555L481.292,333.068L493.927,323.799L506.527,317.579L519.127,308.799L531.728,299.078L544.363,293.632L556.963,294.165L569.564,289.304L582.164,270.672L594.799,251.577L607.4,232.084L620,214.58L620,221.067L607.4,239.892L594.799,262.644L582.164,285.667L569.564,309.297L556.963,317.054L544.363,320.635L531.728,327.716L519.127,335.858L506.527,342.082L493.927,345.64L481.292,352.235L468.691,355.196L456.091,359.789L443.49,363.75L430.855,368.891L418.255,370L405.654,370L393.054,370L380.419,370L367.819,370L355.218,370L342.618,370L329.983,370L317.382,370L304.782,370L292.181,370L279.546,370L266.946,370L254.346,370L241.745,370L229.11,370L216.51,370L203.909,370L191.309,370L178.674,370L166.073,370L153.473,370L140.873,370L128.238,370L115.637,370L103.037,370L90.436,370L77.801,370L65.201,370L52.6,370L40,370Z"><title>Download Single Download Download Single Download - Kiosk + <path aria-label="area" fill="#ff725c" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,365.97L443.49,356.292L456.091,348.237L468.691,339.505L481.292,333.019L493.927,323.681L506.527,317.461L519.127,308.751L531.728,299.015L544.363,293.525L556.963,294.122L569.564,289.242L582.164,270.623L594.799,251.54L607.4,232.053L620,214.556L620,214.58L607.4,232.084L594.799,251.577L582.164,270.672L569.564,289.304L556.963,294.165L544.363,293.632L531.728,299.078L519.127,308.799L506.527,317.579L493.927,323.799L481.292,333.068L468.691,339.555L456.091,348.275L443.49,356.313L430.855,365.97L418.255,370L405.654,370L393.054,370L380.419,370L367.819,370L355.218,370L342.618,370L329.983,370L317.382,370L304.782,370L292.181,370L279.546,370L266.946,370L254.346,370L241.745,370L229.11,370L216.51,370L203.909,370L191.309,370L178.674,370L166.073,370L153.473,370L140.873,370L128.238,370L115.637,370L103.037,370L90.436,370L77.801,370L65.201,370L52.6,370L40,370Z"><title>Kiosk Other Kiosk Other - LP/EP + <path aria-label="area" fill="#ff8ab7" d="M40,233.851L52.6,237.23L65.201,236.586L77.801,225.692L90.436,192.543L103.037,174.796L115.637,205.277L128.238,216.92L140.873,208.984L153.473,221.157L166.073,218.011L178.674,203.203L191.309,207.905L203.909,200.715L216.51,174.181L229.11,158.618L241.745,157.818L254.346,139.323L266.946,140.034L279.546,112.85L292.181,92.031L304.782,44.439L317.382,46.792L329.983,50.622L342.618,65.183L355.218,33.695L367.819,20L380.419,37.442L393.054,59.56L405.654,89.596L418.255,112.423L430.855,108.719L443.49,118.411L456.091,136.792L468.691,164.585L481.292,207.021L493.927,224.065L506.527,241.403L519.127,243.173L531.728,247.832L544.363,249.255L556.963,256.939L569.564,256.801L582.164,243.755L594.799,226.524L607.4,213.234L620,196.234L620,204.016L607.4,219.908L594.799,232.861L582.164,249.676L569.564,262.425L556.963,261.057L544.363,252.871L531.728,250.63L519.127,245.295L506.527,243.033L493.927,225.253L481.292,208.074L468.691,165.026L456.091,137.103L443.49,118.702L430.855,109.127L418.255,112.894L405.654,90.052L393.054,60.179L380.419,38.085L367.819,20.763L355.218,34.529L342.618,66.013L329.983,51.559L317.382,47.451L304.782,44.919L292.181,92.324L279.546,113.234L266.946,140.897L254.346,141.969L241.745,164.921L229.11,176.604L216.51,202.093L203.909,236.573L191.309,255.484L178.674,262.8L166.073,285.809L153.473,300.915L140.873,311.978L128.238,323.664L115.637,318.554L103.037,326.457L90.436,337.363L77.801,342.541L65.201,346.941L52.6,347.196L40,346.048Z"><title>LP/EP Vinyl LP/EP Vinyl - Limited Tier Paid Subscription + <path aria-label="area" fill="#6cc5b0" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,370L443.49,366.946L456.091,365.911L468.691,365.487L481.292,365.889L493.927,366.157L506.527,366.106L519.127,363.573L531.728,360.06L544.363,355.169L556.963,352.199L569.564,344.214L582.164,319.792L594.799,292.237L607.4,271.566L620,249.686L620,262.658L607.4,283.461L594.799,301.887L582.164,324.179L569.564,344.214L556.963,352.199L544.363,355.169L531.728,360.06L519.127,363.573L506.527,366.106L493.927,366.157L481.292,365.889L468.691,365.487L456.091,365.911L443.49,366.946L430.855,370L418.255,370L405.654,370L393.054,370L380.419,370L367.819,370L355.218,370L342.618,370L329.983,370L317.382,370L304.782,370L292.181,370L279.546,370L266.946,370L254.346,370L241.745,370L229.11,370L216.51,370L203.909,370L191.309,370L178.674,370L166.073,370L153.473,370L140.873,370L128.238,370L115.637,370L103.037,370L90.436,370L77.801,370L65.201,370L52.6,370L40,370Z"><title>Limited Tier Paid Subscription Streaming Limited Tier Paid Subscription Streaming - Music Video (Physical) + <path aria-label="area" fill="#ff725c" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,366.279L254.346,364.729L266.946,366.533L279.546,365.515L292.181,364.098L304.782,363.766L317.382,364.221L329.983,363.984L342.618,361.932L355.218,357.54L367.819,360.96L380.419,363.455L393.054,362.433L405.654,363.402L418.255,361.137L430.855,352.981L443.49,335.029L456.091,323.507L468.691,309.193L481.292,309.865L493.927,305.886L506.527,305.304L519.127,300.577L531.728,294.076L544.363,289.724L556.963,291.221L569.564,286.934L582.164,268.618L594.799,250.243L607.4,231.128L620,213.742L620,214.175L607.4,231.567L594.799,250.873L582.164,269.566L569.564,288.122L556.963,292.736L544.363,291.548L531.728,296.106L519.127,303.261L506.527,308.56L493.927,309.792L481.292,314.086L468.691,318.544L456.091,332.453L443.49,347.357L430.855,365.833L418.255,369.826L405.654,369.811L393.054,369.865L380.419,370L367.819,370L355.218,370L342.618,370L329.983,370L317.382,370L304.782,370L292.181,370L279.546,370L266.946,370L254.346,370L241.745,370L229.11,370L216.51,370L203.909,370L191.309,370L178.674,370L166.073,370L153.473,370L140.873,370L128.238,370L115.637,370L103.037,370L90.436,370L77.801,370L65.201,370L52.6,370L40,370Z"><title>Music Video (Physical) Other Music Video (Physical) Other - On-Demand Streaming (Ad-Supported) + <path aria-label="area" fill="#6cc5b0" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,370L443.49,366.946L456.091,365.911L468.691,365.487L481.292,365.889L493.927,366.157L506.527,366.106L519.127,363.573L531.728,360.06L544.363,355.169L556.963,352.199L569.564,344.214L582.164,324.179L594.799,301.887L607.4,283.461L620,262.658L620,276.86L607.4,295.554L594.799,312.629L582.164,332.331L569.564,350.488L556.963,356.992L544.363,358.959L531.728,363.037L519.127,365.596L506.527,366.106L493.927,366.157L481.292,365.889L468.691,365.487L456.091,365.911L443.49,366.946L430.855,370L418.255,370L405.654,370L393.054,370L380.419,370L367.819,370L355.218,370L342.618,370L329.983,370L317.382,370L304.782,370L292.181,370L279.546,370L266.946,370L254.346,370L241.745,370L229.11,370L216.51,370L203.909,370L191.309,370L178.674,370L166.073,370L153.473,370L140.873,370L128.238,370L115.637,370L103.037,370L90.436,370L77.801,370L65.201,370L52.6,370L40,370Z"><title>On-Demand Streaming (Ad-Supported) Streaming On-Demand Streaming (Ad-Supported) Streaming - Other Ad-Supported Streaming + <path aria-label="area" fill="#6cc5b0" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,369.854L443.49,366.528L456.091,365.26L468.691,364.789L481.292,364.032L493.927,359.51L506.527,358.077L519.127,354.89L531.728,348.696L544.363,341.781L556.963,335.934L569.564,327.252L582.164,300.136L594.799,273.548L607.4,247.848L620,227.237L620,231.163L607.4,251.85L594.799,277.818L582.164,301.49L569.564,327.252L556.963,335.934L544.363,341.781L531.728,348.696L519.127,354.89L506.527,358.077L493.927,359.51L481.292,364.032L468.691,364.789L456.091,365.26L443.49,366.528L430.855,369.854L418.255,370L405.654,370L393.054,370L380.419,370L367.819,370L355.218,370L342.618,370L329.983,370L317.382,370L304.782,370L292.181,370L279.546,370L266.946,370L254.346,370L241.745,370L229.11,370L216.51,370L203.909,370L191.309,370L178.674,370L166.073,370L153.473,370L140.873,370L128.238,370L115.637,370L103.037,370L90.436,370L77.801,370L65.201,370L52.6,370L40,370Z"><title>Other Ad-Supported Streaming Streaming Other Ad-Supported Streaming Streaming - Other Digital + <path aria-label="area" fill="#efb118" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,370L443.49,366.946L456.091,365.911L468.691,365.487L481.292,365.889L493.927,366.157L506.527,366.106L519.127,365.596L531.728,363.037L544.363,358.959L556.963,356.992L569.564,350.488L582.164,332.331L594.799,312.629L607.4,295.554L620,276.86L620,277.196L607.4,295.87L594.799,312.904L582.164,332.617L569.564,350.488L556.963,356.992L544.363,358.959L531.728,363.037L519.127,365.596L506.527,366.106L493.927,366.157L481.292,365.889L468.691,365.487L456.091,365.911L443.49,366.946L430.855,370L418.255,370L405.654,370L393.054,370L380.419,370L367.819,370L355.218,370L342.618,370L329.983,370L317.382,370L304.782,370L292.181,370L279.546,370L266.946,370L254.346,370L241.745,370L229.11,370L216.51,370L203.909,370L191.309,370L178.674,370L166.073,370L153.473,370L140.873,370L128.238,370L115.637,370L103.037,370L90.436,370L77.801,370L65.201,370L52.6,370L40,370Z"><title>Other Digital Download Other Digital Download - Other Tapes + <path aria-label="area" fill="#3ca951" d="M40,188.414L52.6,191.614L65.201,192.504L77.801,177.68L90.436,139.038L103.037,116.665L115.637,167.593L128.238,191.35L140.873,195.217L153.473,219.666L166.073,218.011L178.674,203.203L191.309,207.905L203.909,200.715L216.51,174.181L229.11,158.618L241.745,157.818L254.346,139.323L266.946,140.034L279.546,112.85L292.181,92.031L304.782,44.439L317.382,46.792L329.983,50.622L342.618,65.183L355.218,33.695L367.819,20L380.419,37.442L393.054,59.56L405.654,89.596L418.255,112.423L430.855,108.719L443.49,118.411L456.091,136.792L468.691,164.585L481.292,207.021L493.927,224.065L506.527,241.403L519.127,243.173L531.728,247.832L544.363,249.255L556.963,256.939L569.564,256.801L582.164,243.755L594.799,226.524L607.4,213.234L620,196.234L620,196.234L607.4,213.234L594.799,226.524L582.164,243.755L569.564,256.801L556.963,256.939L544.363,249.255L531.728,247.832L519.127,243.173L506.527,241.403L493.927,224.065L481.292,207.021L468.691,164.585L456.091,136.792L443.49,118.411L430.855,108.719L418.255,112.423L405.654,89.596L393.054,59.56L380.419,37.442L367.819,20L355.218,33.695L342.618,65.183L329.983,50.622L317.382,46.792L304.782,44.439L292.181,92.031L279.546,112.85L266.946,140.034L254.346,139.323L241.745,157.818L229.11,158.618L216.51,174.181L203.909,200.715L191.309,207.905L178.674,203.203L166.073,218.011L153.473,219.666L140.873,195.217L128.238,191.35L115.637,167.593L103.037,116.665L90.436,139.038L77.801,178.039L65.201,193.262L52.6,192.692L40,189.819Z"><title>Other Tapes Tape Other Tapes Tape - Paid Subscription + <path aria-label="area" fill="#6cc5b0" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,370L443.49,366.946L456.091,365.911L468.691,365.487L481.292,365.889L493.927,366.157L506.527,366.106L519.127,365.596L531.728,363.037L544.363,358.959L556.963,356.992L569.564,350.488L582.164,332.617L594.799,312.904L607.4,295.87L620,277.196L620,370L607.4,370L594.799,370L582.164,370L569.564,370L556.963,370L544.363,370L531.728,370L519.127,370L506.527,370L493.927,370L481.292,370L468.691,370L456.091,370L443.49,370L430.855,370L418.255,370L405.654,370L393.054,370L380.419,370L367.819,370L355.218,370L342.618,370L329.983,370L317.382,370L304.782,370L292.181,370L279.546,370L266.946,370L254.346,370L241.745,370L229.11,370L216.51,370L203.909,370L191.309,370L178.674,370L166.073,370L153.473,370L140.873,370L128.238,370L115.637,370L103.037,370L90.436,370L77.801,370L65.201,370L52.6,370L40,370Z"><title>Paid Subscription Streaming Paid Subscription Streaming - Ringtones & Ringbacks + <path aria-label="area" fill="#efb118" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,365.97L443.49,347.586L456.091,332.501L468.691,318.598L481.292,314.108L493.927,309.822L506.527,308.576L519.127,303.266L531.728,296.11L544.363,291.556L556.963,292.773L569.564,288.213L582.164,269.613L594.799,250.916L607.4,231.62L620,214.191L620,214.527L607.4,232.017L594.799,251.495L582.164,270.552L569.564,289.134L556.963,293.892L544.363,293.238L531.728,298.652L519.127,308.176L506.527,316.79L493.927,322.919L481.292,332.252L468.691,338.961L456.091,347.846L443.49,356.217L430.855,365.97L418.255,370L405.654,370L393.054,370L380.419,370L367.819,370L355.218,370L342.618,370L329.983,370L317.382,370L304.782,370L292.181,370L279.546,370L266.946,370L254.346,370L241.745,370L229.11,370L216.51,370L203.909,370L191.309,370L178.674,370L166.073,370L153.473,370L140.873,370L128.238,370L115.637,370L103.037,370L90.436,370L77.801,370L65.201,370L52.6,370L40,370Z"><title>Ringtones & Ringbacks Download Ringtones & Ringbacks Download - SACD + <path aria-label="area" fill="#4269d0" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,366.279L254.346,364.729L266.946,366.533L279.546,365.515L292.181,364.098L304.782,363.766L317.382,364.221L329.983,363.984L342.618,361.932L355.218,357.54L367.819,360.96L380.419,363.455L393.054,362.433L405.654,363.402L418.255,360.566L430.855,352.63L443.49,334.824L456.091,323.398L468.691,309.123L481.292,309.808L493.927,305.841L506.527,305.272L519.127,300.551L531.728,294.052L544.363,289.707L556.963,291.209L569.564,286.916L582.164,268.598L594.799,250.229L607.4,231.115L620,213.735L620,213.742L607.4,231.128L594.799,250.243L582.164,268.618L569.564,286.934L556.963,291.221L544.363,289.724L531.728,294.076L519.127,300.577L506.527,305.304L493.927,305.886L481.292,309.865L468.691,309.193L456.091,323.507L443.49,335.029L430.855,352.981L418.255,361.137L405.654,363.402L393.054,362.433L380.419,363.455L367.819,360.96L355.218,357.54L342.618,361.932L329.983,363.984L317.382,364.221L304.782,363.766L292.181,364.098L279.546,365.515L266.946,366.533L254.346,364.729L241.745,366.279L229.11,370L216.51,370L203.909,370L191.309,370L178.674,370L166.073,370L153.473,370L140.873,370L128.238,370L115.637,370L103.037,370L90.436,370L77.801,370L65.201,370L52.6,370L40,370Z"><title>SACD Disc SACD Disc - SoundExchange Distributions + <path aria-label="area" fill="#6cc5b0" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,369.854L443.49,366.528L456.091,365.26L468.691,364.789L481.292,364.032L493.927,359.51L506.527,358.077L519.127,354.89L531.728,348.696L544.363,341.781L556.963,335.934L569.564,327.252L582.164,301.49L594.799,277.818L607.4,251.85L620,231.163L620,245.366L607.4,267.021L594.799,288.452L582.164,316.213L569.564,340.791L556.963,348.995L544.363,351.913L531.728,356.741L519.127,360.08L506.527,362.646L493.927,362.408L481.292,365.889L468.691,365.487L456.091,365.911L443.49,366.946L430.855,370L418.255,370L405.654,370L393.054,370L380.419,370L367.819,370L355.218,370L342.618,370L329.983,370L317.382,370L304.782,370L292.181,370L279.546,370L266.946,370L254.346,370L241.745,370L229.11,370L216.51,370L203.909,370L191.309,370L178.674,370L166.073,370L153.473,370L140.873,370L128.238,370L115.637,370L103.037,370L90.436,370L77.801,370L65.201,370L52.6,370L40,370Z"><title>SoundExchange Distributions Streaming SoundExchange Distributions Streaming - Synchronization + <path aria-label="area" fill="#ff725c" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,370L443.49,366.946L456.091,365.911L468.691,365.487L481.292,365.889L493.927,362.408L506.527,362.646L519.127,360.08L531.728,356.741L544.363,351.913L556.963,348.995L569.564,340.791L582.164,316.213L594.799,288.452L607.4,267.021L620,245.366L620,249.686L607.4,271.566L594.799,292.237L582.164,319.792L569.564,344.214L556.963,352.199L544.363,355.169L531.728,360.06L519.127,363.573L506.527,366.106L493.927,366.157L481.292,365.889L468.691,365.487L456.091,365.911L443.49,366.946L430.855,370L418.255,370L405.654,370L393.054,370L380.419,370L367.819,370L355.218,370L342.618,370L329.983,370L317.382,370L304.782,370L292.181,370L279.546,370L266.946,370L254.346,370L241.745,370L229.11,370L216.51,370L203.909,370L191.309,370L178.674,370L166.073,370L153.473,370L140.873,370L128.238,370L115.637,370L103.037,370L90.436,370L77.801,370L65.201,370L52.6,370L40,370Z"><title>Synchronization Other Synchronization Other - Vinyl Single + <path aria-label="area" fill="#ff8ab7" d="M40,346.048L52.6,347.196L65.201,346.941L77.801,342.541L90.436,337.363L103.037,326.457L115.637,318.554L128.238,323.664L140.873,311.978L153.473,300.915L166.073,285.809L178.674,262.8L191.309,255.484L203.909,236.573L216.51,202.093L229.11,176.604L241.745,164.921L254.346,141.969L266.946,140.897L279.546,113.234L292.181,92.324L304.782,44.919L317.382,47.451L329.983,51.559L342.618,66.013L355.218,34.529L367.819,20.763L380.419,38.085L393.054,60.179L405.654,90.052L418.255,112.894L430.855,109.127L443.49,118.702L456.091,137.103L468.691,165.026L481.292,208.074L493.927,225.253L506.527,243.033L519.127,245.295L531.728,250.63L544.363,252.871L556.963,261.057L569.564,262.425L582.164,249.676L594.799,232.861L607.4,219.908L620,204.016L620,204.122L607.4,219.993L594.799,232.96L582.164,249.757L569.564,262.522L556.963,261.15L544.363,252.922L531.728,250.713L519.127,245.377L506.527,243.075L493.927,225.3L481.292,208.128L468.691,165.104L456.091,137.299L443.49,118.972L430.855,109.548L418.255,113.362L405.654,90.605L393.054,60.888L380.419,38.696L367.819,21.433L355.218,35.159L342.618,66.9L329.983,52.77L317.382,48.676L304.782,46.192L292.181,93.741L279.546,115.127L266.946,142.773L254.346,144.856L241.745,168.674L229.11,182.701L216.51,209.248L203.909,244.894L191.309,265.925L178.674,274.294L166.073,296.618L153.473,312.64L140.873,323.255L128.238,335.794L115.637,338.027L103.037,342.419L90.436,353.533L77.801,359.763L65.201,362.658L52.6,362.928L40,363.157Z"><title>Vinyl Single Vinyl Vinyl Single Vinyl diff --git a/test/output/ridgeline.svg b/test/output/ridgeline.svg index 378528a92c..aee78474e3 100644 --- a/test/output/ridgeline.svg +++ b/test/output/ridgeline.svg @@ -164,229 +164,229 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/test/plots/area-line.ts b/test/plots/area-line.ts index dcb5499912..a0369d1a69 100644 --- a/test/plots/area-line.ts +++ b/test/plots/area-line.ts @@ -8,7 +8,14 @@ test(function areaLine() { insetTop: 10, marks: [ Plot.frame(), - Plot.areaY([1, 3, 2, 5, 8, 6, 4, 7, 9, 3], {line: true, stroke: "steelblue", strokeWidth: 2, fill: "steelblue", marker: "circle", markerEnd: "arrow"}) + Plot.areaY([1, 3, 2, 5, 8, 6, 4, 7, 9, 3], { + line: true, + stroke: "steelblue", + strokeWidth: 2, + fill: "steelblue", + marker: "circle", + markerEnd: "arrow" + }) ] }); }); diff --git a/test/plots/availability.ts b/test/plots/availability.ts index 1399c26efc..6855ba9d98 100644 --- a/test/plots/availability.ts +++ b/test/plots/availability.ts @@ -7,7 +7,15 @@ test(async function availability() { return Plot.plot({ height: 180, marks: [ - Plot.areaY(data, {x: "date", y: "value", interval: "day", curve: "step", fill: "#f2f2fe", line: true}), + Plot.areaY(data, { + x: "date", + y: "value", + interval: "day", + curve: "step", + fill: "#f2f2fe", + fillOpacity: 1, + line: true + }), Plot.ruleY([0]) ] }); diff --git a/test/plots/downloads.ts b/test/plots/downloads.ts index 86aba409de..741e9f68db 100644 --- a/test/plots/downloads.ts +++ b/test/plots/downloads.ts @@ -12,7 +12,6 @@ test(async function downloads() { interval: "day", y: "downloads", curve: "step", - fill: "#ccc", line: true, strokeWidth: 1 }) diff --git a/test/plots/music-revenue.ts b/test/plots/music-revenue.ts index 37a2f15eba..07271ad85e 100644 --- a/test/plots/music-revenue.ts +++ b/test/plots/music-revenue.ts @@ -19,6 +19,7 @@ test(async function musicRevenue() { fill: "group", title: (d: any) => `${d.format}\n${d.group}`, line: true, + fillOpacity: 1, stroke: "white", strokeWidth: 1 }), diff --git a/test/plots/ridgeline.ts b/test/plots/ridgeline.ts index a1acd997e1..0dd0ec6e11 100644 --- a/test/plots/ridgeline.ts +++ b/test/plots/ridgeline.ts @@ -22,6 +22,7 @@ test(async function ridgeline() { sort: "date", fill: "color-mix(in oklab, var(--plot-background), currentColor 20%)", line: true, + fillOpacity: 1, strokeWidth: 1 }) ] From 5a8e988997cf16bbb0a399968ddf3e5fb4a3d64d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Rivi=C3=A8re?= Date: Sat, 4 Apr 2026 18:23:10 +0200 Subject: [PATCH 5/6] simpler --- src/marks/area.js | 3 +- test/output/aaplClose.svg | 2 +- test/output/aaplCloseLine.svg | 2 +- test/output/areaLine.svg | 2 +- test/output/availability.svg | 2 +- test/output/downloads.svg | 2 +- test/output/musicRevenue.svg | 46 ++++++++++----------- test/output/ridgeline.svg | 76 +++++++++++++++++------------------ 8 files changed, 67 insertions(+), 68 deletions(-) diff --git a/src/marks/area.js b/src/marks/area.js index fe789101df..c02694accd 100644 --- a/src/marks/area.js +++ b/src/marks/area.js @@ -71,8 +71,7 @@ export class Area extends Mark { group .append("path") .call(applyDirectStyles, this) - .attr("fill", "none") - .call(applyIndirectStyles, {...this, ...noFill}, dimensions, context) + .call(applyIndirectStyles, {...this, ...noFill, fill: "none"}, dimensions, context) .call(applyGroupedChannelStyles, this, {...channels, ...noFill}) .call(applyGroupedMarkers, this, channels, context) .attr("transform", offset ? `translate(${offset},${offset})` : null) diff --git a/test/output/aaplClose.svg b/test/output/aaplClose.svg index 013a63d7c2..35db15bf9d 100644 --- a/test/output/aaplClose.svg +++ b/test/output/aaplClose.svg @@ -69,7 +69,7 @@ - + diff --git a/test/output/aaplCloseLine.svg b/test/output/aaplCloseLine.svg index 4b26408fdb..24101b1bab 100644 --- a/test/output/aaplCloseLine.svg +++ b/test/output/aaplCloseLine.svg @@ -71,7 +71,7 @@ - + diff --git a/test/output/areaLine.svg b/test/output/areaLine.svg index 474dabe49f..c4a0d6200e 100644 --- a/test/output/areaLine.svg +++ b/test/output/areaLine.svg @@ -51,7 +51,7 @@ - + \ No newline at end of file diff --git a/test/output/availability.svg b/test/output/availability.svg index d84428fe67..41cf2f2716 100644 --- a/test/output/availability.svg +++ b/test/output/availability.svg @@ -51,7 +51,7 @@ - + diff --git a/test/output/downloads.svg b/test/output/downloads.svg index 9b73b3d3af..8cc1694102 100644 --- a/test/output/downloads.svg +++ b/test/output/downloads.svg @@ -66,7 +66,7 @@ - + \ No newline at end of file diff --git a/test/output/musicRevenue.svg b/test/output/musicRevenue.svg index a086ee332f..86d35c26fe 100644 --- a/test/output/musicRevenue.svg +++ b/test/output/musicRevenue.svg @@ -84,139 +84,139 @@ 8 - Track Tape - 8 - Track + <path aria-label="area" fill="none" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,189.819L52.6,192.692L65.201,193.262L77.801,178.039L90.436,139.038L103.037,116.665L115.637,167.593L128.238,191.35L140.873,195.217L153.473,219.666L166.073,218.011L178.674,203.203L191.309,207.905L203.909,200.715L216.51,174.181L229.11,158.618L241.745,157.818L254.346,139.323L266.946,140.034L279.546,112.85L292.181,92.031L304.782,44.439L317.382,46.792L329.983,50.622L342.618,65.183L355.218,33.695L367.819,20L380.419,37.442L393.054,59.56L405.654,89.596L418.255,112.423L430.855,108.719L443.49,118.411L456.091,136.792L468.691,164.585L481.292,207.021L493.927,224.065L506.527,241.403L519.127,243.173L531.728,247.832L544.363,249.255L556.963,256.939L569.564,256.801L582.164,243.755L594.799,226.524L607.4,213.234L620,196.234"><title>8 - Track Tape CD Disc - CD + <path aria-label="area" fill="none" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,369.31L178.674,366.025L191.309,355.528L203.909,336.071L216.51,313.915L229.11,299.371L241.745,282.846L254.346,259.147L266.946,239.204L279.546,213.729L292.181,183.941L304.782,135.417L317.382,118.216L329.983,110.834L342.618,114.948L355.218,77.531L367.819,53.398L380.419,56.649L393.054,71.004L405.654,95.739L418.255,116.493L430.855,110.367L443.49,119.463L456.091,137.525L468.691,165.397L481.292,208.209L493.927,225.358L506.527,243.128L519.127,245.439L531.728,250.769L544.363,252.964L556.963,261.211L569.564,262.542L582.164,249.761L594.799,232.984L607.4,219.995L620,204.125"><title>CD Disc CD Single Disc - CD Single + <path aria-label="area" fill="none" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,369.31L178.674,366.025L191.309,355.528L203.909,336.071L216.51,313.915L229.11,299.039L241.745,282.824L254.346,258.964L266.946,238.174L279.546,212.444L292.181,182.674L304.782,133.903L317.382,115.307L329.983,106.143L342.618,108.155L355.218,72.302L367.819,48.061L380.419,53.336L393.054,69.211L405.654,95.303L418.255,115.71L430.855,110.05L443.49,119.24L456.091,137.373L468.691,165.161L481.292,208.144L493.927,225.3L506.527,243.075L519.127,245.377L531.728,250.713L544.363,252.922L556.963,261.15L569.564,262.522L582.164,249.757L594.799,232.96L607.4,219.993L620,204.122"><title>CD Single Disc Cassette Tape - Cassette + <path aria-label="area" fill="none" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,363.157L52.6,362.928L65.201,362.658L77.801,359.763L90.436,353.533L103.037,342.419L115.637,338.027L128.238,335.794L140.873,323.255L153.473,312.64L166.073,296.618L178.674,274.294L191.309,265.925L203.909,244.894L216.51,209.248L229.11,182.701L241.745,168.674L254.346,144.856L266.946,142.773L279.546,115.127L292.181,93.741L304.782,46.192L317.382,48.676L329.983,52.77L342.618,66.9L355.218,35.159L367.819,21.433L380.419,38.696L393.054,60.888L405.654,90.605L418.255,113.362L430.855,109.548L443.49,118.972L456.091,137.299L468.691,165.104L481.292,208.128L493.927,225.3L506.527,243.075L519.127,245.377L531.728,250.713L544.363,252.922L556.963,261.15L569.564,262.522L582.164,249.757L594.799,232.96L607.4,219.993L620,204.122"><title>Cassette Tape Cassette Single Tape - Cassette Single + <path aria-label="area" fill="none" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,369.31L178.674,366.025L191.309,355.528L203.909,336.071L216.51,313.412L229.11,297.103L241.745,276.549L254.346,251.075L266.946,231.411L279.546,203.929L292.181,174.415L304.782,126.487L317.382,109.108L329.983,101.319L342.618,104.83L355.218,69.986L367.819,46.909L380.419,53.23L393.054,69.092L405.654,95.267L418.255,115.71L430.855,110.05L443.49,119.24L456.091,137.373L468.691,165.161L481.292,208.144L493.927,225.3L506.527,243.075L519.127,245.377L531.728,250.713L544.363,252.922L556.963,261.15L569.564,262.522L582.164,249.757L594.799,232.96L607.4,219.993L620,204.122"><title>Cassette Single Tape DVD Audio Other - DVD Audio + <path aria-label="area" fill="none" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,369.865L405.654,369.811L418.255,369.826L430.855,365.833L443.49,347.357L456.091,332.453L468.691,318.544L481.292,314.086L493.927,309.792L506.527,308.56L519.127,303.261L531.728,296.106L544.363,291.548L556.963,292.736L569.564,288.122L582.164,269.566L594.799,250.873L607.4,231.567L620,214.175"><title>DVD Audio Other Download Album Download - Download Album + <path aria-label="area" fill="none" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,368.891L443.49,363.75L456.091,359.789L468.691,355.196L481.292,352.235L493.927,345.64L506.527,342.082L519.127,335.858L531.728,327.716L544.363,320.635L556.963,317.054L569.564,309.297L582.164,285.667L594.799,262.644L607.4,239.892L620,221.067"><title>Download Album Download Download Music Video Download - Download Music Video + <path aria-label="area" fill="none" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,365.97L443.49,356.217L456.091,347.846L468.691,338.961L481.292,332.252L493.927,322.919L506.527,316.79L519.127,308.176L531.728,298.652L544.363,293.238L556.963,293.892L569.564,289.134L582.164,270.552L594.799,251.495L607.4,232.017L620,214.527"><title>Download Music Video Download Download Single Download - Download Single + <path aria-label="area" fill="none" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,365.97L443.49,356.313L456.091,348.275L468.691,339.555L481.292,333.068L493.927,323.799L506.527,317.579L519.127,308.799L531.728,299.078L544.363,293.632L556.963,294.165L569.564,289.304L582.164,270.672L594.799,251.577L607.4,232.084L620,214.58"><title>Download Single Download Kiosk Other - Kiosk + <path aria-label="area" fill="none" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,365.97L443.49,356.292L456.091,348.237L468.691,339.505L481.292,333.019L493.927,323.681L506.527,317.461L519.127,308.751L531.728,299.015L544.363,293.525L556.963,294.122L569.564,289.242L582.164,270.623L594.799,251.54L607.4,232.053L620,214.556"><title>Kiosk Other LP/EP Vinyl - LP/EP + <path aria-label="area" fill="none" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,233.851L52.6,237.23L65.201,236.586L77.801,225.692L90.436,192.543L103.037,174.796L115.637,205.277L128.238,216.92L140.873,208.984L153.473,221.157L166.073,218.011L178.674,203.203L191.309,207.905L203.909,200.715L216.51,174.181L229.11,158.618L241.745,157.818L254.346,139.323L266.946,140.034L279.546,112.85L292.181,92.031L304.782,44.439L317.382,46.792L329.983,50.622L342.618,65.183L355.218,33.695L367.819,20L380.419,37.442L393.054,59.56L405.654,89.596L418.255,112.423L430.855,108.719L443.49,118.411L456.091,136.792L468.691,164.585L481.292,207.021L493.927,224.065L506.527,241.403L519.127,243.173L531.728,247.832L544.363,249.255L556.963,256.939L569.564,256.801L582.164,243.755L594.799,226.524L607.4,213.234L620,196.234"><title>LP/EP Vinyl Limited Tier Paid Subscription Streaming - Limited Tier Paid Subscription + <path aria-label="area" fill="none" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,370L443.49,366.946L456.091,365.911L468.691,365.487L481.292,365.889L493.927,366.157L506.527,366.106L519.127,363.573L531.728,360.06L544.363,355.169L556.963,352.199L569.564,344.214L582.164,319.792L594.799,292.237L607.4,271.566L620,249.686"><title>Limited Tier Paid Subscription Streaming Music Video (Physical) Other - Music Video (Physical) + <path aria-label="area" fill="none" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,366.279L254.346,364.729L266.946,366.533L279.546,365.515L292.181,364.098L304.782,363.766L317.382,364.221L329.983,363.984L342.618,361.932L355.218,357.54L367.819,360.96L380.419,363.455L393.054,362.433L405.654,363.402L418.255,361.137L430.855,352.981L443.49,335.029L456.091,323.507L468.691,309.193L481.292,309.865L493.927,305.886L506.527,305.304L519.127,300.577L531.728,294.076L544.363,289.724L556.963,291.221L569.564,286.934L582.164,268.618L594.799,250.243L607.4,231.128L620,213.742"><title>Music Video (Physical) Other On-Demand Streaming (Ad-Supported) Streaming - On-Demand Streaming (Ad-Supported) + <path aria-label="area" fill="none" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,370L443.49,366.946L456.091,365.911L468.691,365.487L481.292,365.889L493.927,366.157L506.527,366.106L519.127,363.573L531.728,360.06L544.363,355.169L556.963,352.199L569.564,344.214L582.164,324.179L594.799,301.887L607.4,283.461L620,262.658"><title>On-Demand Streaming (Ad-Supported) Streaming Other Ad-Supported Streaming Streaming - Other Ad-Supported Streaming + <path aria-label="area" fill="none" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,369.854L443.49,366.528L456.091,365.26L468.691,364.789L481.292,364.032L493.927,359.51L506.527,358.077L519.127,354.89L531.728,348.696L544.363,341.781L556.963,335.934L569.564,327.252L582.164,300.136L594.799,273.548L607.4,247.848L620,227.237"><title>Other Ad-Supported Streaming Streaming Other Digital Download - Other Digital + <path aria-label="area" fill="none" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,370L443.49,366.946L456.091,365.911L468.691,365.487L481.292,365.889L493.927,366.157L506.527,366.106L519.127,365.596L531.728,363.037L544.363,358.959L556.963,356.992L569.564,350.488L582.164,332.331L594.799,312.629L607.4,295.554L620,276.86"><title>Other Digital Download Other Tapes Tape - Other Tapes + <path aria-label="area" fill="none" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,188.414L52.6,191.614L65.201,192.504L77.801,177.68L90.436,139.038L103.037,116.665L115.637,167.593L128.238,191.35L140.873,195.217L153.473,219.666L166.073,218.011L178.674,203.203L191.309,207.905L203.909,200.715L216.51,174.181L229.11,158.618L241.745,157.818L254.346,139.323L266.946,140.034L279.546,112.85L292.181,92.031L304.782,44.439L317.382,46.792L329.983,50.622L342.618,65.183L355.218,33.695L367.819,20L380.419,37.442L393.054,59.56L405.654,89.596L418.255,112.423L430.855,108.719L443.49,118.411L456.091,136.792L468.691,164.585L481.292,207.021L493.927,224.065L506.527,241.403L519.127,243.173L531.728,247.832L544.363,249.255L556.963,256.939L569.564,256.801L582.164,243.755L594.799,226.524L607.4,213.234L620,196.234"><title>Other Tapes Tape Paid Subscription Streaming - Paid Subscription + <path aria-label="area" fill="none" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,370L443.49,366.946L456.091,365.911L468.691,365.487L481.292,365.889L493.927,366.157L506.527,366.106L519.127,365.596L531.728,363.037L544.363,358.959L556.963,356.992L569.564,350.488L582.164,332.617L594.799,312.904L607.4,295.87L620,277.196"><title>Paid Subscription Streaming Ringtones & Ringbacks Download - Ringtones & Ringbacks + <path aria-label="area" fill="none" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,365.97L443.49,347.586L456.091,332.501L468.691,318.598L481.292,314.108L493.927,309.822L506.527,308.576L519.127,303.266L531.728,296.11L544.363,291.556L556.963,292.773L569.564,288.213L582.164,269.613L594.799,250.916L607.4,231.62L620,214.191"><title>Ringtones & Ringbacks Download SACD Disc - SACD + <path aria-label="area" fill="none" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,366.279L254.346,364.729L266.946,366.533L279.546,365.515L292.181,364.098L304.782,363.766L317.382,364.221L329.983,363.984L342.618,361.932L355.218,357.54L367.819,360.96L380.419,363.455L393.054,362.433L405.654,363.402L418.255,360.566L430.855,352.63L443.49,334.824L456.091,323.398L468.691,309.123L481.292,309.808L493.927,305.841L506.527,305.272L519.127,300.551L531.728,294.052L544.363,289.707L556.963,291.209L569.564,286.916L582.164,268.598L594.799,250.229L607.4,231.115L620,213.735"><title>SACD Disc SoundExchange Distributions Streaming - SoundExchange Distributions + <path aria-label="area" fill="none" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,369.854L443.49,366.528L456.091,365.26L468.691,364.789L481.292,364.032L493.927,359.51L506.527,358.077L519.127,354.89L531.728,348.696L544.363,341.781L556.963,335.934L569.564,327.252L582.164,301.49L594.799,277.818L607.4,251.85L620,231.163"><title>SoundExchange Distributions Streaming Synchronization Other - Synchronization + <path aria-label="area" fill="none" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,370L52.6,370L65.201,370L77.801,370L90.436,370L103.037,370L115.637,370L128.238,370L140.873,370L153.473,370L166.073,370L178.674,370L191.309,370L203.909,370L216.51,370L229.11,370L241.745,370L254.346,370L266.946,370L279.546,370L292.181,370L304.782,370L317.382,370L329.983,370L342.618,370L355.218,370L367.819,370L380.419,370L393.054,370L405.654,370L418.255,370L430.855,370L443.49,366.946L456.091,365.911L468.691,365.487L481.292,365.889L493.927,362.408L506.527,362.646L519.127,360.08L531.728,356.741L544.363,351.913L556.963,348.995L569.564,340.791L582.164,316.213L594.799,288.452L607.4,267.021L620,245.366"><title>Synchronization Other Vinyl Single Vinyl - Vinyl Single + <path aria-label="area" fill="none" stroke="white" stroke-linejoin="round" stroke-linecap="round" transform="translate(0.5,0.5)" d="M40,346.048L52.6,347.196L65.201,346.941L77.801,342.541L90.436,337.363L103.037,326.457L115.637,318.554L128.238,323.664L140.873,311.978L153.473,300.915L166.073,285.809L178.674,262.8L191.309,255.484L203.909,236.573L216.51,202.093L229.11,176.604L241.745,164.921L254.346,141.969L266.946,140.897L279.546,113.234L292.181,92.324L304.782,44.919L317.382,47.451L329.983,51.559L342.618,66.013L355.218,34.529L367.819,20.763L380.419,38.085L393.054,60.179L405.654,90.052L418.255,112.894L430.855,109.127L443.49,118.702L456.091,137.103L468.691,165.026L481.292,208.074L493.927,225.253L506.527,243.033L519.127,245.295L531.728,250.63L544.363,252.871L556.963,261.057L569.564,262.425L582.164,249.676L594.799,232.861L607.4,219.908L620,204.016"><title>Vinyl Single Vinyl diff --git a/test/output/ridgeline.svg b/test/output/ridgeline.svg index aee78474e3..4cf5f90428 100644 --- a/test/output/ridgeline.svg +++ b/test/output/ridgeline.svg @@ -165,229 +165,229 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + From 4eecd871bb274fa0e517b6487e8a1ac8afac7b09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Rivi=C3=A8re?= Date: Sat, 4 Apr 2026 18:23:16 +0200 Subject: [PATCH 6/6] restore this test --- test/output/timeAxisLocal.svg | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/output/timeAxisLocal.svg b/test/output/timeAxisLocal.svg index 5294919953..64f9de3b06 100644 --- a/test/output/timeAxisLocal.svg +++ b/test/output/timeAxisLocal.svg @@ -24,14 +24,14 @@ - 5:30PM - 6:00 - 6:30 - 7:00 - 7:30 - 8:00 - 8:30 - 9:00 + 8:30AM + 9:00 + 9:30 + 10:00 + 10:30 + 11:00 + 11:30 + 12:00PM