From 3eb6cadda7625a899df0a86afd491b62ad319620 Mon Sep 17 00:00:00 2001
From: jatkinson1000 <109271713+jatkinson1000@users.noreply.github.com>
Date: Sat, 23 Sep 2023 15:26:15 +0100
Subject: [PATCH] Update field to handle all ages except U21 as per new rules,
 and add Compound Limited as a category.

---
 archeryutils/classifications/AGB_ages.json         |  8 ++++----
 archeryutils/classifications/AGB_bowstyles.json    | 14 ++++++++++++++
 .../classifications/agb_field_classifications.py   |  2 +-
 .../classifications/classification_utils.py        |  2 +-
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/archeryutils/classifications/AGB_ages.json b/archeryutils/classifications/AGB_ages.json
index 6aefb98..d823714 100644
--- 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
index 463627e..064660c 100644
--- 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
index a31e57c..120647d 100644
--- a/archeryutils/classifications/agb_field_classifications.py
+++ b/archeryutils/classifications/agb_field_classifications.py
@@ -56,7 +56,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
index 8e42a5f..a5b9a04 100644
--- a/archeryutils/classifications/classification_utils.py
+++ b/archeryutils/classifications/classification_utils.py
@@ -197,7 +197,7 @@ def read_classes_json(
     else:
         msg = (
             "Unexpected classification system specified. "
-            "Expected one of 'agb_indoor', 'agb_outdoor', 'aqb_field'."
+            "Expected one of 'agb_indoor', 'agb_outdoor', 'agb_field'."
         )
         raise ValueError(msg)