Explain that "+" counts just for the single day unit.

[berlin-corona-table] / enhance_table.py

diff --git a/enhance_table.py b/enhance_table.py
index 5287c03a3ea30796251eb1fda25455daa25b8632..cee78f82bb674fb98a879c1814bc6a2cca078ea8 100755 (executable)
--- 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.
@@ -154,24 +155,24 @@ th { text-align: left; vertical-align: bottom; }
 <th colspan=2></th>""")
     sorted_dates.reverse()
     for district in sorted_districts:
-        long_form = translate[district]
         # Wrap in div because the vertical orientation otherwise fails
         # in Chromium.
-        print('<th><div class="vertical_header">%s</div></th>' % long_form)
+        print('<th><div class="vertical_header">%s</div></th>' %
+              translate[district])
     print('</tr>')
     print('<tr class="fixed_head">')
     # In Chromium, the th only stay fixed if also given this class.
     print('<th class="fixed_head">date</th>')
-    print('<th class="fixed_head"></th>')
+    print('<th class="fixed_head"><a href="#symbols">?</a></th>')
     for district in sorted_districts:
-        print('<th class="fixed_head">%s</th>' % district)
+        print('<th class="fixed_head"><abbr title="%s">%s</abbr></th>' %
+              (translate[district], district))
     print('</tr>')
     for date in sorted_dates:
         print('<tr class="day_row">')
         print('<td>%s</td>' % date)
         print('<td><table>')
-        print('<tr><th><abbr title="new infections counted">new</abbr></th></tr>')
-        for abbr in ['wsum', 'wavg', 'winc']:
+        for abbr in ['+', 'Σ', 'Ø', 'i']:
             print('<tr><th><abbr title="%s">%s</abbr></th></tr>' %
                   (translate[abbr], abbr))
         print('</table></td>')
@@ -195,6 +196,11 @@ th { text-align: left; vertical-align: bottom; }
             print('</td>')
         print('</tr>')
     print('</table>')
+    print('<h3 id="symbols">Symbols</h3>')
+    print('<dl>')
+    for abbr in ['+', 'Σ', 'Ø', 'i']:
+        print('<dt>%s</dt><dd>%s</dd>' % (abbr, translate[abbr]))
+    print('</dl>')
     print('</html>')
 
 # Optimized for in-terminal curl.
@@ -208,6 +214,8 @@ Updated daily at 9pm based on data from the "Senatsverwaltung für Gesundheit, P
 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
@@ -224,7 +232,7 @@ HTML view: https://plomlompom.com/berlin_corona.html
         # Week table header.
         if weekday_count == 0:
             print(' '*10, '  '.join(sorted_districts),
-                  'wsum', ' wavg', 'winc')
+                  '   Σ', '    Ø', '   i')
             week_start_date = date
 
         # Day data line.
@@ -259,8 +267,8 @@ HTML view: https://plomlompom.com/berlin_corona.html
             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()