Merge branch 'master' of github.com:natverse/neuprintr

* 'master' of github.com:natverse/neuprintr: synonyms -> notes
natverse · Jul 16, 2020 · 7403d3c · 7403d3c
2 parents 12b6522 + f67a589
commit 7403d3c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/R/name.R b/R/name.R
@@ -126,7 +126,7 @@ neuprint_get_meta <- function(bodyids, dataset = NULL, all_segments = TRUE, conn
   all_segments = ifelse(all_segments,"Segment","Neuron")
 
   fieldNames <- neuprint_get_fields(possibleFields = c("bodyId","name","instance","type","status","statusLabel","pre","post","upstream","downstream","cropped",
-                                                       "size","cellBodyFiber","synonyms"),
+                                                       "size","cellBodyFiber","notes"),
                                     dataset=dataset,conn=conn,...)
   returnCypher <- paste0("n.",fieldNames," AS ",dfFields(fieldNames),collapse=" , ")
   cypher = sprintf(
@@ -389,7 +389,7 @@ neuprint_get_fields <- function(possibleFields = c("bodyId", "pre", "post",
                                                    "status", "statusLabel",
                                                    "cropped", "instance", "name",
                                                    "size", "type", "cellBodyFiber",
-                                                   "somaLocation", "somaRadius","synonyms"),
+                                                   "somaLocation", "somaRadius","notes"),
                                 negateFields=FALSE,
                                 dataset = NULL, conn = NULL, ...){
 
@@ -419,7 +419,7 @@ dfFields <- function(field_name) {
       "cellBodyFiber",
       "somaLocation",
       "somaRadius",
-      "synonyms"
+      "notes"
     ),
     rName = c(
       "bodyid",
@@ -437,7 +437,7 @@ dfFields <- function(field_name) {
       "cellBodyFiber",
       "somaLocation",
       "somaRadius",
-      "synonyms"
+      "notes"
     ),
     stringsAsFactors = FALSE
   )

diff --git a/man/neuprint_get_fields.Rd b/man/neuprint_get_fields.Rd
diff --git a/tests/testthat/test-name.R b/tests/testthat/test-name.R
@@ -27,7 +27,7 @@ test_that("test name searches ", {
   expect_named(mt,
                c(dfFields(neuprint_get_fields(possibleFields = c("bodyId","name","instance","type","status","statusLabel",
                                                                "pre","post","upstream","downstream","cropped",
-                                                               "size","cellBodyFiber","synonyms"))),"soma")
+                                                               "size","cellBodyFiber","notes"))),"soma")
                )