remove cunion()

teunbrand · teunbrand · commit 79fa0b10c66f · 2024-08-01T16:40:34.000+02:00
diff --git a/R/coord-map.R b/R/coord-map.R
@@ -157,7 +157,7 @@ CoordMap <- ggproto("CoordMap", Coord,
 
   transform = function(self, data, panel_params) {
     trans <- mproject(self, data$x, data$y, panel_params$orientation)
-    out <- cunion(trans[c("x", "y")], data)
+    out <- data_frame0(!!!defaults(trans[c("x", "y")], data))
 
     out$x <- rescale(out$x, 0:1, panel_params$x.proj)
     out$y <- rescale(out$y, 0:1, panel_params$y.proj)
diff --git a/R/geom-.R b/R/geom-.R
@@ -172,7 +172,7 @@ Geom <- ggproto("Geom",
 
       modified_aes <- data_frame0(!!!compact(modified_aes))
 
-      data <- cunion(modified_aes, data)
+      data <- data_frame0(!!!defaults(modified_aes, data))
     }
 
     # Override mappings with params
diff --git a/R/layer.R b/R/layer.R
@@ -414,7 +414,7 @@ Layer <- ggproto("Layer", NULL,
     }
     stat_data <- cleanup_mismatched_data(stat_data, nrow(data), "after_stat")
 
-    cunion(stat_data, data)
+    data_frame0(!!!defaults(stat_data, data))
   },
 
   compute_geom_1 = function(self, data) {
diff --git a/R/utilities-matrix.R b/R/utilities-matrix.R

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ Geom <- ggproto("Geom",`
`172`	`172`
`173`	`173`	`modified_aes <- data_frame0(!!!compact(modified_aes))`
`174`	`174`
`175`		`- data <- cunion(modified_aes, data)`
	`175`	`+ data <- data_frame0(!!!defaults(modified_aes, data))`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`# Override mappings with params`
Original file line number	Diff line number	Diff line change
`@@ -414,7 +414,7 @@ Layer <- ggproto("Layer", NULL,`
`414`	`414`	`}`
`415`	`415`	`stat_data <- cleanup_mismatched_data(stat_data, nrow(data), "after_stat")`
`416`	`416`
`417`		`- cunion(stat_data, data)`
	`417`	`+ data_frame0(!!!defaults(stat_data, data))`
`418`	`418`	`},`
`419`	`419`
`420`	`420`	`compute_geom_1 = function(self, data) {`