Skip to content
Snippets Groups Projects
Commit a59476ac authored by Daniel.Kalioudjoglou's avatar Daniel.Kalioudjoglou
Browse files

Merge branch '59-controle-des-dates-et-du-skeleton' into 'dev'

Resolve "controle des dates et du skeleton"

Closes #59

See merge request dreal-datalab/propre.artificialisation!57
parents a2649f0d aa6a25b4
Branches
No related tags found
2 merge requests!65maj_avant_transfert_vers_gitlabforge,!57Resolve "controle des dates et du skeleton"
Pipeline #185451 passed
Showing
with 2 additions and 3 deletions
......@@ -89,7 +89,7 @@ creer_carte_2_2 <- function(millesime_obs_artif) {
# ggplot2::scale_size_area(name="")+
ggplot2::scale_size_continuous(range = c(0, 20), labels = function(x) mapfactory::format_fr(x, dec = 0)) +
ggplot2::labs(
title = glue::glue("Nouvelles surfaces consomm\u00e9es entre {millesime_debut} et {millesime_fin} (10 ans)"),
title = glue::glue("Nouvelles surfaces consomm\u00e9es entre le 1/1/{millesime_debut} et le 1/1/{millesime_obs_artif}"),
subtitle = "",
y = "",
x = "",
......
......@@ -104,7 +104,7 @@ creer_graphe_3_1 <- function(millesime_stock_artif = NULL,
expand = c(0,0)
) +
ggplot2::labs(
title = "Taux de croissance compar\u00e9s des <span style = \'color:#FF8D7E\'>cadastr\u00e9es consomm\u00e9es</span> <br>et de la <span style = \'color:#5770BE\'>population municipale</span>",
title = "Taux de croissance compar\u00e9s des surfaces <span style = \'color:#FF8D7E\'>cadastr\u00e9es consomm\u00e9es</span> <br>et de la <span style = \'color:#5770BE\'>population municipale</span>",
subtitle = glue::glue("Entre {millesime_debut} et {millesime_stock_artif} (en %)"),
caption = glue::glue("Source : Cerema Fichiers fonciers / Insee RP {millesime_population}"),
x = NULL, y = NULL
......
......@@ -46,7 +46,6 @@ creer_graphe_5_1 <- function(millesime_stock_artif,code_reg) {
.data$date %in% c(millesime_stock_artif,millesime_reference)) %>%
dplyr::select(.data$TypeZone,.data$Zone,.data$CodeZone,.data$date,.data$surface_artificialisee) %>%
dplyr::mutate(surface_artificialisee = .data$surface_artificialisee / 10000) %>%
dplyr::mutate(date = dplyr::case_when(
.data$date == millesime_reference ~ "stock_mill_debut",
.data$date == millesime_stock_artif ~ "stock_mill_fin",
......
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment