Этот коммит содержится в:
Maarten 2024-10-15 00:05:57 +02:00
родитель d1615fce2d
Коммит f75e5b9a92

Просмотреть файл

@ -153,13 +153,13 @@
{/each} {/each}
{#each cases as attrCase} {#each cases as attrCase}
{#if attrCase.show} {#if attrCase.show}
<!--a href={'#case-' + attrCase.attribution_id} transition:fade--> {#each attrCase.actor_nation as actorNat}
<g transition:fade> <g transition:fade>
{#if attrCase.offline_mobilization == '1'} {#if attrCase.offline_mobilization == '1'}
<circle <circle
cx={xScale(new Date(attrCase.attribution_date))} cx={xScale(new Date(attrCase.attribution_date))}
cy={actorNations.includes(attrCase.actor_nation[0]) cy={actorNations.includes(actorNat)
? yScale(attrCase.actor_nation[0]) ? yScale(actorNat)
: yScale('Other')} : yScale('Other')}
r={radiusScale(attrCase.breakout_scale) + 2} r={radiusScale(attrCase.breakout_scale) + 2}
fill={'none'} fill={'none'}
@ -170,12 +170,12 @@
{/if} {/if}
<Bubble <Bubble
cx={xScale(new Date(attrCase.attribution_date))} cx={xScale(new Date(attrCase.attribution_date))}
cy={actorNations.includes(attrCase.actor_nation[0]) cy={actorNations.includes(actorNat)
? yScale(attrCase.actor_nation[0]) ? yScale(actorNat)
: yScale('Other')} : yScale('Other')}
r={radiusScale(attrCase.breakout_scale)} r={radiusScale(attrCase.breakout_scale)}
fill={actorNations.includes(attrCase.actor_nation[0]) fill={actorNations.includes(actorNat)
? colorScale(attrCase.actor_nation[0]) ? colorScale(actorNat)
: colorScale('Other')} : colorScale('Other')}
stroke={'#ffffff'} stroke={'#ffffff'}
strokeWidth={1.5} strokeWidth={1.5}
@ -187,7 +187,7 @@
bind:showTooltip bind:showTooltip
></Bubble> ></Bubble>
</g> </g>
<!-- /a--> {/each}
{/if} {/if}
{/each} {/each}
</g> </g>