Support upstream changes

This commit also removes all no longer reported fields.

Issue: #35

WIP

Author: mathiasbynens

README.md

@@ -22,39 +22,15 @@ As of 2021-02-11, this repository also provides [data on vaccine orders being de
 
 Usually, the spreadsheets containing the statistics for day `X` are published on day `X + 1`, but there have been exceptions where the stats got published on the same day. In case multiple spreadsheets are released containing data for the same `date`, we only consider the latest version.
 
-### `initialDoses*` vs. `finalDoses*`
-
-- Any columns with the `initialDoses` prefix refer exclusively to first doses of vaccines that require two doses in total (i.e. Pfizer/BioNTech, Moderna, or Oxford/AstraZeneca).
-- Any columns with the `finalDoses` prefix refer exclusively to
-    - second doses of vaccines that require two doses in total (i.e. Pfizer/BioNTech, Moderna, or Oxford/AstraZeneca), and
-    - doses of vaccines that only require a single dose (i.e. Johnson & Johnson).
-
 ### Partially vs. fully vaccinated
 
 There’s been [some confusion](https://github.com/mathiasbynens/covid-19-vaccinations-germany/issues/27#issuecomment-829299315) about what “partial” vaccination means. Given that there are multiple potentially interesting metrics that RKI does not report directly, we derive and expose the following additional columns:
 
-- `onlyPartiallyVaccinatedCumulative`: the number of people who are partially vaccinated but still need a second shot. (They received exactly 1 dose of Pfizer/BioNTech, Moderna, Oxford/AstraZeneca, and still need a second dose to become fully vaccinated.)
-- `onlyPartiallyVaccinatedPercent`
 - `atLeastPartiallyVaccinatedCumulative`: the number of people who received at least one vaccination. (They received at least 1 dose of Pfizer/BioNTech, Moderna, Oxford/AstraZeneca, or Johnson & Johnson. This includes people who received 2 doses of Pfizer/BioNTech, Moderna, or Oxford/AstraZeneca.)
 - `atLeastPartiallyVaccinatedPercent`
 - `fullyVaccinatedCumulative`: the number of people who received either 1 dose of Johnson & Johnson; or 2 doses of Pfizer/BioNTech, Moderna, or Oxford/AstraZeneca.
 - `fullyVaccinatedPercent`
 
-### Deprecated columns
-
-As of 2021-04-08, RKI stopped reporting the following data points:
-
-- `initialDosesDueToAge`
-- `initialDosesDueToProfession`
-- `initialDosesDueToMedicalReasons`
-- `initialDosesToNursingHomeResidents`
-- `finalDosesDueToAge`
-- `finalDosesDueToProfession`
-- `finalDosesDueToMedicalReasons`
-- `finalDosesToNursingHomeResidents`
-
-These columns are still included in the CSV as they contain potentially useful data for prior dates.
-
 ### Anomalies in the data
 
 Cumulative vaccination metrics cannot decrease over time, yet sometimes the reported data contains such a “drop” (as reflected in [the charts](https://mathiasbynens.github.io/covid-19-vaccinations-germany/)). These anomalies match the data reported by the RKI, which sometimes overreports statistics and then corrects the numbers for the next day, or vice versa. (Sadly, the RKI doesn’t publish corrected numbers for the previous day, else we could retroactively correct our data.)

build-chart.js

@@ -52,15 +52,9 @@ let maxCount = 0;
 let oldestDate = '9001-12-31';
 let latestDate = '1970-01-01';
 let latestPubDate = '1970-01-01';
-for (const {date, pubDate, state, onlyPartiallyVaccinatedCumulative, onlyPartiallyVaccinatedPercent, atLeastPartiallyVaccinatedCumulative, atLeastPartiallyVaccinatedPercent, fullyVaccinatedCumulative, fullyVaccinatedPercent, totalDosesCumulative, initialDosesCumulative, finalDosesCumulative, initialDosesPercent, finalDosesPercent, initialDosesCumulativeBioNTech, finalDosesCumulativeBioNTech, initialDosesCumulativeModerna, finalDosesCumulativeModerna, initialDosesCumulativeAstraZeneca, finalDosesCumulativeAstraZeneca, finalDosesCumulativeJohnsonAndJohnson} of records) {
+for (const {date, pubDate, state, atLeastPartiallyVaccinatedCumulative, atLeastPartiallyVaccinatedPercent, atLeastPartiallyVaccinatedCumulativeBioNTech, atLeastPartiallyVaccinatedCumulativeModerna, atLeastPartiallyVaccinatedCumulativeAstraZeneca, fullyVaccinatedCumulative, fullyVaccinatedPercent, fullyVaccinatedCumulativeBioNTech, fullyVaccinatedCumulativeModerna, fullyVaccinatedCumulativeAstraZeneca, fullyVaccinatedCumulativeJohnsonAndJohnson, totalDosesCumulative} of records) {
   if (state !== BUNDESWEHR) states.add(state);
-  const countInitialDoses = Number(initialDosesCumulative);
-  const countFinalDoses = Number(finalDosesCumulative);
   const countTotal = Number(totalDosesCumulative);
-  const countBioNTech = Number(initialDosesCumulativeBioNTech) + Number(finalDosesCumulativeBioNTech);
-  const countModerna = Number(initialDosesCumulativeModerna) + Number(finalDosesCumulativeModerna);
-  const countAstraZeneca = Number(initialDosesCumulativeAstraZeneca) + Number(finalDosesCumulativeAstraZeneca);
-  const countJohnsonAndJohnson = Number(finalDosesCumulativeJohnsonAndJohnson);
   if (countTotal > maxCount) {
     maxCount = countTotal;
   }
@@ -73,25 +67,24 @@ for (const {date, pubDate, state, onlyPartiallyVaccinatedCumulative, onlyPartial
   if (pubDate > latestPubDate) {
     latestPubDate = pubDate;
   }
-  const percentInitialDose = Number(initialDosesPercent);
-  const percentFinalDose = Number(finalDosesPercent);
+  const percentInitialDose = Number(atLeastPartiallyVaccinatedPercent);
+  const percentFinalDose = Number(fullyVaccinatedPercent);
   if (!map.has(date)) {
     map.set(date, new Map());
   }
   map.get(date).set(state, {
     cumulativeTotal: countTotal,
-    cumulativeInitial: countInitialDoses,
-    cumulativeFinal: countFinalDoses,
-    cumulativeTotalBioNTech: countBioNTech,
-    cumulativeTotalModerna: countModerna,
-    cumulativeTotalAstraZeneca: countAstraZeneca,
-    cumulativeTotalJohnsonAndJohnson: countJohnsonAndJohnson,
-    onlyPartiallyVaccinatedCumulative: Number(onlyPartiallyVaccinatedCumulative),
-    onlyPartiallyVaccinatedPercent: Number(onlyPartiallyVaccinatedPercent),
+    cumulativeFinal: Number(fullyVaccinatedCumulative),
+    // TODO: This might be wrong, depending on whether `atLeastPartiallyVaccinatedCumulative*` includes people who received a second dose as well.
+    cumulativeTotalBioNTech: Number(atLeastPartiallyVaccinatedCumulativeBioNTech) + Number(fullyVaccinatedCumulativeBioNTech),
+    cumulativeTotalModerna: Number(atLeastPartiallyVaccinatedCumulativeModerna) + Number(fullyVaccinatedCumulativeModerna),
+    cumulativeTotalAstraZeneca: Number(atLeastPartiallyVaccinatedCumulativeAstraZeneca) + Number(fullyVaccinatedCumulativeAstraZeneca),
+    cumulativeTotalJohnsonAndJohnson: Number(fullyVaccinatedCumulativeJohnsonAndJohnson),
     atLeastPartiallyVaccinatedCumulative: Number(atLeastPartiallyVaccinatedCumulative),
     atLeastPartiallyVaccinatedPercent: Number(atLeastPartiallyVaccinatedPercent),
     fullyVaccinatedCumulative: Number(fullyVaccinatedCumulative),
     fullyVaccinatedPercent: Number(fullyVaccinatedPercent),
+    // TODO: This now possibly includes 2nd doses, since it’s atLeastPartiallyVaccinatedPercent. Rename.
     percentInitialDose: percentInitialDose,
     percentFinalDose: percentFinalDose,
   });
@@ -146,17 +139,6 @@ const percentFormatter = new Intl.NumberFormat('en', {
   minimumFractionDigits: 2,
   maximumFractionDigits: 2,
 });
-function percentOnlyPartiallyVaccinated(state) {
-  if (state) {
-    const latestEntries = sortedMap.get(latestDate);
-    const latestStateEntries = latestEntries.get(state);
-    const percent = latestStateEntries.onlyPartiallyVaccinatedPercent;
-    return percentFormatter.format(percent);
-  }
-  const percent = nationalCumulativeOnlyPartiallyVaccinated /
-    POPULATION_GERMANY * 100;
-  return percentFormatter.format(percent);
-}
 function percentAtLeastPartiallyVaccinated(state) {
   if (state) {
     const latestEntries = sortedMap.get(latestDate);
@@ -184,12 +166,6 @@ const intFormatter = new Intl.NumberFormat('en', {
   minimumFractionDigits: 0,
   maximumFractionDigits: 0,
 });
-function onlyPartiallyVaccinated(state) {
-  const current = state ?
-    map.get(latestDate).get(state).onlyPartiallyVaccinatedCumulative :
-    nationalCumulativeOnlyPartiallyVaccinated;
-  return intFormatter.format(current);
-}
 function atLeastPartiallyVaccinated(state) {
   const current = state ?
     map.get(latestDate).get(state).atLeastPartiallyVaccinatedCumulative :
@@ -288,7 +264,6 @@ function sevenDayAverageDosesAsPercentage(state) {
 }
 
 let nationalCumulativeTotal = 0;
-let nationalCumulativeOnlyPartiallyVaccinated = 0;
 let nationalCumulativeAtLeastPartiallyVaccinated = 0;
 let nationalCumulativeFullyVaccinated = 0;
 let nationalCumulativeTotalInitialDose = 0;
@@ -309,36 +284,28 @@ function generateNationalData() {
   ];
 
   const countsTotal = [];
-  const countsInitialDose = [];
   const countsFinalDose = [];
   const countsAvailable = [];
   for (const [date, entry] of sortedMap) {
-    let onlyPartiallyVaccinated = 0;
     let atLeastPartiallyVaccinated = 0;
     let fullyVaccinated = 0;
     let totalDoses = 0;
-    let initialDoses = 0;
     let finalDoses = 0;
     let availableDoses = 0;
     for (const data of entry.values()) {
-      onlyPartiallyVaccinated += data.onlyPartiallyVaccinatedCumulative;
       atLeastPartiallyVaccinated += data.atLeastPartiallyVaccinatedCumulative;
       fullyVaccinated += data.fullyVaccinatedCumulative;
       totalDoses += data.cumulativeTotal;
-      initialDoses += data.cumulativeInitial;
       finalDoses += data.cumulativeFinal;
       availableDoses = cumulativeDeliveryMap.get(date).get('Total');
     }
     if (date === latestDate) {
-      nationalCumulativeOnlyPartiallyVaccinated = onlyPartiallyVaccinated;
       nationalCumulativeAtLeastPartiallyVaccinated = atLeastPartiallyVaccinated;
       nationalCumulativeFullyVaccinated = fullyVaccinated;
       nationalCumulativeTotal = totalDoses;
-      nationalCumulativeTotalInitialDose = initialDoses;
       nationalCumulativeTotalFinalDose = finalDoses;
     }
     countsTotal.push(totalDoses);
-    countsInitialDose.push(initialDoses);
     countsFinalDose.push(finalDoses);
     countsAvailable.push(availableDoses);
   }
@@ -353,11 +320,12 @@ function generateNationalData() {
       chartType: 'line',
       values: countsTotal,
     },
-    {
-      name: 'Initial doses',
-      chartType: 'line',
-      values: countsInitialDose,
-    },
+    // TODO: Replace with atLeastPartiallyVaccinatedCumulative?
+    // {
+    //   name: 'Initial doses',
+    //   chartType: 'line',
+    //   values: countsInitialDose,
+    // },
     {
       name: 'Final doses',
       chartType: 'line',
@@ -689,14 +657,14 @@ function generateStateData(desiredState) {
   ];
 
   const countsTotal = [];
-  const countsInitialDose = [];
-  const countsFinalDose = [];
+  const countsAtLeastPartiallyVaccinated = [];
+  const countsFullyVaccinated = [];
   const countsAvailable = [];
   for (const [date, entry] of sortedMap) {
     const data = entry.get(desiredState);
     countsTotal.push(data.cumulativeTotal);
-    countsInitialDose.push(data.cumulativeInitial);
-    countsFinalDose.push(data.cumulativeFinal);
+    countsAtLeastPartiallyVaccinated.push(data.atLeastPartiallyVaccinatedCumulative);
+    countsFullyVaccinated.push(data.cumulativeFinal);
     const availableDoses = cumulativeDeliveryMap.get(date).get(desiredState);
     countsAvailable.push(availableDoses);
   }
@@ -714,12 +682,12 @@ function generateStateData(desiredState) {
     {
       name: 'Initial doses',
       chartType: 'line',
-      values: countsInitialDose,
+      values: countsAtLeastPartiallyVaccinated,
     },
     {
       name: 'Final doses',
       chartType: 'line',
-      values: countsFinalDose,
+      values: countsFullyVaccinated,
     },
   );
 
@@ -784,10 +752,8 @@ const createHtml = template(HTML_TEMPLATE, {
     dataAnomalyWarning,
     isDeliveryDataDefinitelyOutdated,
     population,
-    percentOnlyPartiallyVaccinated,
     percentAtLeastPartiallyVaccinated,
     percentFullyVaccinated,
-    onlyPartiallyVaccinated,
     atLeastPartiallyVaccinated,
     fullyVaccinated,
     sevenDayAverageDoses,