correct obj keys for sweden

elinlutz · Apr 8, 2020 · 4e8e71b · 4e8e71b
1 parent 17415e2
commit 4e8e71b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/assets/stylesheets/settings/_colors.scss b/src/assets/stylesheets/settings/_colors.scss
@@ -329,5 +329,4 @@ $accent: $dark-theme;
   deathrate-7: $amber-700;
   deathrate-8: $amber-800;
   deathrate-9: $amber-900;
-
 }
diff --git a/src/components/markers/Markers.js b/src/components/markers/Markers.js
@@ -32,12 +32,12 @@ const Markers = ({ loadTotal, onClick }) => {
   let maxSweConfirmed = 0
   let maxSweDeathRate = 0
   for (let edge in edges){
-    let conf = edges[edge].node.Confirmed
+    let conf = edges[edge].node.Region_Total
 
     if (conf > maxSweConfirmed){
       maxSweConfirmed = conf
     }
-    let dr = edges[edge].node.Deaths/(conf+Number.EPSILON)
+    let dr = edges[edge].node.Region_Deaths/(conf+Number.EPSILON)
     console.log(dr)
     if (dr > maxSweDeathRate){
       maxSweDeathRate = dr
@@ -52,7 +52,7 @@ const Markers = ({ loadTotal, onClick }) => {
       //color = colors.sweden
       color = colors['deathrate-' + String(8)]
     }
-    radius = 100 * Math.sqrt((number/maxSweConfirmed)/Math.PI)
+    radius = 10 * Math.sqrt((number/maxSweConfirmed)/Math.PI)
 
     return { color, radius }
   }