diff --git a/NAMESPACE b/NAMESPACE index 77a0dd9..ca18889 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -1,7 +1,7 @@ # Generated by roxygen2: do not edit by hand export(activity) -export(birdmoves) +export(animalnexus) export(check_ids) export(check_problems) export(daily) diff --git a/NEWS.md b/NEWS.md index aab33d2..22787eb 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,8 @@ -# feedr 0.6.0.9000 +# feedr 0.6.1 -- Added birdmoves shiny app to feedr package (`birdmoves()`) +- Added animalnexus shiny app to feedr package (`animalnexus()`) +- Fixed some bugs in visualizations +- Correct animalnexus UI issues diff --git a/R/data.R b/R/data.R index 53df916..aa64dd8 100644 --- a/R/data.R +++ b/R/data.R @@ -1,4 +1,4 @@ -#' Read data on Finches from BirdMoves website +#' Read data on Finches from original BirdMoves website #' #' A dataset containing raw reads of finches visiting feeders in Kamloops, BC, #' Canada diff --git a/R/load.R b/R/load.R index 2dc0d09..b472820 100644 --- a/R/load.R +++ b/R/load.R @@ -200,7 +200,7 @@ load.raw.all <- function(r_dir, .Deprecated("load_raw_all") } -#' Download data from BirdMoves website. +#' Download data from original BirdMoves website. #' #' This function uses RCurl to submit an HTML form and retrieve the csv file. #' This is simply a convenience function to replace going to the website @@ -322,7 +322,7 @@ dl_data <- function(start = NULL, return(r) } -#' Depreciated: Download data from BirdMoves website. +#' Depreciated: Download data from original BirdMoves website. #' #' Depreciated use \link{\code{dl_data}} instead. #' diff --git a/R/shiny_functions.R b/R/shiny_functions.R index 70768db..7101ae1 100644 --- a/R/shiny_functions.R +++ b/R/shiny_functions.R @@ -1,7 +1,7 @@ -#' Launch local birdmoves site +#' Launch local animalnexus site #' @export -birdmoves <- function() { - appDir <- system.file("shiny-examples", "birdmoves", package = "feedr") +animalnexus <- function() { + appDir <- system.file("shiny-examples", "animalnexus", package = "feedr") if (appDir == "") { stop("Could not find example directory. Try re-installing `feedr`.", call. = FALSE) } diff --git a/data-raw/bird_pictures.R b/data-raw/bird_pictures.R index a697998..528a3d6 100644 --- a/data-raw/bird_pictures.R +++ b/data-raw/bird_pictures.R @@ -4,4 +4,4 @@ list.files("./data-raw/Bird Pictures/small/") index <- birds_all %>% mutate(img = NA) -write.csv(index, "./inst/shiny-examples/birdmoves/data/img_index.csv", row.names = FALSE) +write.csv(index, "./inst/shiny-examples/animalnexus/data/img_index.csv", row.names = FALSE) diff --git a/inst/shiny-examples/birdmoves/functions.R b/inst/shiny-examples/animalnexus/functions.R similarity index 100% rename from inst/shiny-examples/birdmoves/functions.R rename to inst/shiny-examples/animalnexus/functions.R diff --git a/inst/shiny-examples/birdmoves/global_old.R b/inst/shiny-examples/animalnexus/global_old.R similarity index 100% rename from inst/shiny-examples/birdmoves/global_old.R rename to inst/shiny-examples/animalnexus/global_old.R diff --git a/inst/shiny-examples/birdmoves/map_current.R b/inst/shiny-examples/animalnexus/map_current.R similarity index 100% rename from inst/shiny-examples/birdmoves/map_current.R rename to inst/shiny-examples/animalnexus/map_current.R diff --git a/inst/shiny-examples/birdmoves/map_data.R b/inst/shiny-examples/animalnexus/map_data.R similarity index 100% rename from inst/shiny-examples/birdmoves/map_data.R rename to inst/shiny-examples/animalnexus/map_data.R diff --git a/inst/shiny-examples/birdmoves/map_paths.R b/inst/shiny-examples/animalnexus/map_paths.R similarity index 100% rename from inst/shiny-examples/birdmoves/map_paths.R rename to inst/shiny-examples/animalnexus/map_paths.R diff --git a/inst/shiny-examples/birdmoves/map_static.R b/inst/shiny-examples/animalnexus/map_static.R similarity index 100% rename from inst/shiny-examples/birdmoves/map_static.R rename to inst/shiny-examples/animalnexus/map_static.R diff --git a/inst/shiny-examples/birdmoves/output_data.R b/inst/shiny-examples/animalnexus/output_data.R similarity index 100% rename from inst/shiny-examples/birdmoves/output_data.R rename to inst/shiny-examples/animalnexus/output_data.R diff --git a/inst/shiny-examples/birdmoves/reactive.R b/inst/shiny-examples/animalnexus/reactive.R similarity index 100% rename from inst/shiny-examples/birdmoves/reactive.R rename to inst/shiny-examples/animalnexus/reactive.R diff --git a/inst/shiny-examples/birdmoves/select_data.R b/inst/shiny-examples/animalnexus/select_data.R similarity index 100% rename from inst/shiny-examples/birdmoves/select_data.R rename to inst/shiny-examples/animalnexus/select_data.R diff --git a/inst/shiny-examples/birdmoves/server.R b/inst/shiny-examples/animalnexus/server.R similarity index 100% rename from inst/shiny-examples/birdmoves/server.R rename to inst/shiny-examples/animalnexus/server.R diff --git a/inst/shiny-examples/birdmoves/ui.R b/inst/shiny-examples/animalnexus/ui.R similarity index 99% rename from inst/shiny-examples/birdmoves/ui.R rename to inst/shiny-examples/animalnexus/ui.R index 82755b5..f7e780a 100644 --- a/inst/shiny-examples/birdmoves/ui.R +++ b/inst/shiny-examples/animalnexus/ui.R @@ -12,7 +12,7 @@ shinyUI(fluidPage( ## CSS Styling tags$head( - tags$title("birdmoves"), + tags$title("animalnexus"), tags$style(HTML(" .shiny-output-error-validation { padding: 1em; diff --git a/inst/shiny-examples/birdmoves/www/GitHub-Mark-32px.png b/inst/shiny-examples/animalnexus/www/GitHub-Mark-32px.png similarity index 100% rename from inst/shiny-examples/birdmoves/www/GitHub-Mark-32px.png rename to inst/shiny-examples/animalnexus/www/GitHub-Mark-32px.png diff --git a/inst/shiny-examples/birdmoves/www/logo.jpg b/inst/shiny-examples/animalnexus/www/logo.jpg similarity index 100% rename from inst/shiny-examples/birdmoves/www/logo.jpg rename to inst/shiny-examples/animalnexus/www/logo.jpg diff --git a/man/birdmoves.Rd b/man/animalnexus.Rd similarity index 50% rename from man/birdmoves.Rd rename to man/animalnexus.Rd index 6f9bdda..ce18ec7 100644 --- a/man/birdmoves.Rd +++ b/man/animalnexus.Rd @@ -1,12 +1,12 @@ % Generated by roxygen2: do not edit by hand % Please edit documentation in R/shiny_functions.R -\name{birdmoves} -\alias{birdmoves} -\title{Launch local birdmoves site} +\name{animalnexus} +\alias{animalnexus} +\title{Launch local animalnexus site} \usage{ -birdmoves() +animalnexus() } \description{ -Launch local birdmoves site +Launch local animalnexus site } diff --git a/man/dl_data.Rd b/man/dl_data.Rd index c5d79d0..c9f979c 100644 --- a/man/dl_data.Rd +++ b/man/dl_data.Rd @@ -2,7 +2,7 @@ % Please edit documentation in R/load.R \name{dl_data} \alias{dl_data} -\title{Download data from BirdMoves website.} +\title{Download data from original BirdMoves website.} \usage{ dl_data(start = NULL, end = NULL, url = "http://gaia.tru.ca/birdMOVES/rscripts/rawvisits.csv", diff --git a/man/finches.Rd b/man/finches.Rd index 5098438..924ca83 100644 --- a/man/finches.Rd +++ b/man/finches.Rd @@ -3,7 +3,7 @@ \docType{data} \name{finches} \alias{finches} -\title{Read data on Finches from BirdMoves website} +\title{Read data on Finches from original BirdMoves website} \format{A data frame with 412 rows and 5 variables: \describe{ \item{bird_id}{Unique RFID tag attached to a finch} diff --git a/man/get.data.Rd b/man/get.data.Rd index b05bb6f..4e96727 100644 --- a/man/get.data.Rd +++ b/man/get.data.Rd @@ -2,7 +2,7 @@ % Please edit documentation in R/load.R \name{get.data} \alias{get.data} -\title{Depreciated: Download data from BirdMoves website.} +\title{Depreciated: Download data from original BirdMoves website.} \usage{ get.data(start = NULL, end = NULL, url = "http://gaia.tru.ca/birdMOVES/rscripts/rawvisits.csv",