Skip to content

Commit 446b70c

Browse files
committed
adjust lees_data
Merge branch 'dev_2025' of https://github.com/RCinbo/EU_rapportage_habitats into dev_2025 # Conflicts: # source/R/lees_data.R
2 parents 98c9ade + 22d38f1 commit 446b70c

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

source/R/lees_data.R

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,13 @@ source(file.path(projroot,'source/R/vertalingen.R'))
1818
conflicted::conflicts_prefer(dplyr::filter)
1919

2020
update_fiche_data <- TRUE
21+
<<<<<<< HEAD
2122
update_habitatkwaliteit_data <- FALSE
2223
update_data_opp <- FALSE
24+
=======
25+
update_habitatkwaliteit_data <- TRUE
26+
update_data_opp <- TRUE
27+
>>>>>>> 22d38f1498d609d4ff4dcc87f60363303a69197b
2328

2429
######################################
2530
## Indien alle data al gegenereerd is
@@ -382,10 +387,15 @@ if (update_habitatkwaliteit_data) {
382387
# "Ruimtelijke samenhang (niveau VL)")) %>%
383388
# mutate(Toestand = ifelse(is.na(Toestand), "n.v.t.", Toestand))
384389
#
390+
<<<<<<< HEAD
385391
#
386392
}
387393

388394
if (update_data_opp) {
395+
=======
396+
}
397+
if (update_data_opp){
398+
>>>>>>> 22d38f1498d609d4ff4dcc87f60363303a69197b
389399
#------------------data oppervlaktes voor bar charts---------------------------#
390400
#------------------------------2025--------------------------------------------#
391401
google_id_opp <- "18tmnZ8Ze1K1fx9Yykn3JQ6d25eLgaVxPbim7L6-dLNo"

0 commit comments

Comments
 (0)