Finland fixed, fixes also Sweden (yay!); Disclaimers updated

4be3db35 · Michał Woźniak · 2813e604 · 4be3db35 · 4be3db35
Commit 4be3db35 authored Mar 26, 2020 by Michał Woźniak
--- a/covid.js
+++ b/covid.js
@@ -73,12 +73,12 @@ let getSiteCases = (site) => {
            var data = tdata
                .sections[0]
                .templates
-                .filter(row => row.template == 'medical cases chart/row')
+                .filter(row => ( (row.template == 'medical cases chart/row') && (row.list[0] != "") ) )
                .map((row)=>{
                    if (row.list[6] !== "") {
-                        cases = 1 * row.list[6].replace(/,/g, '')
+                        cases = 1 * row.list[6].replace(/[^0-9]/g, '')
                    } else {
-                        cases = 1 * row.list[8].replace(/,/g, '')
+                        cases = 1 * row.list[8].replace(/[^0-9]/g, '')
                    }
                    return {
                        date: row.list[0],

--- a/index.html
+++ b/index.html
@@ -182,6 +182,9 @@
            #the-chart {
                height:50vh;
            }
+            #disclaimers-container {
+                font-size:80%;
+            }
        </style>
    </head>
    <body>
@@ -209,7 +212,14 @@
            <!--input type="radio" id="chart-tipe-logarithmic" name="chart-type"/>
            <input type="radio" id="chart-tipe-linear" name="chart-type"/-->
        </div>
-        <p><strong>Disclaimer:</strong> this is all back-of-the-napkin math using data from Wikipedia. Take with a grain (or preferably, a spoonfull) of salt. Check your own sources; some great resources: <a href="http://covid.hi.is/">University of Iceland's COVID data model</a> (and its <a href="https://github.com/bgautijonsson/covid19/">sources</a>).</p>
+        <div id="disclaimers-container">
+            <h3>Disclaimers:</h3>
+            <ul>
+                <li><p>This is all back-of-the-napkin math using data from Wikipedia. Take with a grain (or preferably, a spoonfull) of salt. Check your own sources. Make your own analysis.</p></li>
+                <li><p>There are bugs. Wikipedia data is messy. A reasonable attempt is made to clean it before displaying, but it is far from perfect. Some infection areas might not yeild data. Some might have incomplete data.</p></li>
+                <li><p>Some great resources: <a href="http://covid.hi.is/">University of Iceland's COVID data model</a> (and its <a href="https://github.com/bgautijonsson/covid19/">sources</a>); <a href="https://covid-cases.now.sh/">COVID-19 Statistics</a> with some decent predictions.</p></li>
+            </ul>
+        </div>
        <footer>
            <p>cobbled together by <a href="https://mastodon.social/@rysiek/">@rysiek</a>; <a href="https://git.rys.io/rysiek/covid/">code is here</a>; license: <a href="./LICENSE">Affero GPL</a><br/>
            uses <a href="https://github.com/spencermountain/wtf_wikipedia"><code>wtf_wikipedia</code></a> and <a href="https://www.chartjs.org/">Charts.js</a> (both <a href="./LICENSE.wtf_wikipedia-charts.js.txt">MIT-licensed</a>) and the Play font (licensed under the <a href="./Play/OFL.txt">OFL</a>)<br/>