Rebuild 1.7.0

DESCRIPTION

@@ -18,6 +18,7 @@ Depends:
     R (>= 2.10)
 Imports: 
     config,
+    colourpicker,
     data.table,
     dataone,
     datapack,
@@ -31,6 +32,7 @@ Imports:
     htmltools,
     httr,
     jsonlite,
+    leaflet,
     methods,
     mime,
     profvis,

Dockerfile

@@ -71,7 +71,9 @@ RUN  R -e 'remotes::install_version("RCurl",upgrade="never", version = "1.98-1.3
 && R -e 'remotes::install_version("shinybusy",upgrade="never", version = "0.2.2")' \
 && R -e 'remotes::install_version("units",upgrade="never", version = "0.7-2")'\
 && R -e 'remotes::install_version("sf",upgrade="never", version = "1.0-5")' \
-&& R -e 'remotes::install_version("leaflet",upgrade="never", version = "2.0.4.1")' 
+&& R -e 'remotes::install_version("leaflet",upgrade="never", version = "2.0.4.1")' \
+&& R -e 'remotes::install_version("leaflet.extras",upgrade="never", version = "1.0.0")' \
+&& R -e 'remotes::install_version("colourpicker",upgrade="never", version = "1.1.1")' 
 
 
 RUN R -e 'remotes::install_local(dir(".", pattern = "MetaShARK_.*\\.tar.gz"), upgrade="never")'

NAMESPACE

@@ -39,6 +39,7 @@ importFrom(SummeRnote,summernoteInput)
 importFrom(XML,compareXMLDocs)
 importFrom(XML,newXMLNode)
 importFrom(XML,xmlValue)
+importFrom(colourpicker,colourInput)
 importFrom(config,get)
 importFrom(data.table,fread)
 importFrom(data.table,fwrite)
@@ -67,6 +68,14 @@ importFrom(jsonlite,read_json)
 importFrom(jsonlite,serializeJSON)
 importFrom(jsonlite,unserializeJSON)
 importFrom(jsonlite,write_json)
+importFrom(leaflet,addAwesomeMarkers)
+importFrom(leaflet,addPolygons)
+importFrom(leaflet,addRectangles)
+importFrom(leaflet,addTiles)
+importFrom(leaflet,leaflet)
+importFrom(leaflet,leafletOutput)
+importFrom(leaflet,makeAwesomeIcon)
+importFrom(leaflet,renderLeaflet)
 importFrom(lubridate,guess_formats)
 importFrom(mime,guess_type)
 importFrom(readtext,readtext)

R/eal_5_GeoCov.R

@@ -1,5 +1,6 @@
 #' @import shiny
 #' @importFrom shinyWidgets materialSwitch
+#' @importFrom leaflet leafletOutput
 #'
 #' @noRd
 GeoCovUI <- function(id) {
@@ -70,6 +71,7 @@ GeoCovUI <- function(id) {
 #' @import shiny
 #' @importFrom shinyWidgets updateMaterialSwitch
 #' @importFrom shinyjs toggle
+#' @importFrom leaflet renderLeaflet leaflet addTiles addAwesomeMarkers makeAwesomeIcon addRectangles addPolygons
 #'
 #' @noRd
 GeoCov <- function(id, main.env) {

R/eal_5_GeoCov_custom.R

@@ -13,6 +13,8 @@ insertCustomGeoCov <- function(id, main.env) {
 }
 
 # Custom GeoCov Form UI ====
+#' @noRd
+#' @importFrom colourpicker colourInput
 customGeoCov_UI <- function(id, value = NULL) {
   ns <- NS(id)
 

R/fill_module.R

@@ -192,17 +192,17 @@ fill <- function(id, main.env) {
 
     ## Save ----
     observeEvent(input$save, {
-      if(main.env$dev) 
-        devmsg("saved: %s", main.env$EAL$page, timer.env = main.env)
+      devmsg("saved: %s", main.env$EAL$page, timer.env = main.env)
       saveReactive(main.env, main.env$EAL$page, do.template = FALSE)
+      if(main.env$dev) devmsg("done", timer.env = main.env)
     })
 
     ## Autosave ----
     observeEvent(main.env$EAL$page, {
       req(main.env$EAL$page != 1)
-      if(main.env$dev)
-        devmsg("autosaved: %s", main.env$EAL$page, timer.env = main.env)
+      devmsg("autosaved: %s", main.env$EAL$page, timer.env = main.env)
       saveReactive(main.env, main.env$EAL$page, do.template = FALSE)
+      if(main.env$dev) devmsg("done", timer.env = main.env)
     }, priority = -2, label = "EAL: autosave") # important priority
 
     ## Current step ----
@@ -223,7 +223,6 @@ fill <- function(id, main.env) {
     # Navigation ====
     observeEvent(main.env$EAL$page, {
       req(main.env$EAL$page != main.env$EAL$old.page)
-
       withProgress(
         {
           ## Save  & Template ----