X-Git-Url: https://plomlompom.com/repos/?p=berlin-corona-table;a=blobdiff_plain;f=enhance_table.py;h=4ce77925c91c985d1bfb177cb0d7ac5694d2d690;hp=02a7ac9b30b8cd0375a79a49468e2dc5c19e3d77;hb=f91a74c7aa31a742e50629e4e57736cf5192320d;hpb=a3d2a6533cb6aee29c48c8e1e08e4981c0c8829b

diff --git a/enhance_table.py b/enhance_table.py
index 02a7ac9..4ce7792 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 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',
+}
+
 # Read infections table path and output type.
 import sys
 if len(sys.argv) != 3:
@@ -74,6 +94,10 @@ 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.
+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.
 #
@@ -83,9 +107,8 @@ sorted_dates.sort()
 # 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)
@@ -111,23 +134,50 @@ for i in range(len(sorted_dates)):
 
 # Optimized for web browser viewing.
 if output_type == 'html':
-    print('<html>')
-    print('<style>')
-    print('table, tr, th, td { border: 1px solid black; }')
-    print('</style>')
-    print('<table>')
-    print('<tr>')
-    print('<th>date</th>')
+    print("""<!DOCTYPE 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; }
+.bold { font-weight: bold }
+</style>
+<title>Berlin's Corona infection numbers, development by districts</title>
+</head>
+<a href="/">home</a> Â· <a href="/contact.html">contact</a> Â· <a href="/privacy.html">privacy</a>
+<h1>Berlin's Corona infection numbers, development by districts</h1>
+<p>Updated daily at 9pm based on data from the "Senatsverwaltung fÃ¼r Gesundheit, Pflege und Gleichstellung". <a href="https://plomlompom.com/repos/?p=berlin-corona-table">Source code</a>. <a href="berlin_corona.txt">Text view optimized for terminal curl</a>.</p>
+<table>
+<tr>
+<th colspan=2></th>""")
+    sorted_dates.reverse()
     for district in sorted_districts:
-        print('<th>%s</th>' % district)
+        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('</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>')
+    for district in sorted_districts:
+        print('<th class="fixed_head">%s</th>' % district)
     print('</tr>')
-    sorted_dates.reverse()
     for date in sorted_dates:
-        print('<tr>')
+        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']:
+            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 = ''
+            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']
@@ -137,10 +187,10 @@ if output_type == 'html':
                 week_inc = '%.1f' % district_data['week_incidence']
             print('<td>')
             print('<table>')
-            print('<tr><th>new</th><td>%s</td></tr>' % new_infections)
-            print('<tr><th>wsum</th><td>%s</td></tr>' % week_sum)
-            print('<tr><th>wavg</th><td>%s</td></tr>' % week_avg)
-            print('<tr><th>winc</th><td>%s</td></tr>' % week_inc)
+            print('<tr><td class="bold">%s</td></tr>' % new_infections)
+            print('<tr><td>%s</td></tr>' % week_sum)
+            print('<tr><td>%s</td></tr>' % week_avg)
+            print('<tr><td>%s</td></tr>' % week_inc)
             print('</table>')
             print('</td>')
         print('</tr>')
@@ -153,28 +203,15 @@ 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)
 
@@ -182,7 +219,6 @@ Source code: https://plomlompom.com/repos/?p=berlin-corona-table
     # separated into 7-day units.
     sorted_dates.reverse()
     weekday_count = 0
-    sum_district = sorted_districts[-1]
     for date in sorted_dates:
 
         # Week table header.
