Update field to handle all ages except U21 as per new rules, and add …

…Compound Limited as a category.
jatkinson1000 · Sep 23, 2023 · fa8fb08 · fa8fb08
1 parent b704fbc
commit fa8fb08
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/archeryutils/classifications/AGB_ages.json b/archeryutils/classifications/AGB_ages.json
@@ -24,8 +24,8 @@
   {"age_group" : "Under 18",
    "male" : [70, 80],
    "female" : [60, 60],
-   "red" : [50, 60],
-   "blue" : [40, 50],
+   "red" : [60, 60],
+   "blue" : [50, 50],
    "step" : 2
   },
   {"age_group" : "Under 16",
@@ -38,14 +38,14 @@
   {"age_group" : "Under 15",
    "male" : [50, 50],
    "female" : [50, 50],
-   "red" : [50, 60],
+   "red" : [40, 60],
    "blue" : [30, 50],
    "step" : 4
   },
   {"age_group" : "Under 14",
    "male" : [40, 40],
    "female" : [40, 40],
-   "red" : [50, 60],
+   "red" : [30, 60],
    "blue" : [30, 50],
    "step" : 5
   },

diff --git a/archeryutils/classifications/AGB_bowstyles.json b/archeryutils/classifications/AGB_bowstyles.json
@@ -83,6 +83,20 @@
    "genderStep_field" : 5.5,
    "ageStep_field" : 5.5
   },
+  {"bowstyle" : "Compound Limited",
+   "datum_out" : 15,
+   "classStep_out" : 6,
+   "genderStep_out" : 4,
+   "ageStep_out" : 6,
+   "datum_in" : 11,
+   "classStep_in" : 8,
+   "genderStep_in" : 4,
+   "ageStep_in" : 6,
+   "datum_field" : 55,
+   "classStep_field" : 5,
+   "genderStep_field" : 5.5,
+   "ageStep_field" : 5.5
+  },
   {"bowstyle" : "Compound Barebow",
    "datum_out" : 15,
    "classStep_out" : 6,

diff --git a/archeryutils/classifications/agb_field_classifications.py b/archeryutils/classifications/agb_field_classifications.py
@@ -59,7 +59,7 @@ def _make_agb_field_classification_dict() -> Dict[str, Dict[str, Any]]:
         item
         for item in agb_ages
         if item["age_group"].lower().replace(" ", "")
-        in ["50+", "adult", "under21", "under18", "under15", "under12"]
+        not in ["under21"]
     ]
     # Read in bowstyleclass info as list of dicts
     agb_bowstyles = cls_funcs.read_bowstyles_json()

diff --git a/archeryutils/classifications/classification_utils.py b/archeryutils/classifications/classification_utils.py
@@ -143,7 +143,7 @@ def read_classes_json(
     else:
         raise ValueError(
             "Unexpected classification system specified. "
-            "Expected one of 'agb_indoor', 'agb_outdoor', 'aqb_field'."
+            "Expected one of 'agb_indoor', 'agb_outdoor', 'agb_field'."
         )
 
     classes_file = Path(__file__).parent / filename