Skip to content

Commit

Permalink
readDWD: fread now defaults to FALSE
Browse files Browse the repository at this point in the history
  • Loading branch information
brry committed Nov 2, 2017
1 parent e5a63ac commit 272b947
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 10 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: rdwd
Title: Select and Download Climate Data from 'DWD' (German Weather Service)
Version: 0.8.5
Date: 2017-09-29
Version: 0.8.6
Date: 2017-11-02
Depends: R(>= 2.10)
Imports: berryFunctions (>= 1.15.30), pbapply
Suggests: RCurl, leaflet, knitr, rmarkdown, testthat, data.table
Expand Down
1 change: 1 addition & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ rdwd ToDo-list / wishlist / issues
- dataDWD: potentially use curl to download data without sleep need
- selectDWD: if res/var/per is NA or "", give a selection popup
- for per="monthly", make readDWD recognize MESS_DATUM_ENDE and _BEGINN, potentially create new column MESS_DATUM yyyy-mm-15
- readDWD: figure out reason for fread trouble (reported in emails by some users)

---------------------------------------
rdwd: DWD Climate Data access package by Berry Boessenkool, berry-b@gmx.de
Expand Down
4 changes: 2 additions & 2 deletions R/dataDWD.R
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
#' only download is performed and the filename(s) returned. DEFAULT: TRUE
#' @param meta Logical (vector): is the \code{file} a meta file? Passed to
#' \code{\link{readDWD}}. DEFAULT: TRUE for each file ending in ".txt"
#' @param fread Fast reading? See \code{\link{readDWD}}. DEFAULT: NA
#' @param fread Fast reading? See \code{\link{readDWD}}. DEFAULT: FALSE
#' @param format Char (vector): format used in \code{\link{strptime}} to convert date/time column,
#' see \code{\link{readDWD}}. DEFAULT: NA
#' @param ntrunc Single integer: number of filenames printed in messages
Expand All @@ -117,7 +117,7 @@ progbar=!quiet,
browse=FALSE,
read=TRUE,
meta=substr(file, nchar(file)-3, 1e4)==".txt",
fread=NA,
fread=FALSE,
format=NA,
ntrunc=2,
...
Expand Down
5 changes: 3 additions & 2 deletions R/readDWD.R
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
#' DEFAULT: TRUE for each file ending in ".txt"
#' @param fread Logical: read faster with \code{data.table::\link[data.table]{fread}}?
#' For 30 daily/kl/hist files, 7 instead of 10 seconds.
#' DEFAULT: NA, which means TRUE if data.table is available.
#' NA can also be used, which means TRUE if data.table is available.
#' DEFAULT: FALSE
#' @param minfo Logical: read the meta info txt files in the zip folder (instead of actual data)?
#' Returns a named list of data.frames. DEFAULT: FALSE
#' @param format Char (vector), only used if \code{meta=FALSE}: Format passed to
Expand All @@ -47,7 +48,7 @@
readDWD <- function(
file,
meta=substr(file, nchar(file)-3, 1e4)==".txt",
fread=NA,
fread=FALSE,
minfo=FALSE,
format=NA,
tz="GMT",
Expand Down
4 changes: 2 additions & 2 deletions man/dataDWD.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions man/readDWD.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 272b947

Please sign in to comment.