Skip to content

have scatter id col name be pointIds #265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asizemore merged 1 commit into from
Feb 19, 2025
Merged

have scatter id col name be pointIds #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion R/class-plotdata-scatter.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ newScatterPD <- function(.dt = data.table::data.table(),
# If we ask for the point ids, ensure the column is present. Otherwise set to null.
if (returnPointIds) {
if (!is.null(idColumn) && idColumn %in% names(.dt)) {
idCol <- idColumn
idCol <- 'pointIds' # Will become the name of the id column in the output.
} else {
stop("idColumn not found or not supplied. Supply proper idColumn if returnPointIds is TRUE.")
}
Expand Down
10 changes: 5 additions & 5 deletions tests/testthat/test-scattergl.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -904,8 +904,8 @@ test_that("scattergl.dt() returns an appropriately sized data.table", {

dt <- scattergl.dt(df, variables, 'raw', idColumn = idColumn, returnPointIds = TRUE)
expect_equal(nrow(dt), 3)
expect_equal(names(dt), c('entity.cat3','seriesX','seriesY', idColumn))
expect_equal(class(dt[[idColumn]][[1]]), 'character')
expect_equal(names(dt), c('entity.cat3','seriesX','seriesY', 'pointIds'))
expect_equal(class(dt[['pointIds']][[1]]), 'character')

# With id columns and facets and best fit lines
variables <- new("VariableMetadataList", SimpleList(
Expand Down Expand Up @@ -940,8 +940,8 @@ test_that("scattergl.dt() returns an appropriately sized data.table", {

dt <- scattergl.dt(df, variables, 'bestFitLineWithRaw', idColumn = idColumn, returnPointIds = TRUE)
expect_equal(nrow(dt), 9)
expect_equal(names(dt), c('entity.factor3', 'entity.cat3', 'seriesX','seriesY', idColumn, 'bestFitLineX', 'bestFitLineY', 'r2'))
expect_equal(class(dt[[idColumn]][[1]]), 'character')
expect_equal(names(dt), c('entity.factor3', 'entity.cat3', 'seriesX','seriesY', 'pointIds', 'bestFitLineX', 'bestFitLineY', 'r2'))
expect_equal(class(dt[['pointIds']][[1]]), 'character')

dt <- scattergl.dt(df, variables, 'bestFitLineWithRaw', idColumn = idColumn, returnPointIds = FALSE)
expect_equal(nrow(dt), 9)
Expand Down Expand Up @@ -1368,7 +1368,7 @@ test_that("scattergl() returns appropriately formatted json", {

expect_equal(names(jsonList),c('scatterplot','sampleSizeTable', 'completeCasesTable'))
expect_equal(names(jsonList$scatterplot),c('data','config'))
expect_equal(names(jsonList$scatterplot$data),c('seriesX','seriesY','seriesGradientColorscale', idColumn))
expect_equal(names(jsonList$scatterplot$data),c('seriesX','seriesY','seriesGradientColorscale', 'pointIds'))
expect_equal(names(jsonList$scatterplot$config),c('variables','completeCasesAllVars','completeCasesAxesVars'))
expect_equal(names(jsonList$scatterplot$config$variables$variableSpec),c('variableId','entityId'))
expect_equal(jsonList$scatterplot$config$variables$variableSpec$variableId[jsonList$scatterplot$config$variables$plotReference == 'overlay'], 'contC')
Expand Down
Loading