Use scales::squish_infinite

hadley · hadley · commit c207764259fb · 2012-02-20T17:18:48.000+01:00
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -185,7 +185,6 @@ Collate:
     'utilities-grid.r'
     'utilities-layer.r'
     'utilities-matrix.r'
-    'utilities-position.r'
     'utilities-resolution.r'
     'utilities-table-template.r'
     'utilities-table.r'
diff --git a/R/coord-cartesian-.r b/R/coord-cartesian-.r
@@ -58,7 +58,7 @@ coord_transform.cartesian <- function(., data, details) {
   rescale_y <- function(data) rescale(data, from = details$y.range)
   
   data <- transform_position(data, rescale_x, rescale_y)
-  transform_position(data, trim_infinite_01, trim_infinite_01)
+  transform_position(data, squish_infinite, squish_infinite)
 }
 
 #' @S3method coord_train cartesian
diff --git a/R/coord-transform.r b/R/coord-transform.r
@@ -75,7 +75,7 @@ coord_transform.trans <- function(coord, data, details) {
   trans_y <- function(data) transform_y(coord, data, details$y.range)
   
   data <- transform_position(data, trans_x, trans_y)
-  transform_position(data, trim_infinite_01, trim_infinite_01)
+  transform_position(data, squish_infinite, squish_infinite)
 }
 transform_x <- function(coord, x, range) {
   rescale(coord$xtr$transform(x), 0:1, range)
diff --git a/R/utilities-position.r b/R/utilities-position.r

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ coord_transform.cartesian <- function(., data, details) {`
`58`	`58`	`rescale_y <- function(data) rescale(data, from = details$y.range)`
`59`	`59`
`60`	`60`	`data <- transform_position(data, rescale_x, rescale_y)`
`61`		`- transform_position(data, trim_infinite_01, trim_infinite_01)`
	`61`	`+ transform_position(data, squish_infinite, squish_infinite)`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`#' @S3method coord_train cartesian`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ coord_transform.trans <- function(coord, data, details) {`
`75`	`75`	`trans_y <- function(data) transform_y(coord, data, details$y.range)`
`76`	`76`
`77`	`77`	`data <- transform_position(data, trans_x, trans_y)`
`78`		`- transform_position(data, trim_infinite_01, trim_infinite_01)`
	`78`	`+ transform_position(data, squish_infinite, squish_infinite)`
`79`	`79`	`}`
`80`	`80`	`transform_x <- function(coord, x, range) {`
`81`	`81`	`rescale(coord$xtr$transform(x), 0:1, range)`