fixed a couple calls to framework

USEPA · Apr 18, 2022 · d197e00 · d197e00
1 parent 630f033
commit d197e00
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/ControlTable_LakeCat.csv b/ControlTable_LakeCat.csv
@@ -139,8 +139,8 @@ TRI,Point,TRIDens,none,TRI.shp,,EPA_FRS,Density,1,0,0,,Yes
 US_Level_III_Ecoregions,Categorical,L:/Priv/CORFiles/Geospatial_Library_Projects/StreamCat/ControlTables/US_Level_III_Ecoregions_lookup.csv,none,US_Level_III_Ecoregions.tif,,US_Level_III_Ecoregions,Percent,1,0,0,,No
 WetnessIndex,Continuous,WetIndex,none,cti_v3.tif,,WetIndx,Mean,1,0,0,,Yes
 WtDep,Continuous,WtDep,none,wtdep.tif,,STATSGO_Set2,Mean,0.01,0,0,,Yes
-WWTPAll,Point,WWTPAllDens,none,WWTP_All_CWA_Active_2013_CONUS.shp,,WWTP,Density,1,0,0,,No
-WWTPMajor,Point,WWTPMajorDens,none,WWTP_Major_CWA_Active_2013_CONUS.shp,,WWTP,Density,1,0,0,,No
-WWTPMinor,Point,WWTPMinorDens,none,WWTP_Minor_CWA_Active_2013_CONUS.shp,,WWTP,Density,1,0,0,,No
+WWTPAll,Point,WWTPAllDens,none,WWTP_All_CWA_Active_2013_CONUS.shp,,WWTP,Density,1,0,1,,No
+WWTPMajor,Point,WWTPMajorDens,none,WWTP_Major_CWA_Active_2013_CONUS.shp,,WWTP,Density,1,0,1,,No
+WWTPMinor,Point,WWTPMinorDens,none,WWTP_Minor_CWA_Active_2013_CONUS.shp,,WWTP,Density,1,0,1,,No
 Slope,Continuous,Slope,none,slope_perc,,Slope,Mean,1,1,0,,Yes
-wdrw_LD,Continuous,wdrw_LD,none,wdrw_onag12_v3.tif,,wdrw_LD,Mean,3.79E-06,0,1,0,Yes
+wdrw_LD,Continuous,wdrw_LD,none,wdrw_onag12_v3.tif,,wdrw_LD,Mean,3.79E-06,0,0,0,Yes
diff --git a/LakeCat.py b/LakeCat.py
@@ -48,10 +48,10 @@
         makeNParrays(FRAMEWORK)
         us_file = (
             "L:/Priv/CORFiles/Geospatial_Library_Resource/"
-            "POLITICAL/BOUNDARIES/NATIONAL/TIGER_2010_State_Boundaries.shp"
+            "POLITICAL/BOUNDARIES/NATIONAL/tl_2018_us_state.shp"
         )
         bsns = f"{FRAMEWORK}/shps/allBasins.shp"
-        brdr = makeBrdrPctFile(us_file, bsns, "NAME10", "UID")
+        brdr = makeBrdrPctFile(us_file, bsns, "NAME", "UID")
         os.mkdir(f"{FRAMEWORK}/border")
         brdr.to_csv(f"{FRAMEWORK}/border/pct_full.csv")
 

diff --git a/LakeCat_functions.py b/LakeCat_functions.py
@@ -168,9 +168,9 @@ def doStats(OUT_DIR, LYR_DIR, NHD_DIR, FRAMEWORK):
 
         if row.accum_type == "Point":
 
-            pct_full = pd.read_csv("framework/border/pct_full.csv")
+            pct_full = pd.read_csv(f"{FRAMEWORK}/border/pct_full.csv")
             points = gpd.GeoDataFrame.from_file(LLyr)
-            basins = "framework/shps/allBasins.shp"
+            basins = f"{FRAMEWORK}/shps/allBasins.shp"
             stats = PointInPoly(points, basins, pct_full, "UID", summaryfield)
 
         print("ZonalStats Results Complete in : " + str(dt.now() - start))