diff --git a/CITATION.cff b/CITATION.cff index 8b6730f1..769aea60 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -111,7 +111,7 @@ references: authors: - family-names: Ooms given-names: Jeroen - email: jeroen@berkeley.edu + email: jeroenooms@gmail.com orcid: https://orcid.org/0000-0002-4035-0289 year: '2024' identifiers: diff --git a/README.md b/README.md index ecf00c8e..e89fc891 100644 --- a/README.md +++ b/README.md @@ -360,8 +360,7 @@ This package is in no way officially related to or endorsed by Eurostat. ## References -
+
diff --git a/codemeta.json b/codemeta.json index 971e6f00..cd29ea6b 100644 --- a/codemeta.json +++ b/codemeta.json @@ -14,7 +14,7 @@ "name": "R", "url": "https://r-project.org" }, - "runtimePlatform": "R version 4.4.1 (2024-06-14 ucrt)", + "runtimePlatform": "R version 4.4.1 (2024-06-14)", "provider": { "@id": "https://cran.r-project.org", "@type": "Organization", @@ -240,7 +240,7 @@ "applicationCategory": "cartography", "isPartOf": "http://ropengov.org/", "keywords": ["ropengov", "r", "spatial", "api-wrapper", "rstats", "r-package", "eurostat", "gisco", "thematic-maps", "eurostat-data", "cran", "ggplot2", "gis"], - "fileSize": "1244.028KB", + "fileSize": "1234.726KB", "citation": [ { "@type": "SoftwareSourceCode", diff --git a/data/gisco_countrycode.rda b/data/gisco_countrycode.rda index 7934a2ef..96f2dfc1 100644 Binary files a/data/gisco_countrycode.rda and b/data/gisco_countrycode.rda differ diff --git a/data/gisco_db.rda b/data/gisco_db.rda index 5f954174..ec197025 100644 Binary files a/data/gisco_db.rda and b/data/gisco_db.rda differ diff --git a/img/README-example-1.png b/img/README-example-1.png index bfa681c6..51af13f1 100644 Binary files a/img/README-example-1.png and b/img/README-example-1.png differ diff --git a/img/README-example-2.png b/img/README-example-2.png index f7e69372..17d19655 100644 Binary files a/img/README-example-2.png and b/img/README-example-2.png differ diff --git a/img/README-labels-1.png b/img/README-labels-1.png index 2c53689a..1c666981 100644 Binary files a/img/README-labels-1.png and b/img/README-labels-1.png differ diff --git a/img/README-thematic-1.png b/img/README-thematic-1.png index d95c4b9b..439bbf09 100644 Binary files a/img/README-thematic-1.png and b/img/README-thematic-1.png differ diff --git a/inst/schemaorg.json b/inst/schemaorg.json index 69facc0d..bb0f7696 100644 --- a/inst/schemaorg.json +++ b/inst/schemaorg.json @@ -40,7 +40,7 @@ "name": "Comprehensive R Archive Network (CRAN)", "url": "https://cran.r-project.org" }, - "runtimePlatform": "R version 4.4.1 (2024-06-14 ucrt)", + "runtimePlatform": "R version 4.4.1 (2024-06-14)", "version": "0.6.0" }, { diff --git a/tests/testthat/test-gisco_get_communes.R b/tests/testthat/test-gisco_get_communes.R index 5a794f9b..c2f2a07c 100644 --- a/tests/testthat/test-gisco_get_communes.R +++ b/tests/testthat/test-gisco_get_communes.R @@ -1,39 +1,34 @@ -test_that("Communes offline", { - expect_error(gisco_get_communes(year = "2007")) - expect_error(gisco_get_communes(epsg = "9999")) - expect_error(gisco_get_communes(year = "2004", spatialtype = "COASTL")) - expect_error(gisco_get_communes(year = "2004", spatialtype = "INLAND")) - expect_error(gisco_get_communes(spatialtype = "ERR")) -}) - -test_that("Communes online", { - skip_on_cran() - skip_if_gisco_offline() - - expect_silent(gisco_get_communes(spatialtype = "COASTL")) - - # Trying to query a dataset without a country field. Should show a message - # even with verbose TRUE - expect_message(gisco_get_communes( - spatialtype = "COASTL", - country = "LU", verbose = FALSE - )) - - expect_message(gisco_get_communes(spatialtype = "LB", verbose = TRUE)) - lu <- expect_silent(gisco_get_communes(spatialtype = "LB", country = "LU")) - - expect_equal(as.character(unique(lu$CNTR_CODE)), "LU") - - # Test selected years - years <- c("2001", "2013") - - # Liechtenstein - for (i in seq_len(length(years))) { - lb <- gisco_get_communes( - spatialtype = "LB", country = "LU", year = years[i], - verbose = FALSE - ) - - expect_equal(as.character(unique(lb$CNTR_CODE)), "LU") - } -}) +test_that("Communes offline", { + expect_error(gisco_get_communes(year = "2007")) + expect_error(gisco_get_communes(epsg = "9999")) + expect_error(gisco_get_communes(year = "2004", spatialtype = "COASTL")) + expect_error(gisco_get_communes(year = "2004", spatialtype = "INLAND")) + expect_error(gisco_get_communes(spatialtype = "ERR")) +}) + +test_that("Communes online", { + skip_on_cran() + skip_if_gisco_offline() + + expect_silent(gisco_get_communes(spatialtype = "COASTL")) + + # Trying to query a dataset without a country field. Should show a message + # even with verbose TRUE + expect_message(gisco_get_communes( + spatialtype = "COASTL", + country = "LU", verbose = FALSE + )) + + expect_message(gisco_get_communes(spatialtype = "LB", verbose = TRUE)) + lu <- expect_silent(gisco_get_communes(spatialtype = "LB", country = "LU")) + + expect_equal(as.character(unique(lu$CNTR_CODE)), "LU") + + # Test selected years + lb <- gisco_get_communes( + spatialtype = "LB", country = "LU", year = "2013", + verbose = FALSE + ) + + expect_equal(as.character(unique(lb$CNTR_CODE)), "LU") +}) diff --git a/vignettes/africa-1.png b/vignettes/africa-1.png index 1cab61c5..bf36122f 100644 Binary files a/vignettes/africa-1.png and b/vignettes/africa-1.png differ diff --git a/vignettes/country-1.png b/vignettes/country-1.png index ecf20668..5375de2b 100644 Binary files a/vignettes/country-1.png and b/vignettes/country-1.png differ diff --git a/vignettes/giscoR-1.png b/vignettes/giscoR-1.png index 50d3657d..6e4423f4 100644 Binary files a/vignettes/giscoR-1.png and b/vignettes/giscoR-1.png differ