Merge pull request #228 from R4EPI/znk-fix-226

use the msfdict package

DESCRIPTION

@@ -1,7 +1,7 @@
 Type: Package
 Package: sitrep
 Title: Report templates and helper functions for EPI
-Version: 0.1.0
+Version: 0.1.2
 Authors@R: 
     c(person(given = "Dirk",
              family = "Schumacher",
@@ -65,15 +65,17 @@ Imports:
     srvyr,
     stats,
     utils,
-    apyramid
+    apyramid,
+    msfdict
 Suggests:
     testthat (>= 2.1.0),
     sessioninfo,
     vdiffr,
     covr
 Remotes:
   reconhub/linelist,
-  R4EPI/apyramid
+  R4EPI/apyramid,
+  R4EPI/msfdict
 Encoding: UTF-8
 LazyData: true
 Roxygen: list(markdown = TRUE)
@@ -89,20 +91,18 @@ Collate:
     'descriptive-table.R'
     'find_breaks.R'
     'find_date_cause.R'
-    'gen_data.R'
     'gen_eligible_interviewed.R'
-    'gen_polygon.R'
     'gen_population.R'
     'helpers.R'
     'inline_fun.R'
-    'msf_dict_survey.R'
+    'msf_dict_rename_helper.R'
+    'msfdict_exports.R'
     'prettify_tabulation.R'
     'relabel_proportions.R'
     'sample-size.R'
     'tab_descriptive.R'
     'tab_univariate.R'
     'tabulate_survey.R'
-    'template_data_frame.R'
     'transpose_pretty.R'
     'two_by_two_funs.R'
     'unite_ci.R'

NAMESPACE

@@ -45,12 +45,10 @@ importFrom(dplyr,funs)
 importFrom(dplyr,group_by)
 importFrom(dplyr,mutate)
 importFrom(dplyr,mutate_at)
-importFrom(dplyr,row_number)
 importFrom(dplyr,select)
 importFrom(dplyr,summarise)
 importFrom(dplyr,summarise_all)
 importFrom(dplyr,ungroup)
-importFrom(epitrix,clean_labels)
 importFrom(ggplot2,aes)
 importFrom(ggplot2,expand_scale)
 importFrom(ggplot2,geom_density)
@@ -62,26 +60,20 @@ importFrom(ggplot2,scale_y_continuous)
 importFrom(ggplot2,stat_density)
 importFrom(ggplot2,stat_function)
 importFrom(glue,glue)
-importFrom(rio,import)
+importFrom(msfdict,gen_data)
+importFrom(msfdict,gen_polygon)
+importFrom(msfdict,msf_dict)
+importFrom(msfdict,msf_dict_survey)
 importFrom(rlang,"!!")
 importFrom(rlang,".data")
 importFrom(rlang,":=")
 importFrom(rlang,sym)
 importFrom(scales,percent_format)
-importFrom(sf,st_intersection)
-importFrom(sf,st_make_grid)
-importFrom(sf,st_polygon)
-importFrom(sf,st_set_crs)
-importFrom(sf,st_sf)
 importFrom(srvyr,survey_mean)
 importFrom(srvyr,survey_total)
-importFrom(stats,aggregate)
-importFrom(stats,runif)
 importFrom(stats,setNames)
 importFrom(tibble,as_tibble)
 importFrom(tidyr,complete)
-importFrom(tidyr,fill)
 importFrom(tidyr,gather)
 importFrom(tidyr,spread)
 importFrom(tidyr,unite)
-importFrom(utils,read.csv)

NEWS.md

@@ -1,3 +1,17 @@
+# sitrep 0.1.2
+
+* Import {msfdict}. The `msf_dict()`, `msf_dict_survey()`, `gen_data()` and
+  `gen_polygon()` functions (and all associated internal functions) were moved
+  to the {msfdict} package and re-exported (@zkamvar, #228)
+
+# sitrep 0.1.1
+
+* Import {apyramid}. Code from `plot_age_pyramid()` was moved to the {apyramid}
+  package, which is currently on GitHub, but soon to be on CRAN (@zkamvar, #225)
+* Removed erroneous emoji in comments that was causing errors in Windows
+  installations (@zkamvar, #227)
+* NOTE: this release on GitHub was not associated with a formal version change.
+
 # sitrep 0.1.0
 
 * Added a `NEWS.md` file to track changes to the package.