Skip to content

Better sf support #3164

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
thomasp85 merged 3 commits into from
Mar 5, 2019
Merged

Better sf support #3164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c18bbb
Change sf_grob to work on sfc struct instead of list of sfg
thomasp85 Feb 11, 2019
981385b
Use st_normalize
thomasp85 Feb 25, 2019
cf80d2f
fix single quotes
thomasp85 Mar 4, 2019
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
2 changes: 1 addition & 1 deletion DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Suggests:
rgeos,
rmarkdown,
rpart,
sf (>= 0.3-4),
sf (>= 0.7-3),
svglite (>= 1.2.0.9001),
testthat (>= 0.11.0),
vdiffr (>= 0.3.0)
Expand Down
5 changes: 1 addition & 4 deletions R/coord-sf.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,10 +365,7 @@ sf_rescale01 <- function(x, x_range, y_range) {
return(x)
}

# Shift + affine transformation to rescale to [0, 1] x [0, 1]
# Contributed by @edzer
(x - c(x_range[1], y_range[1])) *
diag(1 / c(diff(x_range), diff(y_range)))
sf::st_normalize(x, c(x_range[1], y_range[1], x_range[2], y_range[2]))
}
sf_rescale01_x <- function(x, range) {
(x - range[1]) / diff(range)
Expand Down
74 changes: 39 additions & 35 deletions R/geom-sf.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,15 +105,7 @@ GeomSf <- ggproto("GeomSf", Geom,

# Need to refactor this to generate one grob per geometry type
coord <- coord$transform(data, panel_params)
grobs <- lapply(1:nrow(data), function(i) {
sf_grob(
coord[i, , drop = FALSE],
lineend = lineend,
linejoin = linejoin,
linemitre = linemitre
)
})
do.call("gList", grobs)
sf_grob(coord, lineend = lineend, linejoin = linejoin, linemitre = linemitre)
},

draw_key = function(data, params, size) {
Expand All @@ -138,33 +130,37 @@ default_aesthetics <- function(type) {
}
}

sf_grob <- function(row, lineend = "butt", linejoin = "round", linemitre = 10) {
sf_grob <- function(x, lineend = "butt", linejoin = "round", linemitre = 10) {
# Need to extract geometry out of corresponding list column
geometry <- row$geometry[[1]]

if (inherits(geometry, c("POINT", "MULTIPOINT"))) {
row <- modify_list(default_aesthetics("point"), row)
gp <- gpar(
col = alpha(row$colour, row$alpha),
fill = alpha(row$fill, row$alpha),
# Stroke is added around the outside of the point
fontsize = row$size * .pt + row$stroke * .stroke / 2,
lwd = row$stroke * .stroke / 2
)
sf::st_as_grob(geometry, gp = gp, pch = row$shape)
} else {
row <- modify_list(default_aesthetics("poly"), row)
gp <- gpar(
col = row$colour,
fill = alpha(row$fill, row$alpha),
lwd = row$size * .pt,
lty = row$linetype,
lineend = lineend,
linejoin = linejoin,
linemitre = linemitre
)
sf::st_as_grob(geometry, gp = gp)
}
geometry <- x$geometry
type <- sf_types[sf::st_geometry_type(geometry)]
is_point <- type %in% "point"
type_ind <- match(type, c("point", "line", "other"))
defaults <- list(
Copy link
Member

@hadley hadley Feb 26, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We will need to re-think this at some point in order to expose to the user in the same way as other geoms. But we don't need to do that in this PR.

GeomPoint$default_aes,
GeomLine$default_aes,
modify_list(GeomPolygon$default_aes, list(fill = "grey90", colour = "grey35"))
)
default_names <- unique(unlist(lapply(defaults, names)))
defaults <- lapply(setNames(default_names, default_names), function(n) {
unlist(lapply(defaults, function(def) def[[n]] %||% NA))
})
alpha <- x$alpha %||% defaults$alpha[type_ind]
col <- x$colour %||% defaults$colour[type_ind]
col[is_point] <- alpha(col[is_point], alpha[is_point])
fill <- x$fill %||% defaults$fill[type_ind]
fill <- alpha(fill, alpha)
size <- x$size %||% defaults$size[type_ind]
stroke <- (x$stroke %||% defaults$stroke[1]) * .stroke / 2
fontsize <- size * .pt + stroke
lwd <- ifelse(is_point, stroke, size * .pt)
pch <- x$shape %||% defaults$shape[type_ind]
lty <- x$linetype %||% defaults$linetype[type_ind]
gp <- gpar(
col = col, fill = fill, fontsize = fontsize, lwd = lwd, lty = lty,
lineend = lineend, linejoin = linejoin, linemitre = linemitre
)
sf::st_as_grob(geometry, pch = pch, gp = gp)
}

#' @export
Expand Down Expand Up @@ -282,3 +278,11 @@ geom_sf_text <- function(mapping = aes(), data = NULL,
layer_class = LayerSf
)
}

sf_types <- c(GEOMETRY = "other", POINT = "point", LINESTRING = "line",
POLYGON = "other", MULTIPOINT = "point", MULTILINESTRING = "line",
MULTIPOLYGON = "other", GEOMETRYCOLLECTION = "other",
CIRCULARSTRING = "line", COMPOUNDCURVE = "other", CURVEPOLYGON = "other",
MULTICURVE = "other", MULTISURFACE = "other", CURVE = "other",
SURFACE = "other", POLYHEDRALSURFACE = "other", TIN = "other",
TRIANGLE = "other")