Daily new cases

.gitignore

@@ -1 +1,2 @@
 .idea
+.vscode

index.html

@@ -11,8 +11,8 @@
     <meta charset="utf-8">
     <link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
     <link rel="icon" href="favicon.ico" type="image/x-icon">
-    <title>COVID-19 Dashboard</title>
-    <meta name="description" content="Coronavirus (COVID-19) dashboard to show the dynamics of Сoronavirus distribution per country">
+    <title>COVID-19 Dashboard </title>
+    <meta name="description" content="Coronavirus (COVID-19) dashboard browsable per country">
     <meta name="author" content="Oleksii Trekhleb">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <script src="https://kit.fontawesome.com/4add81f750.js" crossorigin="anonymous"></script>
@@ -35,7 +35,7 @@
         <div class="col-sm">
           <nav class="navbar navbar-expand-sm navbar-dark bg-dark">
             <div class="navbar-brand mb-0 h1">
-              <i class="fas fa-chart-bar"></i> <a class="navbar-brand" href="https://trekhleb.github.io/covid-19/">COVID-19 Dashboard</a>
+              <i class="fas fa-chart-bar"></i> <a class="navbar-brand" href="https://trekhleb.github.io/covid-19/">COVID-19 Dashboard</a>  
             </div>
             <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
               <span class="navbar-toggler-icon"></span>

js/data.js

@@ -37,7 +37,31 @@ const covidDataTypes = {
     borderColor: deathsPalette,
     alertClass: 'alert-danger',
     badgeClass: 'badge-danger',
+  },  
+  newconfirmed: {
+    key: 'newconfirmed',
+    title: 'Confirmed qd',
+    dataSourceUrl: `${covidDataBaseURL}/time_series_covid19_confirmed_global.csv`,
+    borderColor: confirmedPalette,
+    alertClass: 'alert-info',
+    badgeClass: 'badge-info',
+  },
+  newdeaths: {
+    key: 'newdeaths',
+    title: 'Deaths qd',
+    dataSourceUrl: `${covidDataBaseURL}/time_series_covid19_deaths_global.csv`,
+    borderColor: deathsPalette,
+    alertClass: 'alert-danger',
+    badgeClass: 'badge-danger',
   },
+  // dailymortality: {
+  //   key: 'dailymortality',
+  //   title: 'Mortality % qd',
+  //   dataSourceUrl: `${covidDataBaseURL}/time_series_covid19_deaths_global.csv`,
+  //   borderColor: deathsPalette,
+  //   alertClass: 'alert-danger',
+  //   badgeClass: 'badge-danger',
+  // },
 };
 
 const covidCountries = {
@@ -64,9 +88,17 @@ const covidSorts = {
     key: 'deaths',
     dataKey: covidDataTypes.deaths.key,
   },
+  newdeaths: {
+    key: 'newdeaths',
+    dataKey: covidDataTypes.newdeaths.key,
+  },
   lethality: {
     key: 'lethality',
   },
+  newconfirmed: {
+    key: 'newconfirmed',
+    dataKey: covidDataTypes.newconfirmed.key,
+  },
 };
 
 const covidSortDirections = {
@@ -127,6 +159,7 @@ function loadCovidData() {
           const dataType = Object.keys(covidDataTypes)[dataTypeIndex];
           const dataTypeTicks = Papa.parse(dataTypeTicksCSV).data;
           dataContainer.labels = dataTypeTicks.shift();
+
           dataContainer.ticks[dataType] = dataTypeTicks
             .filter(regionTicks => {
               return regionTicks.length === dataContainer.labels.length;
@@ -152,13 +185,58 @@ function loadCovidData() {
               }
               return 0;
             });
+
+            if(dataType==='newconfirmed'||dataType==='newdeaths'){            
+              const newCasesDaily = dataContainer.ticks[dataType].map(function(dataRow){
+                  // store the index columns to allow mapping of the difference calculation
+                  const index = dataRow.slice(0,4);
+                  const dataTicks = dataRow.slice(4);
+                  // calculate yesterday minus today into a new array of ticks 
+                  const newCases = dataTicks.slice(1).map(function(n, i) { return n - dataTicks[i]; }); 
+                  // re-prefix the index columns
+                  return index.concat(newCases);
+              });
+              //replace the cumulative ticks with with the daily new cases 
+              dataContainer.ticks[dataType] = newCasesDaily;              
+              }
+
+              if(dataType==="dailymortality"){              
+                // dailymortality dataType loads data from the deathNumber timeseries url
+                  const dailyMortality = dataContainer.ticks['dailymortality'].map(function(dataRow){
+                  const deathsIndex = dataRow.slice(0,4);
+                  const deathsDataTicks = dataRow.slice(4);
+
+                  // Refrence the confirmedNumber with the identical index
+                  const confirmedDataTicks =  dataContainer.ticks['confirmed'].find((arr) => (arrayEqual(arr.slice(0,4))(deathsIndex.slice(0,4)))).slice(4);
+
+                  // using => calculateMortality(confirmedNumber, deathsNumber)
+                  const dailyMortality = deathsDataTicks.map((deathTickValue,i)=>calculateMortality(confirmedDataTicks[i],deathTickValue)); 
+                  return deathsIndex.concat(dailyMortality);
+              });
+              dataContainer.ticks[dataType] = dailyMortality;
+
+              }
+
           return dataContainer;
         },
         defaultDataContainer
       );
     });
 }
 
+const arrayCompare = f => ([x,...xs]) => ([y,...ys]) =>
+  x === undefined && y === undefined
+    ? true
+    : Boolean (f (x) (y)) && arrayCompare (f) (xs) (ys)
+
+// equal :: a -> a -> Bool
+const equal = x => y =>
+  x === y // notice: triple equal
+
+// arrayEqual :: [a] -> [a] -> Bool
+const arrayEqual =
+  arrayCompare (equal)
+
 function getRegionKey(regionTicks) {
   if (!regionTicks || !regionTicks.length) {
     return null;
@@ -180,8 +258,13 @@ function getRegionByKey(covidData, dataTypeKey, regionKey) {
 }
 
 function getGlobalTicks(covidData, dataTypeKey) {
+
   const totalTicks = covidData.ticks[dataTypeKey][0].length;
   const globalTicks = new Array(totalTicks).fill(0);
+  let mutxDoAverage = false;
+  let itemCount=0;
+  // go easy
+
   globalTicks[covidSchema.stateColumn] = '';
   globalTicks[covidSchema.countryColumn] = covidCountries.all.title;
   globalTicks[covidSchema.latColumn] = '';
@@ -191,10 +274,13 @@ function getGlobalTicks(covidData, dataTypeKey) {
       if (tickIndex < covidSchema.dateStartColumn) {
         return;
       }
-      globalTicks[tickIndex] += regionTick;
+       globalTicks[tickIndex] += regionTick;
     });
   });
-  return globalTicks;
+
+  // return the average when dataType is dailymortality
+  return (dataTypeKey==='dailymortality')?globalTicks.map(i => {return i/covidData.ticks.dailymortality.length}):globalTicks;
+
 }
 
 function getTotalCount(covidData, dataTypeKey, regionKeys) {
@@ -260,20 +346,45 @@ function groupCovidDataByCountries(covidData) {
     ticks: {},
   };
   covidDataByCountries.labels = [...covidData.labels];
+
   Object.values(covidDataTypes).forEach((covidDataType) => {
+
     covidDataByCountries.ticks[covidDataType.key] = Object.values(covidData.ticks[covidDataType.key]
       .reduce((countriesTicksMap, regionTicks) => {
+
         const countryName = regionTicks[covidSchema.countryColumn];
+
         if (!countriesTicksMap[countryName]) {
           countriesTicksMap[countryName] = [...regionTicks];
           countriesTicksMap[countryName][covidSchema.stateColumn] = '';
           return countriesTicksMap;
         }
-        for (let columnIndex = covidSchema.dateStartColumn; columnIndex < regionTicks.length; columnIndex += 1) {
-          countriesTicksMap[countryName][columnIndex] += regionTicks[columnIndex];
-        }
+          for (let columnIndex = covidSchema.dateStartColumn; columnIndex < regionTicks.length; columnIndex += 1) {
+            countriesTicksMap[countryName][columnIndex] += regionTicks[columnIndex];
+          }
         return countriesTicksMap;
-      }, {}));
+
+      }, {})
+    );      
+
+        //if covid data type is dailymortality average the averages calculated earlier for each region by dividing by num regions just summed 
+        if(covidDataType.key==='dailymortality'){
+          //map each covidDataByCountries country 
+          covidDataByCountries.ticks[covidDataType.key] = covidDataByCountries.ticks[covidDataType.key].map(countryTicksMap => {
+            const countryName = countryTicksMap[covidSchema.countryColumn];
+            //get the number of regions from the Country name and the covidData with regions 
+            const numRegions = covidData.ticks[covidDataType.key].filter(countryData => {return countryData[covidSchema.countryColumn]===countryName}).length
+            const dailymortalityIndex = countryTicksMap.slice(0,4);
+            const dailymortalityDataTicks = countryTicksMap.slice(4);
+            return dailymortalityIndex.concat(dailymortalityDataTicks.map(dayData => {return dayData / numRegions}));
+          }) 
+
+
+        }
+
+
+
+
   });
   return covidDataByCountries;
 }

js/index.js

@@ -197,13 +197,16 @@ function DataType({covidData, selectedRegions, dataType, checked, onTypeChange})
   const onChange = () => {
     onTypeChange(dataType.key);
   };
+
+  const totalCountBadge = (dataType.key==="dailymortality")?undefined:e('span', {className: `badge ${badgeClass} ml-2`},totalCount.toLocaleString());
+
   return (
     e('label', {className: `alert ${alertClass} mr-3 mb-3`},
       e('div', {className: 'form-group form-check mb-0'},
         e('input', {type: 'checkbox', className: 'form-check-input', checked, onChange}),
         e('div', {className: 'form-check-label'},
           dataType.title,
-          e('span', {className: `badge ${badgeClass} ml-2`}, totalCount.toLocaleString())
+          totalCountBadge          
         )
       )
     )