Normalize at-large district naming: 00 and 98 both map to 01

DC (GEOID 1198, district 98) and at-large states (GEOID XX00, district
00) should all display as XX-01. Previously max(d, 1) only handled 00,
producing DC-98.h5 instead of DC-01.h5.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: baogorek

policyengine_us_data/calibration/publish_local_area.py

@@ -150,7 +150,9 @@ def build_district_h5(
     """
     cd_int = int(cd_geoid)
     state_fips = cd_int // 100
-    district_num = max(cd_int % 100, 1)
+    district_num = cd_int % 100
+    if district_num in AT_LARGE_DISTRICTS:
+        district_num = 1
     state_code = STATE_CODES.get(state_fips, str(state_fips))
     friendly_name = f"{state_code}-{district_num:02d}"
 
@@ -224,11 +226,16 @@ def build_city_h5(
     return output_path
 
 
+AT_LARGE_DISTRICTS = {0, 98}
+
+
 def get_district_friendly_name(cd_geoid: str) -> str:
     """Convert GEOID to friendly name (e.g., '0101' -> 'AL-01')."""
     cd_int = int(cd_geoid)
     state_fips = cd_int // 100
-    district_num = max(cd_int % 100, 1)
+    district_num = cd_int % 100
+    if district_num in AT_LARGE_DISTRICTS:
+        district_num = 1
     state_code = STATE_CODES.get(state_fips, str(state_fips))
     return f"{state_code}-{district_num:02d}"
 
@@ -327,7 +334,9 @@ def build_and_upload_districts(
     for i, cd_geoid in enumerate(cds_to_calibrate):
         cd_int = int(cd_geoid)
         state_fips = cd_int // 100
-        district_num = max(cd_int % 100, 1)
+        district_num = cd_int % 100
+        if district_num in AT_LARGE_DISTRICTS:
+            district_num = 1
         state_code = STATE_CODES.get(state_fips, str(state_fips))
         friendly_name = f"{state_code}-{district_num:02d}"
 

policyengine_us_data/calibration/stacked_dataset_builder.py

@@ -919,7 +919,9 @@ def create_sparse_cd_stacked_dataset(
             # Convert GEOID to friendly name: 3705 -> NC-05
             cd_int = int(cd_geoid)
             state_fips = cd_int // 100
-            district_num = max(cd_int % 100, 1)
+            district_num = cd_int % 100
+            if district_num in (0, 98):
+                district_num = 1
             state_code = STATE_CODES.get(state_fips, str(state_fips))
             friendly_name = f"{state_code}-{district_num:02d}"