Add additional income categories

SANDAG · Oct 30, 2024 · 4f5e658 · 4f5e658
1 parent 11ef922
commit 4f5e658
Show file tree

Hide file tree

Showing 6 changed files with 1,545 additions and 1,537 deletions.
diff --git a/data/interim/survey_data_clean.csv b/data/interim/survey_data_clean.csv
diff --git a/data/processed/data_model_output.csv b/data/processed/data_model_output.csv
diff --git a/data_model/data_model.py b/data_model/data_model.py
@@ -1430,10 +1430,10 @@ def is_final_destination(cls):
     """
 
     party_size_flight: NoneOrNanString[e.PartySize] = Field(
-        ..., description = "Size of the party flying with the respondent (count includes the respondent)"
+        ..., description = "Number of people flying with the respondent (count excludes the respondent)"
     )
     """
-    Size of the party flying with the respondent (count includes the respondent).
+    Number of people flying with the respondent (count excludes the respondent)
     """
 
     party_size_ground_access_same: NoneOrNanString[bool] = Field(
@@ -1444,10 +1444,10 @@ def is_final_destination(cls):
     """
 
     party_size_ground_access: NoneOrNanString[e.PartySize] = Field(
-        ..., description = "Size of ground access travel party"
+        ..., description = "Size of ground access travel party (count excludes the respondent)"
     )
     """
-    Size of ground access travel party.
+    Size of ground access travel party (count excludes the respondent)
     """
 
     party_includes_child_aged00to05: NoneOrNanString[bool] = Field(

diff --git a/data_model/enums.py b/data_model/enums.py
@@ -551,7 +551,7 @@ class TravelDuration(IntEnum):
 
 class PartySize(IntEnum):
     """
-    Integer mapping for number of persons in travel party
+    Integer mapping for number of persons in travel party (apart from respondent)
     """
     NONE = 0
     ONE = 1  
@@ -1127,8 +1127,10 @@ class HouseholdIncome(IntEnum):
     BETWEEN_60K_75K = 10
     BETWEEN_75K_100K = 11
     BETWEEN_100K_150K = 12
-    ABOVE_150K = 13
+    BETWEEN_150_199K = 13
     PREFER_NOT_TO_SAY = 14  
+    BETWEEN_200_299K = 15
+    MORE_THAN_300K = 16
     OTHER = 98
     REFUSED = 99