'TS': 'Tempelhof-Schöneberg',
'TK': 'Treptow-Köpenick',
'sum': 'all of Berlin',
- 'wsum': 'sum 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',
+ '+': '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',
}
# Read infections table path and output type.
sorted_dates.sort()
# In LaGeSo's data, the last "district" is actually the sum of all districts /
-# the whole of Berlin.
-#
+# 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)
+
# 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
# 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)
<html>
<head>
<style>
-table, tr, th, td { border: 1px solid black; text-align: center; }
-.day_row:nth-child(7n+2) { background-color: yellow; }
-.district_name { writing-mode: vertical-rl; transform: rotate(180deg); }
-.bonus_data th { font-weight: normal; }
-.new_infections { font-weight: bold; }
-thead th { position: sticky; top: 0; background-color: white; }
+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>
<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>
-<thead>
<tr>
-<th>date</th>""")
+<th colspan=2></th>""")
sorted_dates.reverse()
- sum_district = sorted_districts[-1]
for district in sorted_districts:
- long_form = translate[district]
- if sum_district == district:
- print('<th>%s</th>' % long_form)
- else:
- # Wrap in div because the vertical orientation otherwise fails
- # in Chromium.
- print('<th><div class="district_name">%s</div></th>' % long_form)
+ # Wrap in div because the vertical orientation otherwise fails
+ # in Chromium.
+ 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>')
- print('</thead>')
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>')
+ for abbr in ['+', 'Σ', 'Ø', 'i']:
+ 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 = '(not enough data)'
+ 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('<span class="new_infections">%s</span>' % new_infections)
- if district != sum_district:
- print('<details><summary></summary>')
- print('<table class="bonus_data">')
- 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>')
+ 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>')
- if district != sum_district:
- print('</details>')
print('</td>')
print('</tr>')
print('</table>')
+ print('<h3 id="symbols">Symbols</h3>')
+ print('<dl>')
+ for abbr in ['+', 'Σ', 'Ø', 'i']:
+ print('<dt>%s</dt><dd>%s</dd>' % (abbr, translate[abbr]))
+ print('</dl>')
print('</html>')
# Optimized for in-terminal curl.
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,
# separated into 7-day units.
sorted_dates.reverse()
weekday_count = 0
- sum_district = sorted_districts[-1]
for date in sorted_dates:
# Week table header.
if weekday_count == 0:
- print(' '*11, ' '.join(sorted_districts[:-1]),
- sorted_districts[-1], 'wsum', ' wavg', 'winc')
- week_start_date = date
+ print()
+ print(' '*13, ' '.join(sorted_districts))
+ print('-'*77)
- # Day data line.
+ # Day table.
+ print(date)
new_infections = []
+ weekly_sums = []
+ weekly_avgs = []
+ weekly_incs = []
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']]
+ if 'week_sum' in district_day_data:
+ weekly_sums += [district_day_data['week_sum']]
+ if 'week_average' in district_day_data:
+ weekly_avgs += [district_day_data['week_average']]
+ if 'week_incidence' in district_day_data:
+ weekly_incs += [district_day_data['week_incidence']]
+ print('+', ' '*11, ' '.join(['%3s' % i for i in new_infections]))
+ print('Σ', ' '*10, ' '.join(['%4s' % wsum for wsum in weekly_sums]))
+ print('Ø', ' '*9, ''.join(['%5.1f' % wavg for wavg in weekly_avgs]))
+ print('i', ' '*9, ''.join(['%5.1f' % winc for winc in weekly_incs]))
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(' '*7, ' '.join(sorted_districts[:-1]))
- print('wsum', ' '.join(['%5.1f' % wsum for wsum in weekly_sums]))
- print('wavg', ' '.join(['%5.1f' % wavg for wavg in weekly_avgs]))
- print('winc', ' '.join(['%5.1f' % winc for winc in weekly_incs]))
- print()
projects / berlin-corona-table / blobdiff