ci: test new

riatelab · Nov 9, 2023 · 03da8f9 · 03da8f9
1 parent 868bb54
commit 03da8f9
Show file tree

Hide file tree

Showing 16 changed files with 4 additions and 358 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -29,7 +29,6 @@ Imports:
     classInt, 
     graphics,
     maplegend,
-    Rcpp,
     sf,
     stats,
     utils,
@@ -43,7 +42,6 @@ Suggests:
     rmarkdown,
     tinytest,
     covr
-LinkingTo: Rcpp
 Encoding: UTF-8
 RoxygenNote: 7.2.3
 VignetteBuilder: knitr

diff --git a/NAMESPACE b/NAMESPACE
@@ -19,7 +19,6 @@ export(mf_graticule)
 export(mf_init)
 export(mf_inset_off)
 export(mf_inset_on)
-export(mf_label)
 export(mf_layout)
 export(mf_legend)
 export(mf_legend_c)
@@ -42,7 +41,6 @@ export(mf_title)
 export(mf_typo)
 import(graphics)
 import(sf)
-importFrom(Rcpp,evalCpp)
 importFrom(grDevices,colorRampPalette)
 importFrom(grDevices,dev.list)
 importFrom(grDevices,hcl.colors)
@@ -70,4 +68,3 @@ importFrom(stats,quantile)
 importFrom(stats,runif)
 importFrom(stats,sd)
 importFrom(utils,globalVariables)
-useDynLib(mapsf,.registration = TRUE)
diff --git a/R/RcppExports.R b/R/RcppExports.R
diff --git a/R/mf_annotation.R b/R/mf_annotation.R
@@ -91,7 +91,7 @@ mf_annotation <- function(x, txt, pos = "topright",
     lwd = 1.2
   )
   if (halo) {
-    shadowtext(
+    text(
       x = res$x_txt,
       y = res$y_txt,
       labels = txt, col = col_txt, bg = bg,

diff --git a/R/mf_label.R b/R/mf_label.R
diff --git a/R/mf_labels_utils.R b/R/mf_labels_utils.R
diff --git a/R/mf_pkg_utils.R b/R/mf_pkg_utils.R
@@ -8,10 +8,7 @@
 #' @importFrom stats aggregate median na.omit quantile runif sd
 
 
-# Rcpp stuff
-#' @useDynLib mapsf,.registration = TRUE
-#' @importFrom Rcpp evalCpp
-NULL
+
 
 #' @importFrom utils globalVariables
 .gmapsf <- new.env(parent = emptyenv())

diff --git a/R/package.R b/R/package.R
@@ -15,7 +15,6 @@
 #' @section Symbology:
 #' These functions display cartographic layers.
 #' - [mf_map()] Plot a map
-#' - [mf_label()] Plot labels
 #' - [mf_raster()] Plot a raster
 #' - [mf_graticule()] Plot graticules
 #'

diff --git a/inst/tinytest/test_label.R b/inst/tinytest/test_label.R
@@ -1,7 +0,0 @@
-mtq <- mf_get_mtq()
-mf_map(mtq)
-expect_silent(mf_label(x = mtq, var = "LIBGEO", halo = TRUE, cex = 0.8,
-         overlap = FALSE, lines = TRUE))
-expect_silent(mf_label(x = mtq, var = "LIBGEO", halo = TRUE,
-                       cex = 0.8, col = sample(1:5, nrow(mtq), replace = TRUE),
-                       overlap = FALSE, lines = TRUE))

diff --git a/man/mapsf.Rd b/man/mapsf.Rd
diff --git a/man/mf_label.Rd b/man/mf_label.Rd
diff --git a/src/.gitignore b/src/.gitignore
diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp
diff --git a/src/init.c b/src/init.c