X-Git-Url: https://plomlompom.com/repos/?p=berlin-corona-table;a=blobdiff_plain;f=enhance_table.py;h=cee78f82bb674fb98a879c1814bc6a2cca078ea8;hp=8d0fd335ec2c62e077bb3b34fcd47f10920adb30;hb=56de61949ed35ecb8ab728dd1912e161892bc521;hpb=7c0bea9a26a3e3a5466f1a75d41f4a48d2106ac2 diff --git a/enhance_table.py b/enhance_table.py index 8d0fd33..cee78f8 100755 --- a/enhance_table.py +++ b/enhance_table.py @@ -32,9 +32,10 @@ translate = { '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. @@ -94,6 +95,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 +108,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,35 +139,46 @@ if output_type == 'html': -Table of Berlin's Corona infection number development by districts +Berlin's Corona infection numbers, development by districts -

Table of Berlin's Corona infection number development by districts

-

Updated daily at 9pm. Source code. Text view optimized for terminal curl.

+home · contact · privacy +

Berlin's Corona infection numbers, development by districts

+

Updated daily at 9pm based on data from the "Senatsverwaltung für Gesundheit, Pflege und Gleichstellung". Source code. Text view optimized for terminal curl.

-""") +""") sorted_dates.reverse() - sum_district = sorted_districts[-1] for district in sorted_districts: - long_form = translate[district] - if sum_district == district: - print('' % long_form) - else: - print('' % long_form) + # Wrap in div because the vertical orientation otherwise fails + # in Chromium. + print('' % + translate[district]) + print('') + print('') + # In Chromium, the th only stay fixed if also given this class. + print('') + print('') + for district in sorted_districts: + print('' % + (translate[district], district)) print('') for date in sorted_dates: print('') print('' % 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 = '(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'] @@ -172,19 +187,20 @@ table, tr, th, td { border: 1px solid black; } if 'week_incidence' in district_data: week_inc = '%.1f' % district_data['week_incidence'] print('') print('') print('
date%s%s
%s
date?%s
%s') + for abbr in ['+', 'Σ', 'Ø', 'i']: + print('' % + (translate[abbr], abbr)) + print('
%s
') - print(new_infections) - if district != sum_district: - print('
') print('') - print('' % (long_wsum, week_sum)) - print('' % (long_wavg, week_avg)) - print('' % (long_winc, week_inc)) + print('' % new_infections) + print('' % week_sum) + print('' % week_avg) + print('' % week_inc) print('
%s%s
%s%s
%s%s
%s
%s
%s
%s
') - if district != sum_district: - print('
') print('
') + print('

Symbols

') + print('
') + for abbr in ['+', 'Σ', 'Ø', 'i']: + print('
%s
%s
' % (abbr, translate[abbr])) + print('
') print('') # Optimized for in-terminal curl. @@ -193,15 +209,16 @@ elif output_type == 'txt': # Explain what this is. intro = \ """Table of Berlin's Corona infection number development by districts. -Updated daily at 9pm. +Updated daily at 9pm based on data from the "Senatsverwaltung für Gesundheit, Pflege und Gleichstellung". Abbrevations/explanations: """ for k in translate: + if k == '+': # not used in terminal version + continue 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) @@ -210,13 +227,12 @@ 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. if weekday_count == 0: - print(' '*11, ' '.join(sorted_districts[:-1]), - sorted_districts[-1], 'wsum', ' wavg', 'winc') + print(' '*10, ' '.join(sorted_districts), + ' Σ', ' Ø', ' i') week_start_date = date # Day data line. @@ -245,14 +261,14 @@ HTML view: https://plomlompom.com/berlin_corona.html weekly_sums = [] weekly_avgs = [] weekly_incs = [] - for district in sorted_districts[:-1]: + 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(' '*4, ' '.join(sorted_districts[1:])) + print('Σ', ' '.join(['%5.1f' % wsum for wsum in weekly_sums])) + print('Ø', ' '.join(['%5.1f' % wavg for wavg in weekly_avgs])) + print('i', ' '.join(['%5.1f' % winc for winc in weekly_incs])) print()