X-Git-Url: https://plomlompom.com/repos/process_titles?a=blobdiff_plain;f=enhance_table.py;h=03382554e2dbfc538aca8107777ed15ee789546c;hb=6fb8fb729535839b201527cc04662588df3ea425;hp=774b333a77cf96951609c4363f219f96d158244a;hpb=ea8a53f23b20bebeeabb6716a5587731f60b28d5;p=berlin-corona-table diff --git a/enhance_table.py b/enhance_table.py index 774b333..0338255 100755 --- a/enhance_table.py +++ b/enhance_table.py @@ -17,12 +17,35 @@ district_pops = { 'sum': 3754418, } -# Read infections table file lines. +# Map abbreviations to full names. +translate = { + 'CW': 'Charlottenburg-Wilmersdorf', + 'FK': 'Friedrichshain-Kreuzberg', + 'Li': 'Lichtenberg', + 'MH': 'Marzahn-Hellersdorf', + 'Mi': 'Mitte', + 'Ne': 'Neukölln', + 'Pa': 'Pankow', + 'Re': 'Reinickendorf', + 'Sp': 'Spandau', + 'SZ': 'Steglitz-Zehlendorf', + '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', +} + +# Read infections table path and output type. import sys -if len(sys.argv) != 2: - print('Expecting infections table file path as only argument.') +if len(sys.argv) != 3: + print('Expecting infections table file path and output type as only arguments.') exit(1) infections_table = sys.argv[1] +output_type = sys.argv[2] + +# Read infections table file lines. f = open(infections_table, 'r') lines = f.readlines() f.close() @@ -106,79 +129,126 @@ for i in range(len(sorted_dates)): db[district][date]['week_average'] = week_sum / 7 db[district][date]['week_incidence'] = (week_sum / district_pop) * 100000 -# Explain what this is. -intro = """Table of Berlin's Corona infection number development by districts. +# Optimized for web browser viewing. +if output_type == 'html': + print(""" + +
Updated daily at 9pm. 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) + print('|||||
---|---|---|---|---|---|---|---|
%s | ' % date) + long_wsum = translate['wsum'] + long_wavg = translate['wavg'] + long_winc = translate['winc'] + for district in sorted_districts: + district_data = db[district][date] + 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_average' in district_data: + week_avg = '%.1f' % district_data['week_average'] + if 'week_incidence' in district_data: + week_inc = '%.1f' % district_data['week_incidence'] + print('')
+ print(new_infections)
+ if district == sum_district:
+ print('
|