From f682569af96fa481d9144d73dd4cab023c5eb418 Mon Sep 17 00:00:00 2001
From: lilyclements <lily@idems.international>
Date: Mon, 2 Dec 2024 16:57:41 +0000
Subject: [PATCH] updating to 18.10.2024

---
 DESCRIPTION                     |  4 ++--
 R/climatic_details.R            | 10 +++++-----
 R/convert_to_character_matrix.R |  5 ++---
 man/climatic_details.Rd         | 10 +++++-----
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 7556261..0e0b0ad 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -11,7 +11,7 @@ Description: This package contains a set of climatic functions used in R-Instat.
 License: LGPL (>= 3)
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.2
 Imports: 
     climdex.pcic,
     colorRamps,
@@ -45,4 +45,4 @@ Imports:
     tidyselect,
     zoo
 Remotes:
-    pacificclimate/climdex.pcic
\ No newline at end of file
+    pacificclimate/climdex.pcic
diff --git a/R/climatic_details.R b/R/climatic_details.R
index f596533..bdfaa1b 100644
--- a/R/climatic_details.R
+++ b/R/climatic_details.R
@@ -5,8 +5,8 @@
 #' 
 #' @param data A dataset containing climatic data.
 #' @param date The date variable in the dataset.
-#' @param elements A character vector specifying the climatic elements to analyze.
-#' @param stations A character vector specifying the stations to analyze.
+#' @param elements A character vector specifying the climatic elements to analyse.
+#' @param stations A character vector specifying the stations to analyse.
 #' @param order A logical value indicating whether the resulting tables should be ordered.
 #' @param day A logical value indicating whether to include information at the day level.
 #' @param month A logical value indicating whether to include information at the month level.
@@ -29,9 +29,9 @@
 #' #                 level = TRUE)
 
 climatic_details <- function(data, date, elements = ..., stations,
-                             order = FALSE,
-                             day = TRUE,
-                             month = FALSE,
+                             order = TRUE,
+                             day = FALSE,
+                             month = TRUE,
                              year = FALSE, level = FALSE){
   
   
diff --git a/R/convert_to_character_matrix.R b/R/convert_to_character_matrix.R
index 7356d95..91397e9 100644
--- a/R/convert_to_character_matrix.R
+++ b/R/convert_to_character_matrix.R
@@ -41,8 +41,7 @@ convert_to_character_matrix <- function(data, format_decimal_places = TRUE, deci
         #which are recognised oddly by the R.Net
         out[, i] <- as.character(data[[i]])
       } else {
-        out[, i] <-
-          format(data[[i]], digits = decimal_places[i], scientific = is_scientific[i])
+        out[,i] <- format(data[[i]], digits = decimal_places[i], scientific = is_scientific[i])
       }
       if (!is.null(na_display)) {
         out[is.na(data[[i]]), i] <- na_display
@@ -54,4 +53,4 @@ convert_to_character_matrix <- function(data, format_decimal_places = TRUE, deci
   }
   if(return_data_frame) out <- data.frame(out, stringsAsFactors = FALSE, check.names = check.names)
   return(out)
-}
+}
\ No newline at end of file
diff --git a/man/climatic_details.Rd b/man/climatic_details.Rd
index b15299a..694819a 100644
--- a/man/climatic_details.Rd
+++ b/man/climatic_details.Rd
@@ -9,9 +9,9 @@ climatic_details(
   date,
   elements = ...,
   stations,
-  order = FALSE,
-  day = TRUE,
-  month = FALSE,
+  order = TRUE,
+  day = FALSE,
+  month = TRUE,
   year = FALSE,
   level = FALSE
 )
@@ -21,9 +21,9 @@ climatic_details(
 
 \item{date}{The date variable in the dataset.}
 
-\item{elements}{A character vector specifying the climatic elements to analyze.}
+\item{elements}{A character vector specifying the climatic elements to analyse.}
 
-\item{stations}{A character vector specifying the stations to analyze.}
+\item{stations}{A character vector specifying the stations to analyse.}
 
 \item{order}{A logical value indicating whether the resulting tables should be ordered.}