Skip to content

Commit

Permalink
Changed Same to Similar
Browse files Browse the repository at this point in the history
  • Loading branch information
Sebastian Fox committed Sep 11, 2018
1 parent 14b3abc commit 906bf00
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 8 deletions.
1 change: 1 addition & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export(trends)
import(dplyr)
import(ggplot2)
importFrom(broom,tidy)
importFrom(fingertipsR,fingertips_data)
importFrom(geojsonio,geojson_read)
importFrom(ggplot2,scale_fill_manual)
importFrom(grDevices,rgb)
Expand Down
5 changes: 3 additions & 2 deletions R/quick_charts.R
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#' region <- "South East region"
#' top_names <- c("England", region)
#' ordered_levels <- c("Better",
#' "Same",
#' "Similar",
#' "Worse",
#' "Not compared")
#' df <- fingertips_data(90316) %>%
Expand Down Expand Up @@ -712,6 +712,7 @@ box_plots <- function(data, timeperiod, value,
#' @importFrom leaflet colorFactor leaflet addTiles addPolygons addLegend
#' @importFrom stats setNames
#' @importFrom broom tidy
#' @importFrom fingertipsR fingertips_data
#' @examples
#' \donttest{
#' # This example is untested because of the time required to retrieve the data
Expand Down Expand Up @@ -871,7 +872,7 @@ map <- function(data, ons_api, area_code, fill, type = "static", value, name_for
#' @param polarity unquoted field name containing the polarity information
#' (currently only handles polarity returned by fingertipsR package)
#' @param significance unquoted field name describing the statistical
#' significance for that indicator (eg, Better, Worse, Same etc)
#' significance for that indicator (eg, Better, Worse, Similar etc)
#' @param area_type unquoted field name containing area type information. This
#' ensures the vertabra are only plotted for the same area types as the
#' local_area area type (eg, when plotting a spine chart for County & UA
Expand Down
2 changes: 1 addition & 1 deletion man/area_profiles.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/compare_areas.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/spine_rescaler.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tests/testthat/test-compare-areas.R
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ context("compare_areas")
parent <- "PAC11"
top_names <- c("C001", parent)
ordered_levels <- c("Better",
"Same",
"Similar",
"Worse",
"Not compared")
df_ca <- df %>%
Expand Down
4 changes: 2 additions & 2 deletions vignettes/quick_charts.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ ons_api <- "https://opendata.arcgis.com/datasets/687f346f5023410ba86615655ff33ca

```{r static reorder}
ordered_levels <- c("Better",
"Same",
"Similar",
"Worse",
"Not compared")
df <- df %>%
Expand Down Expand Up @@ -196,7 +196,7 @@ df <- fingertips_data(90316) %>%

```{r compare areas reorder}
ordered_levels <- c("Better",
"Same",
"Similar",
"Worse",
"Not compared")
df <- df %>%
Expand Down

0 comments on commit 906bf00

Please sign in to comment.