minot bugs fixed regarding set_modern_Data()

mchevalier2 · Jun 17, 2024 · ddff36f · ddff36f
1 parent 644c23d
commit ddff36f
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 11 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -7,6 +7,7 @@
     * Logging of taxa assignment is fixed.
     * Including minGridCell in the algorithm.
     * Adding a global warning if mingridcell is <15, and an error is <2.
+    * The plots that require variable names function properly.
 
 # crestr 1.3.0
 

diff --git a/R/crestObj.plot.R b/R/crestObj.plot.R
@@ -174,7 +174,7 @@ plot.crestObj <- function(x,
             ylim2 <- ylim[c(idx * 2 - 1, idx * 2)]
         }
 
-        climate_names <- accClimateVariables()
+        climate_names <- accClimateVariables(v=clim)
 
         if(is.character(x$inputs$x) | is.factor(x$inputs$x)) {
             if(simplify) warning("The plotting function is not adapted to non-numeric x values. The sample names were replaced by numeric indexes.")

diff --git a/R/dbFixedNames.R b/R/dbFixedNames.R
@@ -72,7 +72,9 @@ accClimateVariables <- function(v=NA, domain=NA) {
     if(!is.na(v[1])) {
         if(v[1] %in% res[,2]) {
             w=which(res[,2] == v[1])
-            return(c(res[w,1], res[w,2], res[w,3], res[w,4]))
+            return(matrix(c(res[w,1], res[w,2], res[w,3], res[w,4]), ncol=4))
+        } else {
+            return(matrix(c(0, v, v, ''), ncol=4))
         }
     }
     w <- 1:nrow(res)

diff --git a/docs/articles/calibration-data.html b/docs/articles/calibration-data.html
diff --git a/docs/articles/community.html b/docs/articles/community.html
diff --git a/docs/articles/databasing-with-crestr.html b/docs/articles/databasing-with-crestr.html
diff --git a/docs/articles/get-started.html b/docs/articles/get-started.html
diff --git a/docs/articles/limpopo.html b/docs/articles/limpopo.html
diff --git a/docs/articles/technicalities.html b/docs/articles/technicalities.html
diff --git a/docs/articles/theory.html b/docs/articles/theory.html
diff --git a/docs/articles/warnings.html b/docs/articles/warnings.html
diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -10,5 +10,5 @@ articles:
   technicalities: technicalities.html
   theory: theory.html
   warnings: warnings.html
-last_built: 2024-06-14T07:57Z
+last_built: 2024-06-17T15:45Z