@@ -40,23 +40,23 @@ const covidDataTypes = {
4040 } ,
4141 newconfirmed : {
4242 key : 'newconfirmed' ,
43- title : 'New Confirmed' ,
43+ title : 'Confirmed qd ' ,
4444 dataSourceUrl : `${ covidDataBaseURL } /time_series_covid19_confirmed_global.csv` ,
4545 borderColor : confirmedPalette ,
4646 alertClass : 'alert-info' ,
4747 badgeClass : 'badge-info' ,
4848 } ,
4949 newdeaths : {
5050 key : 'newdeaths' ,
51- title : 'New Deaths' ,
51+ title : 'Deaths qd ' ,
5252 dataSourceUrl : `${ covidDataBaseURL } /time_series_covid19_deaths_global.csv` ,
5353 borderColor : deathsPalette ,
5454 alertClass : 'alert-danger' ,
5555 badgeClass : 'badge-danger' ,
5656 } ,
5757 dailymortality : {
5858 key : 'dailymortality' ,
59- title : 'Mortality % ' ,
59+ title : 'Mortality % qd ' ,
6060 dataSourceUrl : `${ covidDataBaseURL } /time_series_covid19_deaths_global.csv` ,
6161 borderColor : deathsPalette ,
6262 alertClass : 'alert-danger' ,
@@ -274,14 +274,13 @@ function getGlobalTicks(covidData, dataTypeKey) {
274274 if ( tickIndex < covidSchema . dateStartColumn ) {
275275 return ;
276276 }
277- // count num items to average when dataType is dailymortality
278- ( dataTypeKey === 'dailymortality' ) && itemCount ++ ;
279- globalTicks [ tickIndex ] += regionTick ;
277+ globalTicks [ tickIndex ] += regionTick ;
280278 } ) ;
281279 } ) ;
280+
282281 // return the average when dataType is dailymortality
283- return ( dataTypeKey === 'dailymortality' ) ?globalTicks . map ( i => Math . floor ( ( i / globalTicks . length ) * 1000 ) / 10 ) :globalTicks ;
284- // return (dataTypeKey==='dailymortality')?globalTicks.map(i => Math.floor((i/itemCount)*1000)/10):globalTicks;
282+ return ( dataTypeKey === 'dailymortality' ) ?globalTicks . map ( i => { return i / covidData . ticks . dailymortality . length } ) :globalTicks ;
283+
285284}
286285
287286function getTotalCount ( covidData , dataTypeKey , regionKeys ) {
@@ -366,8 +365,7 @@ function groupCovidDataByCountries(covidData) {
366365 return countriesTicksMap ;
367366
368367 } , { } )
369- ) ;
370-
368+ ) ;
371369
372370 //if covid data type is dailymortality average the averages calculated earlier for each region by dividing by num regions just summed
373371 if ( covidDataType . key === 'dailymortality' ) {
0 commit comments