diff --git a/README.Rmd b/README.Rmd index b71bc2cd..44e1d550 100644 --- a/README.Rmd +++ b/README.Rmd @@ -52,7 +52,17 @@ knitr::knit_hooks$set(output = function(x, options) { ## Installation -Installation of **tmap** (version 4) is straightforward: +Installation of **tmap** is straightforward: + +```{r eval=FALSE} +install.packages("tmap") +``` + +For Linux and macOS users who are new to working with spatial data in R, this may fail since additional (non-R) libraries are required (which are automatically installed for Windows users). + +### Development version + +The development version ```{r eval=FALSE} # install.packages("remotes") @@ -66,9 +76,6 @@ pak::pak("r-tmap/tmap") install.packages("tmap", repos = c("https://r-tmap.r-universe.dev", "https://cloud.r-project.org")) ``` -The old version of **tmap** (version 3) is available on [![CRAN](https://www.r-pkg.org/badges/version/tmap)](https://cran.r-project.org/package=tmap), but we recommend to use version 4, which will be on CRAN soon. - -For Linux and macOS users who are new to working with spatial data in R, this may fail since additional (non-R) libraries are required (which are automatically installed for Windows users). **Windows** No additional installation required. diff --git a/README.md b/README.md index 650397ca..bd2e931d 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,19 @@ R-library for drawing charts. ## Installation -Installation of **tmap** (version 4) is straightforward: +Installation of **tmap** is straightforward: + +``` r +install.packages("tmap") +``` + +For Linux and macOS users who are new to working with spatial data in R, +this may fail since additional (non-R) libraries are required (which are +automatically installed for Windows users). + +### Development version + +The development version ``` r # install.packages("remotes") @@ -37,14 +49,6 @@ pak::pak("r-tmap/tmap") install.packages("tmap", repos = c("https://r-tmap.r-universe.dev", "https://cloud.r-project.org")) ``` -The old version of **tmap** (version 3) is available on -[![CRAN](https://www.r-pkg.org/badges/version/tmap)](https://cran.r-project.org/package=tmap), -but we recommend to use version 4, which will be on CRAN soon. - -For Linux and macOS users who are new to working with spatial data in R, -this may fail since additional (non-R) libraries are required (which are -automatically installed for Windows users). - **Windows** No additional installation required. **Linux (Ubuntu)** See @@ -64,9 +68,11 @@ Plot a World map of the happy planet index (HPI) per country. The object ``` r tm_shape(World) + tm_polygons(fill = "HPI") +#> [tip] Consider a suitable map projection, e.g. by adding `+ tm_crs("auto")`. +#> This message is displayed once per session. ``` - + This map can be enhanced in several ways. For instance: @@ -80,7 +86,7 @@ tm_shape(World, crs = "+proj=robin") + ) ``` - + # Book chapter about tmap diff --git a/man/figures/README-unnamed-chunk-4-1.png b/man/figures/README-unnamed-chunk-4-1.png index 43cb4e4c..591390dc 100644 Binary files a/man/figures/README-unnamed-chunk-4-1.png and b/man/figures/README-unnamed-chunk-4-1.png differ