properly respect inherit.aes when looking for geometry column

clauswilke · clauswilke · commit 8c97efb9bfe8 · 2018-08-30T10:27:47.000-05:00
diff --git a/R/sf.R b/R/sf.R
@@ -159,9 +159,8 @@ LayerSf <- ggproto("LayerSf", Layer,
       geometry_col <- "geometry"
     }
 
-    # isn't quite complete yet, should also check that the global mapping
-    # doesn't contain a setting for geometry
-    if (is.null(self$mapping$geometry)) {
+    if ((isTRUE(self$inherit.aes) && is.null(self$mapping$geometry) && is.null(plot$mapping$geometry)) ||
+        (isFALSE(self$inherit.aes) && is.null(self$mapping$geometry))) {
       self$mapping$geometry <- as.name(geometry_col)
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -159,9 +159,8 @@ LayerSf <- ggproto("LayerSf", Layer,`
`159`	`159`	`geometry_col <- "geometry"`
`160`	`160`	`}`
`161`	`161`
`162`		`- # isn't quite complete yet, should also check that the global mapping`
`163`		`- # doesn't contain a setting for geometry`
`164`		`- if (is.null(self$mapping$geometry)) {`
	`162`	`+ if ((isTRUE(self$inherit.aes) && is.null(self$mapping$geometry) && is.null(plot$mapping$geometry)) \|\|`
	`163`	`+ (isFALSE(self$inherit.aes) && is.null(self$mapping$geometry))) {`
`165`	`164`	`self$mapping$geometry <- as.name(geometry_col)`
`166`	`165`	`}`
`167`	`166`	`}`