X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=enhance_table.py;h=4a060a4b758a654ee5593662cf0f66386e037bf1;hb=fca28d3ad3def405de5853c253e0ef130eb41fdc;hp=4ce77925c91c985d1bfb177cb0d7ac5694d2d690;hpb=f91a74c7aa31a742e50629e4e57736cf5192320d;p=berlin-corona-table diff --git a/enhance_table.py b/enhance_table.py index 4ce7792..4a060a4 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 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', + '+': '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,13 +95,13 @@ 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. +# 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 @@ -139,39 +140,39 @@ if output_type == 'html':
Updated daily at 9pm based on data from the "Senatsverwaltung für Gesundheit, Pflege und Gleichstellung". 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. Plain text view (optimized for terminal curl).
""") sorted_dates.reverse() for district in sorted_districts: - long_form = translate[district] # 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 | ' %
+ translate[district])
print('
date | ') + print('? | ') + for district in sorted_districts: + print('%s | ' % + (translate[district], district)) + print('|
%s | ' % date) print('
| ')
@@ -194,7 +195,16 @@ th { text-align: left; vertical-align: bottom; }
print('