X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/decks/%7B%7Bdeck_id%7D%7D/cards/%7B%7Bcard_id%7D%7D/feed.xml?a=blobdiff_plain;f=enhance_table.py;h=0ca53d7a200f5f5b4255fb85acaf3452dc4ff425;hb=43820a07318a4751ac914b42a80aaa346a6e85a9;hp=2410099c2e3c72a07acb450a1e441ec47b980c46;hpb=f13581e13f5e699a54dc3d7b48efffbd149e1966;p=berlin-corona-table diff --git a/enhance_table.py b/enhance_table.py index 2410099..0ca53d7 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. @@ -95,17 +96,20 @@ for line in lines[1:]: sorted_dates.sort() # In LaGeSo's data, the last "district" is actually the sum of all districts / -# the whole of Berlin. -# +# 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) + # 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 # 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) @@ -145,30 +149,30 @@ th { text-align: left; vertical-align: bottom; } home · contact · privacy
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('%s | ' %
+ translate[district])
print('||
---|---|---|---|---|
date | ') - print('') + print(' | ? | ') for district in sorted_districts: - print('%s | ' % district) + print('%s | ' % + (translate[district], district)) print('
%s | ' % date) print('
| ')
@@ -192,6 +196,11 @@ th { text-align: left; vertical-align: bottom; }
print('')
print('