get merit fixes

workspace/00_get_data.Rmd

@@ -552,6 +552,15 @@ National Hydrologic Modeling, Alaska Domain
 
 merit_dir <- file.path(data_dir, "merged_AK_MERIT_Hydro")
 
+out <- list(merit_catchments = file.path(merit_dir, "merged_AK_MERIT_Hydro",
+                                         "cat_pfaf_78_81_82_MERIT_Hydro_v07_Basins_v01.shp"),
+            merit_rivers = file.path(merit_dir, "merged_AK_MERIT_Hydro",
+                                     "riv_pfaf_78_81_82_MERIT_Hydro_v07_Basins_v01.shp"),
+            aster_dem = file.path(merit_dir, "dem.tif"),
+            merit_dem = file.path(merit_dir, "ak_merit_dem.tif"),
+            merit_fdr = file.path(merit_dir, "ak_merit_fdr.tif"),
+            merit_fac = file.path(merit_dir, "ak_merit_fac.tif"))
+
 if(!dir.exists(merit_dir)) {
   dir.create(merit_dir, recursive = TRUE, showWarnings = FALSE)
   
@@ -589,15 +598,6 @@ if(!dir.exists(merit_dir)) {
             merit_fac = get_sbfile(file.path(merit_dir, 
                                              "ak_merit_fac.zip"), 
                                    "64ff628ed34ed30c2057b430"))
-  out <- list(merit_catchments = file.path(merit_dir, "merged_AK_MERIT_Hydro",
-                                         "cat_pfaf_78_81_82_MERIT_Hydro_v07_Basins_v01.shp"),
-            merit_rivers = file.path(merit_dir, "merged_AK_MERIT_Hydro",
-                                     "riv_pfaf_78_81_82_MERIT_Hydro_v07_Basins_v01.shp"),
-            aster_dem = file.path(merit_dir, "dem.tif"),
-            merit_dem = file.path(merit_dir, "ak_merit_dem.tif"),
-            merit_fdr = file.path(merit_dir, "ak_merit_fdr.tif"),
-            merit_fac = file.path(merit_dir, "ak_merit_fac.tif"))
-
 
   out <- list(aster_dem = get_sbfile(file.path(merit_dir, "dem.zip"), "5fbbc6b6d34eb413d5e21378"),
               merit_dem = get_sbfile(file.path(merit_dir, 

workspace/cache/data_paths.json

@@ -245,8 +245,8 @@
     "rpu_12d": "data/nhdplusv2_elev/NHDPlusTX/NHDPlus12/NEDSnapshot/NED12d/elev_cm"
   },
   "latest_wbd_rds": "data/wbd/WBD.rds",
-  "merit_catchments": "data/merged_AK_MERIT_Hydro/cat_pfaf_78_81_82_MERIT_Hydro_v07_Basins_v01.shp",
-  "merit_rivers": "data/merged_AK_MERIT_Hydro/riv_pfaf_78_81_82_MERIT_Hydro_v07_Basins_v01.shp",
+  "merit_catchments": "data/merged_AK_MERIT_Hydro/merged_AK_MERIT_Hydro/cat_pfaf_78_81_82_MERIT_Hydro_v07_Basins_v01.shp",
+  "merit_rivers": "data/merged_AK_MERIT_Hydro/merged_AK_MERIT_Hydro/riv_pfaf_78_81_82_MERIT_Hydro_v07_Basins_v01.shp",
   "aster_dem": "data/merged_AK_MERIT_Hydro/dem.tif",
   "merit_dem": "data/merged_AK_MERIT_Hydro/ak_merit_dem.tif",
   "merit_fdr": "data/merged_AK_MERIT_Hydro/ak_merit_fdr.tif",