Merge pull request #144 from Urban-Analytics-Technology-Platform/fix-…

…scotland Fix capitalisation of list names in Scotland 2011 DAG
Urban-Analytics-Technology-Platform · Jul 10, 2024 · f24626a · f24626a
2 parents 8683f79 + e906600
commit f24626a
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/python/popgetter/assets/gb_sct/__init__.py b/python/popgetter/assets/gb_sct/__init__.py
@@ -436,47 +436,47 @@ class SourceTable:
 DERIVED_COLUMNS = [
     DerivedColumn(
         hxltag="#population+children+age5_17",
-        filter_func=lambda df: df.query(f"{AGE_CODE} in @children_5_to_17"),
+        filter_func=lambda df: df.query(f"{AGE_CODE} in @CHILDREN_5_TO_17"),
         output_column_name="children_5_17",
         human_readable_name="Children aged 5 to 17",
     ),
     DerivedColumn(
         hxltag="#population+infants+age0_4",
-        filter_func=lambda df: df.query(f"{AGE_CODE} in @infants"),
+        filter_func=lambda df: df.query(f"{AGE_CODE} in @INFANTS"),
         output_column_name="infants_0_4",
         human_readable_name="Infants aged 0 to 4",
     ),
     DerivedColumn(
         hxltag="#population+children+age0_17",
-        filter_func=lambda df: df.query(f"{AGE_CODE} in @children"),
+        filter_func=lambda df: df.query(f"{AGE_CODE} in @CHILDREN"),
         output_column_name="children_0_17",
         human_readable_name="Children aged 0 to 17",
     ),
     DerivedColumn(
         hxltag="#population+adults+f",
         filter_func=lambda df: df.query(
-            f"{AGE_CODE} in @adults and {SEX_LABEL} == 'Female'"
+            f"{AGE_CODE} in @ADULTS and {SEX_LABEL} == 'Female'"
         ),
         output_column_name="adults_f",
         human_readable_name="Female adults",
     ),
     DerivedColumn(
         hxltag="#population+adults+m",
         filter_func=lambda df: df.query(
-            f"{AGE_CODE} in @adults and {SEX_LABEL} == 'Male'"
+            f"{AGE_CODE} in @ADULTS and {SEX_LABEL} == 'Male'"
         ),
         output_column_name="adults_m",
         human_readable_name="Male adults",
     ),
     DerivedColumn(
         hxltag="#population+adults",
-        filter_func=lambda df: df.query(f"{AGE_CODE} in @adults"),
+        filter_func=lambda df: df.query(f"{AGE_CODE} in @ADULTS"),
         output_column_name="adults",
         human_readable_name="Adults",
     ),
     DerivedColumn(
         hxltag="#population+ind",
-        filter_func=lambda df: df.query(f"{AGE_CODE} in @people"),
+        filter_func=lambda df: df.query(f"{AGE_CODE} in @PEOPLE"),
         output_column_name="individuals",
         human_readable_name="Total individuals",
     ),