Merge branch 'restore-countries' into adding-countries-column

src/HowBadIsMyBatch.ipynb

@@ -16,14 +16,14 @@
     "from IOUtils import IOUtils\n",
     "from VAERSFileDownloader import updateVAERSFiles\n",
     "from datetime import datetime\n",
-    "from DateProvider import DateProvider\n",
     "from InternationalVaersCovid19Provider import getInternationalVaersCovid19, get_international_VAERSVAX_VAERSSYMPTOMS_Covid19\n",
     "from BatchCodeTableHtmlUpdater import updateBatchCodeTableHtmlFile, saveLastUpdatedBatchCodeTable\n",
     "from BatchCodeTablePersister import createGlobalBatchCodeTable\n",
     "from SymptomByBatchcodeTableFactory import SymptomByBatchcodeTableFactory\n",
     "from HistogramFactoryAndPersister import createAndSaveGlobalHistograms\n",
     "from BatchCodeTableFactory import BatchCodeTableFactory\n",
-    "from Column2DataframeAdder import addColumn2Dataframe"
+    "from BatchCodeTableHavingGuessedCountriesFactory import BatchCodeTableHavingGuessedCountriesFactory\n",
+    "from CountriesByBatchcodeProvider import getCountryCountsByBatchcodeTable\n"
    ]
   },
   {
@@ -36,20 +36,6 @@
     "print(datetime.now().strftime(\"%d.%m.%Y, %H:%M:%S Uhr\"))"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "ffad1c04",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "dateProvider = DateProvider()\n",
-    "print('          lastUpdated:', dateProvider.getLastUpdated())\n",
-    "print('lastUpdatedDataSource:', dateProvider.getLastUpdatedDataSource())\n",
-    "needsUpdate = dateProvider.needsUpdate()\n",
-    "print('needsUpdate:', needsUpdate)"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -174,18 +160,20 @@
    ]
   },
   {
-   "attachments": {},
-   "cell_type": "markdown",
-   "id": "2d93b511",
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "d6c2b650",
    "metadata": {},
+   "outputs": [],
    "source": [
-    "# Vaccine Distribution by Zipcode"
+    "countryCountsByBatchcode = getCountryCountsByBatchcodeTable()\n",
+    "countryCountsByBatchcode"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "cfcbad44",
+   "id": "29df3cfc",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -199,20 +187,20 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "59c745d2",
+   "id": "cf55ee83",
    "metadata": {},
    "outputs": [],
    "source": [
-    "from VaccineDistributionByZipcodeSimplifier import VaccineDistributionByZipcodeSimplifier\n",
+    "from CountryCountsByBatchcodeTable2BarChartDescriptionTableConverter import CountryCountsByBatchcodeTable2BarChartDescriptionTableConverter\n",
     "\n",
-    "vaccineDistributionByZipcode = VaccineDistributionByZipcodeSimplifier.sumDoses(vaccineDistributionByZipcode)\n",
-    "vaccineDistributionByZipcode"
+    "barChartDescriptionTable = CountryCountsByBatchcodeTable2BarChartDescriptionTableConverter.convert2BarChartDescriptionTable(countryCountsByBatchcode)\n",
+    "barChartDescriptionTable"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "8cd250f7",
+   "id": "ce1b2189",
    "metadata": {},
    "outputs": [],
    "source": [