Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Maj package #182

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: diades.atlas
Title: The Diades Atlas Shiny App
Version: 0.3.2
Version: 0.3.3
Authors@R: c(
person("Sébastien", "Rochette", , "[email protected]", role = c("cre", "aut"),
comment = c(ORCID = "0000-0002-1565-9313")),
Expand Down Expand Up @@ -71,4 +71,4 @@ Remotes:
thinkr-open/w3css
Encoding: UTF-8
LazyData: true
RoxygenNote: 7.2.3
RoxygenNote: 7.3.2
6 changes: 6 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# diades.atlas 0.3.3

* Upgrade R version in renv.lock
* Upgrade R package version
* Fix bad request in page 1

# diades.atlas 0.3.2

* Upgrade R version in renv.lock
Expand Down
2 changes: 1 addition & 1 deletion R/mod_a_first_fct_map.R
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ tm_catchmment <- function(dataContinent) {
tm_shape(dataContinent) +
tm_polygons(
"abundance_interpretation",
title = "Status in river catchments (1951-2010)" %>% with_i18("status_in_river_catchments") %>% as.character(),
title = "Status in river catchments" %>% with_i18("status_in_river_catchments") %>% as.character(),
# "<span data-i18n='status_in_river_catchments'>Status in river catchments (1951-2010)</span>",
palette = c("#FEE0D2", "#FCBBA1", "#A50F15", "#67000D"),
n = 4,
Expand Down
4 changes: 3 additions & 1 deletion R/mod_c_third_fct_query_and_plot.R
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@ get_bv_geoms <- function(bv_ids,
get_con(session),
query = sprintf(
"select basin_id, verysimplified_geom from basin_outlet where basin_id IN %s",
dbplyr::translate_sql(!!bv_ids)
dbplyr::translate_sql(
con = get_con(session),
!!bv_ids)
)
)
basin <- tbl(get_con(session), "basin") %>%
Expand Down
10 changes: 7 additions & 3 deletions data-raw/bd-page3-climate-change.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ title: "bd-page3-climate-change"
output: rmarkdown::html_vignette
vignette: >
%\VignetteIndexEntry{bd-page3-climate-change}
%\VignetteEngine{knitr::rmarkdown}
%\VignetteEncoding{UTF-8}
%\VignetteEngine{knitr::rmarkdown}
editor_options:
chunk_output_type: console
---

```{r, include = FALSE}
Expand Down Expand Up @@ -73,7 +75,7 @@ datasets <- generate_datasets(
)
)

species_id <- datasets$species_list[datasets$species_list[["latin_name"]] == "alosa-fallax", "species_id"]
species_id <- datasets$species_list[datasets$species_list[["latin_name"]] == "Alosa fallax", "species_id"]

scenario <- "rcp85"
date <- c(1970, 2010)
Expand Down Expand Up @@ -106,7 +108,9 @@ get_bv_geoms <- function(bv_ids,
get_con(session),
query = sprintf(
"select basin_id, verysimplified_geom, ccm_name from basin_outlet where basin_id IN %s",
dbplyr::translate_sql(!!bv_ids)
dbplyr::translate_sql(
con = get_con(session),
!!bv_ids)
)
)
basin <- tbl(get_con(session), "basin") %>%
Expand Down
Loading
Loading