suppress scientific notation in legacyids, closes #96

cont-limno · Jan 31, 2019 · 0d16db9 · 0d16db9
1 parent 7ff004f
commit 0d16db9
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 5 deletions.
diff --git a/R/compile.R b/R/compile.R
@@ -16,7 +16,7 @@
 #'@export
 #'
 #'@examples \dontrun{
-#' lagosne_compile("1.087.1"
+#' lagosne_compile("1.087.1",
 #'  limno_folder = "~/Downloads/LAGOS-NE-LIMNO-EXPORT",
 #'  geo_folder   = "~/Downloads/LAGOS-NE-GEO-EXPORT",
 #'  locus_folder = "~/Downloads/LAGOS-NE-LOCUS-EXPORT")

diff --git a/R/ingest.R b/R/ingest.R
@@ -8,7 +8,7 @@
 #'@importFrom utils read.table
 #'@importFrom progress progress_bar
 #'@examples \dontrun{
-#' lagosne_ingest("1.087.1",
+#' lagos_ingest("1.087.1",
 #'  limno_folder = "~/Downloads/LAGOS-NE-LIMNO-EXPORT",
 #'  geo_folder   = "~/Downloads/LAGOS-NE-GEO-EXPORT",
 #'  locus_folder = "~/Downloads/LAGOS-NE-LOCUS-EXPORT")
@@ -50,6 +50,9 @@ lagos_ingest <- function(version, limno_folder = NA, geo_folder = NA,
 
   lakes_limno          <- load_lagos_txt(limno_path("lakeslimno"),
                                        sep = ",")
+  lakes_limno$legacyid <-
+    suppressWarnings(sapply(lakes_limno$legacyid, format_nonscientific))
+
   secchi               <- load_lagos_txt(limno_path("secchi"),
                                          sep = ",")
   lagos_source_program <- load_lagos_txt(limno_path("sourceprogram"),

diff --git a/R/utils.R b/R/utils.R
@@ -12,7 +12,6 @@ load_lagos_txt <- function(file_name, sep = "\t", ...){
   read.table(file_name, header = TRUE, sep = sep, quote = "\"",
              dec = ".", strip.white = TRUE, comment.char = "",
              stringsAsFactors = FALSE)
-
 }
 
 #' Summarize all LAGOSNE flat files
@@ -253,3 +252,14 @@ pad_huc_ids <- function(dt, col_name, len){
   dt[,col_name] <- as.character(res)
   dt
 }
+
+format_nonscientific <- function(x){
+  if(is.na(as.numeric(x))){
+    x
+  }else{
+    trimws(
+      format(
+        as.numeric(x), scientific = FALSE, drop0trailing = TRUE)
+    )
+  }
+}
diff --git a/man/lagos_ingest.Rd b/man/lagos_ingest.Rd
diff --git a/man/lagosne_compile.Rd b/man/lagosne_compile.Rd
diff --git a/tests/testthat/test-lagos_load.R b/tests/testthat/test-lagos_load.R
@@ -12,3 +12,15 @@ test_that("lagos_load fails well", {
     "\n Try running the `lagosne_get` command."),
     fixed = TRUE)
 })
+
+test_that("legacyids have non-scientific notation", {
+
+  skip_on_cran()
+  skip_on_travis()
+  skip_on_appveyor()
+
+  lakes_limno <- lagosne_load()$lakes_limno
+  expect_gt(
+    nchar(lakes_limno[lakes_limno$lagoslakeid == 448,]$legacyid),
+    11)# [1] "4.51733E+12"
+})