ok

rOpenGov · Nov 18, 2020 · 266ed03 · 266ed03
1 parent 59bf1d1
commit 266ed03
Show file tree

Hide file tree

Showing 123 changed files with 138 additions and 21,110 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -1,7 +1,6 @@
 ^CRAN-RELEASE$
 # Extra material related but not to be included in the package
 inst/extras
-# inst/doc
 README.Rmd
 README.html
 index.*
@@ -10,25 +9,10 @@ index.*
 docs
 
 # Vignette
-./vignettes/2015-RJournal
-./vignettes/2017_RJournal_manuscript/*
-./vignettes/cheatsheet/
-./vignettes/cheatsheet.Rmd
-./vignettes/blogposts.Rmd
-./vignettes/website
-./vignettes/publications.Rmd
-./vignettes/eurostat_tutorial.Rmd
-./vignettes/eurostat_tutorial.pdf
-./vignettes/eurostat_tutorial.md
+#./vignettes/website
 ./vignettes/*.Rmd
-./vignettes/NUTS_2010_60M_SH/*
-./vignettes/NUTS_2010_60M_SH.zip
-./vignettes/NUTS_2010.xls
-./vignettes/zipfile
-./vignettes/figure
-./vignettes/fig
-./vignettes/cheatsheet
-./vignettes/main.R
+#./vignettes/fig
+#./vignettes/fig/
 ./figure$
 ./cache$
 # Git related
@@ -51,3 +35,5 @@ docs
 ^appveyor\.yml$
 ^_pkgdown\.yml$
 ^docs$
+^doc$
+^Meta$
diff --git a/.Rinstignore b/.Rinstignore
@@ -0,0 +1,2 @@
+inst/doc/fig
+
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 _pkgdown.yml
+inst/doc
 docs/docsearch.js
 docs/articles/2015-RJournal/response.txt
 *Rcheck*
@@ -25,3 +26,5 @@ packrat/lib*/
 .Rhistory
 
 /revdep/.cache.rds
+doc
+Meta
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: eurostat
 Type: Package
 Title: Tools for Eurostat Open Data
-Date: 2020-10-16
-Version: 3.6.6
+Date: 2020-11-17
+Version: 3.6.82
 Encoding: UTF-8
 Authors@R: c(
   person("Leo", "Lahti", email = "leo.lahti@iki.fi", role = c("aut", "cre"), comment = c(ORCID = "0000-0001-5537-637X")),
@@ -46,15 +46,16 @@ Suggests:
     knitr,    
     mapproj,    
     plotrix,
-    rmarkdown,
+    markdown,
+    rmarkdown,    
     roxygen2,
     rsdmx,
     rvest,
     testthat,
     tmap,
     usethis
 LazyData: true
-URL: https://ropengov.github.io/eurostat
+URL: https://ropengov.github.io/eurostat/
 BugReports: https://github.com/ropengov/eurostat/issues
 VignetteBuilder: knitr
 NeedsCompilation: no

diff --git a/R/clean_eurostat_cache.R b/R/clean_eurostat_cache.R
@@ -4,7 +4,7 @@
 #' @param cache_dir A path to cache directory. If \code{NULL} (default)
 #'        tries to clean default temporary cache directory.
 #' @export
-#' @author Przemyslaw Biecek, Leo Lahti, Janne Huovari and Markus Kainu \email{ropengov-forum@@googlegroups.com} \url{http://github.com/ropengov/eurostat}
+#' @author Przemyslaw Biecek, Leo Lahti, Janne Huovari and Markus Kainu
 #' @examples clean_eurostat_cache() 
 clean_eurostat_cache <- function(cache_dir = NULL){
   if (is.null(cache_dir)){

diff --git a/R/dic_order.R b/R/dic_order.R
@@ -8,7 +8,7 @@
 #'    \code{\link{get_eurostat_dic}}.
 #' @param type a type of the x. Could be \code{code} or \code{label}.
 #' @export
-#' @author Przemyslaw Biecek, Leo Lahti, Janne Huovari and Markus Kainu \email{ropengov-forum@@googlegroups.com} \url{http://github.com/ropengov/eurostat}
+#' @author Przemyslaw Biecek, Leo Lahti, Janne Huovari and Markus Kainu
 #' @return A numeric vector of orders.
 dic_order <- function(x, dic, type) {
   if (!is_tibble(dic)) dic <- get_eurostat_dic(dic)

diff --git a/R/eurostat-package.R b/R/eurostat-package.R
@@ -4,7 +4,7 @@
 #' Package: \tab eurostat\cr
 #' Type: \tab Package\cr
 #' Version: \tab See sessionInfo() or DESCRIPTION file\cr
-#' Date: \tab 2014-2017\cr
+#' Date: \tab 2014-2020\cr
 #' License: \tab BSD_2_clause + LICENSE\cr
 #' LazyLoad: \tab yes\cr
 #' }
@@ -16,10 +16,10 @@
 #' @docType package
 #' @title R Tools for Eurostat open data
 #'
-#' @author Leo Lahti, Janne Huovari, Markus Kainu, Przemyslaw Biecek \email{ropengov-forum@@googlegroups.com} \url{https://ropengov.github.io/eurostat}
+#' @author Leo Lahti, Janne Huovari, Markus Kainu, Przemyslaw Biecek
 #' @references
 #' See citation("eurostat")
-#' \url{https://ropengov.github.io/eurostat}
+#' \url{https://ropengov.github.io/eurostat/}
 #' @examples library(eurostat)
 #' @keywords package
 NULL
diff --git a/R/eurotime2date.R b/R/eurotime2date.R
@@ -7,6 +7,7 @@
 #'        the first date of the period (month, quarter or year). If \code{TRUE} 
 #'        the date is the last date of the period.
 #' @export
+#' @references See citation("eurostat").
 #' @return an object of class \code{\link{Date}}.
 #' @author Janne Huovari \email{janne.huovari@@ptt.fi}
 #' @examples \dontrun{

diff --git a/R/get_eurostat.R b/R/get_eurostat.R
@@ -47,7 +47,8 @@
 #'        can not be used with a \code{filters}.
 #' @param ... further argument for \code{\link{get_eurostat_json}}.
 #' @export
-#' @author Przemyslaw Biecek, Leo Lahti, Janne Huovari and Markus Kainu \email{ropengov-forum@@googlegroups.com} \url{http://github.com/ropengov/eurostat}
+#' @references See citation("eurostat").
+#' @author Przemyslaw Biecek, Leo Lahti, Janne Huovari and Markus Kainu 
 #' @details Data sets are downloaded from 
 #' \href{http://ec.europa.eu/eurostat/estat-navtree-portlet-prod/BulkDownloadListing}{the Eurostat bulk download facility} or from The Eurostat Web Services 
 #' \href{http://ec.europa.eu/eurostat/web/json-and-unicode-web-services}{JSON API}.

diff --git a/R/get_eurostat_geospatial.R b/R/get_eurostat_geospatial.R
@@ -24,7 +24,7 @@
 #'        'eurostat' directory in the temporary directory from
 #'        \code{\link{tempdir}}. Directory can also be set with
 #'        \code{option} eurostat_cache_dir.
-#' @param crs projection of the map: 4-digit \href{http://spatialreference.org/ref/epsg/}{EPSG code}. One of:
+#' @param crs projection of the map: 4-digit \href{https://spatialreference.org/ref/epsg/}{EPSG code}. One of:
 #' \itemize{
 #' \item "4326" - WGS84
 #' \item "3035" - ETRS89 / ETRS-LAEA

diff --git a/R/get_eurostat_json.R b/R/get_eurostat_json.R
@@ -38,12 +38,11 @@
 #' @return A dataset as a data_frame.
 #' @export
 #' @author Przemyslaw Biecek, Leo Lahti, Janne Huovari and Markus Kainu
-#'   \email{ropengov-forum@@googlegroups.com}
-#'   \url{http://github.com/ropengov/eurostat}
+#' @references See citation("eurostat").
 #' @examples
 #'  \dontrun{
 #'    tmp <- get_eurostat_json("cdh_e_fos")
-#'    nama_gdp_c has been discontinued since 2/2018 and this example has ceased working.
+#'    # nama_gdp_c has been discontinued since 2/2018 and this example has ceased working.
 #'    yy <- get_eurostat_json(id = "nama_gdp_c", filters = list(geo=c("EU28", "FI"),
 #'                                                         unit="EUR_HAB",
 #'                                                         indic_na="B1GM"))

diff --git a/R/tidy_eurostat.R b/R/tidy_eurostat.R
@@ -21,7 +21,7 @@
 #' @return tibble in the molten format with the last column 'values'.
 #' @seealso \code{\link{get_eurostat}}
 #' @references See citation("eurostat").
-#' @author Przemyslaw Biecek, Leo Lahti and Janne Huovari \email{ropengov-forum@@googlegroups.com} \url{http://github.com/ropengov/eurostat}
+#' @author Przemyslaw Biecek, Leo Lahti and Janne Huovari
 #' @keywords internal utilities database
 tidy_eurostat <- function(dat, time_format = "date", select_time = NULL,
            stringsAsFactors = FALSE,

diff --git a/README.Rmd b/README.Rmd
@@ -50,7 +50,7 @@ R tools to access open data from [Eurostat](http://ec.europa.eu/eurostat). Data
 
 ### Installation and use
 
-See the Articles section at the [package homepage](http://ropengov.github.io/eurostat) for more.
+See the Articles section at the [package homepage](https://ropengov.github.io/eurostat/) for more.
 
 
 ### Recommended packages
@@ -65,15 +65,15 @@ Contributions are very welcome:
 
   * [Use issue tracker](https://github.com/ropengov/eurostat/issues) for feedback and bug reports.
   * [Send pull requests](https://github.com/ropengov/eurostat/)
-  * [Star us on the Github page](https://github.com/ropengov/eurostat)
+  * [Star us on the Github page](https://github.com/ropengov/eurostat/)
   * [Join the discussion in Gitter](https://gitter.im/rOpenGov/eurostat)
 
 
 ### Acknowledgements
 
-**Kindly cite this work** as follows: [Leo Lahti](https://github.com/antagomir), Przemyslaw Biecek, Markus Kainu and Janne Huovari. Retrieval and analysis of Eurostat open data with the eurostat package. [R Journal 9(1):385-392, 2017](https://journal.r-project.org/archive/2017/RJ-2017-019/index.html). R package version `r sessionInfo()$otherPkgs$eurostat$Version`. URL: [http://ropengov.github.io/eurostat](http://ropengov.github.io/eurostat)
+**Kindly cite this work** as follows: [Leo Lahti](https://github.com/antagomir), Przemyslaw Biecek, Markus Kainu and Janne Huovari. Retrieval and analysis of Eurostat open data with the eurostat package. [R Journal 9(1):385-392, 2017](https://journal.r-project.org/archive/2017/RJ-2017-019/index.html). R package version `r sessionInfo()$otherPkgs$eurostat$Version`. URL: [https://ropengov.github.io/eurostat/](https://ropengov.github.io/eurostat/)
 
-We are grateful to all [contributors](https://github.com/rOpenGov/eurostat/graphs/contributors), including Daniel Antal, Joona Lehtomäki, Francois Briatte, and Oliver Reiter, and for the [Eurostat](https://ec.europa.eu/eurostat/) open data portal! This project is part of [rOpenGov](http://ropengov.github.io).
+We are grateful to all [contributors](https://github.com/ropengov/eurostat/graphs/contributors), including Daniel Antal, Joona Lehtomäki, Francois Briatte, and Oliver Reiter, and for the [Eurostat](https://ec.europa.eu/eurostat/) open data portal! This project is part of [rOpenGov](http://ropengov.github.io).
 
 
 
@@ -102,7 +102,7 @@ This package is in no way officially related to or endorsed by Eurostat.
 [github-watch]: https://github.com/ropengov/eurostat/watchers
 [github-star-badge]: https://img.shields.io/github/stars/ropengov/eurostat.svg?style=social
 [github-star]: https://github.com/ropengov/eurostat/stargazers
-[twitter]: https://twitter.com/intent/tweet?text=Check%20out%20eurostat!%20%E2%9C%A8%20Recognize%20all%20contributors,%20not%20just%20the%20ones%20who%20commit%20code%20%E2%9C%A8%20https://github.com/ropengov/eurostat%20%F0%9F%A4%97
+[twitter]: https://twitter.com/intent/tweet?text=Check%20out%20eurostat!%20%E2%9C%A8%20Recognize%20all%20contributors,%20not%20just%20the%20ones%20who%20commit%20code%20%E2%9C%A8%20https://github.com/ropengov/eurostat/%20%F0%9F%A4%97
 [twitter-badge]: https://img.shields.io/twitter/url/https/github.com/ropengov/eurostat.svg?style=social
-[emojis]: https://github.com/ropengov/eurostat#emoji-key
-[eurostat]: https://github.com/ropengov/eurostat
+[emojis]: https://github.com/ropengov/eurostat/#emoji-key
+[eurostat]: https://github.com/ropengov/eurostat/
diff --git a/README.md b/README.md
@@ -39,7 +39,7 @@ manipulation and visualization.
 ### Installation and use
 
 See the Articles section at the [package
-homepage](http://ropengov.github.io/eurostat) for more.
+homepage](https://ropengov.github.io/eurostat/) for more.
 
 ### Recommended packages
 
@@ -55,7 +55,7 @@ Contributions are very welcome:
 -   [Use issue tracker](https://github.com/ropengov/eurostat/issues) for
     feedback and bug reports.
 -   [Send pull requests](https://github.com/ropengov/eurostat/)
--   [Star us on the Github page](https://github.com/ropengov/eurostat)
+-   [Star us on the Github page](https://github.com/ropengov/eurostat/)
 -   [Join the discussion in Gitter](https://gitter.im/rOpenGov/eurostat)
 
 ### Acknowledgements
@@ -65,10 +65,10 @@ Lahti](https://github.com/antagomir), Przemyslaw Biecek, Markus Kainu
 and Janne Huovari. Retrieval and analysis of Eurostat open data with the
 eurostat package. [R Journal 9(1):385-392,
 2017](https://journal.r-project.org/archive/2017/RJ-2017-019/index.html).
-R package version 3.6.6. URL: <http://ropengov.github.io/eurostat>
+R package version 3.6.82. URL: <https://ropengov.github.io/eurostat/>
 
 We are grateful to all
-[contributors](https://github.com/rOpenGov/eurostat/graphs/contributors),
+[contributors](https://github.com/ropengov/eurostat/graphs/contributors),
 including Daniel Antal, Joona Lehtomäki, Francois Briatte, and Oliver
 Reiter, and for the [Eurostat](https://ec.europa.eu/eurostat/) open data
 portal! This project is part of [rOpenGov](http://ropengov.github.io).

diff --git a/cran-comments.md b/cran-comments.md