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/do_day?a=blobdiff_plain;f=enhance_table.py;h=ab6ec46f071ce88484503007d163569759369eb1;hb=ecc9a92512c854244ce9997b4861666460319308;hp=d37205ee11220cc828b2e4eb75163a0eb3a2c295;hpb=3314770c7d0362afd2b17ccab7885f3c47ffa03d;p=berlin-corona-table diff --git a/enhance_table.py b/enhance_table.py index d37205e..ab6ec46 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. @@ -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) @@ -130,45 +134,53 @@ for i in range(len(sorted_dates)): db[district][date]['week_incidence'] = (week_sum / district_pop) * 100000 # Optimized for web browser viewing. +import calendar if output_type == 'html': print("""
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).
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: - # Wrap in div because the vertical orientation otherwise fails - # in Chromium. - print('%s | ' % long_form)
+ # Wrap in div because the vertical orientation otherwise fails
+ # in Chromium.
+ print('%s | ' %
+ translate[district])
print('||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
date | ') + print('? | ') + for district in sorted_districts: + print('%s | ' % + (translate[district], district)) + print('||||||||||||
%s | ' % date) - long_wsum = translate['wsum'] - long_wavg = translate['wavg'] - long_winc = translate['winc'] + weekday = calendar.day_name[datetime.date.fromisoformat(date).weekday()] + print('%s (%s) | ' % (date, weekday))
+ 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']
@@ -177,19 +189,24 @@ table, tr, th, td { border: 1px solid black; text-align: center; }
if 'week_incidence' in district_data:
week_inc = '%.1f' % district_data['week_incidence']
print('')
- print('%s' % new_infections)
- if district != sum_district:
- print('') - print('
Symbols') + print('
|