avoid renaming export tables #11

cont-limno · Jul 13, 2020 · 3b7ccaf · 3b7ccaf
1 parent 71d8e90
commit 3b7ccaf
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -4,6 +4,10 @@
 
  * Updated DEPTH module version to 0.1
 
+## BREAKING CHANGES
+
+ * The names of nearly all data tables have changed to exactly match LAGOSUS schema.
+
 ## MINOR IMPROVEMENTS
 
  * `coordinatize` function has a default projection (#12)

diff --git a/R/ingest.R b/R/ingest.R
@@ -53,12 +53,12 @@ lagos_ingest <- function(locus_version = NA, locus_folder = NA,
                  include.dirs = TRUE, full.names = TRUE),
       sep = ",", dictionary = locus_dictionary)
 
-    locus <- list(locus_link = locus_link,
-                  locus_characteristics = locus_characteristics,
-                  locus_watersheds = locus_watersheds,
-                  locus_information = locus_information,
-                  locus_dictionary = locus_dictionary,
-                  locus_source = locus_source
+    locus <- list(lake_link = locus_link,
+                  lake_characteristics = locus_characteristics,
+                  lake_watersheds = locus_watersheds,
+                  lake_information = locus_information,
+                  data_dictionary_locus = locus_dictionary,
+                  source_table_locus = locus_source
                   )
 
     return(locus)
@@ -68,16 +68,16 @@ lagos_ingest <- function(locus_version = NA, locus_folder = NA,
     # Importing LAGOS depth data ####
 
     depth_dictionary <- load_lagos_txt(
-      list.files(depth_folder, pattern = "taxonomy.csv",
+      list.files(depth_folder, pattern = "data_dictionary.*.csv",
                  include.dirs = TRUE, full.names = TRUE),
       na.strings = c(""), sep = ",")
 
     depth <- load_lagos_txt(
       list.files(depth_folder, pattern = "lake_depth.csv",
                  include.dirs = TRUE, full.names = TRUE), sep = ",")
 
-    depth <- list(depth = depth,
-                  depth_dictionary = depth_dictionary)
+    depth <- list(lake_depth = depth,
+                  data_dictionary_depth = depth_dictionary)
 
     return(depth)
   }

diff --git a/README.Rmd b/README.Rmd
@@ -44,7 +44,7 @@ lagosus_compile(
   locus_version = "1.1",
   locus_folder = "~/Downloads/LAGOSUS_LOCUS/LOCUS_v1.1",
   depth_version = "0.1",
-  depth_folder = "~/Downloads/LAGOSUS_DEPTH", 
+  depth_folder = "~/Downloads/LAGOSUS_DEPTH/DEPTH_v0.1", 
   dest_folder = lagosus_path())
 ```
 

diff --git a/README.md b/README.md
@@ -60,7 +60,7 @@ lagosus_compile(
   locus_version = "1.1",
   locus_folder = "~/Downloads/LAGOSUS_LOCUS/LOCUS_v1.1",
   depth_version = "0.1",
-  depth_folder = "~/Downloads/LAGOSUS_DEPTH", 
+  depth_folder = "~/Downloads/LAGOSUS_DEPTH/DEPTH_v0.1", 
   dest_folder = lagosus_path())
 ```