X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/calendar?a=blobdiff_plain;ds=sidebyside;f=enhance_table.py;h=f44252463130075d456b6faf0d593b8144528c10;hb=3cde66c0f3ccba038fb9098a5552f79e0e75ea15;hp=5287c03a3ea30796251eb1fda25455daa25b8632;hpb=f0145a1f179e5fd3e61ab123fcc8ad967586fa90;p=berlin-corona-table
diff --git a/enhance_table.py b/enhance_table.py
index 5287c03..f442524 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.
@@ -94,13 +95,13 @@ 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.
+# In LaGeSo's data, the last "district" is actually the sum of all districts /
+# 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)
-# In LaGeSo's data, the last "district" is actually the sum of all districts /
-# the whole of Berlin.
-#
# 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
@@ -133,45 +134,48 @@ 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("""
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.
+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(' | ' % long_form)
- print('
')
- print('')
- # In Chromium, the th only stay fixed if also given this class.
- print('date | ')
- print(' | ')
- for district in sorted_districts:
- print('%s | ' % district)
+ print(' | ' %
+ translate[district])
print('
')
+ weekday_count = 0
for date in sorted_dates:
+ if weekday_count == 0:
+ print('')
+ print('date | ')
+ print('? | ')
+ for district in sorted_districts:
+ print('%s | ' %
+ (translate[district], district))
+ print('
')
print('')
- print('%s | ' % date)
+ weekday = calendar.day_name[datetime.date.fromisoformat(date).weekday()]
+ print('%s %s | ' % (date, weekday))
print('')
- print('new | ')
- for abbr in ['wsum', 'wavg', 'winc']:
+ for abbr in ['+', 'Σ', 'Ã', 'i']:
print('%s | ' %
(translate[abbr], abbr))
print(' | ')
@@ -194,7 +198,16 @@ th { text-align: left; vertical-align: bottom; }
print('
')
print('')
print('')
+ weekday_count += 1
+ if weekday_count != 7:
+ continue
+ weekday_count = 0
print('')
+ print('Symbols
')
+ print('')
+ for abbr in ['+', 'Σ', 'Ã', 'i']:
+ print('- %s
- %s
' % (abbr, translate[abbr]))
+ print('
')
print('')
# Optimized for in-terminal curl.
@@ -211,8 +224,7 @@ Abbrevations/explanations:
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
-"""
+HTML view: https://plomlompom.com/berlin_corona.html"""
print(intro)
# Output table of enhanced daily infection data, newest on top,
@@ -223,44 +235,31 @@ HTML view: https://plomlompom.com/berlin_corona.html
# Week table header.
if weekday_count == 0:
- print(' '*10, ' '.join(sorted_districts),
- 'wsum', ' wavg', 'winc')
- week_start_date = date
+ print()
+ print(' '*13, ' '.join(sorted_districts))
+ print('-'*77)
- # Day data line.
+ # Day table.
+ weekday = calendar.day_name[datetime.date.fromisoformat(date).weekday()]
+ print('%s (%s)' % (date, weekday))
new_infections = []
+ weekly_sums = []
+ weekly_avgs = []
+ weekly_incs = []
for district in sorted_districts:
- new_infections += [db[district][date]['new_infections']]
- week_sum = week_avg = week_inc = ''
- sum_district_data = db[sum_district][date]
- if 'week_sum' in sum_district_data:
- week_sum = '%4s' % sum_district_data['week_sum']
- if 'week_average' in sum_district_data:
- week_avg = '%5.1f' % sum_district_data['week_average']
- if 'week_incidence' in sum_district_data:
- week_inc = '%4.1f' % sum_district_data['week_incidence']
- print(date, ' '.join(['%3s' % infections
- for infections in new_infections]),
- week_sum, week_avg, week_inc)
-
- # Maintain 7-day cycle.
+ district_day_data = db[district][date]
+ new_infections += [district_day_data['new_infections']]
+ if 'week_sum' in district_day_data:
+ weekly_sums += [district_day_data['week_sum']]
+ if 'week_average' in district_day_data:
+ weekly_avgs += [district_day_data['week_average']]
+ if 'week_incidence' in district_day_data:
+ weekly_incs += [district_day_data['week_incidence']]
+ print('+', ' '*11, ' '.join(['%3s' % i for i in new_infections]))
+ print('Σ', ' '*10, ' '.join(['%4s' % wsum for wsum in weekly_sums]))
+ print('Ã', ' '*9, ''.join(['%5.1f' % wavg for wavg in weekly_avgs]))
+ print('i', ' '*9, ''.join(['%5.1f' % winc for winc in weekly_incs]))
weekday_count += 1
if weekday_count != 7:
continue
weekday_count = 0
-
- # After each 7 days, print summary for individual districts.
- weekly_sums = []
- weekly_avgs = []
- weekly_incs = []
- 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()