From 7d7f5a7b7db6ee848aa5819b0312f193e3ae7c32 Mon Sep 17 00:00:00 2001
From: David Nortes-Martinez <davidnortes@gmail.com>
Date: Wed, 19 Jan 2022 18:36:36 +0100
Subject: [PATCH] new database gaspar

---
 geau/data-raw/so_ii_scope.R | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/geau/data-raw/so_ii_scope.R b/geau/data-raw/so_ii_scope.R
index 6c286a2..9631b16 100644
--- a/geau/data-raw/so_ii_scope.R
+++ b/geau/data-raw/so_ii_scope.R
@@ -1,6 +1,7 @@
 # code to prepare `so_ii_scope` dataset goes here
 
 so_ii_scope = read.csv2(current_version("data-common/so-ii/scope"), colClasses = "character")[["code"]]
+so_ii_scope = sort(so_ii_scope)
 
 # code to prepare `so_ii_commune` dataset goes here
 
@@ -8,7 +9,8 @@ admin_express = current_version("data-common/data/IGN/ADMIN-EXPRESS/version")
 selection = c("ID", "NOM", "NOM_M", "INSEE_COM", "STATUT", "POPULATION", "SIREN_EPCI")
 so_ii_commune = sf::st_read(file.path(admin_express, "COMMUNE.shp"))[selection]
 names(so_ii_commune) = c("id", "commune", "commune_majuscule", "code", "statut", "pop_2021", "epci", "geometry")
-so_ii_commune = so_ii_commune[so_ii_commune[["code"]] %in% so_ii_scope, ]
+rownames(so_ii_commune) = so_ii_commune[["code"]]
+so_ii_commune = so_ii_commune[so_ii_scope, ]
 
 # code to prepare `so_ii_limit` dataset goes here
 
@@ -28,6 +30,13 @@ so_ii_clc[["color"]] = as.character(
     )
 )
 
+# code to prepare `so_ii_gaspar` dataset goes here
+
+so_ii_gaspar = read.csv2(current_version("data-common/so-ii/gaspar", "catnat_year_n"), header = TRUE, row.names = 1)
+so_ii_gaspar = as.matrix(so_ii_gaspar)
+colnames(so_ii_gaspar) = gsub("^X", "", colnames(so_ii_gaspar))
+so_ii_gaspar = so_ii_gaspar[so_ii_scope, ]
+
 # updating datasets
 
 # actual = setwd(file.path(system.file(package = "geau"), ".."))
@@ -36,4 +45,5 @@ usethis::use_data(so_ii_scope, internal = FALSE, overwrite = TRUE)
 usethis::use_data(so_ii_commune, internal = FALSE, overwrite = TRUE)
 usethis::use_data(so_ii_limit, internal = FALSE, overwrite = TRUE)
 usethis::use_data(so_ii_clc, internal = FALSE, overwrite = TRUE)
+usethis::use_data(so_ii_gaspar, internal = FALSE, overwrite = TRUE)
 setwd(actual)
-- 
GitLab