Merge pull request #1 from SevillaR/master

Update from original repo

DESCRIPTION

@@ -3,8 +3,9 @@ Type: Package
 Title: Obtain Climatic and Meteorological Data from Spanish Meteorological Agency (AEMET)
 Version: 0.1.2
 Date: 2018-03-17
-Authors@R: c(person("Francisco", "Balao", role = "aut"),
+Authors@R: c(
             person("Francisco", "Rodriguez-Sanchez", email = "[email protected]", role = c("aut", "cre")),
+            person("Francisco", "Balao", role = "aut"),
             person("Francisco", "Viciana", role = "aut"),
             person("Pedro", "Molina", role = "aut"),
             person("Jose", "Alcaide", role = "aut"),
@@ -20,7 +21,8 @@ Depends:
     R (>= 3.0.0)
 Imports:
   httr,
-  jsonlite
+  jsonlite,
+  stringr
 VignetteBuilder: knitr
 RoxygenNote: 6.0.1
 

NAMESPACE

@@ -1,8 +1,9 @@
 # Generated by roxygen2: do not edit by hand
 
+export(aemet_climatology_station)
 export(aemet_stations)
 export(dms2decdegrees)
-export(get_aemet_normalized)
 export(get_data)
 import(httr)
 importFrom(jsonlite,fromJSON)
+importFrom(stringr,str_extract_all)

R/aemet_climatology_station.R

@@ -0,0 +1,20 @@
+#' Get normal climatology values for a station
+#'
+#' Standard climatology from 1981 to 2010.
+#'
+#' @param station Station identifier code (see \code{\link{aemet_stations}}).
+#' @param apikey Personal API key (see \url{https://opendata.aemet.es/centrodedescargas/inicio}).
+#'
+#' @return a data.frame
+#' @export
+#'
+#' @examples \dontrun{
+#' aemet_climatology_station("5911A")
+#' }
+aemet_climatology_station <- function(station, apikey) {
+
+  apidest <- paste0("/api/valores/climatologicos/normales/estacion/", station)
+
+  clim <- get_data(apidest, apikey)
+
+}

R/get_data.R

@@ -7,6 +7,7 @@
 #' @export
 #' @import httr
 #' @importFrom jsonlite fromJSON
+#' @importFrom stringr str_extract_all
 #'
 #'
 get_data <- function(apidest, apikey) {
@@ -17,8 +18,14 @@ get_data <- function(apidest, apikey) {
 
   path1 <- httr::GET(url1, add_headers(api_key = apikey))
 
-  url.data <- httr::content(path1, as = "parsed")$datos
-  url.metadata <- httr::content(path1, as = "parsed")$metadatos
+  urls.text <- httr::content(path1, as = "text")
+
+  ## TO DO: use base R rather than stringr
+  ## Also extract urls more safely
+  urls <- unlist(stringr::str_extract_all(urls.text,
+                                       pattern = "https://opendata.aemet.es/opendata/sh/([:alnum:])+"))
+  url.data <- urls[1]
+  url.metadata <- urls[2]
 
   #path2 <- GET(url.data, add_headers(api_key = apikey)) # it seems apikey not necessary for this step
   path2 <- httr::GET(url.data)
@@ -27,4 +34,4 @@ get_data <- function(apidest, apikey) {
 
   datos
 
-}
+}

README.Rmd

@@ -31,6 +31,6 @@ To be able to download data from AEMET you will need a free API key which you ca
 ```{r eval=FALSE}
 library(aemet)
 stations <- aemet_stations(apikey)
-grazalema <- get_aemet_normalized(apikey, "5911A")
+grazalema <- aemet_climatology_station("5911A", apikey)
 ```
 

README.md

@@ -23,5 +23,5 @@ Usage
 ``` r
 library(aemet)
 stations <- aemet_stations(apikey)
-grazalema <- get_aemet_normalized(apikey, "5911A")
+grazalema <- aemet_climatology_station("5911A", apikey)
 ```