Skip to content

make legend detection code more robust. #3964

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 27, 2020
Merged

make legend detection code more robust. #3964

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
30d1b56
make legend detection code more robust. fixes #3963
clauswilke Apr 26, 2020
1823e48
properly infer geometry from the right column
clauswilke Apr 26, 2020
5d4867e
add unit test
clauswilke Apr 26, 2020
d5d0973
add news.md
clauswilke Apr 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions R/layer-sf.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,25 @@ LayerSf <- ggproto("LayerSf", Layer,
(!isTRUE(self$inherit.aes) && is.null(self$mapping$geometry))) {
if (is_sf(data)) {
geometry_col <- attr(data, "sf_column")
self$mapping$geometry <- as.name(geometry_col)
self$mapping$geometry <- sym(geometry_col)
}
}

# automatically determine the legend type
if (is.null(self$legend_key_type)) {
if (is_sf(data)) {
sf_type <- detect_sf_type(data)
if (sf_type == "point") {
self$geom_params$legend <- "point"
} else if (sf_type == "line") {
self$geom_params$legend <- "line"
} else {
self$geom_params$legend <- "polygon"
# first, set default value in case downstream tests fail
self$geom_params$legend <- "polygon"

# now check if the type should not be polygon
if (!is.null(self$mapping$geometry)) {
geometry_column <- as_name(self$mapping$geometry)
if (inherits(data[[geometry_column]], "sfc")) {
sf_type <- detect_sf_type(data[[geometry_column]])
if (sf_type == "point") {
self$geom_params$legend <- "point"
} else if (sf_type == "line") {
self$geom_params$legend <- "line"
}
}
}
} else {
Expand Down
26 changes: 26 additions & 0 deletions tests/testthat/test-geom-sf.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,32 @@ test_that("geom_sf() determines the legend type automatically", {
expect_identical(fun_geom_sf(mpol, "point")$plot$layers[[1]]$geom_params$legend, "point")
})

test_that("geom_sf() determines the legend type from mapped geometry column", {
skip_if_not_installed("sf")
if (packageVersion("sf") < "0.5.3") skip("Need sf 0.5.3")

p1 <- rbind(c(1,1), c(2,2), c(3,3))
s1 <- rbind(c(0,3), c(0,4), c(1,5), c(2,5))
s2 <- rbind(c(0.2,3), c(0.2,4), c(1,4.8), c(2,4.8))
s3 <- rbind(c(0,4.4), c(0.6,5))

d_sf <- sf::st_sf(
g_point = sf::st_sfc(sf::st_multipoint(p1)),
g_line = sf::st_sfc(sf::st_multilinestring(list(s1, s2, s3))),
v = "a"
)

p <- ggplot_build(
ggplot(d_sf) + geom_sf(aes(geometry = g_point, colour = "a"))
)
expect_identical(p$plot$layers[[1]]$geom_params$legend, "point")

p <- ggplot_build(
ggplot(d_sf) + geom_sf(aes(geometry = g_line, colour = "a"))
)
expect_identical(p$plot$layers[[1]]$geom_params$legend, "line")
})

test_that("geom_sf() removes rows containing missing aes", {
skip_if_not_installed("sf")
if (packageVersion("sf") < "0.5.3") skip("Need sf 0.5.3")
Expand Down