Merge pull request #1690 from ropensci/sf-geometry

Don't assume sf geometry is always accessible via [['geometry']], fixes #1659

Author: cpsievert

NEWS.md

@@ -1,3 +1,9 @@
+# 4.9.1.9000
+
+## BUG FIXES
+
+* `add_sf()`/`geom_sf()` now correctly handle geometry columns that are named something other than `"geometry"` (#1659).
+
 # 4.9.1
 
 ## Changes to plotly.js

R/layers2traces.R

@@ -273,16 +273,14 @@ to_basic.GeomRect <- function(data, prestats_data, layout, params, p, ...) {
 
 #' @export
 to_basic.GeomSf <- function(data, prestats_data, layout, params, p, ...) {
-  
-  data[["geometry"]] <- sf::st_sfc(data[["geometry"]])
-  data <- sf::st_as_sf(data, sf_column_name = "geometry")
+
+  data <- sf::st_as_sf(data)
   geom_type <- sf::st_geometry_type(data)
   # st_cast should "expand" a collection into multiple rows (one per feature)
   if ("GEOMETRYCOLLECTION" %in% geom_type) {
     data <- sf::st_cast(data)
     geom_type <- sf::st_geometry_type(data)
   }
-  data <- remove_class(data, "sf")
 
   basic_type <- dplyr::recode(
     as.character(geom_type),
@@ -310,6 +308,7 @@ to_basic.GeomSf <- function(data, prestats_data, layout, params, p, ...) {
     d[[i]] <- prefix_class(
       fortify_sf(d[[i]]), c(names(d)[[i]], "GeomSf")
     )
+    d[[i]] <- remove_class(d[[i]], "sf")
   }
   if (length(d) == 1) d[[1]] else d
 }

R/sf.R

@@ -11,7 +11,7 @@ fortify_sf <- function(model, ...) {
   # the coordinate belongs; for POINT this is absent (each coordinate is a feature), 
   # for LINESTRING L1 refers to the feature, for MULTIPOLYGON L1 refers to the main 
   # ring or holes, L2 to the ring id in the MULTIPOLYGON, and L3 to the simple feature.
-  coords <- sf::st_coordinates(model$geometry)
+  coords <- sf::st_coordinates(sf::st_geometry(model))
   colnames(coords) <- tolower(colnames(coords))
   lcols <- grep("^l", colnames(coords))
 

tests/figs/colorscales/colorramp.svg

@@ -1,3 +1,3 @@
 - vdiffr-svg-engine: 1.0
-- vdiffr: 0.3.1
+- vdiffr: 0.3.1.9000
 - freetypeharfbuzz: 0.2.5