Housekeeping

DESCRIPTION

@@ -34,9 +34,8 @@ Imports:
     DT (>= 0.23),
     ggplot2 (>= 3.3.5),
     ggthemes (>= 4.2.4),
-    shinyhttr (>= 1.1.0),
     shinyjs (>= 2.1.0),
-    shinyWidgets (>= 0.7.6)
+    htmltools (>= 0.5.7)
 Depends: 
     R (>= 4.0)
 Suggests: 

R/app.R

@@ -29,8 +29,7 @@ aq_app <- function() {
 
   # Check for suggested packages
   rlang::check_installed(
-    c("DT", "ggplot2", "ggthemes",
-      "shinyWidgets", "shinyjs", "shinyhttr"))
+    c("DT", "ggplot2", "ggthemes", "shinyjs"))
 
   ui <- tagList(
     page_navbar(

R/fetching_data.R

@@ -216,7 +216,7 @@ cache_dir <- function() {
 #'
 #' Removes data cache
 #'
-#' @param bcmaps Logical. Whether or not to also remove CDED files cached with
+#' @param bcmaps_cded Logical. Whether or not to also remove CDED files cached with
 #'   the bcmaps package. These are used by bcaquifertools for acquiring TRIM
 #'   data, but may also be cached for use by other workflows.
 #'

R/lithology.R

@@ -602,8 +602,8 @@ lith_yield <- function(lith, flatten = FALSE) {
       # least one of each
       flag_yield = .data$n_yield != .data$n_depth &
         .data$n_yield != 0 & .data$n_depth != 0,
-      yield = replace(yield, .data$flag_yield, NA),
-      depth = replace(depth, .data$flag_yield, NA)) %>%
+      yield = replace(.data$yield, .data$flag_yield, NA),
+      depth = replace(.data$depth, .data$flag_yield, NA)) %>%
     dplyr::select(-"n_yield", -"n_depth") %>%
     tidyr::unnest(cols = c("yield", "depth"), keep_empty = TRUE)
 

R/mod_wells.R

@@ -34,9 +34,6 @@ ui_wells <- function(id) {
                      choices = c("Lidar" = "lidar", "TRIM" = "trim")),
         h4("Messages"),
         verbatimTextOutput(ns("messages"), placeholder = TRUE)
-        #shinyWidgets::progressBar(
-        #  title = "Current Lidar tile:",
-        #  id = ns("lidar_progress"), value = 0, display_pct = TRUE)
       ),
       nav_panel("Maps",
                 plotOutput(ns("map_plot"), height = "650px")),
@@ -177,15 +174,13 @@ dem_region_shiny <- function(type, watershed, session) {
   withCallingHandlers({
     message(stringr::str_to_title(type), " - Start")
 
-    p <- shinyhttr::progress(session, id = "dem_progress")
-
     # Catch errors if have issues and try again
-    l <- try(dem_region(watershed, progress = p, type = type), silent = TRUE)
+    l <- try(dem_region(watershed, type = type), silent = TRUE)
     #l <- try(stop("testing"), silent = TRUE)
     if(inherits(l, "try-error")) {
       message("  Problem with ", type, " tiles, trying again...")
       l <- tryCatch(
-        dem_region(watershed, progress = p, type = type),
+        dem_region(watershed, type = type),
         #stop("testing2"),
         error = function(cond) {
           message("  Problem fetching ", type, " tiles\n",