X-Git-Url: https://plomlompom.com/repos/unset_cookie?a=blobdiff_plain;f=enhance_table.py;h=4ce77925c91c985d1bfb177cb0d7ac5694d2d690;hb=f91a74c7aa31a742e50629e4e57736cf5192320d;hp=03382554e2dbfc538aca8107777ed15ee789546c;hpb=6fb8fb729535839b201527cc04662588df3ea425;p=berlin-corona-table diff --git a/enhance_table.py b/enhance_table.py index 0338255..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) @@ -131,36 +134,50 @@ for i in range(len(sorted_dates)): # Optimized for web browser viewing. if output_type == 'html': - print(""" + print(""" + +
-Updated daily at 9pm. Source code. Text view optimized for terminal curl.
+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('%s | ' % long_form)
+ print('||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
date | ') + print('') + for district in sorted_districts: + print(' | %s | ' % district) print('||||||||||||
%s | ' % date) - long_wsum = translate['wsum'] - long_wavg = translate['wavg'] - long_winc = translate['winc'] + print('
| ')
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']
@@ -169,15 +186,12 @@ table, tr, th, td { border: 1px solid black; }
if 'week_incidence' in district_data:
week_inc = '%.1f' % district_data['week_incidence']
print('')
- print(new_infections)
- if district == sum_district:
- print('
|