toolMappingFile -> toolGetMapping

merfort · May 2, 2021 · 6f78fc6 · 6f78fc6
1 parent ae0254c
commit 6f78fc6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -170,7 +170,6 @@ importFrom(lusweave,swopen)
 importFrom(lusweave,swtable)
 importFrom(madrat,calcOutput)
 importFrom(madrat,toolGetMapping)
-importFrom(madrat,toolMappingFile)
 importFrom(madrat,toolNAreplace)
 importFrom(magclass,"getNames<-")
 importFrom(magclass,"getRegions<-")

diff --git a/R/toolRegionSubsets.R b/R/toolRegionSubsets.R
@@ -24,7 +24,7 @@
 #' 
 #' @export
 #' @importFrom gdx readGDX
-#' @importFrom madrat toolMappingFile
+#' @importFrom madrat toolGetMapping
 #' @importFrom utils read.csv
 #' 
 #' @export
@@ -33,7 +33,7 @@ toolRegionSubsets <- function(gdx=NULL,map=NULL,parentMapping=NULL,singleMatches
 
   # default to "regionmappingH12.csv" as default
   if (is.null(parentMapping))
-    parentMapping <- toolMappingFile("regional","regionmappingH12.csv")
+    parentMapping <- toolGetMapping(type = "regional", name = "regionmappingH12.csv", returnPathOnly = TRUE)
 
   # reading parent mapping
   if(!(is.data.frame(parentMapping))) {