view mode knit working in v4

NAMESPACE

@@ -1,6 +1,12 @@
 # Generated by roxygen2: do not edit by hand
 
 
+if(getRversion() >= "3.6.0") {
+  S3method(knitr::knit_print, tmap)
+} else {
+  export(knit_print.tmap)
+}
+
 if(getRversion() >= "3.6.0") {
   S3method(knitr::knit_print, tmap_arrange)
 } else {

R/print.R

@@ -6,7 +6,9 @@
 #' @param vp viewport (for `"plot"` mode)
 #' @param ... not used
 #' @export
-print.tmap = function(x, return.asp = FALSE, show = TRUE, vp = NULL, ...) {
+#' @method print tmap
+print.tmap = function(x, return.asp = FALSE, show = TRUE, vp = NULL, knit = FALSE, options = NULL, ...) {
+	args = list(...)
 	dev = getOption("tmap.devel.mode")
 	if (dev) timing_init()
 	x2 = step1_rearrange(x)
@@ -15,13 +17,30 @@ print.tmap = function(x, return.asp = FALSE, show = TRUE, vp = NULL, ...) {
 	if (dev) timing_add("step 2")
 	x4 = step3_trans(x3)
 	if (dev) timing_add("step 3")
-	res = step4_plot(x4, vp = vp, return.asp = return.asp, show = show)
+	res = step4_plot(x4, vp = vp, return.asp = return.asp, show = show, knit = knit, args)
 	if (dev) timing_add("step 4")
 	if (dev) timing_eval()
 	#if (return.asp) return(asp) else invisible(NULL)
-	invisible(res)
+	if (knit && tmap_graphics_name() == "Leaflet") {
+		kp = get("knit_print", asNamespace("knitr"))
+		return(do.call(kp, c(list(x=res), args, list(options=options))))
+	} else {
+		invisible(res)
+	}
+}
+
+#' @rdname print.tmap
+#' @rawNamespace
+#' if(getRversion() >= "3.6.0") {
+#'   S3method(knitr::knit_print, tmap)
+#' } else {
+#'   export(knit_print.tmap)
+#' }
+knit_print.tmap <- function(x, ..., options=NULL) {
+	print.tmap(x, knit=TRUE, options=options, ...)
 }
 
+
 timing_init = function() {
 	ts = data.table(s1 = "---------", s2 = "---------", s3 = "---------", s4 = "---------", t = Sys.time())
 	assign("timings", ts, envir = .TMAP)

R/step4_plot.R

@@ -212,7 +212,7 @@ process_components2 = function(cdt, o) {
 	cdt
 }
 
-step4_plot = function(tm, vp, return.asp, show) {
+step4_plot = function(tm, vp, return.asp, show, knit, args) {
 	tmx = tm$tmo
 	o = tm$o
 	aux = tm$aux
@@ -750,5 +750,5 @@ step4_plot = function(tm, vp, return.asp, show) {
 
 
 
-	do.call(FUNrun, list(o = o, show = show))
+	do.call(FUNrun, list(o = o, show = show, knit = knit, args))
 }

R/tmapGridRun.R

@@ -1,4 +1,4 @@
-tmapGridRun = function(o, show) {
+tmapGridRun = function(o, show, knit, args) {
 	gts = get("gts", .TMAP_GRID)
 	if (show) {
 		mapply(function(gt,i) {

R/tmapLeafletRun.R

@@ -1,4 +1,4 @@
-tmapLeafletRun = function(o, show) {
+tmapLeafletRun = function(o, show, knit, args) {
 	lfs = get("lfs", envir = .TMAP_LEAFLET)
 
 	lfs2 = lapply(lfs, function(lfsi) {
@@ -23,6 +23,8 @@ tmapLeafletRun = function(o, show) {
 	})
 
 	if (length(lfs2) == 1) lfs2 = lfs2[[1]]
-	if (show) print(lfs2)
+	if (show && !knit) {
+		print(lfs2)
+	}
 	lfs2
 }