worldbank ex code cleanup

animint · Jan 10, 2025 · 7a7c446 · 7a7c446
1 parent 511179c
commit 7a7c446
Show file tree

Hide file tree

Showing 2 changed files with 166 additions and 63 deletions.
diff --git a/inst/examples/WorldBank-facets-map.R b/inst/examples/WorldBank-facets-map.R
@@ -0,0 +1,88 @@
+library(animint2)
+data(WorldBank)
+not.na <- subset(WorldBank, !(is.na(life.expectancy) | is.na(fertility.rate)))
+subset(not.na, is.na(not.na$population))
+subset(not.na, country == "Kuwait" & 1991 <= year & year <= 1995)
+not.na[not.na$country=="Kuwait", "population"] <- 1700000
+BOTH <- function(df, top, side)data.frame(
+  df,
+  top=factor(top, c("Fertility rate", "Years")),
+  side=factor(side, c("Years", "Life expectancy")))
+TS <- function(df)BOTH(df, "Years", "Life expectancy")
+SCATTER <- function(df)BOTH(df, "Fertility rate", "Life expectancy")
+TS2 <- function(df)BOTH(df, "Fertility rate", "Years")
+years <- unique(not.na[, "year", drop=FALSE])
+by.country <- split(not.na, not.na$country)
+min.years <- do.call(rbind, lapply(by.country, subset, year == min(year)))
+min.years$year <- 1958
+wb.facets <- animint(
+  ts=ggplot()+
+    theme_bw()+
+    theme(panel.margin=grid::unit(0, "lines"))+
+    theme_animint(width=1100, height=600)+
+    xlab("")+
+    ylab("")+
+    ## TS
+    geom_tallrect(aes(
+      xmin=year-1/2, xmax=year+1/2),
+      clickSelects="year",
+      data=TS(years),
+      alpha=1/2)+
+    geom_line(aes(
+      year, life.expectancy, group=country, colour=region),
+      clickSelects="country",
+      data=TS(not.na),
+      size=4,
+      alpha=1,
+      alpha_off=0.1)+
+    geom_text(aes(
+      year, life.expectancy, colour=region, label=country),
+      showSelected="country",
+      clickSelects="country",
+      data=TS(min.years),
+      hjust=1)+
+    ## TS2
+    geom_widerect(aes(
+      ymin=year-1/2, ymax=year+1/2),
+      clickSelects="year",
+      data=TS2(years),
+      alpha=1/2)+
+    geom_path(aes(
+      fertility.rate, year, group=country, colour=region),
+      clickSelects="country",
+      data=TS2(not.na),
+      size=4,
+      alpha=1,
+      alpha_off=0.1)+
+    ## SCATTER
+    geom_point(aes(
+      fertility.rate, life.expectancy, colour=region, size=population,
+      key=country), # key aesthetic for smooth transitions!
+      clickSelects="country",
+      showSelected="year",
+      chunk_vars=character(),
+      data=SCATTER(not.na))+
+    geom_text(aes(
+      fertility.rate, life.expectancy, label=country,
+      key=country), #also use key here!
+      showSelected=c("country", "year", "region"),
+      clickSelects="country",
+      chunk_vars=character(),
+      data=SCATTER(not.na))+
+    scale_size_animint(breaks=10^(9:5))+
+    facet_grid(side ~ top, scales="free")+
+    geom_text(aes(
+      5, 85, label=paste0("year = ", year),
+      key=1),
+      showSelected="year",
+      data=SCATTER(years)),
+  ##time=list(variable="year", ms=3000),
+  duration=list(year=2000),
+  first=list(year=1975, country=c("United States", "Vietnam")),
+  selector.types=list(country="multiple"),
+  source="https://github.com/animint/animint2/blob/master/inst/examples/WorldBank-facets-map.R",
+  title="World Bank data (multiple selection, facets)")
+wb.facets
+if(FALSE){
+  animint2pages(wb.facets, "2025-01-WorldBank-facets-map")
+}
diff --git a/inst/examples/WorldBank-facets.R b/inst/examples/WorldBank-facets.R
@@ -4,73 +4,88 @@ not.na <- subset(WorldBank, !(is.na(life.expectancy) | is.na(fertility.rate)))
 subset(not.na, is.na(not.na$population))
 subset(not.na, country == "Kuwait" & 1991 <= year & year <= 1995)
 not.na[not.na$country=="Kuwait", "population"] <- 1700000
-BOTH <- function(df, top, side){
-  data.frame(df,
-             top=factor(top, c("Fertility rate", "Years")),
-             side=factor(side, c("Years", "Life expectancy")))
-}
+BOTH <- function(df, top, side)data.frame(
+  df,
+  top=factor(top, c("Fertility rate", "Years")),
+  side=factor(side, c("Years", "Life expectancy")))
 TS <- function(df)BOTH(df, "Years", "Life expectancy")
 SCATTER <- function(df)BOTH(df, "Fertility rate", "Life expectancy")
 TS2 <- function(df)BOTH(df, "Fertility rate", "Years")
 years <- unique(not.na[, "year", drop=FALSE])
 by.country <- split(not.na, not.na$country)
 min.years <- do.call(rbind, lapply(by.country, subset, year == min(year)))
 min.years$year <- 1958
-wb.facets <-
-  list(ts=ggplot()+
-         theme_bw()+
-         theme(panel.margin=grid::unit(0, "lines"))+
-         xlab("")+
-         ylab("")+
-         geom_tallrect(aes(xmin=year-1/2, xmax=year+1/2),
-                       clickSelects="year",
-                       data=TS(years), alpha=1/2)+
-         theme_animint(width=1000, height=800)+
-         geom_line(aes(year, life.expectancy, group=country, colour=region),
-                   clickSelects="country",
-                   data=TS(not.na), size=4, alpha=3/5)+
-         geom_point(aes(year, life.expectancy, color=region, size=population),
-                    showSelected="country", clickSelects="country",
-                    data=TS(not.na))+
-         geom_text(aes(year, life.expectancy, colour=region, label=country),
-                   showSelected="country",
-                   clickSelects="country",
-                   data=TS(min.years), hjust=1)+
-
-         geom_widerect(aes(ymin=year-1/2, ymax=year+1/2),
-                       clickSelects="year",
-                       data=TS2(years), alpha=1/2)+
-         geom_path(aes(fertility.rate, year, group=country, colour=region),
-                   clickSelects="country",
-                   data=TS2(not.na), size=4, alpha=3/5)+
-         geom_point(aes(fertility.rate, year, color=region, size=population),
-                    showSelected="country", clickSelects="country",
-                    data=TS2(not.na))+
-
-         geom_point(aes(fertility.rate, life.expectancy, colour=region, size=population,
-                        key=country), # key aesthetic for animated transitions!
-                    clickSelects="country",
-                    showSelected="year",
-                    data=SCATTER(not.na))+
-         geom_text(aes(fertility.rate, life.expectancy, label=country,
-                       key=country), #also use key here!
-                   showSelected=c("country", "year", "region"),
-                   clickSelects="country",
-                   data=SCATTER(not.na))+
-         scale_size_animint(breaks=10^(9:5))+
-         facet_grid(side ~ top, scales="free")+
-         geom_text(aes(5, 85, label=paste0("year = ", year)),
-                   showSelected="year",
-                   data=SCATTER(years)),
-
-       time=list(variable="year", ms=3000),
-
-       duration=list(year=1000),
-
-       first=list(year=1975, country=c("United States", "Vietnam")),
-
-       selector.types=list(country="multiple"),
-
-       title="World Bank data (multiple selection, facets)")
-
-animint2dir(wb.facets, "WorldBank-facets")
+wb.facets <- animint(
+  ts=ggplot()+
+    theme_bw()+
+    theme(panel.margin=grid::unit(0, "lines"))+
+    theme_animint(width=1000, height=800)+
+    xlab("")+
+    ylab("")+
+    ## TS
+    geom_tallrect(aes(
+      xmin=year-1/2, xmax=year+1/2),
+      clickSelects="year",
+      data=TS(years),
+      alpha=1/2)+
+    geom_line(aes(
+      year, life.expectancy, group=country, colour=region),
+      clickSelects="country",
+      data=TS(not.na),
+      size=4,
+      alpha=3/5)+
+    geom_point(aes(
+      year, life.expectancy, color=region, size=population),
+      showSelected="country", clickSelects="country",
+      data=TS(not.na))+
+    geom_text(aes(
+      year, life.expectancy, colour=region, label=country),
+      showSelected="country",
+      clickSelects="country",
+      data=TS(min.years),
+      hjust=1)+
+    ## TS2
+    geom_widerect(aes(
+      ymin=year-1/2, ymax=year+1/2),
+      clickSelects="year",
+      data=TS2(years),
+      alpha=1/2)+
+    geom_path(aes(
+      fertility.rate, year, group=country, colour=region),
+      clickSelects="country",
+      data=TS2(not.na),
+      size=4,
+      alpha=3/5)+
+    geom_point(aes(
+      fertility.rate, year, color=region, size=population),
+      showSelected="country",
+      clickSelects="country",
+      data=TS2(not.na))+
+    ## SCATTER
+    geom_point(aes(
+      fertility.rate, life.expectancy, colour=region, size=population,
+      key=country), # key aesthetic for smooth transitions!
+      clickSelects="country",
+      showSelected="year",
+      chunk_vars=character(),
+      data=SCATTER(not.na))+
+    geom_text(aes(
+      fertility.rate, life.expectancy, label=country,
+      key=country), #also use key here!
+      showSelected=c("country", "year", "region"),
+      clickSelects="country",
+      chunk_vars=character(),
+      data=SCATTER(not.na))+
+    scale_size_animint(breaks=10^(9:5))+
+    facet_grid(side ~ top, scales="free")+
+    geom_text(aes(
+      5, 85, label=paste0("year = ", year),
+      key=1),
+      showSelected="year",
+      data=SCATTER(years)),
+  time=list(variable="year", ms=2000),
+  duration=list(year=1000),
+  first=list(year=1975, country=c("United States", "Vietnam")),
+  selector.types=list(country="multiple"),
+  title="World Bank data (multiple selection, facets)")
+wb.facets