Fixes #29

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: ggalt
 Title: Extra Coordinate Systems, 'Geoms', Statistical Transformations, Scales
     and Fonts for 'ggplot2'
-Version: 0.3.1.9000
+Version: 0.4
 Maintainer: Bob Rudis <bob@rudis.net>
 Authors@R: c(
       person("Bob", "Rudis", email = "bob@rudis.net", role = c("aut", "cre")),
@@ -44,7 +44,7 @@ Imports:
     MASS,
     extrafont,
     plotly (>= 3.4.1)
-RoxygenNote: 5.0.1
+RoxygenNote: 6.0.0
 VignetteBuilder: knitr
 Collate:
     'a-pokemon-colors.r'

R/coord_proj.r

@@ -14,7 +14,7 @@
 #'
 #' \if{latex}{
 #' A sample of the output from \code{coord_proj()} using the Winkel-Tripel projection:
-#'
+#'``
 #' \figure{coordproj01.png}{options: width=10cm}
 #' }
 #'
@@ -100,19 +100,20 @@ coord_proj <- function(proj=NULL, inverse = FALSE, degrees = TRUE,
 #' @export
 CoordProj <- ggproto("CoordProj", Coord,
 
-  transform = function(self, data, scale_details) {
+  transform = function(self, data, panel_params) {
 
     trans <- project4(self, data$x, data$y)
     out <- cunion(trans[c("x", "y")], data)
 
-    out$x <- rescale(out$x, 0:1, scale_details$x.proj)
+    out$x <- rescale(out$x, 0:1, panel_params$x.proj)
-    out$y <- rescale(out$y, 0:1, scale_details$y.proj)
+    out$y <- rescale(out$y, 0:1, panel_params$y.proj)
+
     out
 
   },
 
-  distance = function(x, y, scale_details) {
+  distance = function(x, y, panel_params) {
-    max_dist <- dist_central_angle(scale_details$x.range, scale_details$y.range)
+    max_dist <- dist_central_angle(panel_params$x.range, panel_params$y.range)
     dist_central_angle(x, y) / max_dist
   },
 
@@ -120,13 +121,13 @@ CoordProj <- ggproto("CoordProj", Coord,
     diff(ranges$y.proj) / diff(ranges$x.proj)
   },
 
-  train = function(self, scale_details) {
+  setup_panel_params = function(self, scale_x, scale_y, params = list()) {
 
     # range in scale
     ranges <- list()
     for (n in c("x", "y")) {
 
-      scale <- scale_details[[n]]
+      scale <- get(paste0("scale_", n))
       limits <- self$limits[[n]]
 
       if (is.null(limits)) {
@@ -153,7 +154,8 @@ CoordProj <- ggproto("CoordProj", Coord,
     ret$y$proj <- proj[3:4]
 
     for (n in c("x", "y")) {
-      out <- scale_details[[n]]$break_info(ranges[[n]])
+      out <- get(paste0("scale_", n))$break_info(ranges[[n]])
+      # out <- panel_params[[n]]$break_info(ranges[[n]])
       ret[[n]]$range <- out$range
       ret[[n]]$major <- out$major_source
       ret[[n]]$minor <- out$minor_source
@@ -170,9 +172,10 @@ CoordProj <- ggproto("CoordProj", Coord,
     details
   },
 
-  render_bg = function(self, scale_details, theme) {
+  render_bg = function(self, panel_params, theme) {
-    xrange <- expand_range(scale_details$x.range, 0.2)
+
-    yrange <- expand_range(scale_details$y.range, 0.2)
+    xrange <- expand_range(panel_params$x.range, 0.2)
+    yrange <- expand_range(panel_params$y.range, 0.2)
 
     # Limit ranges so that lines don't wrap around globe
     xmid <- mean(xrange)
@@ -182,17 +185,17 @@ CoordProj <- ggproto("CoordProj", Coord,
     yrange[yrange < ymid - 90] <- ymid - 90
     yrange[yrange > ymid + 90] <- ymid + 90
 
-    xgrid <- with(scale_details, expand.grid(
+    xgrid <- with(panel_params, expand.grid(
       y = c(seq(yrange[1], yrange[2], length.out = 50), NA),
       x = x.major
     ))
-    ygrid <- with(scale_details, expand.grid(
+    ygrid <- with(panel_params, expand.grid(
       x = c(seq(xrange[1], xrange[2], length.out = 50), NA),
       y = y.major
     ))
 
-    xlines <- self$transform(xgrid, scale_details)
+    xlines <- self$transform(xgrid, panel_params)
-    ylines <- self$transform(ygrid, scale_details)
+    ylines <- self$transform(ygrid, panel_params)
 
     if (nrow(xlines) > 0) {
       grob.xlines <- element_render(
@@ -218,49 +221,49 @@ CoordProj <- ggproto("CoordProj", Coord,
     ))
   },
 
-  render_axis_h = function(self, scale_details, theme) {
+  render_axis_h = function(self, panel_params, theme) {
-    arrange <- scale_details$x.arrange %||% c("primary", "secondary")
+    arrange <- panel_params$x.arrange %||% c("primary", "secondary")
 
-    if (is.null(scale_details$x.major)) {
+    if (is.null(panel_params$x.major)) {
       return(list(
         top = zeroGrob(),
         bottom = zeroGrob()
       ))
     }
 
-    x_intercept <- with(scale_details, data.frame(
+    x_intercept <- with(panel_params, data.frame(
       x = x.major,
       y = y.range[1]
     ))
-    pos <- self$transform(x_intercept, scale_details)
+    pos <- self$transform(x_intercept, panel_params)
 
     axes <- list(
-      bottom = guide_axis(pos$x, scale_details$x.labels, "bottom", theme),
+      bottom = guide_axis(pos$x, panel_params$x.labels, "bottom", theme),
-      top = guide_axis(pos$x, scale_details$x.labels, "top", theme)
+      top = guide_axis(pos$x, panel_params$x.labels, "top", theme)
     )
     axes[[which(arrange == "secondary")]] <- zeroGrob()
     axes
   },
 
-  render_axis_v = function(self, scale_details, theme) {
+  render_axis_v = function(self, panel_params, theme) {
-    arrange <- scale_details$y.arrange %||% c("primary", "secondary")
+    arrange <- panel_params$y.arrange %||% c("primary", "secondary")
 
-    if (is.null(scale_details$y.major)) {
+    if (is.null(panel_params$y.major)) {
       return(list(
         left = zeroGrob(),
         right = zeroGrob()
       ))
     }
 
-    x_intercept <- with(scale_details, data.frame(
+    x_intercept <- with(panel_params, data.frame(
       x = x.range[1],
       y = y.major
     ))
-    pos <- self$transform(x_intercept, scale_details)
+    pos <- self$transform(x_intercept, panel_params)
 
     axes <- list(
-      left = guide_axis(pos$y, scale_details$y.labels, "left", theme),
+      left = guide_axis(pos$y, panel_params$y.labels, "left", theme),
-      right = guide_axis(pos$y, scale_details$y.labels, "right", theme)
+      right = guide_axis(pos$y, panel_params$y.labels, "right", theme)
     )
     axes[[which(arrange == "secondary")]] <- zeroGrob()
     axes

README.Rmd

@@ -182,7 +182,7 @@ world <- map_data("world")
 world <- world[world$region != "Antarctica",]
 
 gg <- ggplot()
-gg <- gg + geom_map(data=world, map=world,
+gg <- gg + geom_cartogram(data=world, map=world,
                     aes(x=long, y=lat, map_id=region))
 gg <- gg + coord_proj("+proj=wintri")
 gg

README.md

@@ -39,7 +39,7 @@ library(ggalt)
 
 # current verison
 packageVersion("ggalt")
-#> [1] '0.3.0.9000'
+#> [1] '0.4'
 
 set.seed(1492)
 dat <- data.frame(x=c(1:10, 1:10, 1:10),
@@ -64,6 +64,7 @@ ggplot(dat, aes(x, y, group=group, color=factor(group))) +
   geom_point() +
   geom_line() +
   geom_smooth(se=FALSE, linetype="dashed", size=0.5)
+#> `geom_smooth()` using method = 'loess' and formula 'y ~ x'
 ```
 
 <img src="README_figs/README-splines-2.png" width="672" />
@@ -74,6 +75,7 @@ ggplot(dat, aes(x, y, group=group, color=factor(group))) +
   geom_point(color="black") +
   geom_smooth(se=FALSE, linetype="dashed", size=0.5) +
   geom_xspline(size=0.5)
+#> `geom_smooth()` using method = 'loess' and formula 'y ~ x'
 ```
 
 <img src="README_figs/README-splines-3.png" width="672" />
@@ -84,6 +86,7 @@ ggplot(dat, aes(x, y, group=group, color=factor(group))) +
   geom_point(color="black") +
   geom_smooth(se=FALSE, linetype="dashed", size=0.5) +
   geom_xspline(spline_shape=-0.4, size=0.5)
+#> `geom_smooth()` using method = 'loess' and formula 'y ~ x'
 ```
 
 <img src="README_figs/README-splines-4.png" width="672" />
@@ -94,6 +97,7 @@ ggplot(dat, aes(x, y, group=group, color=factor(group))) +
   geom_point(color="black") +
   geom_smooth(se=FALSE, linetype="dashed", size=0.5) +
   geom_xspline(spline_shape=0.4, size=0.5)
+#> `geom_smooth()` using method = 'loess' and formula 'y ~ x'
 ```
 
 <img src="README_figs/README-splines-5.png" width="672" />
@@ -104,6 +108,7 @@ ggplot(dat, aes(x, y, group=group, color=factor(group))) +
   geom_point(color="black") +
   geom_smooth(se=FALSE, linetype="dashed", size=0.5) +
   geom_xspline(spline_shape=1, size=0.5)
+#> `geom_smooth()` using method = 'loess' and formula 'y ~ x'
 ```
 
 <img src="README_figs/README-splines-6.png" width="672" />
@@ -114,6 +119,7 @@ ggplot(dat, aes(x, y, group=group, color=factor(group))) +
   geom_point(color="black") +
   geom_smooth(se=FALSE, linetype="dashed", size=0.5) +
   geom_xspline(spline_shape=0, size=0.5)
+#> `geom_smooth()` using method = 'loess' and formula 'y ~ x'
 ```
 
 <img src="README_figs/README-splines-7.png" width="672" />
@@ -124,6 +130,7 @@ ggplot(dat, aes(x, y, group=group, color=factor(group))) +
   geom_point(color="black") +
   geom_smooth(se=FALSE, linetype="dashed", size=0.5) +
   geom_xspline(spline_shape=-1, size=0.5)
+#> `geom_smooth()` using method = 'loess' and formula 'y ~ x'
 ```
 
 <img src="README_figs/README-splines-8.png" width="672" />
@@ -248,13 +255,10 @@ m + stat_bkde2d(bandwidth=c(0.5, 4), aes(fill = ..level..), geom = "polygon")
 
 ``` r
 world <- map_data("world")
-#> 
-#>  # maps v3.1: updated 'world': all lakes moved to separate new #
-#>  # 'lakes' database. Type '?world' or 'news(package="maps")'.  #
 world <- world[world$region != "Antarctica",]
 
 gg <- ggplot()
-gg <- gg + geom_map(data=world, map=world,
+gg <- gg + geom_cartogram(data=world, map=world,
                     aes(x=long, y=lat, map_id=region))
 gg <- gg + coord_proj("+proj=wintri")
 gg

man/absoluteGrob.Rd

@@ -14,4 +14,3 @@ This grob has fixed dimensions and position.
 It's still experimental
 }
 \keyword{internal}
-

man/annotate_textp.Rd

@@ -39,4 +39,3 @@ p <- ggplot(mtcars, aes(x = wt, y = mpg)) + geom_point()
 p <- p + geom_smooth(method = "lm", se = FALSE)
 p + annotate_textp(x = 0.9, y = 0.35, label="A relative linear\\nrelationship", hjust=1, color="red")
 }
-

man/byte_format.Rd

@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
 % Please edit documentation in R/formatters.r
 \name{byte_format}
-\alias{Gb}
+\alias{byte_format}
 \alias{Kb}
 \alias{Mb}
-\alias{byte_format}
+\alias{Gb}
 \alias{bytes}
 \title{Bytes formatter: convert to byte measurement and display symbol.}
 \usage{
@@ -47,4 +47,3 @@ bytes(sample(3000000000, 10))
 Units of Information (Wikipedia) :
   \url{http://en.wikipedia.org/wiki/Units_of_information}
 }
-

man/coord_proj.Rd

@@ -45,7 +45,7 @@ A sample of the output from \code{coord_proj()} using the Winkel-Tripel projecti
 
 \if{latex}{
 A sample of the output from \code{coord_proj()} using the Winkel-Tripel projection:
-
+``
 \figure{coordproj01.png}{options: width=10cm}
 }
 }
@@ -90,4 +90,3 @@ gg <- gg + coord_proj(
                     " +y_0=0 +ellps=WGS84 +datum=WGS84 +units=m +no_defs"))
 gg
 }
-

man/fortify.table.Rd

@@ -16,4 +16,3 @@
 \description{
 Fortify contingency tables
 }
-

man/geom_bkde.Rd

@@ -119,6 +119,7 @@ are in bold):
   \item{scaled}{density estimate, scaled to maximum of 1}
 }
 }
+
 \examples{
 data(geyser, package="MASS")
 
@@ -139,4 +140,3 @@ See \code{\link{geom_histogram}}, \code{\link{geom_freqpoly}} for
   other methods of displaying continuous distribution.
   See \code{\link{geom_violin}} for a compact density display.
 }
-

man/geom_bkde2d.Rd

@@ -109,6 +109,7 @@ A sample of the output from \code{geom_bkde2d()}:
 
 Same as \code{\link{stat_contour}}
 }
+
 \examples{
 m <- ggplot(faithful, aes(x = eruptions, y = waiting)) +
        geom_point() +
@@ -139,4 +140,3 @@ d + stat_bkde2d(bandwidth=c(0.5, 0.5), geom = "point",
 \code{\link{geom_contour}} for contour drawing geom,
  \code{\link{stat_sum}} for another way of dealing with overplotting
 }
-

man/geom_cartogram.Rd

@@ -60,6 +60,7 @@ This replicates the old behaviour of \code{geom_map()}, enabling specifying of
 
 \aesthetics{geom}{cartogram}
 }
+
 \examples{
 # When using geom_polygon, you will typically need two data frames:
 # one contains the coordinates of each polygon (positions),  and the
@@ -114,4 +115,3 @@ if (require(maps)) {
     facet_wrap( ~ variable)
 }
 }
-

man/geom_dumbbell.Rd

@@ -64,6 +64,7 @@ alternative to the clustered bar chart or slope graph.
 
 \Sexpr[results=rd,stage=build]{ggplot2:::rd_aesthetics("geom", "segment")}
 }
+
 \examples{
 df <- data.frame(trt=LETTERS[1:5],
                  l=c(20, 40, 10, 30, 50),
@@ -71,4 +72,3 @@ df <- data.frame(trt=LETTERS[1:5],
 
 ggplot(df, aes(y=trt, x=l, xend=r)) + geom_dumbbell()
 }
-

man/geom_encircle.Rd

@@ -79,4 +79,3 @@ gg + geom_encircle(data=ss, colour="blue", s_shape=0.9, expand=0.07) +
 \author{
 Ben Bolker
 }
-

man/geom_lollipop.Rd

@@ -83,6 +83,7 @@ A sample of the output from \code{geom_lollipop()}:
 
 \Sexpr[results=rd,stage=build]{ggplot2:::rd_aesthetics("geom", "point")}
 }
+
 \examples{
 df <- data.frame(trt=LETTERS[1:10],
                  value=seq(100, 10, by=-10))
@@ -91,4 +92,3 @@ ggplot(df, aes(trt, value)) + geom_lollipop()
 
 ggplot(df, aes(value, trt)) + geom_lollipop(horizontal=TRUE)
 }
-

man/geom_stateface.Rd

@@ -114,4 +114,3 @@ gg
 Other StateFace operations: \code{\link{load_stateface}},
   \code{\link{show_stateface}}
 }
-

man/geom_xspline.Rd

@@ -130,6 +130,7 @@ are in bold):
   \item{y}
 }
 }
+
 \examples{
 set.seed(1492)
 dat <- data.frame(x=c(1:10, 1:10, 1:10),
@@ -192,4 +193,3 @@ Blanc, C. and Schlick, C. (1995), "X-splines : A Spline Model
 
 Other xspline implementations: \code{\link{geom_xspline2}}
 }
-

man/geom_xspline2.Rd

@@ -59,10 +59,9 @@ creates a spline curve
 Alternative implemenation for connecting  control points/observations
 with an X-spline
 }
-\author{
-Ben Bolker
-}
 \seealso{
 Other xspline implementations: \code{\link{geom_xspline}}
 }
-
+\author{
+Ben Bolker
+}

man/ggalt-ggproto.Rd

@@ -1,22 +1,25 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/coord_proj.r, R/geom_ash.r, R/geom_bkde.r, R/geom_bkde2d.r, R/geom_dumbbell.R, R/geom_encircle.r, R/geom_lollipop.r, R/geom_twoway_bar.r, R/geom_xspline.r, R/geom_xspline2.r, R/stat-stepribbon.r, R/stateface.r
+% Please edit documentation in R/coord_proj.r, R/geom_ash.r, R/geom_bkde.r,
+%   R/geom_bkde2d.r, R/geom_dumbbell.R, R/geom_encircle.r, R/geom_lollipop.r,
+%   R/geom_twoway_bar.r, R/geom_xspline.r, R/geom_xspline2.r,
+%   R/stat-stepribbon.r, R/stateface.r
 \docType{data}
 \name{CoordProj}
 \alias{CoordProj}
+\alias{StatAsh}
 \alias{GeomBkde}
+\alias{StatBkde}
 \alias{GeomBkde2d}
+\alias{StatBkde2d}
 \alias{GeomDumbbell}
 \alias{GeomEncircle}
 \alias{GeomLollipop}
-\alias{GeomStateface}
 \alias{GeomTwowayBar}
-\alias{GeomXSpline2}
 \alias{GeomXspline}
-\alias{StatAsh}
-\alias{StatBkde}
-\alias{StatBkde2d}
-\alias{StatStepribbon}
 \alias{StatXspline}
+\alias{GeomXSpline2}
+\alias{StatStepribbon}
+\alias{GeomStateface}
 \title{Geom Proto}
 \description{
 Geom Proto
@@ -34,4 +37,3 @@ Geom Proto
 }
 \keyword{datasets}
 \keyword{internal}
-

man/ggalt.Rd

@@ -12,4 +12,3 @@ for ggplot2 2.0+
 \author{
 Bob Rudis (@hrbrmstr)
 }
-

man/ggplot2-ggproto.Rd

@@ -8,4 +8,3 @@
 Geom Cartogram
 }
 \keyword{datasets}
-

man/list_avatars.Rd

@@ -21,4 +21,3 @@ Warning: huge! list\cr
 Other pokemon aeshetics: \code{\link{pokemon_pal}},
   \code{\link{scale_colour_pokemon}}
 }
-

man/load_stateface.Rd

@@ -14,4 +14,3 @@ et. al. devices.
 Other StateFace operations: \code{\link{geom_stateface}},
   \code{\link{show_stateface}}
 }
-

man/pokemon_pal.Rd

@@ -22,4 +22,3 @@ Pokémon & Pokémon character names are trademarks of Nintendo.
 Other pokemon aeshetics: \code{\link{list_avatars}},
   \code{\link{scale_colour_pokemon}}
 }
-

man/scale_pokemon.Rd

@@ -1,8 +1,8 @@
 % Generated by roxygen2: do not edit by hand
 % Please edit documentation in R/pokemon.r
 \name{scale_colour_pokemon}
-\alias{scale_color_pokemon}
 \alias{scale_colour_pokemon}
+\alias{scale_color_pokemon}
 \alias{scale_fill_pokemon}
 \title{Pokemon color scales}
 \usage{
@@ -31,4 +31,3 @@ Pokémon & Pokémon character names are trademarks of Nintendo.
 Other pokemon aeshetics: \code{\link{list_avatars}},
   \code{\link{pokemon_pal}}
 }
-

man/show_stateface.Rd

@@ -15,4 +15,3 @@ the font on your system
 Other StateFace operations: \code{\link{geom_stateface}},
   \code{\link{load_stateface}}
 }
-

man/stat_ash.Rd

@@ -98,6 +98,7 @@ are in bold):
   \item{\code{density}}{ash density estimate}
 }
 }
+
 \examples{
 # compare
 library(gridExtra)
@@ -127,4 +128,3 @@ David Scott (1992), \emph{"Multivariate Density Estimation,"}
             B. W. Silverman (1986), \emph{"Density Estimation for Statistics
             and Data Analysis,"} Chapman & Hall.
 }
-

man/stat_stepribbon.Rd

@@ -74,4 +74,3 @@ gg
 \references{
 \url{https://groups.google.com/forum/?fromgroups=#!topic/ggplot2/9cFWHaH1CPs}
 }
-