Improve continuous integration + tweak to improve R CMD CHECK log

.Rbuildignore

@@ -12,9 +12,7 @@ local
 LICENSE
 README
 .Rprofile
-.travis.yml
-appveyor.yml
-tic.R
+build/
 gdal-2.1.0
 gdal-2.1.0.tar.gz
 ubuntu_16_installation.sh

.github/workflows/R-CMD-check.yaml

@@ -0,0 +1,47 @@
+# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
+# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
+on:
+  push:
+    branches: [main, master]
+  pull_request:
+    branches: [main, master]
+
+name: R-CMD-check
+
+jobs:
+  R-CMD-check:
+    runs-on: ${{ matrix.config.os }}
+
+    name: ${{ matrix.config.os }} (${{ matrix.config.r }})
+
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          - {os: macos-latest,   r: 'release'}
+          - {os: windows-latest, r: 'release'}
+          - {os: ubuntu-latest,   r: 'devel', http-user-agent: 'release'}
+
+    env:
+      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+      R_KEEP_PKG_SOURCE: yes
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: r-lib/actions/setup-pandoc@v2
+
+      - uses: r-lib/actions/setup-r@v2
+        with:
+          r-version: ${{ matrix.config.r }}
+          http-user-agent: ${{ matrix.config.http-user-agent }}
+          use-public-rspm: true
+
+      - uses: r-lib/actions/setup-r-dependencies@v2
+        with:
+          extra-packages: any::rcmdcheck
+          needs: check
+
+      - uses: r-lib/actions/check-r-package@v2
+        with:
+          upload-snapshots: true

.github/workflows/pkgdown.yaml

@@ -1,54 +1,48 @@
+# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
+# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
 on:
   push:
-    branches: master
+    branches: [main, master]
+  pull_request:
+    branches: [main, master]
+  release:
+    types: [published]
+  workflow_dispatch:
 
 name: pkgdown
 
 jobs:
   pkgdown:
-    runs-on: macOS-latest
+    runs-on: ubuntu-latest
+    # Only restrict concurrency for non-PR jobs
+    concurrency:
+      group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+    permissions:
+      contents: write
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - uses: r-lib/actions/setup-r@master
+      - uses: r-lib/actions/setup-pandoc@v2
 
-      - uses: r-lib/actions/setup-pandoc@master
-
-      - name: Query dependencies
-        run: |
-          install.packages('remotes')
-          saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2)
-          writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
-        shell: Rscript {0}
+      - uses: r-lib/actions/setup-r@v2
+        with:
+          use-public-rspm: true
 
-      - name: Cache R packages
-        uses: actions/cache@v1
+      - uses: r-lib/actions/setup-r-dependencies@v2
         with:
-          path: ${{ env.R_LIBS_USER }}
-          key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
-          restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-
-
-      - name: Brew
-        run: |
-          brew install pkg-config
-          brew install udunits
-          brew install gdal
-          brew install sqlite3
-          brew install v8
+          extra-packages: any::pkgdown, local::.
+          needs: website
 
-      - name: Install dependencies
-        run: |
-          install.packages("remotes")
-          remotes::install_dev("tmaptools")
-          remotes::install_deps(dependencies = TRUE)
-          remotes::install_dev("pkgdown")
+      - name: Build site
+        run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
         shell: Rscript {0}
 
-      - name: Install package
-        run: R CMD INSTALL .
-
-      - name: Deploy package
-        run: pkgdown::deploy_to_branch(new_process = FALSE)
-        shell: Rscript {0}
+      - name: Deploy to GitHub pages 🚀
+        if: github.event_name != 'pull_request'
+        uses: JamesIves/github-pages-deploy-action@v4.4.1
+        with:
+          clean: false
+          branch: gh-pages
+          folder: docs

.github/workflows/test-coverage.yaml

@@ -0,0 +1,50 @@
+# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
+# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
+on:
+  push:
+    branches: [main, master]
+  pull_request:
+    branches: [main, master]
+
+name: test-coverage
+
+jobs:
+  test-coverage:
+    runs-on: ubuntu-latest
+    env:
+      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: r-lib/actions/setup-r@v2
+        with:
+          use-public-rspm: true
+
+      - uses: r-lib/actions/setup-r-dependencies@v2
+        with:
+          extra-packages: any::covr
+          needs: coverage
+
+      - name: Test coverage
+        run: |
+          covr::codecov(
+            quiet = FALSE,
+            clean = FALSE,
+            install_path = file.path(Sys.getenv("RUNNER_TEMP"), "package")
+          )
+        shell: Rscript {0}
+
+      - name: Show testthat output
+        if: always()
+        run: |
+          ## --------------------------------------------------------------------
+          find ${{ runner.temp }}/package -name 'testthat.Rout*' -exec cat '{}' \; || true
+        shell: bash
+
+      - name: Upload test results
+        if: failure()
+        uses: actions/upload-artifact@v3
+        with:
+          name: coverage-test-failures
+          path: ${{ runner.temp }}/package

DESCRIPTION

@@ -28,7 +28,7 @@ Imports:
     stars (>= 0.4-2),
     units (>= 0.6-1),
     grid,
-    cols4all,
+    cols4all (>= 0.6-1),
     classInt (>= 0.4-3),
     htmltools,
     htmlwidgets,
@@ -59,7 +59,11 @@ Suggests:
     covr,
     av,
     gifski
-URL: https://github.com/r-tmap/tmap
+URL: https://github.com/r-tmap/tmap, https://r-tmap.github.io/tmap/
+Remotes: r-tmap/tmaptools, mtennekes/cols4all
 BugReports: https://github.com/r-tmap/tmap/issues
 VignetteBuilder: knitr
 RoxygenNote: 7.2.3
+SystemRequirements: GDAL, sqlite3, v8, uduntis, GEOS, PROJ
+Config/Needs/check: Nowosad/spDataLarge, lwgeom
+Config/Needs/coverage: Nowosad/spDataLarge, lwgeom

NAMESPACE

@@ -117,11 +117,15 @@ export(tm_fill)
 export(tm_format)
 export(tm_graticules)
 export(tm_grid)
+export(tm_iso)
 export(tm_layout)
 export(tm_legend)
 export(tm_legend_combine)
 export(tm_legend_hide)
 export(tm_lines)
+export(tm_logo)
+export(tm_markers)
+export(tm_minimap)
 export(tm_mouse_coordinates)
 export(tm_mv)
 export(tm_mv_dim)
@@ -156,6 +160,7 @@ export(tm_scalebar)
 export(tm_sf)
 export(tm_shape)
 export(tm_shape_vars)
+export(tm_squares)
 export(tm_style)
 export(tm_symbols)
 export(tm_text)

R/global-variables.R

@@ -0,0 +1,23 @@
+# Will need investigating, maybe some are false positive
+# But this will reduce clutter in R CMD CHECK
+utils::globalVariables(c(
+  ".", "..cols", "X__", "Y__", "asp", "attr.color", "bbox",
+  "between.margin", "bi", "blue", "by1", "by1__", "by2", "by2__", "by2b__",
+  "by3", "by3__", "ca", "cell.h", "cell.v", "columns", "comp",
+  "crs", "crs_parameters", "dasp", "devsize", "facet_col", "facet_row", "fl",
+  "fn", "gp", "green", "grid.labels.format",
+  "grid.labels.inside.frame", "grid.labels.margin.x", "grid.labels.margin.y",
+  "grid.labels.pos", "grid.labels.rot", "grid.labels.size",
+  "grid.labels.space.x", "grid.labels.space.y", "hover", "id",
+  "ids", "label.show", "labels.cardinal", "labels.inside.frame",
+  "labels.pos", "labels.rot", "legH", "legW",
+  "legend.present.auto", "legend.present.fix", "lfmv", "lineH", "lineW",
+  "main_class", "mapping.args", "mfun", "nby", "ndiscr", "ord__",
+  "outer.margins", "pages", "panel.label.height",
+  "panel.labels", "panel.type", "panel.wrap.pos", "panel.xtab.pos", "pos.h",
+  "pos.h.id", "pos.v", "pos.v.id", "red", "rows", "s1", "s2", "s3", "s4",
+  "scale.factor", "set.bounds",
+  "split_geometry_collection", "stack_auto", "t1",
+  "t2", "t3", "t4", "text.fontface", "text.fontfamily", "title.bg.alpha",
+  "tmapID__", "vneutral"
+))

R/misc_stars.R

@@ -72,7 +72,7 @@ regular_intervals = function (x, epsilon = 1e-10) {
 	}
 }
 
-get_downsample = function(dims, px = round(dev.size("px") * (par("fin")[1] / dev.size()[1]))) { 
+get_downsample = function(dims, px = round(dev.size("px") * (graphics::par("fin")[1] / dev.size()[1]))) { 
 	floor(sqrt(prod(dims) / prod(px)))
 }
 
@@ -131,6 +131,7 @@ transwarp = function(x, crs, raster.warp) {
 		y = tryCatch({
 			stars::st_warp(x, crs = crs)
 		}, error = function(e) {
+			# tm_shape does not have a raster.warp argument.
 			stop("Unable to warp stars. You could try with raster.warp = FALSE (argument of tm_shape)", call. = FALSE)	
 		})
 	} else {

R/pkg.R

@@ -107,9 +107,6 @@
 #' --------------------------- \tab --------------------------------------------------------------------------------------------------- \cr
 #' }
 #' 
-#' @name tmap-package
-#' @aliases tmap
-#' @docType package
 #' @author Martijn Tennekes \email{mtennekes@@gmail.com}
 #' @concept GIS
 #' @concept thematic maps
@@ -118,4 +115,4 @@
 #' @concept bubble map
 #' @seealso \href{../doc/tmap-getstarted.html}{\code{vignette("tmap-getstarted")}}
 #' @references Tennekes, M., 2018, {tmap}: Thematic Maps in {R}, Journal of Statistical Software, 84(6), 1-39, \doi{10.18637/jss.v084.i06}
-NULL
+"_PACKAGE"

R/process_meta.R

@@ -3,7 +3,7 @@ prepreprocess_meta = function(o, vp) {
 	within(o, {
 		vp = vp
 		if (is.null(vp)) {
-			devsize = par("fin") #dev.size() MAY NOT BE EQUAL IN RSTUDIO: https://github.com/rstudio/rstudio/issues/10723
+			devsize = graphics::par("fin") #dev.size() MAY NOT BE EQUAL IN RSTUDIO: https://github.com/rstudio/rstudio/issues/10723
 		} else {
 			if (is.character(vp)) seekViewport(vp) else pushViewport(vp)
 			devsize = c(grid::convertWidth(grid::unit(1, "npc"), unitTo = "inch", valueOnly = TRUE),
@@ -23,7 +23,7 @@ prepreprocess_meta = function(o, vp) {
 		}
 
 
-		lin = par("cin")[2]# * scale
+		lin = graphics::par("cin")[2]# * scale
 
 		lineH = lin / devsize[2] * scale
 		lineW = lin / devsize[1] * scale