@@ -2,7 +2,7 @@ import * as Plot from "@observablehq/plot";
2
2
import * as d3 from "d3" ;
3
3
4
4
export async function musicRevenue ( ) {
5
- const data = await d3 . csv < any > ( "data/riaa-us-revenue.csv" , d3 . autoType ) ;
5
+ const riaa = await d3 . csv < any > ( "data/riaa-us-revenue.csv" , d3 . autoType ) ;
6
6
const stack : Plot . AreaYOptions = {
7
7
x : "year" ,
8
8
y : "revenue" ,
@@ -16,21 +16,15 @@ export async function musicRevenue() {
16
16
transform : ( d ) => d / 1000
17
17
} ,
18
18
marks : [
19
- Plot . areaY ( data , Plot . stackY ( { ...stack , fill : "group" , title : ( d ) => `${ d . format } \n${ d . group } ` } ) ) ,
20
- Plot . lineY ( data , Plot . stackY2 ( { ...stack , stroke : "white" , strokeWidth : 1 } ) ) ,
19
+ Plot . areaY ( riaa , Plot . stackY ( { ...stack , fill : "group" , title : ( d ) => `${ d . format } \n${ d . group } ` } ) ) ,
20
+ Plot . lineY ( riaa , Plot . stackY2 ( { ...stack , stroke : "white" , strokeWidth : 1 } ) ) ,
21
21
Plot . ruleY ( [ 0 ] )
22
22
]
23
23
} ) ;
24
24
}
25
25
26
26
export async function musicRevenueCustomOrder ( ) {
27
- const data = await d3 . csv < any > ( "data/riaa-us-revenue.csv" , d3 . autoType ) ;
28
- const stack : Plot . AreaYOptions = {
29
- x : "year" ,
30
- y : "revenue" ,
31
- z : "format" ,
32
- order : ( a , b ) => d3 . ascending ( a . group , b . group ) || d3 . descending ( a . revenue , b . revenue )
33
- } ;
27
+ const riaa = await d3 . csv < any > ( "data/riaa-us-revenue.csv" , d3 . autoType ) ;
34
28
return Plot . plot ( {
35
29
y : {
36
30
grid : true ,
@@ -39,8 +33,16 @@ export async function musicRevenueCustomOrder() {
39
33
} ,
40
34
marks : [
41
35
Plot . areaY (
42
- data ,
43
- Plot . stackY ( { ...stack , fill : "group" , stroke : "white" , title : ( d ) => `${ d . format } \n${ d . group } ` } )
36
+ riaa ,
37
+ Plot . stackY ( {
38
+ x : "year" ,
39
+ y : "revenue" ,
40
+ z : "format" ,
41
+ order : ( a , b ) => d3 . ascending ( a . group , b . group ) || d3 . descending ( a . revenue , b . revenue ) ,
42
+ fill : "group" ,
43
+ stroke : "white" ,
44
+ title : ( d ) => `${ d . format } \n${ d . group } `
45
+ } )
44
46
) ,
45
47
Plot . ruleY ( [ 0 ] )
46
48
]
0 commit comments