X-Git-Url: https://plomlompom.com/repos/?p=berlin-corona-table;a=blobdiff_plain;f=enhance_table.py;h=c5c11c22bfe1d52518243e13a279ad800c77301d;hp=c670739eb69c53f2ef9ce2b7e26a9300e9138424;hb=dc7fd6818afda18eb8e2d0c8c99af29ccf3655c1;hpb=b2afbdcf5351cf2aa7898241baa7ab081814d522

diff --git a/enhance_table.py b/enhance_table.py
index c670739..c5c11c2 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.
@@ -95,17 +96,20 @@ for line in lines[1:]:
 sorted_dates.sort()
 
 # In LaGeSo's data, the last "district" is actually the sum of all districts /
-# the whole of Berlin.
-#
+# 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)
+
 # 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
 # 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)
@@ -135,6 +139,7 @@ if output_type == 'html':
 <html>
 <head>
 <style>
+th { text-align: left; vertical-align: bottom; }
 .day_row:nth-child(7n+3) > td { border-top: 1px solid black; }
 .vertical_header { writing-mode: vertical-rl; transform: rotate(180deg); font-weight: normal; }
 .fixed_head { position: sticky; top: 0; background-color: white; }
@@ -149,35 +154,31 @@ if output_type == 'html':
 <tr>
 <th colspan=2></th>""")
     sorted_dates.reverse()
-    long_wsum = translate['wsum']
-    long_wavg = translate['wavg']
-    long_winc = translate['winc']
-    sum_district = sorted_districts[-1]
     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">+<abbr></th></tr>')
-        print('<tr><th><abbr title="%s">Î£</abbr></th></tr>' % long_wsum)
-        print('<tr><th><abbr title="%s">Ã</abbr></th></tr>' % long_wavg)
-        print('<tr><th><abbr title="%s">i</abbr></th></tr>' % long_winc)
+        for abbr in ['+', 'Î£', 'Ã', 'i']:
+            print('<tr><th><abbr title="%s">%s</abbr></th></tr>' %
+                  (translate[abbr], abbr))
         print('</table></td>')
         for district in sorted_districts:
             district_data = db[district][date]
-            week_sum = week_avg = week_inc = '(not enough data)'
+            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']
@@ -195,6 +196,11 @@ if output_type == 'html':
             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.
@@ -211,58 +217,41 @@ 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,
     # 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')
-            week_start_date = date
+            print()
+            print(' '*13, '   '.join(sorted_districts))
+            print('-'*77)
 
-        # Day data line.
+        # Day table.
+        print(date)
         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()
