Commit 4885566b authored by jml's avatar jml
Browse files

ugrade to new friendltyts

parent 381cf91c
......@@ -28,4 +28,4 @@ License: GPL-3
Encoding: UTF-8
VignetteBuilder: knitr
LazyData: false
RoxygenNote: 5.0.1
RoxygenNote: 6.0.1
......@@ -21,7 +21,11 @@ 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)
tbl_friendlyts <- friendlyts::as_tbl_friendlyts(res)
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)
}
......@@ -21,6 +21,10 @@ 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)
tbl_friendlyts <- friendlyts::as_tbl_friendlyts(res,precision=precision)
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)
}
......@@ -24,4 +24,3 @@ friendlyr()
}
}
\keyword{friendlyr}
......@@ -33,4 +33,3 @@ meta()
}
}
\keyword{friendlyr}
......@@ -40,4 +40,3 @@ qa()
}
}
\keyword{friendlyr}
......@@ -40,4 +40,3 @@ ts()
}
}
\keyword{friendlyr}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment