Merge pull request #190 from BayAreaMetro/pba50_new_base_zoning

Update hybrid base zoning input
BayAreaMetro · Jun 22, 2020 · 4adc9df · 4adc9df
2 parents 8940d6f + 089c1ab
commit 4adc9df
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -290,15 +290,15 @@ 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')
 
 
 # zoning for use in the "baseline" scenario
 @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)