X-Git-Url: https://plomlompom.com/repos/?p=berlin-corona-table;a=blobdiff_plain;f=enhance_table.py;h=4ce77925c91c985d1bfb177cb0d7ac5694d2d690;hp=6fe12d4282fb8c0816756673041b33e57c076a7d;hb=f91a74c7aa31a742e50629e4e57736cf5192320d;hpb=46e399e76a33e978ff50cdfd735d4701093c1976
diff --git a/enhance_table.py b/enhance_table.py
index 6fe12d4..4ce7792 100755
--- a/enhance_table.py
+++ b/enhance_table.py
@@ -32,7 +32,7 @@ translate = {
'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',
}
@@ -94,6 +94,10 @@ for line in lines[1:]:
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.
#
@@ -103,9 +107,8 @@ sorted_dates.sort()
# 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)
@@ -135,11 +138,11 @@ if output_type == 'html':
Berlin's Corona infection numbers, development by districts
@@ -148,25 +151,33 @@ table, tr, th, td { border: 1px solid black; text-align: center; }
Updated daily at 9pm based on data from the "Senatsverwaltung für Gesundheit, Pflege und Gleichstellung". Source code. Text view optimized for terminal curl.
-date | """)
+ | """)
sorted_dates.reverse()
- sum_district = sorted_districts[-1]
for district in sorted_districts:
long_form = translate[district]
- if sum_district == district:
- print('%s | ' % long_form)
- else:
- print('%s | ' % long_form)
+ # Wrap in div because the vertical orientation otherwise fails
+ # in Chromium.
+ print(' | ' % long_form)
+ print('
')
+ print('')
+ # In Chromium, the th only stay fixed if also given this class.
+ print('date | ')
+ print(' | ')
+ for district in sorted_districts:
+ print('%s | ' % district)
print('
')
for date in sorted_dates:
print('')
print('%s | ' % date)
- long_wsum = translate['wsum']
- long_wavg = translate['wavg']
- long_winc = translate['winc']
+ print('')
+ print('new | ')
+ for abbr in ['wsum', 'wavg', 'winc']:
+ print('%s | ' %
+ (translate[abbr], abbr))
+ print(' | ')
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']
@@ -175,16 +186,12 @@ table, tr, th, td { border: 1px solid black; text-align: center; }
if 'week_incidence' in district_data:
week_inc = '%.1f' % district_data['week_incidence']
print('')
- print('%s' % new_infections)
- if district != sum_district:
- print('')
- print('')
- print('%s | %s | ' % (long_wsum, week_sum))
- print('%s | %s | ' % (long_wavg, week_avg))
- print('%s | %s | ' % (long_winc, week_inc))
+ print('')
+ print('%s | ' % new_infections)
+ print('%s | ' % week_sum)
+ print('%s | ' % week_avg)
+ print('%s | ' % week_inc)
print(' ')
- if district != sum_district:
- print('')
print('')
print('')
print(' ')
@@ -204,7 +211,6 @@ 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)
@@ -213,7 +219,6 @@ HTML view: https://plomlompom.com/berlin_corona.html
# separated into 7-day units.
sorted_dates.reverse()
weekday_count = 0
- sum_district = sorted_districts[-1]
for date in sorted_dates:
# Week table header.
|