diff --git a/.gitignore b/.gitignore index 2515143ae..e0dc08ca8 100644 --- a/.gitignore +++ b/.gitignore @@ -38,5 +38,5 @@ data/simple_parcels.* data/02_01_2016_parcels_geography.csv data/07_11_2019_parcels_geography.csv data/2015_12_21_zoning_parcels.csv -data/2020_06_15_zoning_lookup_hybrid_pba50.csv -data/2020_06_15_zoning_parcels_hybrid_pba50.csv +data/2020_06_22_zoning_lookup_hybrid_pba50.csv +data/2020_06_22_zoning_parcels_hybrid_pba50.csv diff --git a/baus/datasources.py b/baus/datasources.py index 64d93ae3f..25511b65c 100644 --- a/baus/datasources.py +++ b/baus/datasources.py @@ -290,7 +290,7 @@ def costar(store, parcels): @orca.table(cache=True) def zoning_lookup(): - return pd.read_csv(os.path.join(misc.data_dir(), "2020_06_15_zoning_lookup_hybrid_pba50.csv"), + return pd.read_csv(os.path.join(misc.data_dir(), "2020_06_22_zoning_lookup_hybrid_pba50.csv"), index_col='id') @@ -298,7 +298,7 @@ def zoning_lookup(): @orca.table(cache=True) def zoning_baseline(parcels, zoning_lookup, settings): df = pd.read_csv(os.path.join(misc.data_dir(), - "2020_06_15_zoning_parcels_hybrid_pba50.csv"), + "2020_06_22_zoning_parcels_hybrid_pba50.csv"), index_col="geom_id") df = pd.merge(df, zoning_lookup.to_frame(), left_on="zoning_id", right_index=True)