Merge pull request #273 from BayAreaMetro/fix_taz_areatype_bug

Fix taz areatype bug

.gitignore

@@ -57,3 +57,7 @@ data/2020_10_27_parcels_geography.csv
 data/2020_11_05_zoning_lookup_hybrid_pba50.csv
 data/2020_11_05_zoning_parcels_hybrid_pba50.csv
 data/2020_11_10_parcels_geography.csv
+data/2020_10_20_zoning_lookup_hybrid_pba50.csv
+data/2020_10_20_zoning_parcels_hybrid_pba50.csv
+data/2020_10_27_zoning_parcels_hybrid_pba50.csv
+data/2020_10_27_zoning_lookup_hybrid_pba50.csv

baus/summaries.py

@@ -1486,13 +1486,6 @@ def gethhcounts(filter):
     taz_df["totacre"] = zone_forecast_inputs.totacre_abag
     # total population = group quarters plus households population
     taz_df["totpop"] = (taz_df.hhpop + taz_df.gqpop).fillna(0)
-    taz_df["density"] = \
-        (taz_df.totpop + (2.5 * taz_df.totemp)) / taz_df.totacre
-    taz_df["areatype"] = pd.cut(
-        taz_df.density,
-        bins=[0, 6, 30, 55, 100, 300, np.inf],
-        labels=[5, 4, 3, 2, 1, 0]
-    )
 
     buildings_df = buildings.to_frame(['zone_id',
                                        'building_type',
@@ -1531,6 +1524,16 @@ def count_acres_with_mask(mask):
     taz_df = add_population(taz_df, year, rc)
     taz_df.totpop = taz_df.hhpop + taz_df.gqpop
     taz_df = add_employment(taz_df, year, rc)
+    taz_df["density_pop"] = taz_df.totpop / taz_df.totacre
+    taz_df["density_pop"] = taz_df["density_pop"].fillna(0)
+    taz_df["density_emp"] = (2.5 * taz_df.totemp) / taz_df.totacre
+    taz_df["density_emp"] = taz_df["density_emp"].fillna(0)
+    taz_df["density"] = taz_df["density_pop"] + taz_df["density_emp"]
+    taz_df["areatype"] = pd.cut(
+        taz_df.density,
+        bins=[0, 6, 30, 55, 100, 300, np.inf],
+        labels=[5, 4, 3, 2, 1, 0]
+    )
     taz_df = add_age_categories(taz_df, year, rc)
     orca.add_table('taz_summary_1', taz_df)