From efac604340f9dff896301c8cb10181783483b943 Mon Sep 17 00:00:00 2001
From: Nathaniel Flower <nathaniel@rewolf.co>
Date: Wed, 24 Apr 2024 22:06:20 -0400
Subject: [PATCH 1/2] Added tract geometry support for 2008 and 2009

---
 pygris/enumeration_units.py | 15 +++++----------
 pygris/helpers.py           | 24 +++++++++++++++++++++++-
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/pygris/enumeration_units.py b/pygris/enumeration_units.py
index a4db96b..449cb45 100644
--- a/pygris/enumeration_units.py
+++ b/pygris/enumeration_units.py
@@ -2,7 +2,7 @@
 
 __author__ = "Kyle Walker <kyle@walker-data.com"
 
-from .helpers import _load_tiger, validate_state, validate_county, fips_codes
+from .helpers import _load_tiger, validate_state, validate_county, fips_codes, get_state_name
 import pandas as pd
 
 def counties(state = None, cb = False, resolution = '500k', year = None, cache = False, subset_by = None):
@@ -90,15 +90,7 @@ def counties(state = None, cb = False, resolution = '500k', year = None, cache =
         if type(state) is not list:
             state = [state]
         valid_state = [validate_state(x) for x in state]
-
-        if year == 1990:
-            state_col = 'ST'
-        elif year in [2000, 2010]: 
-            state_col = 'STATE' if cb is True else f'STATEFP{yr}'
-        else: 
-            state_col = 'STATEFP'
-
-        ctys = ctys.query(f'{state_col} in @valid_state')
+        ctys = ctys.query('STATEFP in @valid_state')
 
     return ctys
 
@@ -181,6 +173,9 @@ def tracts(state = None, county = None, cb = False, year = None, cache = False,
         elif year in [2000, 2010]:
             suf = str(year)[2:]
             url = f"https://www2.census.gov/geo/tiger/TIGER2010/TRACT/{year}/tl_2010_{state}_tract{suf}.zip"
+        elif year in [2008, 2009]:
+            state_name = get_state_name(state).upper().replace(' ', '_')
+            url = f"https://www2.census.gov/geo/tiger/TIGER{year}/{state}_{state_name}/tl_{year}_{state}_tract00.zip"
         else:
             url = f"https://www2.census.gov/geo/tiger/TIGER{year}/TRACT/tl_{year}_{state}_tract.zip"
 
diff --git a/pygris/helpers.py b/pygris/helpers.py
index 92f0f01..363aedc 100644
--- a/pygris/helpers.py
+++ b/pygris/helpers.py
@@ -78,7 +78,7 @@ def fips_codes():
 def validate_state(state, quiet = False):
     # Standardize as lowercase
     original_input = state
-    state = str(state).lower()
+    state = state.lower()
     # Get rid of whitespace
     state = state.strip()
 
@@ -120,6 +120,28 @@ def validate_state(state, quiet = False):
                     print(f"Using FIPS code '{state_fips}' for input '{original_input}'")
                 
                 return state_fips
+
+def get_state_name(state, quiet = False):
+    # Standardize as lowercase
+    original_input = state
+    state = state.lower()
+    # Get rid of whitespace
+    state = state.strip()
+
+    # Get the FIPS codes dataset
+    fips = fips_codes()
+    # If a state name, grab the appropriate info from fips_codes
+    state_sub = fips.query('state_code == @state')
+
+    if state_sub.shape[0] == 0:
+        raise ValueError("You have likely entered an invalid state code, please revise.")
+    else:
+        state_name = state_sub.state_name.unique()[0]
+
+        if not quiet:
+            print(f"Using state name '{state_name}' for input '{original_input}'")
+        
+        return state_name
             
 
 def validate_county(state, county, quiet = False):

From dc640664d89638b89e8ddd5356ed5f1907249193 Mon Sep 17 00:00:00 2001
From: Nathaniel Flower <nathaniel@rewolf.co>
Date: Wed, 24 Apr 2024 22:12:37 -0400
Subject: [PATCH 2/2] Fixing some stale lines

---
 pygris/enumeration_units.py | 10 +++++++++-
 pygris/helpers.py           |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pygris/enumeration_units.py b/pygris/enumeration_units.py
index 449cb45..e714916 100644
--- a/pygris/enumeration_units.py
+++ b/pygris/enumeration_units.py
@@ -90,7 +90,15 @@ def counties(state = None, cb = False, resolution = '500k', year = None, cache =
         if type(state) is not list:
             state = [state]
         valid_state = [validate_state(x) for x in state]
-        ctys = ctys.query('STATEFP in @valid_state')
+
+        if year == 1990:
+            state_col = 'ST'
+        elif year in [2000, 2010]: 
+            state_col = 'STATE' if cb is True else f'STATEFP{yr}'
+        else: 
+            state_col = 'STATEFP'
+
+        ctys = ctys.query(f'{state_col} in @valid_state')
 
     return ctys
 
diff --git a/pygris/helpers.py b/pygris/helpers.py
index 363aedc..8df49e1 100644
--- a/pygris/helpers.py
+++ b/pygris/helpers.py
@@ -78,7 +78,7 @@ def fips_codes():
 def validate_state(state, quiet = False):
     # Standardize as lowercase
     original_input = state
-    state = state.lower()
+    state = str(state).lower()
     # Get rid of whitespace
     state = state.strip()