X-Git-Url: https://plomlompom.com/repos/new_day?a=blobdiff_plain;f=enhance_table.py;h=fd401671a3723ed5798b4f49927e43e0e6b34aaa;hb=bdc52bdeda5f03066adb764c810a37dff408f2ff;hp=0482bdfbffbf8fe0e89bb174454b04f561318a92;hpb=5252dee46a33cce9616ba4e4103b59dba2ec44c1;p=berlin-corona-table
diff --git a/enhance_table.py b/enhance_table.py
index 0482bdf..fd40167 100755
--- a/enhance_table.py
+++ b/enhance_table.py
@@ -32,6 +32,9 @@ 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',
}
# Read infections table path and output type.
@@ -128,23 +131,41 @@ 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
+
+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.
+
+
+date | """)
+ sorted_dates.reverse()
+ sum_district = sorted_districts[-1]
for district in sorted_districts:
- print('%s | ' % district)
+ long_form = translate[district]
+ if sum_district == district:
+ print('%s | ' % long_form)
+ else:
+ print('%s | ' % long_form)
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']
for district in sorted_districts:
district_data = db[district][date]
- week_sum = week_avg = week_inc = ''
+ week_sum = week_avg = week_inc = '(not enough data)'
new_infections = district_data['new_infections']
if 'week_sum' in district_data:
week_sum = '%s' % district_data['week_sum']
@@ -153,12 +174,16 @@ if output_type == 'html':
if 'week_incidence' in district_data:
week_inc = '%.1f' % district_data['week_incidence']
print('')
- print('')
- print('new | %s | ' % new_infections)
- print('wsum | %s | ' % week_sum)
- print('wavg | %s | ' % week_avg)
- print('winc | %s | ' % week_inc)
+ print('%s' % new_infections)
+ if district != sum_district:
+ print('')
+ print('')
+ print('%s | %s | ' % (long_wsum, week_sum))
+ print('%s | %s | ' % (long_wavg, week_avg))
+ print('%s | %s | ' % (long_winc, week_inc))
print(' ')
+ if district != sum_district:
+ print(' ')
print('')
print('')
print(' ')
@@ -170,17 +195,16 @@ 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:
intro += "%s: %s\n" % (k, translate[k])
- intro += """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
-
+ intro += """
Source code: https://plomlompom.com/repos/?p=berlin-corona-table
+
+HTML view: https://plomlompom.com/berlin_corona.html
"""
print(intro)
|