(11 versioni intermedie di uno stesso utente non sono mostrate) | |||
Riga 64: | Riga 64: | ||
allTo = unpack(rows, 'totale_ospedalizzati'), | allTo = unpack(rows, 'totale_ospedalizzati'), | ||
allIdom = unpack(rows, 'isolamento_domiciliare'), | allIdom = unpack(rows, 'isolamento_domiciliare'), | ||
− | allAttPos = unpack(rows, ' | + | allAttPos = unpack(rows, 'totale_positivi'), |
− | allNewPos = unpack(rows, ' | + | allNewPos = unpack(rows, 'nuovi_positivi'), |
allDimGuariti = unpack(rows, 'dimessi_guariti'), | allDimGuariti = unpack(rows, 'dimessi_guariti'), | ||
allMorti = unpack(rows, 'deceduti'), | allMorti = unpack(rows, 'deceduti'), | ||
Riga 89: | Riga 89: | ||
currallMortiTi = []; | currallMortiTi = []; | ||
currallMortiOsp = []; | currallMortiOsp = []; | ||
+ | currNewMorti = []; | ||
//allDay = allDay.split(' ')[0]; | //allDay = allDay.split(' ')[0]; | ||
Riga 113: | Riga 114: | ||
currallMortiTi = []; | currallMortiTi = []; | ||
currallMortiOsp = []; | currallMortiOsp = []; | ||
+ | currNewMorti = []; | ||
for (var i = 0 ; i < allRegionNames.length ; i++){ | for (var i = 0 ; i < allRegionNames.length ; i++){ | ||
Riga 130: | Riga 132: | ||
currallMortiTi.push(parseInt(allTi[i])+parseInt(allMorti[i])); | currallMortiTi.push(parseInt(allTi[i])+parseInt(allMorti[i])); | ||
currallMortiOsp.push(parseInt(allTo[i])+parseInt(allMorti[i])); | currallMortiOsp.push(parseInt(allTo[i])+parseInt(allMorti[i])); | ||
+ | currNewMorti = get_diff(currallMorti); | ||
} | } | ||
} | } | ||
Riga 144: | Riga 147: | ||
x: currentYear, | x: currentYear, | ||
y: currallRicoverati, | y: currallRicoverati, | ||
− | + | ||
name: 'Ricoverati con sintomi', | name: 'Ricoverati con sintomi', | ||
mode: 'markers', | mode: 'markers', | ||
Riga 167: | Riga 170: | ||
var trace3 = { | var trace3 = { | ||
− | |||
x: currentYear, | x: currentYear, | ||
y: currallTo, | y: currallTo, | ||
Riga 181: | Riga 183: | ||
var trace4 = { | var trace4 = { | ||
− | |||
x: currentYear, | x: currentYear, | ||
y: currallIdom, | y: currallIdom, | ||
Riga 223: | Riga 224: | ||
var trace7 = { | var trace7 = { | ||
+ | visible: 'legendonly', | ||
x: currentYear, | x: currentYear, | ||
y: currallDimGuariti, | y: currallDimGuariti, | ||
Riga 278: | Riga 280: | ||
var trace11 = { | var trace11 = { | ||
+ | visible: 'legendonly', | ||
x: currentYear, | x: currentYear, | ||
y: currallMortiTi, | y: currallMortiTi, | ||
Riga 291: | Riga 294: | ||
var trace12 = { | var trace12 = { | ||
+ | visible: 'legendonly', | ||
x: currentYear, | x: currentYear, | ||
y: currallMortiOsp, | y: currallMortiOsp, | ||
Riga 358: | Riga 362: | ||
width: 2 | width: 2 | ||
} | } | ||
− | }; | + | }; |
+ | |||
+ | var trace17 = { | ||
+ | x: currentYear, | ||
+ | y: currNewMorti, | ||
+ | mode: 'markers', | ||
+ | name: 'Incremento morti', | ||
+ | marker: { | ||
+ | size: 6, | ||
+ | opacity: 1, | ||
+ | symbol: 'cross' | ||
+ | } | ||
+ | }; | ||
var data = [trace8, | var data = [trace8, | ||
Riga 372: | Riga 388: | ||
trace6, | trace6, | ||
trace10, | trace10, | ||
− | trace13, trace14, trace15, trace16,]; | + | trace13, trace14, trace15, trace16,trace17]; |
var updatemenus=[ | var updatemenus=[ | ||
Riga 384: | Riga 400: | ||
}, | }, | ||
{ | { | ||
− | args: [{'yaxis.type':'log' | + | args: [{'yaxis.type':'log'}], |
− | |||
label:'SemiLog', | label:'SemiLog', | ||
method:'relayout' | method:'relayout' | ||
Riga 550: | Riga 565: | ||
<script> | <script> | ||
+ | function get_diff(vect){ | ||
+ | var vdiff = []; | ||
+ | vdiff.push(0); | ||
+ | for (var i=1;i<vect.length;i++){ | ||
+ | vdiff.push(vect[i]-vect[i-1]); | ||
+ | } | ||
+ | |||
+ | return vdiff; | ||
+ | } | ||
// ITA | // ITA | ||
Plotly.d3.csv('https://raw.githubusercontent.com/pcm-dpc/COVID-19/master/dati-andamento-nazionale/dpc-covid19-ita-andamento-nazionale.csv', function(err, rows){ | Plotly.d3.csv('https://raw.githubusercontent.com/pcm-dpc/COVID-19/master/dati-andamento-nazionale/dpc-covid19-ita-andamento-nazionale.csv', function(err, rows){ | ||
Riga 563: | Riga 587: | ||
allTo = unpack(rows, 'totale_ospedalizzati'), | allTo = unpack(rows, 'totale_ospedalizzati'), | ||
allIdom = unpack(rows, 'isolamento_domiciliare'), | allIdom = unpack(rows, 'isolamento_domiciliare'), | ||
− | allAttPos = unpack(rows, ' | + | allAttPos = unpack(rows, 'totale_positivi'), |
− | allNewPos = unpack(rows, ' | + | allNewPos = unpack(rows, 'nuovi_positivi'), |
allDimGuariti = unpack(rows, 'dimessi_guariti'), | allDimGuariti = unpack(rows, 'dimessi_guariti'), | ||
allMorti = unpack(rows, 'deceduti'), | allMorti = unpack(rows, 'deceduti'), | ||
Riga 588: | Riga 612: | ||
currallMortiTi = []; | currallMortiTi = []; | ||
currallMortiOsp = []; | currallMortiOsp = []; | ||
+ | currNewMorti = []; | ||
//allDay = allDay.split(' ')[0]; | //allDay = allDay.split(' ')[0]; | ||
Riga 612: | Riga 637: | ||
currallMortiTi = []; | currallMortiTi = []; | ||
currallMortiOsp = []; | currallMortiOsp = []; | ||
+ | currNewMorti = []; | ||
for (var i = 0 ; i < allRegionNames.length ; i++){ | for (var i = 0 ; i < allRegionNames.length ; i++){ | ||
Riga 629: | Riga 655: | ||
currallMortiTi.push(parseInt(allTi[i])+parseInt(allMorti[i])); | currallMortiTi.push(parseInt(allTi[i])+parseInt(allMorti[i])); | ||
currallMortiOsp.push(parseInt(allTo[i])+parseInt(allMorti[i])); | currallMortiOsp.push(parseInt(allTo[i])+parseInt(allMorti[i])); | ||
+ | currNewMorti = get_diff(currallMorti); | ||
} | } | ||
} | } | ||
Riga 666: | Riga 693: | ||
var trace3 = { | var trace3 = { | ||
− | |||
x: currentYear, | x: currentYear, | ||
y: currallTo, | y: currallTo, | ||
Riga 680: | Riga 706: | ||
var trace4 = { | var trace4 = { | ||
− | |||
x: currentYear, | x: currentYear, | ||
y: currallIdom, | y: currallIdom, | ||
Riga 694: | Riga 719: | ||
var trace5 = { | var trace5 = { | ||
− | |||
x: currentYear, | x: currentYear, | ||
y: currallAttPos, | y: currallAttPos, | ||
mode: 'markers', | mode: 'markers', | ||
− | name: 'Totale | + | name: 'Totale positivi', |
marker: { | marker: { | ||
size: 6, | size: 6, | ||
Riga 713: | Riga 737: | ||
mode: 'markers', | mode: 'markers', | ||
− | name: 'Nuovi | + | name: 'Nuovi positivi', |
marker: { | marker: { | ||
size: 6, | size: 6, | ||
Riga 722: | Riga 746: | ||
var trace7 = { | var trace7 = { | ||
+ | visible: 'legendonly', | ||
x: currentYear, | x: currentYear, | ||
y: currallDimGuariti, | y: currallDimGuariti, | ||
Riga 777: | Riga 802: | ||
var trace11 = { | var trace11 = { | ||
+ | visible: 'legendonly', | ||
x: currentYear, | x: currentYear, | ||
y: currallMortiTi, | y: currallMortiTi, | ||
Riga 790: | Riga 816: | ||
var trace12 = { | var trace12 = { | ||
+ | visible: 'legendonly', | ||
x: currentYear, | x: currentYear, | ||
y: currallMortiOsp, | y: currallMortiOsp, | ||
Riga 858: | Riga 885: | ||
} | } | ||
}; | }; | ||
+ | |||
+ | var trace17 = { | ||
+ | x: currentYear, | ||
+ | y: currNewMorti, | ||
+ | mode: 'markers', | ||
+ | name: 'Incremento morti', | ||
+ | marker: { | ||
+ | size: 6, | ||
+ | opacity: 1, | ||
+ | symbol: 'cross' | ||
+ | } | ||
+ | }; | ||
var data = [trace8, | var data = [trace8, | ||
Riga 871: | Riga 910: | ||
trace6, | trace6, | ||
trace10, | trace10, | ||
− | trace13, trace14, trace15, trace16]; | + | trace13, trace14, trace15, trace16, trace17]; |
var updatemenus=[ | var updatemenus=[ | ||
Riga 883: | Riga 922: | ||
}, | }, | ||
{ | { | ||
− | args: [{'yaxis.type':'log' | + | args: [{'yaxis.type':'log'}], |
− | |||
label:'SemiLog', | label:'SemiLog', | ||
method:'relayout' | method:'relayout' | ||
Riga 1 074: | Riga 1 112: | ||
}, | }, | ||
{ | { | ||
− | args: [{'yaxis.type':'log' | + | args: [{'yaxis.type':'log'}], |
− | |||
label:'SemiLog', | label:'SemiLog', | ||
method:'relayout' | method:'relayout' |