Skip to content

Commit 80c21ec

Browse files
committed
merge staging > main
Merge branch 'staging' # Conflicts: # DESCRIPTION
2 parents 51fc007 + 6c7fde2 commit 80c21ec

3 files changed

Lines changed: 8 additions & 9 deletions

File tree

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: remora
22
Title: Rapid Extraction of Marine Observations for Roving Animals
33
Version: 0.9.10
4-
Date: 2026-05-19
4+
Date: 2026-05-20
55
Authors@R:
66
c(person(given = "Fabrice",
77
family = "Jaine",

R/remote_urls.R

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ remote_urls <- function(input,
8080
start_url <- "https://thredds.aodn.org.au/thredds/dodsC/IMOS/SRS/SST/ghrsst/L4/RAMSSA/"
8181
end_url <- "120000-ABOM-L4_GHRSST-SSTfnd-RAMSSA_09km-AUS-v02.0-fv01.0.nc"
8282
layer <- "analysed_sst"
83-
8483
}
8584

8685
## Daily SST 'raw' dataset (~2km resolution)
@@ -135,18 +134,17 @@ remote_urls <- function(input,
135134
##
136135
if(var_name %in% c('BRAN_temp', 'BRAN_salt', 'BRAN_ssh', 'BRAN_mld', 'BRAN_cur', 'BRAN_wcur', 'BRAN_wind')){
137136

138-
## BRAN2020 dataset: 1993-01-01 - 2023-12-31
137+
## BRAN2023 dataset: 1993-01-01 - 2025-12-31
139138
if(date_range[1] < as.Date("1993-01-01") |
140-
date_range[2] > as.Date("2023-12-31")){
141-
warning("Bluelink data is currently only available from 1993-01-01 to 2023-12-31,\ndetections prior or after these dates will not have envrionmental data associated")}
139+
date_range[2] > as.Date("2025-12-31")){
140+
warning("Bluelink data is currently only available from 1993-01-01 to 2025-12-31,\ndetections prior or after these dates will not have envrionmental data associated")}
142141

143142
sub_dates <- dates[dates >= as.Date("1993-01-01") &
144-
dates <= as.Date("2023-12-31")]
143+
dates <= as.Date("2025-12-31")]
145144
fdates <- sub_dates %>% format("%Y%m%d")
146145

147146
## define start and mid url, and define end of THREDDS based on variable name
148-
## example :"http://thredds.aodn.org.au/thredds/dodsC/IMOS/SRS/SST/ghrsst/L3S-1d/dn/2013/20130501092000-ABOM-L3S_GHRSST-SSTfnd-AVHRR_D-1d_dn.nc"
149-
start_url <- "https://thredds.nci.org.au/thredds/dodsC/gb6/BRAN/BRAN2020/daily/"
147+
start_url <- "https://thredds.nci.org.au/thredds/dodsC/gb6/BRAN/BRAN2023/daily/"
150148
end_url <- ".nc"
151149

152150
# Select BRAN2020 variables

R/writeQC.R

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ writeQC <- function(x, path = NULL, summary = TRUE, csv = TRUE) {
6262
file = paste0(file.path(path, files[i]), ".csv"),
6363
delim = ";",
6464
col_names = TRUE,
65-
quote_escape = FALSE
65+
quote = "none",
66+
escape = "none"
6667
)
6768
}
6869
})

0 commit comments

Comments
 (0)