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
</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>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">Plain text view (optimized for terminal curl)</a>.</p>
<table>
<tr>
<th colspan=2></th>""")
weekly_avgs = []
weekly_incs = []
for district in sorted_districts:
- new_infections += [db[district][date]['new_infections']]
- weekly_sums += [db[district][date]['week_sum']]
- weekly_avgs += [db[district][date]['week_average']]
- weekly_incs += [db[district][date]['week_incidence']]
+ 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]))