diff --git a/CITATION.cff b/CITATION.cff index 7a62fe5..6123dbe 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -11,6 +11,10 @@ title: 'furdeb: FUnctions for R DEvelopment and Beyond!' version: 1.0.0 abstract: Functions and processes for R development and beyond! authors: +- family-names: Clément + given-names: Jeanne + email: jeanne.clement@ird.fr + orcid: https://orcid.org/0000-0002-5228-5015 - family-names: Depetris given-names: Mathieu email: mathieu.depetris@ird.fr @@ -26,8 +30,8 @@ authors: repository-code: https://github.com/OB7-IRD/furdeb url: https://github.com/OB7-IRD/furdeb contact: -- family-names: Depetris - given-names: Mathieu - email: mathieu.depetris@ird.fr - orcid: https://orcid.org/0000-0001-8080-0531 +- family-names: Clément + given-names: Jeanne + email: jeanne.clement@ird.fr + orcid: https://orcid.org/0000-0002-5228-5015 diff --git a/DESCRIPTION b/DESCRIPTION index 26ca92a..fe25fe3 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -3,10 +3,15 @@ Type: Package Title: FUnctions for R DEvelopment and Beyond! Version: 1.0.0 Authors@R: - c(person(given = "Mathieu", + c(person(given = "Jeanne", + family = "Clément", + email = "jeanne.clement@ird.fr", + role = c("aut", "cre"), + comment = c(ORCID = "0000-0002-5228-5015")), + person(given = "Mathieu", family = "Depetris", email = "mathieu.depetris@ird.fr", - role = c("aut", "cre"), + role = c("aut"), comment = c(ORCID = "0000-0001-8080-0531")), person(given = "Oceane", family = "Bouhineau", @@ -27,11 +32,6 @@ Authors@R: email = "philippe.sabarros@ird.fr", role = c("ctb"), comment = c(ORCID = "0000-0001-6135-9015")), - person(given = "Jeanne", - family = "Clément", - email = "jeanne.clement@ird.fr", - role = c("ctb"), - comment = c(ORCID = "0000-0002-5228-5015")), person(given = "IRD - Ob7", family = "Observatory of Exploited Tropical Pelagic Ecosystems", email = "ob7@ird.fr", @@ -41,7 +41,7 @@ Description: Functions and processes for R development and beyond! License: GPL-3 + file LICENSE Encoding: UTF-8 LazyData: true -RoxygenNote: 7.3.1 +RoxygenNote: 7.3.2 VignetteBuilder: knitr URL: https://github.com/OB7-IRD/furdeb BugReports: https://github.com/OB7-IRD/furdeb/issues diff --git a/R/access_dbconnection.R b/R/access_dbconnection.R index e782c10..0ddea7c 100644 --- a/R/access_dbconnection.R +++ b/R/access_dbconnection.R @@ -8,8 +8,8 @@ #' @details #' Difference between drivers "u_can_access" and "access_jdbc42": #' \itemize{ -#' \item{"u_can_access": }{the main advantage is it's a free java JDBC driver. To understand briefly the process behind, the Access database is converted in HSQLDB system. This conversion could take a long time, especially if the database if large. Furthermore, after the conversion, queries should be faster than if there run on an Access database.} -#' \item{"access_jdbc42": }{this driver is paying. In opposition with the "u_can_access" driver, the Access database is not converted. The connection should be faster but the queries could be longer.} +#' \item{"u_can_access": the main advantage is it's a free java JDBC driver. To understand briefly the process behind, the Access database is converted in HSQLDB system. This conversion could take a long time, especially if the database if large. Furthermore, after the conversion, queries should be faster than if there run on an Access database.} +#' \item{"access_jdbc42": this driver is paying. In opposition with the "u_can_access" driver, the Access database is not converted. The connection should be faster but the queries could be longer.} #' } #' @export access_dbconnection <- function(driver_name = "u_can_access", diff --git a/R/latitude_longitude_to_csquare.R b/R/latitude_longitude_to_csquare.R index c5183a4..2b03156 100644 --- a/R/latitude_longitude_to_csquare.R +++ b/R/latitude_longitude_to_csquare.R @@ -10,13 +10,13 @@ #' @details #' For the argument "grid_square", you can choose between 7 modalities: #' \itemize{ -#' \item{10: }{for a grid with a resolution of 10x10 degrees} -#' \item{5: }{for a grid with a resolution of 5x5 degrees} -#' \item{1: }{for a grid with a resolution of 1x1 degrees} -#' \item{0.5: }{for a grid with a resolution of 0.5x0.5 degrees} -#' \item{0.1: }{for a grid with a resolution of 0.1x0.1 degrees} -#' \item{0.05: }{for a grid with a resolution of 0.05x0.05 degrees} -#' \item{0.01: }{for a grid with a resolution of 0.01x0.01 degrees} +#' \item{10: for a grid with a resolution of 10x10 degrees} +#' \item{5: for a grid with a resolution of 5x5 degrees} +#' \item{1: for a grid with a resolution of 1x1 degrees} +#' \item{0.5: for a grid with a resolution of 0.5x0.5 degrees} +#' \item{0.1: for a grid with a resolution of 0.1x0.1 degrees} +#' \item{0.05: for a grid with a resolution of 0.05x0.05 degrees} +#' \item{0.01: for a grid with a resolution of 0.01x0.01 degrees} #' } #' This function have been developped regarding a MS Excel worksheet of Tony Rees (Tony.Rees@@csiro.au). #' If you want more informations about C-square visit http://www.cmar.csiro.au/csquares/spec1-1.htm. diff --git a/R/marine_area_overlay.R b/R/marine_area_overlay.R index e50d223..58d2099 100644 --- a/R/marine_area_overlay.R +++ b/R/marine_area_overlay.R @@ -16,12 +16,12 @@ #' @details #' For the argument "fao_overlay_level", you can choose between 5 modalities (descending size classification): #' \itemize{ -#' \item{ocean: }{ocean area} -#' \item{major: }{major fao fishing area} -#' \item{subarea: }{sub fao fishing area} -#' \item{division: }{division fao fishing area} -#' \item{subdivision: }{sub-division fao fishing area} -#' \item{subunit: }{sub-unit fao fishing area} +#' \item{ocean: ocean area} +#' \item{major: major fao fishing area} +#' \item{subarea: sub fao fishing area} +#' \item{division: division fao fishing area} +#' \item{subdivision: sub-division fao fishing area} +#' \item{subunit: sub-unit fao fishing area} #' } #' Specificity for fao fishing area parameters: all the items above your specification (thus contain it at higher levels) will be added in the output. For example, if you select "subarea", you will also have the information about the major area concerning. #' If you want more information visit http://www.fao.org/fishery/area/search/en diff --git a/man/access_dbconnection.Rd b/man/access_dbconnection.Rd index 16a6c74..15328c5 100644 --- a/man/access_dbconnection.Rd +++ b/man/access_dbconnection.Rd @@ -26,7 +26,7 @@ Generate a common connection with an Access database using a JDBC driver. \details{ Difference between drivers "u_can_access" and "access_jdbc42": \itemize{ -\item{"u_can_access": }{the main advantage is it's a free java JDBC driver. To understand briefly the process behind, the Access database is converted in HSQLDB system. This conversion could take a long time, especially if the database if large. Furthermore, after the conversion, queries should be faster than if there run on an Access database.} -\item{"access_jdbc42": }{this driver is paying. In opposition with the "u_can_access" driver, the Access database is not converted. The connection should be faster but the queries could be longer.} +\item{"u_can_access": the main advantage is it's a free java JDBC driver. To understand briefly the process behind, the Access database is converted in HSQLDB system. This conversion could take a long time, especially if the database if large. Furthermore, after the conversion, queries should be faster than if there run on an Access database.} +\item{"access_jdbc42": this driver is paying. In opposition with the "u_can_access" driver, the Access database is not converted. The connection should be faster but the queries could be longer.} } } diff --git a/man/furdeb-package.Rd b/man/furdeb-package.Rd index ca1f112..8806807 100644 --- a/man/furdeb-package.Rd +++ b/man/furdeb-package.Rd @@ -19,10 +19,11 @@ Useful links: } \author{ -\strong{Maintainer}: Mathieu Depetris \email{mathieu.depetris@ird.fr} (\href{https://orcid.org/0000-0001-8080-0531}{ORCID}) +\strong{Maintainer}: Jeanne Clément \email{jeanne.clement@ird.fr} (\href{https://orcid.org/0000-0002-5228-5015}{ORCID}) Authors: \itemize{ + \item Mathieu Depetris \email{mathieu.depetris@ird.fr} (\href{https://orcid.org/0000-0001-8080-0531}{ORCID}) \item Oceane Bouhineau \email{oceane.bouhineau@ird.fr} (\href{https://orcid.org/0000-0001-7418-2925}{ORCID}) \item Clara Lerebourg \email{clara.lerebourg@ird.fr} (\href{https://orcid.org/0000-0003-0589-8932}{ORCID}) } diff --git a/man/latitude_longitude_to_csquare.Rd b/man/latitude_longitude_to_csquare.Rd index e3b2205..85b5420 100644 --- a/man/latitude_longitude_to_csquare.Rd +++ b/man/latitude_longitude_to_csquare.Rd @@ -32,13 +32,13 @@ Latitude-longitude to c-square converter. \details{ For the argument "grid_square", you can choose between 7 modalities: \itemize{ -\item{10: }{for a grid with a resolution of 10x10 degrees} -\item{5: }{for a grid with a resolution of 5x5 degrees} -\item{1: }{for a grid with a resolution of 1x1 degrees} -\item{0.5: }{for a grid with a resolution of 0.5x0.5 degrees} -\item{0.1: }{for a grid with a resolution of 0.1x0.1 degrees} -\item{0.05: }{for a grid with a resolution of 0.05x0.05 degrees} -\item{0.01: }{for a grid with a resolution of 0.01x0.01 degrees} +\item{10: for a grid with a resolution of 10x10 degrees} +\item{5: for a grid with a resolution of 5x5 degrees} +\item{1: for a grid with a resolution of 1x1 degrees} +\item{0.5: for a grid with a resolution of 0.5x0.5 degrees} +\item{0.1: for a grid with a resolution of 0.1x0.1 degrees} +\item{0.05: for a grid with a resolution of 0.05x0.05 degrees} +\item{0.01: for a grid with a resolution of 0.01x0.01 degrees} } This function have been developped regarding a MS Excel worksheet of Tony Rees (Tony.Rees@csiro.au). If you want more informations about C-square visit http://www.cmar.csiro.au/csquares/spec1-1.htm. diff --git a/man/marine_area_overlay.Rd b/man/marine_area_overlay.Rd index e11df39..9e9fe91 100644 --- a/man/marine_area_overlay.Rd +++ b/man/marine_area_overlay.Rd @@ -50,12 +50,12 @@ Consistent spatial marine area overlay for points, grids and polygons (related t \details{ For the argument "fao_overlay_level", you can choose between 5 modalities (descending size classification): \itemize{ -\item{ocean: }{ocean area} -\item{major: }{major fao fishing area} -\item{subarea: }{sub fao fishing area} -\item{division: }{division fao fishing area} -\item{subdivision: }{sub-division fao fishing area} -\item{subunit: }{sub-unit fao fishing area} +\item{ocean: ocean area} +\item{major: major fao fishing area} +\item{subarea: sub fao fishing area} +\item{division: division fao fishing area} +\item{subdivision: sub-division fao fishing area} +\item{subunit: sub-unit fao fishing area} } Specificity for fao fishing area parameters: all the items above your specification (thus contain it at higher levels) will be added in the output. For example, if you select "subarea", you will also have the information about the major area concerning. If you want more information visit http://www.fao.org/fishery/area/search/en