#401 fix get_concepts_hierarchy

Author: eblondel

R/geoflow_utils.R

@@ -935,7 +935,7 @@ build_hierarchical_list <- function(data, parent, parent_key, child_key) {
     return(NULL)
   } else {
     nested_list <- lapply(1:nrow(children), function(i) {
-      build_vocabulary_hierarchical_list(data, children[i, child_key])
+      build_hierarchical_list(data, children[i, child_key], parent_key, child_key)
     })
     names(nested_list) <- children[,child_key]
     return(nested_list)

R/geoflow_vocabulary.R

@@ -142,10 +142,10 @@ geoflow_skos_vocabulary <- R6Class("geoflow_skos_vocabulary",
     #'@description list_concepts
     #'@param lang lang
     #'@param mimetype mimetype
-    #'@param out_format output format (data.frame or list). Default is "data.frame"
+    #'@param out_format output format (tibble or list). Default is "tibble"
     #'@return the response of the SPARQL query
     get_concepts_hierarchy = function(lang = "en", mimetype = "text/csv",
-                                      out_format = c("data.frame","list")){
+                                      out_format = c("tibble","list")){
       out_format = match.arg(out_format)
       str = paste0("
         PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
@@ -168,7 +168,12 @@ geoflow_skos_vocabulary <- R6Class("geoflow_skos_vocabulary",
       ")
       out = self$query(str = str, mimetype = mimetype)
       if(out_format == "list"){
-        out = build_hierarchical_list(out, parent = "root", parent_key = "broaderPrefLabel", child_key = "prefLabel")
+        out = build_hierarchical_list(
+          as.data.frame(out), 
+          parent = "root", 
+          parent_key = "broaderPrefLabel", 
+          child_key = "prefLabel"
+        )
       }
       return(out)
     },