From f6681e3c07768b327e575a493184317dc75989f0 Mon Sep 17 00:00:00 2001 From: mtennekes Date: Tue, 12 Sep 2023 16:20:29 +0200 Subject: [PATCH] cready to submit CRAN 3.3-4 --- DESCRIPTION | 2 +- R/tmap_save.R | 2 +- README.md | 2 +- cran-comments.md | 3 +-- vignettes/tmap-getstarted.Rmd | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 18d73978..0dbed81d 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -16,7 +16,7 @@ Authors@R: c( ) Description: Thematic maps are geographical maps in which spatial data distributions are visualized. This package offers a flexible, layer-based, and easy to use approach to create thematic maps, such as choropleths and bubble maps. Version: 3.3-4 -Date: 2023-09-08 +Date: 2023-09-12 Encoding: UTF-8 Depends: R (>= 3.5.0), diff --git a/R/tmap_save.R b/R/tmap_save.R index 282a8d97..b4ee6200 100644 --- a/R/tmap_save.R +++ b/R/tmap_save.R @@ -200,7 +200,7 @@ tmap_save <- function(tm=NULL, filename=NA, device=NULL, width=NA, height=NA, un if (!is.arrange && !missing(insets_tm) && !missing(insets_vp)) { args_inset <- if (!is.na(scale)) list(scale = scale) else list() - if (class(insets_tm)=="list" && class(insets_vp)=="list") { + if (inherits(insets_tm, "list") && inherits(insets_vp, "list")) { if (length(insets_tm) != length(insets_vp)) stop("Number of insets unequal to number of viewports") mapply(function(tm_i, vp_i) { print(tm_i + do.call("tm_layout", args_inset), vp=vp_i) diff --git a/README.md b/README.md index d92f1b1b..a7841ed6 100644 --- a/README.md +++ b/README.md @@ -152,7 +152,7 @@ Please tag your questions with *tmap*. [17]: http://www.computerworld.com/article/2921176/business-intelligence/great-r-packages-for-data-import-wrangling-visualization.html [18]: http://www.computerworld.com/article/3175623/data-analytics/mapping-in-r-just-got-a-whole-lot-easier.html [19]: https://sesync-ci.github.io/maps-in-R-lesson/ - [20]: http://geocompr.robinlovelace.net/adv-map.html + [20]: https://r.geocompx.org/adv-map [21]: https://mtennekes.github.io/downloads/presentations/tmap_user2017.pdf [22]: https://gotellilab.github.io/Bio381/StudentPresentations/SpatialDataTutorial.html [23]: https://mtennekes.github.io/downloads/presentations/tmap_opengeo_muenster.pdf diff --git a/cran-comments.md b/cran-comments.md index 2b658c15..31cfeef9 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,6 +1,5 @@ ## Test environments -* ubuntu 14.04 (on travis-ci), R 3.5.1 and R devel -* ubuntu 20.04.2, R 4.1.2 +* MacOS 13.4.1, R 4.3.1 * win-builder (devel and release) ## Submission note diff --git a/vignettes/tmap-getstarted.Rmd b/vignettes/tmap-getstarted.Rmd index b7975bed..a9bc1868 100644 --- a/vignettes/tmap-getstarted.Rmd +++ b/vignettes/tmap-getstarted.Rmd @@ -23,7 +23,7 @@ A more detailed description of tmap can be found in an [article](https://www.jst However, that article describes tmap version 1.11-2, which is out-of-date. Some major changes have been made since then, which are described in [`vignette("tmap-changes")`](../doc/tmap-changes.html). -For more context on R's geographic capabilities we recommend the online version of the book [Geocomputation with R](https://geocompr.robinlovelace.net/). The [Making maps with R](https://geocompr.robinlovelace.net/adv-map.html) chapter of the book provides many more context and abundant code examples of map making with `tmap` and other packages. Other good resources are the vignettes of the [`sf` package](https://CRAN.R-project.org/package=sf/vignettes/sf1.html). +For more context on R's geographic capabilities we recommend the online version of the book [Geocomputation with R](https://r.geocompx.org/). The [Making maps with R](https://r.geocompx.org/adv-map) chapter of the book provides many more context and abundant code examples of map making with `tmap` and other packages. Other good resources are the vignettes of the [`sf` package](https://CRAN.R-project.org/package=sf/vignettes/sf1.html). ### Hello World!