Resolve "`plot.GRiwrm`: mermaid code is displayed with the diagram"

Closes #73 (closed)

R/plot.GRiwrm.R

@@ -32,9 +32,13 @@ plot.GRiwrm <- function(x, display = TRUE, orientation = "LR", width = "100%", h
     g2$down
   )
   styleSD <- paste("style", unique(g2$down), "fill:#cfc")
-  styleDF <- paste("style", unique(g2$id[is.na(g2$model)]), "fill:#fcc")
+  if (length(g2$id[is.na(g2$model)]) > 0) {
+    styleDF <- paste("style", unique(g2$id[is.na(g2$model)]), "fill:#fcc")
+  } else {
+    styleDF <- ""
+  }
   diagram <- paste(c(paste("graph", orientation), nodes, styleSD, styleDF), collapse = "\n")
-  if(display) {
+  if (display) {
     DiagrammeR::mermaid(diagram = diagram, width, height, ...)
   } else {
     return(diagram)

tests/testthat/test-plot.R

+test_that("plot.GRiwrm should have all styles correctly filled (#73)", {
+  data(Severn)
+  nodes <- Severn$BasinsInfo[, c("gauge_id", "downstream_id", "distance_downstream", "area")]
+  nodes$distance_downstream <- nodes$distance_downstream #je ne comprends pas cette ligne, elle semble inutile
+  nodes$model <- "RunModel_GR4J"
+  griwrm <- CreateGRiwrm(nodes, list(id = "gauge_id", down = "downstream_id", length = "distance_downstream"))
+  code_mermaid <-plot(griwrm, display = FALSE)
+  expect_length(grep("style  fill", code_mermaid), 0)
+})

vignettes/V01_Structure_SD_model.Rmd

@@ -75,7 +75,8 @@ griwrm
 The diagram of the network structure is represented below with in blue the upstream nodes with a GR4J model and in green the intermediate nodes with an SD (GR4J + LAG) model.
 
 ```{r diagram}
-plot(griwrm)
+mermaid_code <- plot(griwrm, display = FALSE)
+DiagrammeR::mermaid(mermaid_code)
 ```