diff --git a/README.md b/README.md index 1172e22..c5ab9cb 100644 --- a/README.md +++ b/README.md @@ -1415,7 +1415,6 @@ BaseException | +-- KeyError # Raised when a dictionary key or set element is not found. +-- NameError # Raised when a variable name is not found. +-- OSError # Errors such as “file not found” or “disk full” (see Open). - | +-- FileNotFoundError # When a file or directory is requested but doesn't exist. +-- RuntimeError # Raised by errors that don't fall into other categories. | +-- RecursionError # Raised when the maximum recursion depth is exceeded. @@ -3369,7 +3368,7 @@ continents = pd.read_csv('https://datahub.io/JohnSnowLabs/country-and-continent- df = pd.merge(covid, continents, left_on='iso_code', right_on='Three_Letter_Country_Code') df = df.groupby(['Continent_Name', 'date']).sum().reset_index() df['Total Deaths per Million'] = df.total_deaths * 1e6 / df.population -df = df[('2020-03-14' < df.date) & (df.date < '2020-11-08')] +df = df[('2020-03-14' < df.date) & (df.date < '2020-11-25')] df = df.rename({'date': 'Date', 'Continent_Name': 'Continent'}, axis='columns') line(df, x='Date', y='Total Deaths per Million', color='Continent').show() ``` diff --git a/index.html b/index.html index cc252c5..3686d2f 100644 --- a/index.html +++ b/index.html @@ -213,7 +213,7 @@ pre.prettyprint {
- +
@@ -2859,7 +2859,7 @@ continents = pd.read_csv('https://datahub.io/JohnSnowL df = pd.merge(covid, continents, left_on='iso_code', right_on='Three_Letter_Country_Code') df = df.groupby(['Continent_Name', 'date']).sum().reset_index() df['Total Deaths per Million'] = df.total_deaths * 1e6 / df.population -df = df[('2020-03-14' < df.date) & (df.date < '2020-11-08')] +df = df[('2020-03-14' < df.date) & (df.date < '2020-11-25')] df = df.rename({'date': 'Date', 'Continent_Name': 'Continent'}, axis='columns') line(df, x='Date', y='Total Deaths per Million', color='Continent').show() @@ -2991,7 +2991,7 @@ $ pyinstaller script.py --add-data '<path>:.'
- +
diff --git a/pdf/README.md b/pdf/README.md index 98d90e8..75d225d 100644 --- a/pdf/README.md +++ b/pdf/README.md @@ -17,7 +17,7 @@ Printing to PDF * Change brightness of comments by right clicking on them and selecting inspect. Then click on the rectangle that represents color and toggle the color space to HSLA by clicking on the button with two vertical arrows. * Change lightness (L) percentage to 77%. * Open `index.html` in Chrome and select 'Print...'. -* Select destination 'Save as PDF', paper size 'A4', customised margins of top 10mm, right 9.5mm, bottom 5mm and left 10mm, 'Default' scale and no headers and footers and save (the document should be 50 pages long). +* Select destination 'Save as PDF', paper size 'A4', customised margins of top 10mm, right 9.5mm, bottom 5mm and left 10mm, 'Default' scale and no headers and footers and save (the document should be 51 pages long with last page empty). ### PDF optimized for laser color printing * Run `./parse.js` again. @@ -35,7 +35,7 @@ Printing to PDF * 58% for the comments. * Individually change brightness of every comment line that starts with: `# $ pip3 install ...` and of comments in basic script template to 57%, by adding `color: hsla(0, 0%, 57%, 1);` to their element.style. -* Select 'Print...' with destination 'Save as PDF', paper size 'A4', customised margins of top 10mm, right 9.5mm, bottom 5mm and left 10mm, 'Default' scale and no headers and footers and save (the document should be 50 pages long). +* Select 'Print...' with destination 'Save as PDF', paper size 'A4', customised margins of top 10mm, right 9.5mm, bottom 5mm and left 10mm, 'Default' scale and no headers and footers and save (the document should be 51 pages long with last page empty). Adding headers and footers to PDF (the same for both files) ----------------------------------------------------------- @@ -46,7 +46,8 @@ Adding headers and footers to PDF (the same for both files) * Select 'Edit PDF' tab and add headers and footers by clicking 'Header & Footer' button, selecting a preset from 'Saved Settings' dropdown menu and clicking ok. Repeat the process for each preset. * If presets get lost, the font and the margins are as follow: Borders: left-line: 0.6, left-text: 0.8, top-line: 11.4, bottom-text: 0.27, right-text-odd: 0.57, font-name: menlo, font-size: 8. * Set title and author by selecting 'File/Properties...'. -* Save in Adobe, Optimized format. +* Save the progress by running 'Save as' in 'Adobe PDF format'. +* Run 'Save as' again, this time in 'Adobe optimized format', so that Menlo font error gets fixed. Printing the PDF ---------------- diff --git a/web/covid_cases.js b/web/covid_cases.js index 5522242..b6305c9 100644 --- a/web/covid_cases.js +++ b/web/covid_cases.js @@ -269,7 +269,24 @@ if (document.getElementById("e23ccacc-a456-478b-b467-7282a2165921")) { "2020-11-05", "2020-11-06", "2020-11-07", - "2020-11-08" + "2020-11-08", + "2020-11-09", + "2020-11-10", + "2020-11-11", + "2020-11-12", + "2020-11-13", + "2020-11-14", + "2020-11-15", + "2020-11-16", + "2020-11-17", + "2020-11-18", + "2020-11-19", + "2020-11-20", + "2020-11-21", + "2020-11-22", + "2020-11-23", + "2020-11-24", + "2020-11-25" ], "y": [ 100.0, @@ -529,9 +546,26 @@ if (document.getElementById("e23ccacc-a456-478b-b467-7282a2165921")) { 97.38663529709316, 98.17547185114833, 99.11907962047327, - 100.012547330084, - 100.55361441813406, - 101.16727320355385 + 100.10595330282132, + 101.03441408253919, + 101.79996493869096, + 102.51033598914871, + 103.14584188320757, + 103.64435790080016, + 104.2223218394103, + 104.64211148550294, + 104.84055379148343, + 104.95609398951513, + 104.90016765776701, + 104.89132705747815, + 105.03406920958436, + 105.07366215783658, + 105.2191455042381, + 105.24717539030853, + 105.22621021412539, + 105.27133064836063, + 105.3489847170559, + 105.42615505457347 ], "yaxis": "y2" }, @@ -798,7 +832,24 @@ if (document.getElementById("e23ccacc-a456-478b-b467-7282a2165921")) { "2020-11-05", "2020-11-06", "2020-11-07", - "2020-11-08" + "2020-11-08", + "2020-11-09", + "2020-11-10", + "2020-11-11", + "2020-11-12", + "2020-11-13", + "2020-11-14", + "2020-11-15", + "2020-11-16", + "2020-11-17", + "2020-11-18", + "2020-11-19", + "2020-11-20", + "2020-11-21", + "2020-11-22", + "2020-11-23", + "2020-11-24", + "2020-11-25" ], "y": [ 100.0, @@ -1058,9 +1109,26 @@ if (document.getElementById("e23ccacc-a456-478b-b467-7282a2165921")) { 116.02642648143858, 116.14824171723517, 116.0005988224007, - 115.94975775853476, - 116.04777923273136, - 116.13725938396422 + 115.96195961386258, + 115.80719897008687, + 115.69860216482468, + 115.55950071514197, + 115.5084563337943, + 115.15134850190285, + 114.7669900590762, + 114.5630156111975, + 114.48939785036809, + 114.53759533143624, + 114.52051244113275, + 114.52234302041104, + 114.38080179552001, + 114.08856795830941, + 113.59174948080523, + 113.09716721292324, + 112.52673010114016, + 111.90077506924476, + 111.63409676766705, + 111.39531345251345 ], "yaxis": "y2" }, @@ -1327,7 +1395,24 @@ if (document.getElementById("e23ccacc-a456-478b-b467-7282a2165921")) { "2020-11-05", "2020-11-06", "2020-11-07", - "2020-11-08" + "2020-11-08", + "2020-11-09", + "2020-11-10", + "2020-11-11", + "2020-11-12", + "2020-11-13", + "2020-11-14", + "2020-11-15", + "2020-11-16", + "2020-11-17", + "2020-11-18", + "2020-11-19", + "2020-11-20", + "2020-11-21", + "2020-11-22", + "2020-11-23", + "2020-11-24", + "2020-11-25" ], "y": [ 100.0, @@ -1587,9 +1672,26 @@ if (document.getElementById("e23ccacc-a456-478b-b467-7282a2165921")) { 149.1959992065398, 151.33938994876942, 153.21414189308825, - 154.91851114530473, - 156.10787776170685, - 157.83948174049442 + 154.79926489373742, + 156.86134317199955, + 159.72298564540958, + 162.20843046049214, + 164.23922548716735, + 164.63368213288194, + 165.84121113854275, + 168.79292546946795, + 171.23315545579766, + 173.84170848781508, + 177.33802451387004, + 180.42541715923693, + 182.6233705922216, + 184.771619804003, + 187.96234949623997, + 190.87719523208418, + 191.333352079023, + 190.73562606228532, + 191.16079628515072, + 191.67508936185212 ], "yaxis": "y2" }, @@ -1856,7 +1958,24 @@ if (document.getElementById("e23ccacc-a456-478b-b467-7282a2165921")) { "2020-11-05", "2020-11-06", "2020-11-07", - "2020-11-08" + "2020-11-08", + "2020-11-09", + "2020-11-10", + "2020-11-11", + "2020-11-12", + "2020-11-13", + "2020-11-14", + "2020-11-15", + "2020-11-16", + "2020-11-17", + "2020-11-18", + "2020-11-19", + "2020-11-20", + "2020-11-21", + "2020-11-22", + "2020-11-23", + "2020-11-24", + "2020-11-25" ], "y": [ 78818.0, @@ -1884,241 +2003,258 @@ if (document.getElementById("e23ccacc-a456-478b-b467-7282a2165921")) { 173492.0, 187733.0, 204825.0, - 225119.0, - 256315.0, - 288303.0, - 322529.0, - 356799.0, - 401369.0, - 443905.0, - 497740.0, - 558849.0, - 624034.0, - 686888.0, - 744252.0, - 808965.0, - 883804.0, - 961451.0, - 1039097.0, - 1121096.0, - 1206366.0, - 1272626.0, - 1345891.0, - 1423285.0, - 1508343.0, - 1595776.0, - 1685399.0, - 1760764.0, - 1829287.0, - 1894542.0, - 1971519.0, - 2050331.0, - 2134761.0, - 2217038.0, - 2296734.0, - 2367237.0, - 2441893.0, - 2529214.0, - 2595818.0, - 2674605.0, - 2747755.0, - 2847602.0, - 2929436.0, - 2996209.0, - 3069037.0, - 3148547.0, - 3234220.0, - 3322751.0, - 3403382.0, - 3480405.0, - 3558014.0, - 3637570.0, - 3725873.0, - 3818689.0, - 3908387.0, - 3996805.0, - 4071339.0, - 4142710.0, - 4229829.0, - 4317319.0, - 4414503.0, - 4512734.0, - 4605708.0, - 4684759.0, - 4772710.0, - 4869088.0, - 4974061.0, - 5082846.0, - 5189649.0, - 5288603.0, - 5380855.0, - 5471806.0, - 5566446.0, - 5670259.0, - 5789591.0, - 5912777.0, - 6040543.0, - 6146168.0, - 6248940.0, - 6362151.0, - 6488667.0, - 6616019.0, - 6749876.0, - 6875263.0, - 6988931.0, - 7097681.0, - 7224453.0, - 7360114.0, - 7496842.0, - 7641832.0, - 7774801.0, - 7894417.0, - 8016009.0, - 8159260.0, - 8337288.0, - 8476098.0, - 8657452.0, - 8816588.0, - 8942874.0, - 9079368.0, - 9243545.0, - 9419366.0, - 9598234.0, - 9787934.0, - 9969181.0, - 10128251.0, - 10290066.0, - 10483863.0, - 10686101.0, - 10894985.0, - 11100785.0, - 11288558.0, - 11465107.0, - 11642269.0, - 11850780.0, - 12066692.0, - 12291653.0, - 12523373.0, - 12739092.0, - 12933285.0, - 13125838.0, - 13350892.0, - 13585180.0, - 13841331.0, - 14090158.0, - 14317178.0, - 14530806.0, - 14735442.0, - 14976978.0, - 15260868.0, - 15536709.0, - 15820996.0, - 16077986.0, - 16307329.0, - 16522676.0, - 16767380.0, - 17067356.0, - 17357581.0, - 17634845.0, - 17896867.0, - 18117780.0, - 18325100.0, - 18581911.0, - 18859752.0, - 19145687.0, - 19421539.0, - 19687229.0, - 19914763.0, - 20135944.0, - 20397552.0, - 20687271.0, - 20972816.0, - 21262241.0, - 21518580.0, - 21748836.0, - 21948479.0, - 22206544.0, - 22487202.0, - 22761655.0, - 23015976.0, - 23279287.0, - 23503508.0, - 23716689.0, - 23973248.0, - 24251510.0, - 24535142.0, - 24812123.0, - 25078177.0, - 25321396.0, - 25566912.0, - 25835917.0, - 26120893.0, - 26400958.0, - 26695865.0, - 26969306.0, - 27215335.0, - 27424352.0, - 27670048.0, - 27959232.0, - 28264923.0, - 28569619.0, - 28853755.0, - 29123698.0, - 29369220.0, - 29672743.0, - 29962460.0, - 30280647.0, - 30592615.0, - 30886120.0, - 31170449.0, - 31439388.0, - 31722098.0, - 32033579.0, - 32354468.0, - 32666069.0, - 32965336.0, - 33245193.0, - 33483705.0, - 33777645.0, - 34093656.0, - 34416828.0, - 34735618.0, - 35037530.0, - 35318548.0, - 35588964.0, - 35915720.0, - 36269350.0, - 36632393.0, - 36981623.0, - 37331053.0, - 37635137.0, - 37920177.0, - 38250883.0, - 38639272.0, - 39041865.0, - 39439223.0, - 39809563.0, - 40171464.0, - 40520482.0, - 40915439.0, - 41367715.0, - 41840206.0, - 42328982.0, - 42788582.0, - 43227554.0, - 43643411.0, - 44122781.0, - 44636197.0, - 45184307.0, - 45726409.0, - 46184350.0, - 46671506.0, - 47141989.0, - 47646807.0, - 48216449.0, - 48805036.0, - 49384557.0, - 49951976.0 + 225120.0, + 256316.0, + 288304.0, + 322530.0, + 356800.0, + 401370.0, + 443906.0, + 497741.0, + 558850.0, + 624037.0, + 686892.0, + 744257.0, + 808971.0, + 883810.0, + 961458.0, + 1039104.0, + 1121103.0, + 1206374.0, + 1272635.0, + 1345900.0, + 1423294.0, + 1508352.0, + 1595785.0, + 1685408.0, + 1760775.0, + 1829298.0, + 1894554.0, + 1971531.0, + 2050343.0, + 2134774.0, + 2217052.0, + 2296748.0, + 2367252.0, + 2441910.0, + 2529231.0, + 2595836.0, + 2674623.0, + 2747773.0, + 2847620.0, + 2929454.0, + 2996227.0, + 3069055.0, + 3148565.0, + 3234239.0, + 3322770.0, + 3403401.0, + 3480424.0, + 3558033.0, + 3637589.0, + 3725892.0, + 3818708.0, + 3908406.0, + 3996824.0, + 4071358.0, + 4142729.0, + 4229848.0, + 4317338.0, + 4414522.0, + 4512754.0, + 4605728.0, + 4684779.0, + 4772730.0, + 4869108.0, + 4974081.0, + 5082866.0, + 5189669.0, + 5288623.0, + 5380875.0, + 5471826.0, + 5566466.0, + 5670279.0, + 5789611.0, + 5912797.0, + 6040563.0, + 6146188.0, + 6248960.0, + 6362173.0, + 6488689.0, + 6616041.0, + 6749898.0, + 6875285.0, + 6988953.0, + 7097704.0, + 7224476.0, + 7360137.0, + 7496865.0, + 7641855.0, + 7774824.0, + 7894440.0, + 8016032.0, + 8159283.0, + 8337311.0, + 8476121.0, + 8657475.0, + 8816611.0, + 8942897.0, + 9079391.0, + 9243568.0, + 9419389.0, + 9598257.0, + 9787957.0, + 9969204.0, + 10128274.0, + 10290089.0, + 10483886.0, + 10686124.0, + 10895008.0, + 11100808.0, + 11288581.0, + 11465130.0, + 11642292.0, + 11850803.0, + 12066715.0, + 12291676.0, + 12523396.0, + 12739115.0, + 12933308.0, + 13125861.0, + 13350915.0, + 13585203.0, + 13841354.0, + 14090181.0, + 14317201.0, + 14530829.0, + 14735465.0, + 14977001.0, + 15260891.0, + 15536732.0, + 15821019.0, + 16078009.0, + 16307352.0, + 16522699.0, + 16767403.0, + 17067379.0, + 17357604.0, + 17634868.0, + 17896890.0, + 18117803.0, + 18325123.0, + 18581934.0, + 18859784.0, + 19145719.0, + 19421571.0, + 19687261.0, + 19914795.0, + 20135976.0, + 20397584.0, + 20687303.0, + 20972848.0, + 21262273.0, + 21518612.0, + 21748868.0, + 21948511.0, + 22206576.0, + 22487234.0, + 22761687.0, + 23016008.0, + 23279319.0, + 23503540.0, + 23716721.0, + 23973280.0, + 24251542.0, + 24535174.0, + 24812155.0, + 25078209.0, + 25321428.0, + 25566944.0, + 25835949.0, + 26120925.0, + 26400990.0, + 26695897.0, + 26969338.0, + 27215367.0, + 27424384.0, + 27670080.0, + 27959264.0, + 28264955.0, + 28569651.0, + 28853787.0, + 29123730.0, + 29369253.0, + 29672776.0, + 29962493.0, + 30280681.0, + 30592649.0, + 30886154.0, + 31170483.0, + 31439424.0, + 31722134.0, + 32033616.0, + 32354505.0, + 32666108.0, + 32965375.0, + 33245232.0, + 33483744.0, + 33777684.0, + 34093695.0, + 34416868.0, + 34735659.0, + 35037571.0, + 35318590.0, + 35589007.0, + 35915763.0, + 36269393.0, + 36632438.0, + 36981671.0, + 37331102.0, + 37635186.0, + 37920228.0, + 38250937.0, + 38639329.0, + 39041929.0, + 39439290.0, + 39809632.0, + 40171533.0, + 40520554.0, + 40915521.0, + 41367807.0, + 41840303.0, + 42329082.0, + 42788685.0, + 43227657.0, + 43643540.0, + 44122943.0, + 44636369.0, + 45184499.0, + 45726633.0, + 46184592.0, + 46671746.0, + 47142350.0, + 47647360.0, + 48217148.0, + 48829573.0, + 49435572.0, + 50028890.0, + 50557624.0, + 51059869.0, + 51626707.0, + 52250192.0, + 52897568.0, + 53533147.0, + 54127701.0, + 54642114.0, + 55186571.0, + 55769341.0, + 56395008.0, + 57035918.0, + 57715431.0, + 58287281.0, + 58806033.0, + 59338940.0, + 59900689.0 ], "yaxis": "y" } diff --git a/web/covid_cases.png b/web/covid_cases.png index 1795ea3..4134e46 100644 Binary files a/web/covid_cases.png and b/web/covid_cases.png differ diff --git a/web/covid_deaths.js b/web/covid_deaths.js index 7cf60fe..5e13b1b 100644 --- a/web/covid_deaths.js +++ b/web/covid_deaths.js @@ -255,7 +255,24 @@ if (document.getElementById("2a950764-39fc-416d-97fe-0a6226a3095f")) { "2020-11-04", "2020-11-05", "2020-11-06", - "2020-11-07" + "2020-11-07", + "2020-11-08", + "2020-11-09", + "2020-11-10", + "2020-11-11", + "2020-11-12", + "2020-11-13", + "2020-11-14", + "2020-11-15", + "2020-11-16", + "2020-11-17", + "2020-11-18", + "2020-11-19", + "2020-11-20", + "2020-11-21", + "2020-11-22", + "2020-11-23", + "2020-11-24" ], "xaxis": "x", "y": [ @@ -496,7 +513,24 @@ if (document.getElementById("2a950764-39fc-416d-97fe-0a6226a3095f")) { 32.63343241426252, 32.79992190015546, 33.02837832474398, - 33.2000939379968 + 33.2000939379968, + 33.480811636184, + 33.86157234383154, + 34.04821974954112, + 34.30355340055182, + 34.5312632355175, + 34.75076058463197, + 34.96204544789521, + 35.15167921209614, + 35.35848453762235, + 35.55782396692018, + 35.857952995301176, + 36.14837635858528, + 36.40520318884166, + 36.66650955683507, + 36.88526031632669, + 37.07190772203627, + 37.31902888719575 ], "yaxis": "y" }, @@ -749,7 +783,24 @@ if (document.getElementById("2a950764-39fc-416d-97fe-0a6226a3095f")) { "2020-11-04", "2020-11-05", "2020-11-06", - "2020-11-07" + "2020-11-07", + "2020-11-08", + "2020-11-09", + "2020-11-10", + "2020-11-11", + "2020-11-12", + "2020-11-13", + "2020-11-14", + "2020-11-15", + "2020-11-16", + "2020-11-17", + "2020-11-18", + "2020-11-19", + "2020-11-20", + "2020-11-21", + "2020-11-22", + "2020-11-23", + "2020-11-24" ], "xaxis": "x", "y": [ @@ -987,10 +1038,27 @@ if (document.getElementById("2a950764-39fc-416d-97fe-0a6226a3095f")) { 57.10131863995143, 57.447749278214815, 57.81878974324008, - 58.307859215241834, - 58.75490650091132, - 59.164454061392696, - 59.57168422312649 + 58.21570207742528, + 58.6620444055339, + 59.070946142500524, + 59.47753413507073, + 59.87087068246146, + 60.24569727468086, + 60.62283761129668, + 61.02774288066949, + 61.47114044318268, + 61.901496900916065, + 62.3265948486576, + 62.72392786364214, + 63.102330242656, + 63.577068524720644, + 64.09946003067058, + 64.57768686312568, + 65.00156016131938, + 65.56763747356909, + 65.9969882597116, + 66.43455527777735, + 66.88876543230299 ], "yaxis": "y" }, @@ -1243,248 +1311,282 @@ if (document.getElementById("2a950764-39fc-416d-97fe-0a6226a3095f")) { "2020-11-04", "2020-11-05", "2020-11-06", - "2020-11-07" + "2020-11-07", + "2020-11-08", + "2020-11-09", + "2020-11-10", + "2020-11-11", + "2020-11-12", + "2020-11-13", + "2020-11-14", + "2020-11-15", + "2020-11-16", + "2020-11-17", + "2020-11-18", + "2020-11-19", + "2020-11-20", + "2020-11-21", + "2020-11-22", + "2020-11-23", + "2020-11-24" ], "xaxis": "x", "y": [ - 2.27247480363812, - 2.7440739309691984, - 3.248771030225739, - 3.958481205591712, - 4.815959787444378, - 5.834804116649182, - 7.0790677902353245, - 8.742694868709792, - 10.30479685501661, - 12.079178579492153, - 14.27581239184679, - 16.786251034537806, - 19.422442348209206, - 22.663169437969803, - 25.90966499887629, - 28.960032540822542, - 32.456879749460626, - 36.43943222858258, - 40.53043196524726, - 44.839479911226555, - 51.02674206230739, - 55.97262922279286, - 59.59522910241133, - 63.69199731022189, - 69.57814526748732, - 74.29790835905392, - 79.93485836281693, - 84.91189526749021, - 89.08249990596815, - 92.77201405087894, - 96.58843456099929, - 101.67161133475692, - 107.2681820404987, - 112.06870372810775, - 116.58080185842235, - 120.82639662179686, - 123.74062824470012, - 127.14517991500398, - 131.6399726318809, - 135.46793008429304, - 139.01092506209824, - 142.69813181855065, - 146.11652781960464, - 147.96474597474756, - 150.80168008429592, - 154.32044748328838, - 157.45734209242298, - 160.1742920021368, - 162.67780847945278, - 164.97135260705835, - 166.48846051842722, - 168.32168064859084, - 170.9071094161784, - 173.40601111657764, - 175.46189423297258, - 177.67929454145244, - 179.08680150104942, - 180.27741394556097, - 181.81874943574257, - 184.0361497442224, - 185.74823198032234, - 187.62875357388225, - 189.1585521217721, - 190.51529653528524, - 191.33211204954318, - 192.3681294673449, - 193.92446298250582, - 195.2073709653516, - 197.0671260627863, - 198.1723651343387, - 199.16684955988998, - 197.90355437894024, - 198.91303682947085, - 199.78984444364605, - 200.9943012189077, - 202.09838659623094, - 203.1217133775117, - 203.95237322251975, - 204.51422231212936, - 205.15682999778141, - 206.07401690997781, - 206.98428165679914, - 207.7157237980979, - 208.59253141227308, - 209.30320705744663, - 209.7739143029512, - 210.3219190618107, - 211.16642323756886, - 211.99131461143105, - 212.5670080317908, - 213.21538418858876, - 213.76685003013577, - 214.16833562188967, - 214.60558573474808, - 215.35779437217204, - 216.04308874430367, - 218.19703587017872, - 218.7819588443719, - 219.17652227075072, - 219.52839901064996, - 219.89412008129935, - 220.50442432853444, - 220.9693631028931, - 221.47698856373137, - 222.01576376875744, - 222.4749340719702, - 222.84526991953632, - 223.22368162670665, - 223.73822925291998, - 224.31046159059218, - 224.79732055530525, - 225.29802385076843, - 225.7271981040226, - 226.0721526785468, - 226.53709145290546, - 227.1139385674944, - 227.64117683022866, - 228.10496191035816, - 228.56874699048765, - 228.99676754951264, - 229.43978613351695, - 229.77320376574934, - 230.23583515164967, - 230.74346061248792, - 231.19340136186727, - 231.62257561512143, - 231.9525321646663, - 232.21095967200213, - 232.75204226548655, - 233.1835239071991, - 233.6150055489116, - 234.00726158683207, - 234.41682303819022, - 234.75831653002686, - 234.99713123546667, - 235.29824542928208, - 235.92816247841318, - 236.36310520281324, - 236.75997601765044, - 237.17992071707118, - 237.50756987815768, - 238.1432553984347, - 238.44667698070845, - 238.8712364570459, - 239.33848261986293, - 239.68112980592878, - 240.08838386882854, - 240.44372169141533, - 241.1901618576934, - 241.58357158984305, - 241.9146818336171, - 242.3415486984129, - 242.77879881127132, - 243.18605287417108, - 243.73175024457223, - 244.03286443838763, - 244.52203079155905, - 245.066574467731, - 245.4830580844642, - 245.89031214736397, - 246.2502647468675, - 246.63098384249616, - 246.94017389591585, - 247.41434222410794, - 247.89774010613345, - 248.3961360131383, - 248.7906994395171, - 249.1818017832084, - 249.55559871346205, - 249.93401042063238, - 250.4266378564913, - 251.03348102103888, - 251.546874953023, - 252.19525110982096, - 252.5725091227621, - 253.05359961632928, - 253.42162807543704, - 253.92233137090022, - 254.58224446998994, - 255.1314029230786, - 255.68286876462562, - 256.1155041005673, - 256.4973768904252, - 257.03615209545126, - 257.61876768118606, - 258.655938793217, - 259.350462719182, - 260.04267925668876, - 260.7718140095291, - 261.31981876838864, - 261.9151249906444, - 262.65348929731823, - 263.5349116884101, - 264.33903656614706, - 265.15815946886335, - 265.9057533293706, - 266.6245048341484, - 267.322489842801, - 268.0839280340584, - 269.1372508652978, - 270.12712051393237, - 271.0246946242328, - 271.91073179224134, - 272.6744773719571, - 273.3078555037757, - 274.3807911369111, - 275.51487256419296, - 276.6962554548711, - 277.93878413969566, - 278.84558780382946, - 279.95890273498605, - 281.0006886239337, - 281.9640233052972, - 283.58611739152127, - 285.11822332786943, - 286.788772571719, - 288.2793455158168, - 289.64531948316335, - 291.11858701382346, - 292.73952740581836, - 294.77925880300484, - 296.94012809425493, - 299.2255963622563, - 301.4060784554024, - 303.420428579547, - 305.41631959602466, - 307.6844824505883, - 310.95751297876586, - 314.0701800090877, - 317.2451465277852, - 320.63470017310976, - 323.600848036326, - 326.3570235498319, - 329.50314771279994, - 335.80231820411103, - 340.4297857573434, - 344.82305338205265, - 346.61422206649576 + 2.27503389688546, + 2.746383757510418, + 3.2522357700375686, + 3.9619434340514132, + 4.819422015904078, + 5.839419346324206, + 7.083682567152036, + 8.747309645626505, + 10.30941163193332, + 12.083793356408863, + 14.28158086299268, + 16.792019505683694, + 19.428210819355094, + 22.668937909115694, + 25.91543347002218, + 28.96580101196843, + 32.46264822060651, + 36.445200699728474, + 40.537354130622326, + 44.84640207660162, + 51.03366422768246, + 55.98070508239711, + 59.60445865624475, + 63.70122686405532, + 69.58737482132074, + 74.30829160711653, + 79.94639530510871, + 84.92343220978198, + 89.09288315403076, + 92.78239729894153, + 96.59881780906188, + 101.68199458281951, + 107.2785652885613, + 112.07908697617036, + 116.59118510648496, + 120.83677986985946, + 123.75101149276273, + 127.15556316306657, + 131.6503558799435, + 135.47831333235564, + 139.02130831016083, + 142.70851506661324, + 146.12691106766724, + 147.97512922281018, + 150.81206333235852, + 154.33083073135097, + 157.46772534048557, + 160.1846752501994, + 162.68819172751537, + 164.98173585512095, + 166.4988437664898, + 168.33206389665344, + 170.91749266424102, + 173.41639436464024, + 175.47227748103518, + 177.68967778951503, + 179.09718474911202, + 180.28779719362356, + 181.82913268380517, + 184.04653299228502, + 185.75861522838494, + 187.63913682194485, + 189.16893536983468, + 190.52567978334784, + 191.34249529760578, + 192.37851271540748, + 193.9348462305684, + 195.2177542134142, + 197.0763556166197, + 198.1815946881721, + 199.1760791137234, + 197.91278393277366, + 198.92226638330428, + 199.79907399747947, + 201.00353077274113, + 202.10761615006436, + 203.13094293134512, + 203.96160277635317, + 204.52345186596278, + 205.16605955161484, + 206.08324646381124, + 206.99351121063256, + 207.72495335193133, + 208.6017609661065, + 209.31243661128005, + 209.78314385678462, + 210.3311486156441, + 211.17565279140229, + 212.00054416526447, + 212.57623758562423, + 213.22461374242218, + 213.7760795839692, + 214.1775651757231, + 214.6148152885815, + 215.36702392600546, + 216.0523182981371, + 218.20626542401214, + 218.79118839820532, + 219.18575182458414, + 219.53762856448338, + 219.90334963513277, + 220.51365388236786, + 220.97859265672653, + 221.4862181175648, + 222.02499332259086, + 222.48416362580363, + 222.85449947336974, + 223.23291118054007, + 223.7474588067534, + 224.3196911444256, + 224.80655010913867, + 225.30725340460185, + 225.736427657856, + 226.0813822323802, + 226.54632100673888, + 227.1231681213278, + 227.65040638406208, + 228.11419146419158, + 228.57797654432107, + 229.00599710334606, + 229.44901568735037, + 229.78243331958276, + 230.2450647054831, + 230.75269016632134, + 231.2026309157007, + 231.63180516895486, + 231.96176171849973, + 232.22018922583558, + 232.76127181931997, + 233.1927534610325, + 233.62423510274502, + 234.0164911406655, + 234.42605259202364, + 234.76754608386028, + 235.0063607893001, + 235.30747498311553, + 235.93739203224663, + 236.37233475664667, + 236.76920557148387, + 237.1891502709046, + 237.5167994319911, + 238.1524849522681, + 238.45590653454187, + 238.88046601087933, + 239.34771217369635, + 239.6903593597622, + 240.09761342266196, + 240.45295124524876, + 241.19939141152682, + 241.59280114367647, + 241.92391138745052, + 242.35077825224633, + 242.78802836510474, + 243.1952824280045, + 243.74097979840565, + 244.04209399222106, + 244.53126034539247, + 245.0758040215644, + 245.49228763829763, + 245.89954170119742, + 246.2594943007009, + 246.64021339632959, + 246.94940344974927, + 247.42357177794136, + 247.90696965996688, + 248.4053655669717, + 248.79992899335053, + 249.19103133704184, + 249.56482826729547, + 249.9432399744658, + 250.43586741032473, + 251.0427105748723, + 251.55610450685643, + 252.20448066365438, + 252.58173867659556, + 253.06282917016273, + 253.43085762927046, + 253.93156092473365, + 254.59147402382337, + 255.14063247691203, + 255.69209831845905, + 256.12473365440076, + 256.50660644425864, + 257.04538164928465, + 257.6279972350195, + 258.6651683470504, + 259.35969227301547, + 260.05190881052215, + 260.7810435633626, + 261.32904832222204, + 261.9243545444778, + 262.6627188511517, + 263.54414124224354, + 264.3482661199805, + 265.1673890226968, + 265.914982883204, + 266.63373438798186, + 267.3317193966344, + 268.0931575878918, + 269.1464804191312, + 270.1363500677658, + 271.0339241780662, + 271.9199613460748, + 272.6837069257905, + 273.3170850576092, + 274.39002069074456, + 275.5241021180264, + 276.7054850087045, + 277.94801369352905, + 278.85481735766285, + 279.9681322888195, + 281.01107187199625, + 281.9744065533598, + 283.59650063958384, + 285.12860657593205, + 286.79915581978156, + 288.29088245810857, + 289.65685642545515, + 291.13012395611526, + 292.75106434811016, + 294.79194943952575, + 296.9562798134634, + 299.24290177569395, + 301.42453756306924, + 303.44119507567217, + 305.43823978637903, + 307.7064026409427, + 310.98058686334946, + 314.10017605904636, + 317.2820647431189, + 320.6739257769018, + 323.65161058240983, + 326.43316736895764, + 329.5989043338217, + 335.9176876270288, + 340.57861231290735, + 345.0203350952421, + 349.8012439809551, + 353.63035512759643, + 357.0810545670674, + 361.38548773612996, + 367.66389173131586, + 373.2016240313696, + 378.4255515010869, + 383.7302375668467, + 388.1684992664939, + 392.1937384320954, + 397.594181118877, + 404.3052204500046, + 410.34942451666734, + 416.23326508547444, + 423.0123723761235, + 427.3006538259776, + 431.2612861147452, + 437.20742617192786 ], "yaxis": "y" }, @@ -1737,7 +1839,24 @@ if (document.getElementById("2a950764-39fc-416d-97fe-0a6226a3095f")) { "2020-11-04", "2020-11-05", "2020-11-06", - "2020-11-07" + "2020-11-07", + "2020-11-08", + "2020-11-09", + "2020-11-10", + "2020-11-11", + "2020-11-12", + "2020-11-13", + "2020-11-14", + "2020-11-15", + "2020-11-16", + "2020-11-17", + "2020-11-18", + "2020-11-19", + "2020-11-20", + "2020-11-21", + "2020-11-22", + "2020-11-23", + "2020-11-24" ], "xaxis": "x", "y": [ @@ -1978,7 +2097,24 @@ if (document.getElementById("2a950764-39fc-416d-97fe-0a6226a3095f")) { 594.263802154146, 597.4232504098196, 600.5810073120373, - 603.6914063174889 + 603.6914063174889, + 606.4077199677095, + 607.6999140080385, + 609.3811193432309, + 613.071652584066, + 617.8564915108865, + 620.219312288818, + 624.6980162401154, + 628.1416118763849, + 629.8380393926808, + 632.3310943867187, + 635.2825061673132, + 639.6326672559602, + 644.314333621969, + 648.8945187806222, + 652.5867433749131, + 654.7313795570299, + 656.9774969465024 ], "yaxis": "y" }, @@ -2231,7 +2367,24 @@ if (document.getElementById("2a950764-39fc-416d-97fe-0a6226a3095f")) { "2020-11-04", "2020-11-05", "2020-11-06", - "2020-11-07" + "2020-11-07", + "2020-11-08", + "2020-11-09", + "2020-11-10", + "2020-11-11", + "2020-11-12", + "2020-11-13", + "2020-11-14", + "2020-11-15", + "2020-11-16", + "2020-11-17", + "2020-11-18", + "2020-11-19", + "2020-11-20", + "2020-11-21", + "2020-11-22", + "2020-11-23", + "2020-11-24" ], "xaxis": "x", "y": [ @@ -2472,7 +2625,24 @@ if (document.getElementById("2a950764-39fc-416d-97fe-0a6226a3095f")) { 25.625881593852167, 25.673825245103526, 25.745740721980567, - 25.84162802448329 + 25.84162802448329, + 25.84162802448329, + 25.84162802448329, + 25.88957167573465, + 25.93830756778917, + 26.00969740513171, + 26.033494017579223, + 26.05729063002674, + 26.08108724247425, + 26.200070304711815, + 26.200070304711815, + 26.31905336694938, + 26.461833041634456, + 26.485629654081972, + 26.533222878976996, + 26.62840932876705, + 26.62840932876705, + 26.62840932876705 ], "yaxis": "y" }, @@ -2725,7 +2895,24 @@ if (document.getElementById("2a950764-39fc-416d-97fe-0a6226a3095f")) { "2020-11-04", "2020-11-05", "2020-11-06", - "2020-11-07" + "2020-11-07", + "2020-11-08", + "2020-11-09", + "2020-11-10", + "2020-11-11", + "2020-11-12", + "2020-11-13", + "2020-11-14", + "2020-11-15", + "2020-11-16", + "2020-11-17", + "2020-11-18", + "2020-11-19", + "2020-11-20", + "2020-11-21", + "2020-11-22", + "2020-11-23", + "2020-11-24" ], "xaxis": "x", "y": [ @@ -2965,8 +3152,25 @@ if (document.getElementById("2a950764-39fc-416d-97fe-0a6226a3095f")) { 688.5616537373912, 690.740712476475, 693.8582997129892, - 695.293969543217, - 696.9758869495034 + 696.757516457527, + 699.141007146546, + 701.0250334124275, + 702.5489806755821, + 704.637438891399, + 706.4053106402718, + 709.2325115842642, + 712.7008854621448, + 715.0936685125246, + 718.5666885710855, + 719.9907429496125, + 721.8794153961744, + 724.9714486389466, + 728.0588357010387, + 730.7141279598582, + 733.2625580630296, + 735.172138322653, + 736.6496237790041, + 738.3547720886921 ], "yaxis": "y" } diff --git a/web/covid_deaths.png b/web/covid_deaths.png index b9d5f85..b05cde1 100644 Binary files a/web/covid_deaths.png and b/web/covid_deaths.png differ diff --git a/web/template.html b/web/template.html index f32d630..431c408 100644 --- a/web/template.html +++ b/web/template.html @@ -213,7 +213,7 @@ pre.prettyprint {
- +
@@ -221,7 +221,7 @@ pre.prettyprint {