Merge pull request #55 from rOpenSpain/dechelp2

Package update

Author: dieghernan

NAMESPACE

@@ -22,6 +22,7 @@ export(climatestripes_station)
 export(climatogram_normal)
 export(climatogram_period)
 export(dms2decdegrees)
+export(dms2decdegrees_2)
 export(first_day_of_year)
 export(get_data_aemet)
 export(get_metadata_aemet)

NEWS.md

@@ -2,7 +2,9 @@
 
 -   Migrate from **httr** to **httr2** (#50).
 -   It is possible to use several API keys to avoid API throttling, see
-    `?climaemet::aemet_api_key` (#53).
+    `?climaemet::aemet_api_key` (#53). `?climaemet::aemet_api_key`.
+-   New helper function `dms2decdegrees_2()`.
+-   Update `aemet_munic` with January 2024 data.
 
 # climaemet 1.2.1
 

R/data.R

@@ -89,11 +89,11 @@ NULL
 #'
 #' @description
 #' A [`tibble`][tibble::tibble()] with all the municipalities of  Spain as
-#' defined by the INE (Instituto Nacional de Estadistica) as of January 2020.
+#' defined by the INE (Instituto Nacional de Estadistica) as of January 2024.
 #'
 #' @source
 #' INE, [Municipality codes by
-#' province](https://www.ine.es/en/daco/daco42/codmun/codmunmapa_en.htm)
+#' province](https://www.ine.es/dyngs/INEbase/es/operacion.htm?c=Estadistica_C&cid=1254736177031&menu=ultiDatos&idp=1254734710990)
 #'
 #' @encoding UTF-8
 #'

R/helpers.R

@@ -4,7 +4,12 @@
 #'
 #' @family helpers
 #'
-#' @note Code modified from project <https://github.com/SevillaR/aemet>
+#' @rdname dms2decdegrees
+#'
+#' @note
+#'
+#' Code for `dms2decdegrees()` modified from project
+#' <https://github.com/SevillaR/aemet>.
 #'
 #' @param input Character string as DMS coordinates.
 #'
@@ -13,7 +18,6 @@
 #' @examples
 #' dms2decdegrees("055245W")
 #' @export
-
 dms2decdegrees <- function(input = NULL) {
   if (is.null(input)) {
     stop("Input can't be missing")
@@ -33,6 +37,29 @@ dms2decdegrees <- function(input = NULL) {
   return(x)
 }
 
+#' @rdname dms2decdegrees
+#' @export
+#' @examples
+#' dms2decdegrees_2("-3º 40' 37\"")
+dms2decdegrees_2 <- function(input = NULL) {
+  input_2 <- iconv(input, "latin1", "ASCII", sub = " ")
+  minus <- ifelse(grepl("^-", input_2), -1, 1)
+  # Remove now signs
+  input_3 <- gsub("[^0-9]", " ", input_2)
+
+  pieces <- unlist(strsplit(input_3, split = " "))
+  pieces <- as.double(pieces[pieces != ""])
+
+  # Check here
+  if (length(pieces) != 3) stop("Something went wrong")
+
+
+  # Convert pieces and sign
+  dec <- minus * sum(pieces / c(1, 60, 60^2))
+
+  dec
+}
+
 #' First and last day of year
 #'
 #' Get first and last day of year.

README.Rmd

@@ -150,7 +150,7 @@ data_observation <- aemet_last_obs(station)
 knitr::kable(head(data_observation))
 
 ## Get daily/annual climatology values for a station
-data_daily <- aemet_daily_clim(station, start = "2022-01-01", end = "2022-12-31")
+data_daily <- aemet_daily_clim(station, start = "2022-01-01", end = "2022-06-30")
 
 knitr::kable(head(data_daily))
 

README.md

@@ -117,20 +117,22 @@ library(climaemet)
 # See a tibble in action
 
 aemet_last_obs("9434")
-#> # A tibble: 24 × 25
+#> # A tibble: 13 × 25
 #>    idema   lon fint                 prec   alt  vmax    vv    dv   lat  dmax
 #>    <chr> <dbl> <dttm>              <dbl> <dbl> <dbl> <dbl> <dbl> <dbl> <dbl>
-#>  1 9434  -1.00 2024-04-22 10:00:00     0   249  16.1   9.8   325  41.7   310
-#>  2 9434  -1.00 2024-04-22 11:00:00     0   249  15.1   8.3   322  41.7   323
-#>  3 9434  -1.00 2024-04-22 12:00:00     0   249  13.5   7.8   335  41.7   318
-#>  4 9434  -1.00 2024-04-22 13:00:00     0   249  14.5   9.4   317  41.7   330
-#>  5 9434  -1.00 2024-04-22 14:00:00     0   249  16.6   9.9   325  41.7   315
-#>  6 9434  -1.00 2024-04-22 15:00:00     0   249  15.9   8.7   332  41.7   318
-#>  7 9434  -1.00 2024-04-22 16:00:00     0   249  16.4   8.8   328  41.7   328
-#>  8 9434  -1.00 2024-04-22 17:00:00     0   249  16.8  10.5   327  41.7   325
-#>  9 9434  -1.00 2024-04-22 18:00:00     0   249  18.5  12.1   321  41.7   318
-#> 10 9434  -1.00 2024-04-22 19:00:00     0   249  19.5  10.2   318  41.7   315
-#> # ℹ 14 more rows
+#>  1 9434  -1.00 2024-06-19 21:00:00     0   249  14.6   7.5   317  41.7   318
+#>  2 9434  -1.00 2024-06-19 22:00:00     0   249  14.1   8.8   307  41.7   318
+#>  3 9434  -1.00 2024-06-19 23:00:00     0   249  14.5   7.3   300  41.7   293
+#>  4 9434  -1.00 2024-06-20 00:00:00     0   249   9.4   3.9   316  41.7   293
+#>  5 9434  -1.00 2024-06-20 01:00:00     0   249   8.4   5.9   310  41.7   295
+#>  6 9434  -1.00 2024-06-20 02:00:00     0   249   8.4   6.1   309  41.7   323
+#>  7 9434  -1.00 2024-06-20 03:00:00     0   249  10     7.7   298  41.7   298
+#>  8 9434  -1.00 2024-06-20 04:00:00     0   249  10.4   7.2   304  41.7   325
+#>  9 9434  -1.00 2024-06-20 05:00:00     0   249   9.7   6.5   301  41.7   313
+#> 10 9434  -1.00 2024-06-20 06:00:00     4   249   9.2   4.5   304  41.7   305
+#> 11 9434  -1.00 2024-06-20 07:00:00     0   249   9.8   6.9   291  41.7   280
+#> 12 9434  -1.00 2024-06-20 08:00:00     0   249  11     5.1   313  41.7   308
+#> 13 9434  -1.00 2024-06-20 09:00:00     0   249   7.9   4.9   320  41.7   308
 #> # ℹ 15 more variables: ubi <chr>, pres <dbl>, hr <dbl>, stdvv <dbl>, ts <dbl>,
 #> #   pres_nmar <dbl>, tamin <dbl>, ta <dbl>, tamax <dbl>, tpr <dbl>,
 #> #   stddv <dbl>, inso <dbl>, tss5cm <dbl>, pacutp <dbl>, tss20cm <dbl>
@@ -169,17 +171,17 @@ knitr::kable(head(data_observation))
 
 | idema |       lon | fint                | prec | alt | vmax |  vv |  dv |      lat | dmax | ubi                 |  pres |  hr | stdvv |   ts | pres_nmar | tamin |   ta | tamax |  tpr | stddv | inso | tss5cm | pacutp | tss20cm |
 |:------|----------:|:--------------------|-----:|----:|-----:|----:|----:|---------:|-----:|:--------------------|------:|----:|------:|-----:|----------:|------:|-----:|------:|-----:|------:|-----:|-------:|-------:|--------:|
-| 9434  | -1.004167 | 2024-04-22 10:00:00 |    0 | 249 | 16.1 | 9.8 | 325 | 41.66056 |  310 | ZARAGOZA AEROPUERTO | 988.0 |  29 |   1.9 | 17.0 |    1018.1 |  11.4 | 13.1 |  13.4 | -4.5 |    11 |   60 |   17.5 |      0 |    18.0 |
-| 9434  | -1.004167 | 2024-04-22 11:00:00 |    0 | 249 | 15.1 | 8.3 | 322 | 41.66056 |  323 | ZARAGOZA AEROPUERTO | 987.5 |  26 |   1.8 | 19.2 |    1017.5 |  13.1 | 14.6 |  14.7 | -4.8 |    11 |   60 |   19.1 |      0 |    17.9 |
-| 9434  | -1.004167 | 2024-04-22 12:00:00 |    0 | 249 | 13.5 | 7.8 | 335 | 41.66056 |  318 | ZARAGOZA AEROPUERTO | 987.1 |  22 |   1.9 | 20.6 |    1017.0 |  14.4 | 15.4 |  15.5 | -6.4 |    14 |   60 |   21.0 |      0 |    18.0 |
-| 9434  | -1.004167 | 2024-04-22 13:00:00 |    0 | 249 | 14.5 | 9.4 | 317 | 41.66056 |  330 | ZARAGOZA AEROPUERTO | 986.6 |  22 |   1.4 | 20.6 |    1016.4 |  15.4 | 16.0 |  16.2 | -5.7 |    10 |   60 |   22.6 |      0 |    18.2 |
-| 9434  | -1.004167 | 2024-04-22 14:00:00 |    0 | 249 | 16.6 | 9.9 | 325 | 41.66056 |  315 | ZARAGOZA AEROPUERTO | 986.2 |  22 |   2.0 | 21.3 |    1015.9 |  15.8 | 16.2 |  16.5 | -5.7 |    11 |   60 |   23.5 |      0 |    18.5 |
-| 9434  | -1.004167 | 2024-04-22 15:00:00 |    0 | 249 | 15.9 | 8.7 | 332 | 41.66056 |  318 | ZARAGOZA AEROPUERTO | 985.8 |  22 |   1.8 | 20.4 |    1015.6 |  15.9 | 15.9 |  16.5 | -5.7 |    13 |   60 |   23.8 |      0 |    18.9 |
+| 9434  | -1.004167 | 2024-06-19 21:00:00 |    0 | 249 | 14.6 | 7.5 | 317 | 41.66056 |  318 | ZARAGOZA AEROPUERTO | 984.2 |  48 |   2.3 | 24.8 |    1013.0 |  23.9 | 23.9 |  26.4 | 12.2 |    14 |    0 |   34.0 |      0 |    33.9 |
+| 9434  | -1.004167 | 2024-06-19 22:00:00 |    0 | 249 | 14.1 | 8.8 | 307 | 41.66056 |  318 | ZARAGOZA AEROPUERTO | 984.3 |  61 |   1.1 | 21.6 |    1013.4 |  20.6 | 20.7 |  23.9 | 13.0 |     9 |    0 |   32.9 |      0 |    33.7 |
+| 9434  | -1.004167 | 2024-06-19 23:00:00 |    0 | 249 | 14.5 | 7.3 | 300 | 41.66056 |  293 | ZARAGOZA AEROPUERTO | 985.3 |  58 |   1.4 | 21.0 |    1014.5 |  20.2 | 20.3 |  20.7 | 11.8 |     9 |    0 |   31.9 |      0 |    33.4 |
+| 9434  | -1.004167 | 2024-06-20 00:00:00 |    0 | 249 |  9.4 | 3.9 | 316 | 41.66056 |  293 | ZARAGOZA AEROPUERTO | 984.9 |  60 |   0.8 | 19.6 |    1014.2 |  19.4 | 19.4 |  20.4 | 11.4 |    10 |    0 |   31.1 |      0 |    33.0 |
+| 9434  | -1.004167 | 2024-06-20 01:00:00 |    0 | 249 |  8.4 | 5.9 | 310 | 41.66056 |  295 | ZARAGOZA AEROPUERTO | 984.8 |  60 |   0.8 | 19.5 |    1014.1 |  19.0 | 19.0 |  19.4 | 11.1 |     7 |    0 |   30.3 |      0 |    32.6 |
+| 9434  | -1.004167 | 2024-06-20 02:00:00 |    0 | 249 |  8.4 | 6.1 | 309 | 41.66056 |  323 | ZARAGOZA AEROPUERTO | 984.3 |  61 |   0.9 | 19.9 |    1013.6 |  18.6 | 18.7 |  19.1 | 11.0 |     7 |    0 |   29.7 |      0 |    32.2 |
 
 ``` r
 
 ## Get daily/annual climatology values for a station
-data_daily <- aemet_daily_clim(station, start = "2022-01-01", end = "2022-12-31")
+data_daily <- aemet_daily_clim(station, start = "2022-01-01", end = "2022-06-30")
 
 knitr::kable(head(data_daily))
 ```

codemeta.json

@@ -14,7 +14,7 @@
     "name": "R",
     "url": "https://r-project.org"
   },
-  "runtimePlatform": "R version 4.3.3 (2024-02-29 ucrt)",
+  "runtimePlatform": "R version 4.4.0 (2024-04-24)",
   "provider": {
     "@id": "https://cran.r-project.org",
     "@type": "Organization",
@@ -301,7 +301,7 @@
   },
   "applicationCategory": "Meteorology",
   "isPartOf": "https://ropenspain.es/",
-  "fileSize": "772.362KB",
+  "fileSize": "776.122KB",
   "citation": [
     {
       "@type": "SoftwareSourceCode",

data-raw/aemet_munic.R

@@ -3,7 +3,13 @@
 
 library(readxl)
 library(dplyr)
-munis <- read_excel("data-raw/20codmun.xlsx",
+
+download.file(
+  "https://www.ine.es/daco/daco42/codmun/diccionario24.xlsx",
+  "data-raw/diccionario24.xlsx"
+)
+
+munis <- read_excel("data-raw/diccionario24.xlsx",
   skip = 1
 )
 
@@ -21,6 +27,8 @@ selected <- master_mapspain %>%
   ) %>%
   distinct_all()
 
+prev <- climaemet::aemet_munic
+
 # Build final name
 aemet_munic <- munis %>%
   left_join(selected) %>%
@@ -33,4 +41,7 @@ aemet_munic <- munis %>%
   arrange(municipio)
 
 
+identical(names(prev), names(aemet_munic))
+
+
 usethis::use_data(aemet_munic, overwrite = TRUE)

data-raw/diccionario24.xlsx

@@ -42,7 +42,7 @@
         "name": "Comprehensive R Archive Network (CRAN)",
         "url": "https://cran.r-project.org"
       },
-      "runtimePlatform": "R version 4.3.3 (2024-02-29 ucrt)",
+      "runtimePlatform": "R version 4.4.0 (2024-04-24)",
       "version": "1.2.1.9000"
     },
     {

data/aemet_munic.rda

@@ -35,7 +35,7 @@ Once that you have your API Key, you can use any of the following methods:
 This is the recommended option. Just type:
 
 
-```r
+``` r
 aemet_api_key("YOUR_API_KEY", install = TRUE)
 ```
 
@@ -49,7 +49,7 @@ This is a temporary alternative. You can set your API key as an environment
 variable
 
 
-```r
+``` r
 Sys.setenv(AEMET_API_KEY = "YOUR_API_KEY")
 ```
 
@@ -83,27 +83,27 @@ numbers are parsed as double, etc.).
 See how a `tibble` is displayed:
 
 
-```r
+``` r
 # See a tibble in action
 
 aemet_last_obs("9434")
-#> # A tibble: 24 × 25
-#>    idema   lon fint                 prec   alt  vmax    vv    dv   lat  dmax
-#>    <chr> <dbl> <dttm>              <dbl> <dbl> <dbl> <dbl> <dbl> <dbl> <dbl>
-#>  1 9434  -1.00 2024-04-22 10:00:00     0   249  16.1   9.8   325  41.7   310
-#>  2 9434  -1.00 2024-04-22 11:00:00     0   249  15.1   8.3   322  41.7   323
-#>  3 9434  -1.00 2024-04-22 12:00:00     0   249  13.5   7.8   335  41.7   318
-#>  4 9434  -1.00 2024-04-22 13:00:00     0   249  14.5   9.4   317  41.7   330
-#>  5 9434  -1.00 2024-04-22 14:00:00     0   249  16.6   9.9   325  41.7   315
-#>  6 9434  -1.00 2024-04-22 15:00:00     0   249  15.9   8.7   332  41.7   318
-#>  7 9434  -1.00 2024-04-22 16:00:00     0   249  16.4   8.8   328  41.7   328
-#>  8 9434  -1.00 2024-04-22 17:00:00     0   249  16.8  10.5   327  41.7   325
-#>  9 9434  -1.00 2024-04-22 18:00:00     0   249  18.5  12.1   321  41.7   318
-#> 10 9434  -1.00 2024-04-22 19:00:00     0   249  19.5  10.2   318  41.7   315
-#> # ℹ 14 more rows
-#> # ℹ 15 more variables: ubi <chr>, pres <dbl>, hr <dbl>, stdvv <dbl>, ts <dbl>,
-#> #   pres_nmar <dbl>, tamin <dbl>, ta <dbl>, tamax <dbl>, tpr <dbl>,
-#> #   stddv <dbl>, inso <dbl>, tss5cm <dbl>, pacutp <dbl>, tss20cm <dbl>
+#> # A tibble: 13 × 25
+#>    idema   lon fint                 prec   alt  vmax    vv    dv   lat  dmax ubi    pres    hr stdvv    ts pres_nmar tamin    ta
+#>    <chr> <dbl> <dttm>              <dbl> <dbl> <dbl> <dbl> <dbl> <dbl> <dbl> <chr> <dbl> <dbl> <dbl> <dbl>     <dbl> <dbl> <dbl>
+#>  1 9434  -1.00 2024-06-19 21:00:00     0   249  14.6   7.5   317  41.7   318 ZARA…  984.    48   2.3  24.8     1013   23.9  23.9
+#>  2 9434  -1.00 2024-06-19 22:00:00     0   249  14.1   8.8   307  41.7   318 ZARA…  984.    61   1.1  21.6     1013.  20.6  20.7
+#>  3 9434  -1.00 2024-06-19 23:00:00     0   249  14.5   7.3   300  41.7   293 ZARA…  985.    58   1.4  21       1014.  20.2  20.3
+#>  4 9434  -1.00 2024-06-20 00:00:00     0   249   9.4   3.9   316  41.7   293 ZARA…  985.    60   0.8  19.6     1014.  19.4  19.4
+#>  5 9434  -1.00 2024-06-20 01:00:00     0   249   8.4   5.9   310  41.7   295 ZARA…  985.    60   0.8  19.5     1014.  19    19  
+#>  6 9434  -1.00 2024-06-20 02:00:00     0   249   8.4   6.1   309  41.7   323 ZARA…  984.    61   0.9  19.9     1014.  18.6  18.7
+#>  7 9434  -1.00 2024-06-20 03:00:00     0   249  10     7.7   298  41.7   298 ZARA…  984.    63   0.8  19.9     1014.  18.4  18.8
+#>  8 9434  -1.00 2024-06-20 04:00:00     0   249  10.4   7.2   304  41.7   325 ZARA…  984     70   1.3  18.8     1013.  17.8  17.9
+#>  9 9434  -1.00 2024-06-20 05:00:00     0   249   9.7   6.5   301  41.7   313 ZARA…  985.    70   1.2  18.6     1014.  17.8  17.8
+#> 10 9434  -1.00 2024-06-20 06:00:00     4   249   9.2   4.5   304  41.7   305 ZARA…  985.    81   0.8  17.8     1015.  16.7  17.3
+#> 11 9434  -1.00 2024-06-20 07:00:00     0   249   9.8   6.9   291  41.7   280 ZARA…  985.    76   1.2  20.8     1015.  17.3  18.2
+#> 12 9434  -1.00 2024-06-20 08:00:00     0   249  11     5.1   313  41.7   308 ZARA…  986.    68   0.9  23.8     1015   18.1  19.2
+#> 13 9434  -1.00 2024-06-20 09:00:00     0   249   7.9   4.9   320  41.7   308 ZARA…  986.    65   0.8  25.9     1016.  19.2  20.1
+#> # ℹ 7 more variables: tamax <dbl>, tpr <dbl>, stddv <dbl>, inso <dbl>, tss5cm <dbl>, pacutp <dbl>, tss20cm <dbl>
 ```
 
 Note that when possible, data representing dates and numbers are converted to
@@ -117,7 +117,7 @@ spatial **sf** format, using `return_sf = TRUE`. The coordinate reference system
 (WGS)** and return coordinates in latitude/longitude (unprojected coordinates):
 
 
-```r
+``` r
 # You would need to install `sf` if not installed yet
 # run install.packages("sf") for installation