Bug fixes.

NAU-CCL · May 21, 2024 · 601023c · 601023c
1 parent a05b6cf
commit 601023c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/epymorph/geo/adrio/census/adrio_census.py b/epymorph/geo/adrio/census/adrio_census.py
@@ -345,7 +345,7 @@ def fetch_sf(self, scope: CensusScope) -> GeoDataFrame:
                 sort_param = ['state', 'county', 'tract']
 
             case TractScope('county', includes):
-                data_df = concat(tracts(state=s, county=c)
+                data_df = concat(tracts(state=s, county=c, year=scope.year)
                                  for s, c in map(COUNTY.decompose, includes))
 
                 data_df = data_df.rename(
@@ -354,7 +354,7 @@ def fetch_sf(self, scope: CensusScope) -> GeoDataFrame:
                 sort_param = ['state', 'county', 'tract']
 
             case TractScope('tract', includes):
-                data_df = concat(tracts(state=s, county=c)
+                data_df = concat(tracts(state=s, county=c, year=scope.year)
                                  for s, c, t in map(TRACT.decompose, includes))
 
                 data_df = data_df.rename(
@@ -374,7 +374,7 @@ def fetch_sf(self, scope: CensusScope) -> GeoDataFrame:
                 sort_param = ['state', 'county', 'tract', 'block group']
 
             case BlockGroupScope('county', includes):
-                data_df = concat(block_groups(state=s, county=c)
+                data_df = concat(block_groups(state=s, county=c, year=scope.year)
                                  for s, c in map(COUNTY.decompose, includes))
 
                 data_df = data_df.rename(columns={
@@ -383,7 +383,7 @@ def fetch_sf(self, scope: CensusScope) -> GeoDataFrame:
                 sort_param = ['state', 'county', 'tract', 'block group']
 
             case BlockGroupScope('tract', includes):
-                data_df = concat(block_groups(state=s, county=c)
+                data_df = concat(block_groups(state=s, county=c, year=scope.year)
                                  for s, c, t in map(TRACT.decompose, includes))
 
                 data_df = data_df.rename(columns={
@@ -395,7 +395,7 @@ def fetch_sf(self, scope: CensusScope) -> GeoDataFrame:
                 sort_param = ['state', 'county', 'tract', 'block_group']
 
             case BlockGroupScope('block group', includes):
-                data_df = concat(block_groups(state=s, county=c)
+                data_df = concat(block_groups(state=s, county=c, year=scope.year)
                                  for s, c, t, bg in map(BLOCK_GROUP.decompose, includes))
 
                 data_df = data_df.rename(columns={

diff --git a/epymorph/geo/dynamic.py b/epymorph/geo/dynamic.py
@@ -79,7 +79,7 @@ def __init__(self, spec: DynamicGeoSpec, adrios: dict[str, ADRIO]):
             raise ValueError("Geo must contain an attribute called 'label'.")
         self._adrios = adrios
         labels = self._adrios[LABEL.name].get_value()
-        super().__init__(spec, len(labels))
+        super().__init__(spec, labels.size)
 
         # events
         self.fetch_start = Event()