Merge PR

.github/workflows/check-full.yaml

@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - {os: windows-latest, r: 'devel'}
+          #- {os: windows-latest, r: 'devel'}
           - {os: windows-latest, r: 'release'}
           - {os: windows-latest, r: 'oldrel'}
           #- {os: macOS-latest, r: 'devel'}

.github/workflows/rhub.yaml

@@ -0,0 +1,96 @@
+# R-hub's generic GitHub Actions workflow file. It's canonical location is at
+# https://github.com/r-hub/actions/blob/v1/workflows/rhub.yaml
+# You can update this file to a newer version using the rhub2 package:
+#
+# rhub::rhub_setup()
+#
+# It is unlikely that you need to modify this file manually.
+
+name: R-hub
+run-name: "${{ github.event.inputs.id }}: ${{ github.event.inputs.name || format('Manually run by {0}', github.triggering_actor) }}"
+
+on:
+  workflow_dispatch:
+    inputs:
+      config:
+        description: 'A comma separated list of R-hub platforms to use.'
+        type: string
+        default: 'linux,windows,macos'
+      name:
+        description: 'Run name. You can leave this empty now.'
+        type: string
+      id:
+        description: 'Unique ID. You can leave this empty now.'
+        type: string
+
+jobs:
+
+  setup:
+    runs-on: ubuntu-latest
+    outputs:
+      containers: ${{ steps.rhub-setup.outputs.containers }}
+      platforms: ${{ steps.rhub-setup.outputs.platforms }}
+
+    steps:
+    # NO NEED TO CHECKOUT HERE
+    - uses: r-hub/actions/setup@v1
+      with:
+        config: ${{ github.event.inputs.config }}
+      id: rhub-setup
+
+  linux-containers:
+    needs: setup
+    if: ${{ needs.setup.outputs.containers != '[]' }}
+    runs-on: ubuntu-latest
+    name: ${{ matrix.config.label }}
+    strategy:
+      fail-fast: false
+      matrix:
+        config: ${{ fromJson(needs.setup.outputs.containers) }}
+    container:
+      image: ${{ matrix.config.container }}
+
+    steps:
+      - uses: r-hub/actions/checkout@v1
+      - uses: r-hub/actions/platform-info@v1
+        with:
+          token: ${{ secrets.RHUB_TOKEN }}
+          job-config: ${{ matrix.config.job-config }}
+      - uses: r-hub/actions/setup-deps@v1
+        with:
+          token: ${{ secrets.RHUB_TOKEN }}
+          job-config: ${{ matrix.config.job-config }}
+      - uses: r-hub/actions/run-check@v1
+        with:
+          token: ${{ secrets.RHUB_TOKEN }}
+          job-config: ${{ matrix.config.job-config }}
+
+  other-platforms:
+    needs: setup
+    if: ${{ needs.setup.outputs.platforms != '[]' }}
+    runs-on: ${{ matrix.config.os }}
+    name: ${{ matrix.config.label }}
+    strategy:
+      fail-fast: false
+      matrix:
+        config: ${{ fromJson(needs.setup.outputs.platforms) }}
+
+    steps:
+      - uses: r-hub/actions/checkout@v1
+      - uses: r-hub/actions/setup-r@v1
+        with:
+          job-config: ${{ matrix.config.job-config }}
+          token: ${{ secrets.RHUB_TOKEN }}
+      - uses: r-hub/actions/platform-info@v1
+        with:
+          token: ${{ secrets.RHUB_TOKEN }}
+          job-config: ${{ matrix.config.job-config }}
+      - uses: r-hub/actions/setup-deps@v1
+        with:
+          job-config: ${{ matrix.config.job-config }}
+          token: ${{ secrets.RHUB_TOKEN }}
+      - uses: r-hub/actions/run-check@v1
+        with:
+          job-config: ${{ matrix.config.job-config }}
+          token: ${{ secrets.RHUB_TOKEN }}
+

.github/workflows/test-coverage.yaml

@@ -1,4 +1,4 @@
-# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
+# 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:
@@ -13,6 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
     steps:
       - uses: actions/checkout@v4
@@ -28,18 +29,20 @@ jobs:
 
       - name: Test coverage
         run: |
+          token <- Sys.getenv("CODECOV_TOKEN", "")
           covr::codecov(
             quiet = FALSE,
             clean = FALSE,
-            install_path = file.path(Sys.getenv("RUNNER_TEMP"), "package")
+            install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package"),
+            token = if (token != "") token
           )
         shell: Rscript {0}
 
       - name: Show testthat output
         if: always()
         run: |
           ## --------------------------------------------------------------------
-          find ${{ runner.temp }}/package -name 'testthat.Rout*' -exec cat '{}' \; || true
+          find '${{ runner.temp }}/package' -name 'testthat.Rout*' -exec cat '{}' \; || true
         shell: bash
 
       - name: Upload test results

CITATION.cff

@@ -159,6 +159,9 @@ references:
     email: [email protected]
     orcid: https://orcid.org/0000-0002-4035-0289
   year: '2024'
+  identifiers:
+  - type: url
+    value: https://curl.se/libcurl/
 - type: software
   title: ggplot2
   abstract: 'ggplot2: Create Elegant Data Visualisations Using the Grammar of Graphics'

R/data.R

@@ -173,8 +173,15 @@ NULL
 #' @docType data
 #'
 #' @source
-#' <https://ec.europa.eu/eurostat/web/gisco/geodata/reference-data/>, LAU 2019
-#' data.
+#'
+#' ```{r, echo=FALSE, results='asis'}
+#'
+#' cat(paste0("<https://ec.europa.eu/eurostat/web/gisco/geodata/",
+#'            "statistical-units/local-administrative-units>, "))
+#'
+#'
+#' ```
+#' LAU 2019 data.
 #'
 #' @encoding UTF-8
 #'

R/esp_dict.R

@@ -1,4 +1,4 @@
-#' Convert and translate Subdivision Names
+#' Convert and translate subdivision names
 #'
 #' Converts long subdivision names into different coding schemes and languages.
 #'

R/esp_getTiles.R

@@ -1,4 +1,4 @@
-#' Get static tiles from public administrations of Spanish.
+#' Get static tiles from public administrations of Spain
 #'
 #' @description
 #' Get static map tiles based on a spatial object. Maps can be fetched from

README.Rmd

@@ -35,6 +35,7 @@ knitr::opts_chunk$set(
 [![Downloads](https://cranlogs.r-pkg.org/badges/mapSpain)](https://CRAN.R-project.org/package=mapSpain)
 [![r-universe](https://ropenspain.r-universe.dev/badges/mapSpain)](https://ropenspain.r-universe.dev/mapSpain)
 [![R-CMD-check](https://github.com/rOpenSpain/mapSpain/workflows/R-CMD-check/badge.svg)](https://github.com/rOpenSpain/mapSpain/actions?query=workflow%3AR-CMD-check)
+[![R-hub](https://github.com/rOpenSpain/mapSpain/actions/workflows/rhub.yaml/badge.svg)](https://github.com/rOpenSpain/mapSpain/actions/workflows/rhub.yaml)
 [![codecov](https://codecov.io/gh/rOpenSpain/mapSpain/branch/main/graph/badge.svg?token=6L01BKLL85)](https://app.codecov.io/gh/rOpenSpain/mapSpain)
 [![DOI](https://img.shields.io/badge/DOI-10.5281/zenodo.5366622-blue)](https://doi.org/10.5281/zenodo.5366622)
 [![Project-Status:Active](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active)

README.md

@@ -9,6 +9,7 @@
 [![Downloads](https://cranlogs.r-pkg.org/badges/mapSpain)](https://CRAN.R-project.org/package=mapSpain)
 [![r-universe](https://ropenspain.r-universe.dev/badges/mapSpain)](https://ropenspain.r-universe.dev/mapSpain)
 [![R-CMD-check](https://github.com/rOpenSpain/mapSpain/workflows/R-CMD-check/badge.svg)](https://github.com/rOpenSpain/mapSpain/actions?query=workflow%3AR-CMD-check)
+[![R-hub](https://github.com/rOpenSpain/mapSpain/actions/workflows/rhub.yaml/badge.svg)](https://github.com/rOpenSpain/mapSpain/actions/workflows/rhub.yaml)
 [![codecov](https://codecov.io/gh/rOpenSpain/mapSpain/branch/main/graph/badge.svg?token=6L01BKLL85)](https://app.codecov.io/gh/rOpenSpain/mapSpain)
 [![DOI](https://img.shields.io/badge/DOI-10.5281/zenodo.5366622-blue)](https://doi.org/10.5281/zenodo.5366622)
 [![Project-Status:Active](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active)

codemeta.json

@@ -245,7 +245,7 @@
   "applicationCategory": "cartography",
   "isPartOf": "https://ropenspain.es/",
   "keywords": ["rOpenSpain", "tiles", "r", "maps", "spatial", "rstats", "r-package", "municipalities", "Spain", "gisco", "provinces", "ign", "administrative-boundaries", "ccaa", "static-tiles", "spain", "cran", "ropenspain", "ggplot2", "gis"],
-  "fileSize": "2420.44KB",
+  "fileSize": "2418.69KB",
   "citation": [
     {
       "@type": "SoftwareSourceCode",
@@ -266,6 +266,6 @@
   ],
   "releaseNotes": "https://github.com/rOpenSpain/mapSpain/blob/master/NEWS.md",
   "readme": "https://github.com/rOpenSpain/mapSpain/blob/main/README.md",
-  "contIntegration": ["https://github.com/rOpenSpain/mapSpain/actions?query=workflow%3AR-CMD-check", "https://app.codecov.io/gh/rOpenSpain/mapSpain"],
+  "contIntegration": ["https://github.com/rOpenSpain/mapSpain/actions?query=workflow%3AR-CMD-check", "https://github.com/rOpenSpain/mapSpain/actions/workflows/rhub.yaml", "https://app.codecov.io/gh/rOpenSpain/mapSpain"],
   "developmentStatus": "https://www.repostatus.org/#active"
 }

revdep/README.md

@@ -1,50 +1,41 @@
 # Platform
 
-|field    |value                                  |
-|:--------|:--------------------------------------|
-|version  |R version 4.3.2 (2023-10-31 ucrt)      |
-|os       |Windows 11 x64 (build 22621)           |
-|system   |x86_64, mingw32                        |
-|ui       |RStudio                                |
-|language |(EN)                                   |
-|collate  |Spanish_Spain.utf8                     |
-|ctype    |Spanish_Spain.utf8                     |
-|tz       |Europe/Madrid                          |
-|date     |2024-01-23                             |
-|rstudio  |2023.12.0+369 Ocean Storm (desktop)    |
-|pandoc   |2.19.2 @ C:\PROGRA~1\Pandoc\pandoc.exe |
+|field    |value                          |
+|:--------|:------------------------------|
+|version  |R version 4.3.3 (2024-02-29)   |
+|os       |macOS Monterey 12.7.4          |
+|system   |x86_64, darwin20               |
+|ui       |X11                            |
+|language |(EN)                           |
+|collate  |en_US.UTF-8                    |
+|ctype    |en_US.UTF-8                    |
+|tz       |UTC                            |
+|date     |2024-04-22                     |
+|pandoc   |3.1.11 @ /usr/local/bin/pandoc |
 
 # Dependencies
 
 |package     |old    |new    |Δ  |
 |:-----------|:------|:------|:--|
-|mapSpain    |0.8.0  |0.9.0  |*  |
-|askpass     |1.2.0  |1.2.0  |   |
-|classInt    |0.4-10 |0.4-10 |   |
-|countrycode |1.5.0  |1.5.0  |   |
-|curl        |5.2.0  |5.2.0  |   |
-|DBI         |1.2.1  |1.2.1  |   |
-|e1071       |1.7-14 |1.7-14 |   |
-|geojsonsf   |2.0.3  |2.0.3  |   |
-|geometries  |0.2.4  |0.2.4  |   |
-|giscoR      |0.4.0  |0.4.0  |   |
-|httr        |1.4.7  |1.4.7  |   |
-|jsonify     |1.2.2  |1.2.2  |   |
-|jsonlite    |1.8.8  |1.8.8  |   |
-|magrittr    |2.0.3  |2.0.3  |   |
-|mime        |0.12   |0.12   |   |
-|openssl     |2.1.1  |2.1.1  |   |
-|proxy       |0.4-27 |0.4-27 |   |
-|R6          |2.5.1  |2.5.1  |   |
-|rapidjsonr  |1.2.0  |1.2.0  |   |
-|rappdirs    |0.3.3  |0.3.3  |   |
-|Rcpp        |1.0.12 |1.0.12 |   |
-|s2          |1.1.6  |1.1.6  |   |
-|sf          |1.0-15 |1.0-15 |   |
-|sfheaders   |0.4.4  |0.4.4  |   |
-|sys         |3.4.2  |3.4.2  |   |
-|units       |0.8-5  |0.8-5  |   |
-|wk          |0.9.1  |0.9.1  |   |
+|mapSpain    |0.9.0  |0.9.0  |NA |
+|classInt    |0.4-10 |0.4-10 |NA |
+|countrycode |1.6.0  |1.6.0  |NA |
+|DBI         |1.2.2  |1.2.2  |NA |
+|e1071       |1.7-14 |1.7-14 |NA |
+|geojsonsf   |2.0.3  |2.0.3  |NA |
+|geometries  |0.2.4  |0.2.4  |NA |
+|giscoR      |0.4.2  |0.4.2  |NA |
+|jsonify     |1.2.2  |1.2.2  |NA |
+|magrittr    |2.0.3  |2.0.3  |NA |
+|proxy       |0.4-27 |0.4-27 |NA |
+|rapidjsonr  |1.2.0  |1.2.0  |NA |
+|rappdirs    |0.3.3  |0.3.3  |NA |
+|Rcpp        |1.0.12 |1.0.12 |NA |
+|s2          |1.1.6  |1.1.6  |NA |
+|sf          |1.0-16 |1.0-16 |NA |
+|sfheaders   |0.4.4  |0.4.4  |NA |
+|units       |0.8-5  |0.8-5  |NA |
+|wk          |0.9.1  |0.9.1  |NA |
 
 # Revdeps
 

revdep/cran.md

@@ -1,6 +1,6 @@
 ## revdepcheck results
 
-We checked 1 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.
+We checked 2 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.
 
  * We saw 0 new problems
  * We failed to check 0 packages

tests/testthat/test-esp_getTiles.R

@@ -240,7 +240,7 @@ test_that("Custom WMS", {
 
   segovia <- esp_get_prov_siane("segovia", epsg = 3857)
   custom_wms <- list(
-    id = "an_id_for_caching",
+    id = "new_cached_test",
     q = paste0(
       "https://idecyl.jcyl.es/geoserver/ge/wms?request=GetMap",
       "&service=WMS&version=1.3.0",