X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/calendar?a=blobdiff_plain;ds=sidebyside;f=enhance_table.py;h=cee78f82bb674fb98a879c1814bc6a2cca078ea8;hb=56de61949ed35ecb8ab728dd1912e161892bc521;hp=0b30d216f5105d66391251659427caa7903f316a;hpb=049ba1c6850f9344523f8efd46c837a6c15263ee;p=berlin-corona-table
diff --git a/enhance_table.py b/enhance_table.py
index 0b30d21..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)
@@ -131,29 +135,50 @@ for i in range(len(sorted_dates)):
# Optimized for web browser viewing.
if output_type == 'html':
- print('')
- print('')
- print('
')
- print('')
- print('date | ')
+ print("""
+
+
+
+Berlin's Corona infection numbers, development by districts
+
+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()
for district in sorted_districts:
- long_form = translate[district]
- print('%s | ' % 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('date | ')
+ print('? | ')
+ for district in sorted_districts:
+ print('%s | ' %
+ (translate[district], district))
print('
')
- sorted_dates.reverse()
for date in sorted_dates:
- print('')
+ print('
')
print('%s | ' % date)
- long_wsum = translate['wsum']
- long_wavg = translate['wavg']
- long_winc = translate['winc']
+ print('')
+ for abbr in ['+', 'Σ', 'Ã', 'i']:
+ print('%s | ' %
+ (translate[abbr], abbr))
+ print(' | ')
for district in sorted_districts:
district_data = db[district][date]
- week_sum = week_avg = week_inc = ''
+ 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']
@@ -162,15 +187,20 @@ if output_type == 'html':
if 'week_incidence' in district_data:
week_inc = '%.1f' % district_data['week_incidence']
print('')
- print(new_infections)
- print('
')
- print('%s | %s | ' % (long_wsum, week_sum))
- print('%s | %s | ' % (long_wavg, week_avg))
- print('%s | %s | ' % (long_winc, week_inc))
- print(' ')
+ print('')
+ print('%s | ' % new_infections)
+ print('%s | ' % week_sum)
+ print('%s | ' % week_avg)
+ print('%s | ' % week_inc)
+ print(' ')
print(' | ')
print('
')
print('
')
+ print('Symbols
')
+ print('')
+ for abbr in ['+', 'Σ', 'Ã', 'i']:
+ print('- %s
- %s
' % (abbr, translate[abbr]))
+ print('
')
print('')
# Optimized for in-terminal curl.
@@ -179,14 +209,17 @@ elif output_type == 'txt':
# Explain what this is.
intro = \
"""Table of Berlin's Corona infection number development by districts.
-Updated daily around 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)
@@ -194,13 +227,12 @@ Source code: https://plomlompom.com/repos/?p=berlin-corona-table
# 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.
@@ -229,14 +261,14 @@ Source code: https://plomlompom.com/repos/?p=berlin-corona-table
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()