X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=enhance_table.py;h=6fe12d4282fb8c0816756673041b33e57c076a7d;hb=46e399e76a33e978ff50cdfd735d4701093c1976;hp=02a7ac9b30b8cd0375a79a49468e2dc5c19e3d77;hpb=a3d2a6533cb6aee29c48c8e1e08e4981c0c8829b;p=berlin-corona-table
diff --git a/enhance_table.py b/enhance_table.py
index 02a7ac9..6fe12d4 100755
--- a/enhance_table.py
+++ b/enhance_table.py
@@ -17,6 +17,26 @@ district_pops = {
'sum': 3754418,
}
+# Map abbreviations to full names.
+translate = {
+ 'CW': 'Charlottenburg-Wilmersdorf',
+ 'FK': 'Friedrichshain-Kreuzberg',
+ 'Li': 'Lichtenberg',
+ 'MH': 'Marzahn-Hellersdorf',
+ 'Mi': 'Mitte',
+ 'Ne': 'Neukölln',
+ 'Pa': 'Pankow',
+ 'Re': 'Reinickendorf',
+ 'Sp': 'Spandau',
+ 'SZ': 'Steglitz-Zehlendorf',
+ '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.
import sys
if len(sys.argv) != 3:
@@ -111,23 +131,42 @@ 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.
+
+
+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']
@@ -136,12 +175,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(' ')
@@ -153,28 +196,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:
-
-CW: Charlottenburg-Wilmersdorf
-FK: Friedrichshain-Kreuzberg
-Li: Lichtenberg
-MH: Marzahn-Hellersdorf
-Mi: Mitte
-Ne: Neukölln
-Pa: Pankow
-Re: Reinickendorf
-Sp: Spandau
-SZ: Steglitz-Zehlendorf
-TS: Tempelhof-Schöneberg
-TK: Treptow-Köpenick
-sum: sum for all the districts
-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
-
+"""
+ for k in translate:
+ 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)
|