Minor bugfixes and indentation.

9 years ago · a1c5490082
parent c3dddfd7df
commit a1c5490082
2 changed files with 41 additions and 62 deletions
--- a/index.html
+++ b/index.html
@ -2,31 +2,6 @@
 <html>
 <head>
 <meta charset="utf-8">
-<style>
-
-* {
-    border-sizing: border-box;
-    margin: 0;
-    padding: 0;
-}
-
-body {
-  font-family: sans-serif;
-  padding: 20px;
-}
-
-.notes {
-    font-size:14px;
-}
-
-.visualization {
-    height: 700px;
-    margin: 0 auto;
-    position: relative;
-    width: 1100px;
-}
-
-</style>
 <script src="http://d3js.org/d3.v4.0.0-alpha.50.min.js"></script>
 <script src="http://d3js.org/d3-chord.v0.0.min.js"></script>
 <script src='js/matrices.js'></script>
@ -35,6 +10,7 @@ body {
 <script src='js/sorter.js'></script>
 <script src='js/main.js'></script>
 <link rel="stylesheet" href="res/flags.min.css">
+<link rel="stylesheet" href="res/reset.css">
 <link rel="stylesheet" href="res/options.css">
 <link rel="stylesheet" href="res/events.css">
 <link rel="stylesheet" href="res/diagram.css">
@ -74,8 +50,9 @@ body {
        fix setState to not remove everything
        1974 two germanies?
        embiggen current event flag
-        move styling out of index.html
        add sort metric below team name
+        update ribbon hover
+        // STRANGE EXTENDED TIME CHILE-BRAZIL (when? not 1930) - FIX BY HAND? IS BECAUE se1 IS SCORE __GOING INTO__ EXTENDED TIME
        better layout
        better colors
        webpack 2 / css modules?
--- a/js/diagram.js
+++ b/js/diagram.js
@ -151,12 +151,6 @@ const Diagram = {
                break;
        }

-        // let sortedChords = Diagram.swapGroups(data, "1930", chords, 2, 10);
-        // sortedChords = Diagram.swapGroups(data, "1930", chords, 2, 8);
-        // [ Romania, Belgium, Serbia, France, US, Mexico, Paraguay, Peru, Uruguay, Chile, Bolivia, Brazil, Argentina ]
-        // PROBLEMS: 2-8, 2-10, 2-11
-
-
        const arc = d3.arc()
            .innerRadius(innerRadius)
            .outerRadius(outerRadius);
@ -235,17 +229,25 @@ const Diagram = {
            .each(function(d) { d.angle = (d.startAngle + d.endAngle) / 2; })
            .attr("dy", ".35em")
            .attr("transform", function(d) {
-            return "rotate(" + (d.angle * 180 / Math.PI - 90) + ")"
+                return "rotate(" + (d.angle * 180 / Math.PI - 91) + ")"
                + "translate(" + (innerRadius + 26) + ")"
                + (d.angle > Math.PI ? "rotate(180)" : "");
            })
            .style("text-anchor", function(d) { return d.angle > Math.PI ? "end" : null; })
            .text(function(d) {
-              // STRANGE EXTENDED TIME CHILE-BRAZIL (when? not 1930) - FIX BY HAND? IS BECAUE se1 IS SCORE __GOING INTO__ EXTENDED TIME
-
                const team = data.tourneys[eventKey].teams[d.index];
-                const country = data.countries[team.cId];
-                return data.countries[team.cId] + ' ' + team.p;
+                let metric = '';
+
+                switch (sort) {
+                    case SORT_TYPES.GOALS:
+                        metric = `(${team.gf})`;
+                        break;
+                    case SORT_TYPES.POPULATION:
+                        metric = `(${Number(team.p).toLocaleString()})`;
+                        break;
+                }
+
+                return `${data.countries[team.cId]} ${metric}`;
            });
    },
 };