Dev version 4.1.0.9006: Remove experimental functions, fix tests

Author: pitkant

DESCRIPTION

@@ -1,8 +1,8 @@
 Type: Package
 Package: eurostat
 Title: Tools for Eurostat Open Data
-Version: 4.1.0.9005
-Date: 2025-10-16
+Version: 4.1.0.9006
+Date: 2025-11-06
 Authors@R: c(
     person("Leo", "Lahti", , "leo.lahti@iki.fi", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0001-5537-637X")),
@@ -20,6 +20,7 @@ Authors@R: c(
     person("Oliver", "Reiter", role = "ctb"),
     person("Pyry", "Kantanen", role = "aut",
            comment = c(ORCID = "0000-0003-2853-2765")),
+    person("Akewak", "Jeba", role = "ctb"),
     person("Enrico", "Spinielli", , "enrico.spinielli@gmail.com", role = "ctb",
            comment = c(ORCID = "0000-0001-8584-9131"))
   )
@@ -52,8 +53,7 @@ Imports:
     tibble,
     tidyr (>= 1.0.0),
     xml2,
-    data.table (>= 1.14.8),
-    dataset (>= 0.4.0)
+    data.table (>= 1.14.8)
 Suggests:
     giscoR,
     knitr,

NAMESPACE

@@ -9,7 +9,6 @@ export(eurotime2date)
 export(eurotime2num)
 export(get_bibentry)
 export(get_eurostat)
-export(get_eurostat_async)
 export(get_eurostat_dic)
 export(get_eurostat_folder)
 export(get_eurostat_geospatial)
@@ -37,15 +36,12 @@ importFrom(ISOweek,ISOweek2date)
 importFrom(classInt,classIntervals)
 importFrom(countrycode,countrycode)
 importFrom(curl,curl_download)
-importFrom(data.table,"%chin%")
 importFrom(data.table,":=")
 importFrom(data.table,.SD)
 importFrom(data.table,fread)
 importFrom(data.table,melt)
 importFrom(data.table,setDT)
 importFrom(data.table,setcolorder)
-importFrom(dataset,dataset_df)
-importFrom(dataset,dublincore)
 importFrom(digest,digest)
 importFrom(dplyr,"%>%")
 importFrom(dplyr,case_when)
@@ -64,11 +60,9 @@ importFrom(httr2,req_user_agent)
 importFrom(httr2,request)
 importFrom(httr2,resp_body_json)
 importFrom(httr2,resp_body_raw)
-importFrom(httr2,resp_body_xml)
 importFrom(httr2,resp_check_status)
 importFrom(httr2,resp_content_type)
 importFrom(httr2,resp_is_error)
-importFrom(httr2,resp_status)
 importFrom(httr2,url_build)
 importFrom(httr2,url_parse)
 importFrom(jsonlite,fromJSON)
@@ -109,8 +103,9 @@ importFrom(utils,person)
 importFrom(utils,read.csv)
 importFrom(utils,read.delim)
 importFrom(utils,toBibtex)
-importFrom(utils,unzip)
 importFrom(xml2,read_xml)
+importFrom(xml2,xml_attr)
 importFrom(xml2,xml_find_all)
 importFrom(xml2,xml_find_first)
+importFrom(xml2,xml_ns)
 importFrom(xml2,xml_text)

NEWS.md

@@ -1,3 +1,9 @@
+# eurostat 4.1.0.9006
+
+## Minor updates
+
+* Removed experimental functions from the codebase, fixed tests that were pointing at datasets renamed by Eurostat
+
 # eurostat 4.1.0.9005
 
 ## Deprecated and defunct

R/get_eurostat.R

@@ -142,7 +142,7 @@
 #' set_eurostat_cache_dir(file.path(tempdir(), "r_cache2"))
 #' k <- get_eurostat("nama_10_lp_ulc")
 #' k <- get_eurostat("nama_10_lp_ulc", cache = FALSE)
-#' k <- get_eurostat("avia_gonc", select_time = "Y", cache = FALSE)
+#' k <- get_eurostat("avia_gooc", select_time = "Y", cache = FALSE)
 #'
 #' dd <- get_eurostat("nama_10_gdp",
 #'   filters = list(

R/get_eurostat_async.R

@@ -13,12 +13,14 @@
 #' what is the best way to interact with SDMX APIs.
 #'
 #' @inheritParams get_eurostat
-#' @inheritParams get_eurostat_async
 #' @param agency Either "Eurostat" (default), "Eurostat_comext"
 #' (for Comext and Prodcom datasets), "COMP", "EMPL" or "GROW"
 #' @param use.data.table Use data.table to process files? Default is FALSE.
 #' If data.table is used, data will be downloaded as a TSV file and
 #' processed using [tidy_eurostat()]
+#' @param wait Integer. Seconds between status checks. Default is 1 second.
+#' @param max_wait Integer. Max time to wait in seconds. Default is 60 seconds.
+#' @param compressed Logical. Download data in compressed format? Default is TRUE.
 #'
 #' @importFrom curl curl_download
 #' @importFrom utils download.file
@@ -131,7 +133,7 @@ get_eurostat_sdmx <- function(
 }
 
 get_sdmx_codelist <- function(codelist_id, agency = "Eurostat", type = "list", lang = NULL) {
-  lang <- eurostat:::check_lang(lang)
+  lang <- check_lang(lang)
 
   api_base_uri <- build_api_base_uri(agency)
 
@@ -170,7 +172,7 @@ get_sdmx_codelist <- function(codelist_id, agency = "Eurostat", type = "list", l
 
 get_sdmx_conceptscheme <- function(id, agency = "Eurostat", type = "list", lang = NULL) {
 
-  lang <- eurostat:::check_lang(lang)
+  lang <- check_lang(lang)
 
   api_base_uri <- build_api_base_uri(agency)
 
@@ -223,6 +225,7 @@ get_sdmx_conceptscheme <- function(id, agency = "Eurostat", type = "list", lang
   return(metadata_returnable)
 }
 
+#' @importFrom xml2 xml_ns xml_find_first xml_text xml_attr xml_find_all 
 get_sdmx_dsd <- function(id, agency = "Eurostat", type = "list", lang = NULL) {
   api_base_uri <- build_api_base_uri(agency)
 
@@ -649,84 +652,3 @@ label_eurostat_sdmx <- function(x, agency, id, lang = "en", verbose = TRUE) {
   }
   x
 }
-
-#' @title Create OM compliant datasets
-#' @importFrom dataset dublincore dataset_df
-#' @examples
-#' enriched_dataset <- om_dataset("nama_10_gdp", lang = "de")
-#'   
-om_dataset <- function(id, agency = "eurostat", lang = "en") {
-  lang <- check_lang(lang)
-  
-  df <- get_eurostat_sdmx(id = id, lang = lang, agency = agency, legacy.data.output = FALSE, verbose = FALSE)
-  
-  dataflow <- eurostat:::get_sdmx_dataflow(id = id, agency = agency, type = "list", lang = lang)
-  
-  colnames <- names(df)
-  
-  if ("geo" %in% colnames) {
-    geo_dict <- get_sdmx_codelist("geo", lang = lang)
-    geo_names <- unique(geo_dict$name[geo_dict$id %in% df$geo])
-    if (length(geo_names) > 40) {
-      coverage = "Europe"
-    } else {
-      coverage = paste(unique(geo_names), collapse = ", ")
-    }
-  } else {
-    coverage = "Europe"
-  }
-  
-  concept_scheme <- eurostat:::get_sdmx_conceptscheme(id = id, agency = agency, lang = lang)
-  
-  dsd <- get_sdmx_dsd(id = id, agency = agency, lang = lang)
-  
-  bibentry <- dataset::dublincore(
-    title = dataflow$name,
-    creator = person(given = dataflow$source_institutions, role = "cre"),
-    publisher = dataflow$source_institutions, # I think the publisher is Eurostat... or maybe European Commission?
-    datasource = dataflow$doi_url,
-    rights = "Creative Commons Attribution 4.0 International", # could be shortened to CC-BY 4.0
-    coverage = coverage,
-    language = lang)
-  
-  df_with_metadata <- add_metadata(df, concept_scheme = concept_scheme, dsd = dsd)
-  
-  dataset_enriched <- dataset::dataset_df(df_with_metadata, 
-                                          dataset_bibentry = bibentry)
-  
-  return(dataset_enriched)
-}
-
-
-add_metadata <- function(df, concept_scheme, 
-                         dsd) {
-  
-  # Check required columns in concept_scheme
-  if (!all(c("id", "name") %in% names(concept_scheme))) {
-    stop("concept_scheme must contain 'id' and 'name' columns.")
-  }
-  
-  # Make sure we can iterate over the names
-  df_out <- df
-  
-  for (var in names(df)) {
-    if (var %in% concept_scheme$id) {
-      
-      label <- concept_scheme$name[concept_scheme$id == var]
-      
-      # Construct metadata URIs
-      concept_uri <- concept_scheme$urn[concept_scheme$id == var]
-      namespace <- dsd$urn[dsd$id == var]
-      
-      # Apply defined() dynamically
-      df_out[[var]] <- dataset::defined(
-        df[[var]],
-        label = label,
-        concept = concept_uri,
-        namespace = namespace
-      )
-    }
-  }
-  
-  return(df_out)
-}