Remove North Korea
Этот коммит содержится в:
родитель
44e9611afe
Коммит
035fdef9d2
@ -42,8 +42,8 @@
|
|||||||
? utcFormat('%b')
|
? utcFormat('%b')
|
||||||
: utcFormat('%b %-d')
|
: utcFormat('%b %-d')
|
||||||
|
|
||||||
const actorNations = ['Other', 'China', 'Iran', 'North Korea', 'Russia'];
|
const actorNations = ['Other', 'China', 'Iran', /*'North Korea', */'Russia'];
|
||||||
const colors = ['#555555', '#bf0a0a', '#0f8a0f', '#8a4d0f', '#0f4c8a'];
|
const colors = ['#555555', '#bf0a0a', '#0f8a0f', /*'#8a4d0f', */'#0f4c8a'];
|
||||||
|
|
||||||
let yScale = scalePoint(actorNations, [height - margins.bottom - margins.top, 0]).padding(0.5);
|
let yScale = scalePoint(actorNations, [height - margins.bottom - margins.top, 0]).padding(0.5);
|
||||||
let colorScale = scaleOrdinal(actorNations, colors);
|
let colorScale = scaleOrdinal(actorNations, colors);
|
||||||
@ -104,7 +104,7 @@
|
|||||||
y1={yScale(nation)}
|
y1={yScale(nation)}
|
||||||
y2={yScale(nation)}
|
y2={yScale(nation)}
|
||||||
style:stroke={colorScale(nation)}
|
style:stroke={colorScale(nation)}
|
||||||
stroke-width={32}
|
stroke-width={yScale.step()*0.9}
|
||||||
opacity={0.1}
|
opacity={0.1}
|
||||||
></line>
|
></line>
|
||||||
<text
|
<text
|
||||||
|
|||||||
@ -25,8 +25,8 @@
|
|||||||
.range([0.2, 1])
|
.range([0.2, 1])
|
||||||
$: ticks = yScale.ticks(5);
|
$: ticks = yScale.ticks(5);
|
||||||
|
|
||||||
const actorNations = ['Other', 'China', 'Iran', 'North Korea', 'Russia'];
|
const actorNations = ['Other', 'China', 'Iran', /*'North Korea', */'Russia'];
|
||||||
const colors = ['#555555', '#bf0a0a', '#0f8a0f', '#8a4d0f', '#0f4c8a'];
|
const colors = ['#555555', '#bf0a0a', '#0f8a0f', /*'#8a4d0f', */'#0f4c8a'];
|
||||||
|
|
||||||
$: xScale = scalePoint(actorNations, [0, width - margins.left - margins.right]).padding(0.5);
|
$: xScale = scalePoint(actorNations, [0, width - margins.left - margins.right]).padding(0.5);
|
||||||
let colorScale = scaleOrdinal(actorNations, colors);
|
let colorScale = scaleOrdinal(actorNations, colors);
|
||||||
|
|||||||
Загрузка…
x
Ссылка в новой задаче
Block a user