'TS': 'Tempelhof-Schöneberg',
'TK': 'Treptow-Köpenick',
'sum': 'all of Berlin',
- 'wsum': 'sum for last 7 days',
+ 'wsum': 'sum of new infections for last 7 days',
'wavg': 'per-day average of new infections for last 7 days',
'winc': '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.
+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.
#
# the table file, since we should have a human look at what mistake was
# probably made.
for date in sorted_dates:
- sum_district = sorted_districts[-1]
day_sum = 0
- for district in sorted_districts[:-1]:
+ for district in [d for d in sorted_districts if not d==sum_district]:
day_sum += db[district][date]['new_infections']
if day_sum != db[sum_district][date]['new_infections']:
raise Exception('Questionable district infection sum in %s' % date)
# Optimized for web browser viewing.
if output_type == 'html':
- print('<html>')
- print('<style>')
- print('table, tr, th, td { border: 1px solid black; }')
- print('.day_row:nth-child(7n+2) { background-color: yellow; }')
- print('.district_header { writing-mode: vertical-rl; '
- 'transform: rotate(180deg); }')
- print('</style>')
- print('<table>')
- print('<tr>')
- print('<th>date</th>')
+ 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; }
+.bold { font-weight: bold }
+</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>
+<table>
+<tr>
+<th colspan=2></th>""")
+ sorted_dates.reverse()
for district in sorted_districts:
long_form = translate[district]
- print('<th class="district_header">%s</th>' % long_form)
+ # Wrap in div because the vertical orientation otherwise fails
+ # in Chromium.
+ print('<th><div class="vertical_header">%s</div></th>' % long_form)
+ 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"></th>')
+ for district in sorted_districts:
+ print('<th class="fixed_head">%s</th>' % district)
print('</tr>')
- sorted_dates.reverse()
- sum_district = sorted_districts[-1]
for date in sorted_dates:
print('<tr class="day_row">')
print('<td>%s</td>' % date)
- long_wsum = translate['wsum']
- long_wavg = translate['wavg']
- long_winc = translate['winc']
+ print('<td><table>')
+ print('<tr><th><abbr title="new infections counted">new</abbr></th></tr>')
+ for abbr in ['wsum', 'wavg', 'winc']:
+ print('<tr><th><abbr title="%s">%s</abbr></th></tr>' %
+ (translate[abbr], abbr))
+ print('</table></td>')
for district in sorted_districts:
district_data = db[district][date]
- week_sum = week_avg = week_inc = ''
+ week_sum = week_avg = week_inc = '?'
new_infections = district_data['new_infections']
if 'week_sum' in district_data:
week_sum = '%s' % district_data['week_sum']
if 'week_incidence' in district_data:
week_inc = '%.1f' % district_data['week_incidence']
print('<td>')
- print(new_infections)
- if district == sum_district:
- print('<details open><summary></summary><table>')
- else:
- print('<details><summary></summary><table>')
- print('<tr><th>%s</th><td>%s</td></tr>' % (long_wsum, week_sum))
- print('<tr><th>%s</th><td>%s</td></tr>' % (long_wavg, week_avg))
- print('<tr><th>%s</th><td>%s</td></tr>' % (long_winc, week_inc))
- print('</table></details>')
+ print('<table>')
+ print('<tr><td class="bold">%s</td></tr>' % new_infections)
+ print('<tr><td>%s</td></tr>' % week_sum)
+ print('<tr><td>%s</td></tr>' % week_avg)
+ print('<tr><td>%s</td></tr>' % week_inc)
+ print('</table>')
print('</td>')
print('</tr>')
print('</table>')
# Explain what this is.
intro = \
"""Table of Berlin's Corona infection number development by districts.
-Updated daily around 9pm.
+Updated daily at 9pm based on data from the "Senatsverwaltung für Gesundheit, Pflege und Gleichstellung".
Abbrevations/explanations:
"""
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
"""
print(intro)
# separated into 7-day units.
sorted_dates.reverse()
weekday_count = 0
- sum_district = sorted_districts[-1]
for date in sorted_dates:
# Week table header.
projects / berlin-corona-table / blobdiff