'TS': 'Tempelhof-Schöneberg',
'TK': 'Treptow-Köpenick',
'sum': 'all of Berlin',
- '+': 'new infections counted',
+ '+': 'new infections counted that day',
'Σ': 'sum of new infections for last 7 days',
'Ø': 'per-day average of new infections for last 7 days',
'i': 'incidence (x per 100k inhabitants) of new infections for last 7 days',
db[district][date] = {'new_infections': int(district_data)}
sorted_dates.sort()
-# Define and move sum_district from end to start.
+# In LaGeSo's data, the last "district" is actually the sum of all districts /
+# the whole of Berlin. For our district order, move it in front of the other
+# districts, as its numbers are the most interesting, so in the table views
+# we want to see it first.
sum_district = sorted_districts.pop()
sorted_districts.insert(0, sum_district)
-# In LaGeSo's data, the last "district" is actually the sum of all districts /
-# the whole of Berlin.
-#
# Fail on any day where the "sum" district's new infections are not the proper
# sum of the individual districts new infections. Yes, sometimes Lageso sends
# data that is troubled in this way. It will then have to be fixed manually in
db[district][date]['week_incidence'] = (week_sum / district_pop) * 100000
# Optimized for web browser viewing.
+import calendar
if output_type == 'html':
print("""<!DOCTYPE html>
<html>
<head>
<style>
th { text-align: left; vertical-align: bottom; }
-.day_row:nth-child(7n+3) > td { border-top: 1px solid black; }
.vertical_header { writing-mode: vertical-rl; transform: rotate(180deg); font-weight: normal; }
-.fixed_head { position: sticky; top: 0; background-color: white; }
+.repeated_head th { padding-top: 0.5em; border-bottom: 1px solid black; }
.bold { font-weight: bold }
+.date { vertical-align: top; padding-top: 0.5em; }
</style>
<title>Berlin's Corona infection numbers, development by districts</title>
</head>
<a href="/">home</a> · <a href="/contact.html">contact</a> · <a href="/privacy.html">privacy</a>
<h1>Berlin's Corona infection numbers, development by districts</h1>
-<p>Updated daily at 9pm based on data from the "Senatsverwaltung für Gesundheit, Pflege und Gleichstellung". <a href="https://plomlompom.com/repos/?p=berlin-corona-table">Source code</a>. <a href="berlin_corona.txt">Text view optimized for terminal curl</a>.</p>
+<p><del>Updated daily at 7pm based on data from the "Senatsverwaltung für Gesundheit, Pflege und Gleichstellung".</del> Updates currently inactive – check out <a href="https://www.berlin.de/corona/lagebericht/desktop/corona.html#bezirke">the new dashboard</a> instead that they offer by themselves.</p>
+<p><a href="https://plomlompom.com/repos/?p=berlin-corona-table">Source code</a>. <a href="berlin_corona.txt">Plain text view (optimized for terminal curl)</a>.</p>
<table>
<tr>
<th colspan=2></th>""")
print('<th><div class="vertical_header">%s</div></th>' %
translate[district])
print('</tr>')
- print('<tr class="fixed_head">')
- # In Chromium, the th only stay fixed if also given this class.
- print('<th class="fixed_head">date</th>')
- print('<th class="fixed_head"><a href="#symbols">?</a></th>')
- for district in sorted_districts:
- print('<th class="fixed_head"><abbr title="%s">%s</abbr></th>' %
- (translate[district], district))
- print('</tr>')
+ weekday_count = 0
for date in sorted_dates:
+ if weekday_count == 0:
+ print('<tr class="repeated_head">')
+ print('<th>date</th>')
+ print('<th><a href="#symbols">?</a></th>')
+ for district in sorted_districts:
+ print('<th><abbr title="%s">%s</abbr></th>' %
+ (translate[district], district))
+ print('</tr>')
print('<tr class="day_row">')
- print('<td>%s</td>' % date)
+ weekday = calendar.day_name[datetime.date.fromisoformat(date).weekday()]
+ print('<td class="date">%s<br />%s</td>' % (date, weekday))
print('<td><table>')
for abbr in ['+', 'Σ', 'Ø', 'i']:
print('<tr><th><abbr title="%s">%s</abbr></th></tr>' %
print('</table>')
print('</td>')
print('</tr>')
+ weekday_count += 1
+ if weekday_count != 7:
+ continue
+ weekday_count = 0
print('</table>')
print('<h3 id="symbols">Symbols</h3>')
print('<dl>')
# Explain what this is.
intro = \
"""Table of Berlin's Corona infection number development by districts.
-Updated daily at 9pm based on data from the "Senatsverwaltung für Gesundheit, Pflege und Gleichstellung".
+NO LONGER Updated daily at 7pm based on data from the "Senatsverwaltung für Gesundheit, Pflege und Gleichstellung".
+Currently inactive. Instead check out the new dashboard they offer: https://www.berlin.de/corona/lagebericht/desktop/corona.html#bezirke
Abbrevations/explanations:
"""
for k in translate:
- if k == '+': # not used in terminal version
- continue
intro += "%s: %s\n" % (k, translate[k])
intro += """
Source code: https://plomlompom.com/repos/?p=berlin-corona-table
-HTML view: https://plomlompom.com/berlin_corona.html
-"""
+HTML view: https://plomlompom.com/berlin_corona.html"""
print(intro)
# Output table of enhanced daily infection data, newest on top,
# Week table header.
if weekday_count == 0:
- print(' '*10, ' '.join(sorted_districts),
- ' Σ', ' Ø', ' i')
- week_start_date = date
+ print()
+ print(' '*13, ' '.join(sorted_districts))
+ print('-'*77)
- # Day data line.
+ # Day table.
+ weekday = calendar.day_name[datetime.date.fromisoformat(date).weekday()]
+ print('%s (%s)' % (date, weekday))
new_infections = []
+ weekly_sum_strings = []
+ weekly_avg_strings = []
+ weekly_inc_strings = []
for district in sorted_districts:
- new_infections += [db[district][date]['new_infections']]
- week_sum = week_avg = week_inc = ''
- sum_district_data = db[sum_district][date]
- if 'week_sum' in sum_district_data:
- week_sum = '%4s' % sum_district_data['week_sum']
- if 'week_average' in sum_district_data:
- week_avg = '%5.1f' % sum_district_data['week_average']
- if 'week_incidence' in sum_district_data:
- week_inc = '%4.1f' % sum_district_data['week_incidence']
- print(date, ' '.join(['%3s' % infections
- for infections in new_infections]),
- week_sum, week_avg, week_inc)
-
- # Maintain 7-day cycle.
+ district_day_data = db[district][date]
+ new_infections += [district_day_data['new_infections']]
+ wsum_string = ' '*3 + '?'
+ wavg_string = winc_string = ' '*4 + '?'
+ if 'week_sum' in district_day_data:
+ wsum_string = '%4s' % district_day_data['week_sum']
+ weekly_sum_strings += [wsum_string]
+ if 'week_average' in district_day_data:
+ wavg_string = '%5.1f' % district_day_data['week_average']
+ weekly_avg_strings += [wavg_string]
+ if 'week_incidence' in district_day_data:
+ winc_string = '%5.1f' % district_day_data['week_incidence']
+ weekly_inc_strings += [winc_string]
+ print('+', ' '*11, ' '.join(['%3s' % i for i in new_infections]))
+ print('Σ', ' '*10, ' '.join(weekly_sum_strings))
+ print('Ø', ' '*9, ''.join(weekly_avg_strings))
+ print('i', ' '*9, ''.join(weekly_inc_strings))
weekday_count += 1
if weekday_count != 7:
continue
weekday_count = 0
-
- # After each 7 days, print summary for individual districts.
- weekly_sums = []
- weekly_avgs = []
- weekly_incs = []
- for district in sorted_districts[1:]:
- weekly_sums += [db[district][week_start_date]['week_sum']]
- weekly_avgs += [db[district][week_start_date]['week_average']]
- weekly_incs += [db[district][week_start_date]['week_incidence']]
- print()
- print('district stats for week from %s to %s:' % (date, week_start_date))
- print(' '*4, ' '.join(sorted_districts[1:]))
- print('Σ', ' '.join(['%5.1f' % wsum for wsum in weekly_sums]))
- print('Ø', ' '.join(['%5.1f' % wavg for wavg in weekly_avgs]))
- print('i', ' '.join(['%5.1f' % winc for winc in weekly_incs]))
- print()
projects / berlin-corona-table / blobdiff