Update data for 2020

Offenware · Jan 13, 2020 · 64fc358 · 64fc358
1 parent f55e150
commit 64fc358
Show file tree

Hide file tree

Showing 2,144 changed files with 303,683 additions and 36,481 deletions.
diff --git a/ALL2019.json b/ALL2019.json
diff --git a/ALL2020.json b/ALL2020.json
diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ COUNTRIES = AHO ARG AUS AUT BRA BUL CAN CRO CYP DEN ECU ESP EST FIN FRA GBR \
             POL POR ROU RSA RUS SLO SUI SWE TUR UKR USA
 
 
-YEAR = 2019
+YEAR = 2020
 
 JSON_FILES = $(addprefix data/$(YEAR)/, $(addsuffix $(YEAR).json, $(COUNTRIES)))
 

diff --git a/scoring.py b/scoring.py
@@ -7,7 +7,7 @@
 from parser.parser import parse_json_glob
 from parser.util import log
 
-YEAR = 2019
+YEAR = 2020
 
 if __name__ == '__main__':
     # display help:

diff --git a/site/data/ARG/ARG001.json b/site/data/ARG/ARG001.json
@@ -4,17 +4,17 @@
   "name": "MAC",
   "owner": "-",
   "rating": {
-    "gph": 509.3,
+    "gph": 509.2,
     "osn": 497.6,
     "triple_offshore": [
-      1.1826,
-      1.4777,
-      1.6868
+      1.1825,
+      1.4782,
+      1.6873
     ],
     "triple_inshore": [
-      0.9142,
-      1.1875,
-      1.3822
+      0.9136,
+      1.1858,
+      1.3789
     ]
   },
   "boat": {
@@ -31,7 +31,7 @@
       "main": 64.27,
       "spinnaker": 0.0,
       "spinnaker_asym": 187.17,
-      "crew": 826.0,
+      "crew": 848.0,
       "wetted_surface": 30.76
     }
   },
@@ -56,13 +56,13 @@
       20
     ],
     "52": [
-      6.62,
+      6.61,
       7.74,
-      8.05,
-      8.19,
-      8.3,
-      8.45,
-      8.51
+      8.04,
+      8.18,
+      8.29,
+      8.43,
+      8.49
     ],
     "60": [
       7.05,
@@ -71,97 +71,97 @@
       8.49,
       8.6,
       8.81,
-      8.98
+      8.97
     ],
     "75": [
-      7.39,
+      7.4,
       8.25,
-      8.76,
-      9.09,
-      9.3,
-      9.43,
-      9.9
+      8.78,
+      9.1,
+      9.31,
+      9.45,
+      9.91
     ],
     "90": [
-      7.36,
-      8.24,
-      8.92,
-      9.59,
-      10.0,
-      10.27,
-      10.64
+      7.37,
+      8.25,
+      8.94,
+      9.62,
+      10.03,
+      10.31,
+      10.68
     ],
     "110": [
-      7.21,
-      8.32,
-      8.85,
-      9.41,
-      9.98,
-      10.8,
-      12.15
+      7.22,
+      8.33,
+      8.87,
+      9.46,
+      10.04,
+      10.87,
+      12.22
     ],
     "120": [
-      7.01,
-      8.29,
-      9.1,
-      9.7,
-      10.25,
-      11.0,
-      12.34
+      7.02,
+      8.3,
+      9.12,
+      9.73,
+      10.37,
+      11.09,
+      12.44
     ],
     "135": [
-      6.23,
+      6.24,
       7.87,
-      8.72,
-      9.77,
-      10.94,
-      11.84,
-      13.32
+      8.73,
+      9.8,
+      10.99,
+      11.9,
+      13.56
     ],
     "150": [
-      5.2,
-      6.62,
-      7.75,
-      8.68,
-      9.48,
-      10.63,
-      13.53
+      5.21,
+      6.63,
+      7.76,
+      8.69,
+      9.51,
+      10.69,
+      13.63
     ],
     "beat_angle": [
-      43.2,
-      41.3,
-      39.5,
-      38.8,
-      38.2,
-      38.1,
-      39
+      43.5,
+      41.6,
+      39.8,
+      39,
+      38.6,
+      38.6,
+      39.4
     ],
     "beat_vmg": [
-      4.31,
-      5.21,
-      5.57,
-      5.73,
-      5.88,
-      5.98,
-      5.96
+      4.3,
+      5.2,
+      5.55,
+      5.71,
+      5.85,
+      5.94,
+      5.92
     ],
     "run_angle": [
-      141.8,
-      140.8,
-      148.3,
+      142,
+      141,
+      148,
       152,
-      147.9,
-      145.4,
+      147.8,
+      145.2,
       145.5
     ],
     "run_vmg": [
       4.51,
-      5.73,
-      6.71,
-      7.46,
-      8.21,
-      9.21,
-      11.72
+      5.74,
+      6.72,
+      7.47,
+      8.23,
+      9.25,
+      11.8
     ]
   }
 }