Merge pull request #4 from codestance/dev

Dev

Author: codestance

README.md

@@ -1 +1 @@
-Babies given names in Poland the last 20 years.
+Babies given names in Poland the last 21 years.

births.csv

@@ -19,4 +19,5 @@ year,M,W,sum
 2017,206990,196093,403083
 2018,200468,188987,389455
 2019,193327,182865,376192
-2020,182932,173608,356540
+2020,182932,173608,356540
+2021,175132,165856,340988

index.html

@@ -18,10 +18,11 @@
         .race span{
             position: absolute;
             bottom: 1.5em;
-            right: 2em;
+            right: 1.5em;
             font-size: 3em;
             font-weight: bolder;
             color: lightslategray;
+            mix-blend-mode: multiply;
         }
 
     </style>
@@ -69,7 +70,6 @@ <h3 id="instruction">Jak używać</h3>
                 </div>
                 <br/>
                 <div id="names"></div>
-                <!-- <div id="namesNew"></div> -->
             </section>
             <section class="py-3">
                 <h3>Ranking najpopularniejszych imion wg kolejnych lat</h3>
@@ -116,7 +116,7 @@ <h2>O danych</h2>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.8/js/select2.min.js"></script>
     <script>
     var chart,data;
-    const years = []; for(let i=2000; i<=2020; i++) years.push(i)
+    const years = []; for(let i=2000; i<=2021; i++) years.push(i)
     const yearsColumn = ['x']; for(let y of years) yearsColumn.push(y)
     function addOption(name){
         const opt = `<option id="${name}" value="${name}" >${name}</option>`;
@@ -135,7 +135,7 @@ <h2>O danych</h2>
     }
     function addName(name){chart.load({columns:[yearsColumn, getNameData(name)]})}
     function delName(name){chart.unload({ids: name})}
-    d3.csv('https://gist.githubusercontent.com/codestance/f9a514f4dcad8ab1e981aa322deb885f/raw/7e8b4d14df60fa493081a5155edbaa5061dbf8dd/names-given-in-poland-till-2020').then(function(dat){
+    d3.csv('https://gist.githubusercontent.com/codestance/0ae1d47de69530a8c38d50dd785a4a6c/raw/256683201d597826d39fb1cd0f0b900fd69d818a/names-given-in-poland-till-2021.csv').then(function(dat){
         data=dat;
         dat.map(d=>addOption(d.name))
         chart=c3.generate({
@@ -184,36 +184,13 @@ <h2>O danych</h2>
             delName(e.params.data.text)
         })
     })
-
-    // c3.generate({
-    //     bindto: '#namesNew',
-    //     data: {
-    //         x: 'name',
-    //         xFormat: '%Y',
-    //         columns: [['name','2000','2001','2002','2003','2004','2005','2006','2007','2008','2009','2010','2011','2012','2013','2014','2015','2016','2017','2018','2019','2020'],
-    //             ['JAKUB',7.349072051,9.696426618,9.717660383,8.967060557,8.791191153,8.195207966,7.846769856,7.604767252,6.966773376,6.382508738,6.002904631,5.855582945,5.549923387,5.238200796,4.840549122,4.370972261,4.336138056,4.222377331,4.306523116,4.000321392,3.838362184],
-    //             ['JULIA',5.38307809,6.784997939,6.761774589,6.98353401,7.791083783,7.772292368,7.520597363,7.664508955,8.031592747,7.283529942,7.131775071,6.7657978,7.006591208,5.737263235,4.831635434,4.62043389,4.483998703,4.634105525,4.347714472,4.342983819,4.157123549],
-    //             ['KACPER',4.510729331,4.464253153,5.419194779,6.470540076,6.849542276,6.489472046,6.23219586,5.754295906,5.125589249,4.481096322,3.864991343,3.701305609,4.267640646,4.170321039,3.7488347,3.261132825,2.92678836,2.741644533,2.628487447,2.455130716,2.297014845]
-    //         ],
-    //         type: 'line',
-    //         order: null
-    //     },
-    //     axis: {
-    //         x: {
-    //             type: 'timeseries',
-    //             tick: {
-    //                 format: '%Y'
-    //             }
-    //         }
-    //     }
-    // })
     </script>
     <script type="module">
         import {default as births} from '/births.js'
         import {default as race} from '/race.js'
         births('births')
-        race('raceM', 2020)
-        race('raceW', 2020)
+        race('raceM', 2021)
+        race('raceW', 2021)
     </script>
 </body>
 <footer class="py-4">

race.js

@@ -8,7 +8,10 @@ export default function(dataName, lastYear){
                     x: 'name',
                     value: ["value"]
                 },
-                type: 'bar'
+                type: 'bar',
+                names: {
+                    value: 'liczba'
+                }
             },
             axis: {
                 rotated: true,

raceM.json

@@ -1091,5 +1091,57 @@
             "value": 4963,
             "rank": 10
         }
+    ],
+    "2021": [
+        {
+            "name": "ANTONI",
+            "value": 7821,
+            "rank": 1
+        },
+        {
+            "name": "JAN",
+            "value": 6975,
+            "rank": 2
+        },
+        {
+            "name": "ALEKSANDER",
+            "value": 6919,
+            "rank": 3
+        },
+        {
+            "name": "FRANCISZEK",
+            "value": 6629,
+            "rank": 4
+        },
+        {
+            "name": "JAKUB",
+            "value": 6427,
+            "rank": 5
+        },
+        {
+            "name": "LEON",
+            "value": 5296,
+            "rank": 6      
+        },
+        {
+            "name": "MIKOŁAJ",
+            "value": 5205,
+            "rank": 7
+        },
+        {
+            "name": "SZYMON",
+            "value": 4962,
+            "rank": 8
+        },
+        {
+            "name": "FILIP",
+            "value": 4884,
+            "rank": 9
+        },
+        {
+            "name": "STANISŁAW",
+            "value": 4679,
+            "rank": 10
+        }
     ]
 }

raceW.json

@@ -1090,5 +1090,57 @@
             "value": 4650,
             "rank": 10
         }
+    ],
+    "2021": [
+        {
+            "name": "ZUZANNA",
+            "value": 6562,
+            "rank": 1      
+        },
+        {
+            "name": "ZOFIA",
+            "value": 6325,
+            "rank": 2
+        },
+        {
+            "name": "HANNA",
+            "value": 6065,
+            "rank": 3
+        },
+        {
+            "name": "JULIA",
+            "value": 5954,
+            "rank": 4
+        },
+        {
+            "name": "MAJA",
+            "value": 5585,
+            "rank": 5
+        },
+        {
+            "name": "LAURA",
+            "value": 5569,
+            "rank": 6      
+        },
+        {
+            "name": "OLIWIA",
+            "value": 4770,
+            "rank": 7
+        },
+        {
+            "name": "ALICJA",
+            "value": 4767,
+            "rank": 8
+        },
+        {
+            "name": "LENA",
+            "value": 4599,
+            "rank": 9
+        },
+        {
+            "name": "POLA",
+            "value": 4483,
+            "rank": 10
+        }
     ]
 }