Skip to content
Snippets Groups Projects
Commit 14167e65 authored by jml's avatar jml
Browse files

remove any friendlyts dependencies

parent 75bc8ebc
No related branches found
No related tags found
No related merge requests found
Package: friendlyr
Type: Package
Version: 0.0.8
Version: 0.0.9
Authors@R: c(person("Jean-Marie", "Lepioufle", , "jml@nilu.no", role=c("aut","cre")),
person("NILU",role="cph"))
Title: friendlyr
......@@ -18,10 +18,8 @@ Imports:
utils,
timemanip,
osmdata,
friendlyts,
tibble
Remotes: git::git@git.nilu.no:rspacetimemanip/timemanip.git,
git::git@git.nilu.no:rfriendlyts/friendlyts.git
Suggests:
knitr
License: GPL-3
......
......@@ -22,10 +22,5 @@ qa <- function(service=NULL, username=NULL,password=NULL,fromDate=NULL,toDate=NU
friend <- friendlyr(service=service, username=username,password=password)
res <- friend$qa(fromDate = fromDate, toDate = toDate, precision=precision,timeResolution=timeResolution,element_id=element_id,station_id=station_id,location=location,COL_DATE=FALSE)
if (!is.null(precision)) {
tbl_friendlyts <- friendlyts::as_tbl_friendlyts(res,date_type="friendlyts",precision=precision)
} else tbl_friendlyts <- friendlyts::as_tbl_friendlyts(res,date_type="friendlyts",precision=timeResolution)
return(tbl_friendlyts)
return(res)
}
......@@ -22,9 +22,5 @@ ts <- function(service=NULL, username=NULL,password=NULL,fromDate=NULL,toDate=NU
friend <- friendlyr(service=service, username=username,password=password)
res <- friend$data(fromDate = fromDate, toDate = toDate, precision=precision,timeResolution=timeResolution,element_id=element_id,station_id=station_id,location=location,COL_DATE=FALSE)
if (!is.null(precision)) {
tbl_friendlyts <- friendlyts::as_tbl_friendlyts(res,date_type="friendlyts",precision=precision)
} else tbl_friendlyts <- friendlyts::as_tbl_friendlyts(res,date_type="friendlyts",precision=timeResolution)
return(tbl_friendlyts)
return(res)
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment