Skip to content

Commit

Permalink
- fix #12
Browse files Browse the repository at this point in the history
  • Loading branch information
MaelTheuliere committed Sep 3, 2019
1 parent 02912d3 commit cb2d0c4
Show file tree
Hide file tree
Showing 14 changed files with 39 additions and 9 deletions.
4 changes: 4 additions & 0 deletions R/data.R
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@
#' \describe{
#' \item{DEPCOM}{Code Insee}
#' \item{geometry}{géométrie}
#' \item{AREA}{Aire de la commune}
#' }
"communes_geo"

Expand All @@ -233,6 +234,7 @@
#' \describe{
#' \item{EPCI}{Code Sirene}
#' \item{geometry}{géométrie}
#' \item{AREA}{Aire de l'EPCI}
#' }
"epci_geo"

Expand All @@ -244,6 +246,7 @@
#' \describe{
#' \item{DEP}{Code Insee}
#' \item{geometry}{géométrie}
#' \item{AREA}{Aire du département}
#' }
"departements_geo"

Expand All @@ -255,5 +258,6 @@
#' \describe{
#' \item{REG}{Code Insee}
#' \item{geometry}{géométrie}
#' \item{AREA}{Aire de la région}
#' }
"regions_geo"
36 changes: 27 additions & 9 deletions data-raw/admin-express_2019.R
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ communes_geo <- bind_rows(com_metro, com_971, com_972, com_973, com_974, com_976
select(DEPCOM=INSEE_COM, geometry)%>%
st_as_sf()%>%
st_set_crs(2154)

rm(i, origine_metro, doms, dom, com_dom, com_metro, com_971, com_972, com_973, com_974, com_976, ctrd_com_dom, bbox_dom, ctrd_dom, alpha, url_admin_express)

# gestion des arrondissements de Paris, Lyon, Marseille dorénavant intégré à admin express
Expand All @@ -57,17 +58,34 @@ communes_geo<-communes_geo %>%
left_join(table_passage_com_historique) %>%
select(-DEPCOM_HIST) %>%
group_by(DEPCOM) %>%
summarise(do_union=T)
summarise(do_union=T) %>%
mutate(AREA=st_area(geometry))

epci_geo <- filter(communes_info_supra, NOM_EPCI != "Sans objet")%>%
inner_join(communes_geo, ., by="DEPCOM") %>%
select(EPCI) %>% group_by(EPCI) %>% summarise(do_union=T) %>% ungroup()

departements_geo <- inner_join(communes_geo, communes_info_supra, by="DEPCOM") %>%
select(DEP) %>% group_by(DEP) %>% summarise(do_union=T) %>% ungroup()

regions_geo <- inner_join(communes_geo, communes_info_supra, by="DEPCOM")%>%
select(REG) %>% group_by(REG) %>% summarise(do_union=T) %>% ungroup()
inner_join(communes_geo %>% select(DEPCOM), ., by="DEPCOM") %>%
select(EPCI) %>%
group_by(EPCI) %>%
summarise(do_union=T) %>%
ungroup() %>%
mutate(AREA=st_area(geometry))

departements_geo <- inner_join(communes_geo %>% select(DEPCOM),
communes_info_supra,
by = "DEPCOM") %>%
select(DEP) %>%
group_by(DEP) %>%
summarise(do_union=T) %>%
ungroup() %>%
mutate(AREA=st_area(geometry))

regions_geo <- inner_join(communes_geo %>% select(DEPCOM),
communes_info_supra,
by = "DEPCOM") %>%
select(REG) %>%
group_by(REG) %>%
summarise(do_union = T) %>%
ungroup() %>%
mutate(AREA=st_area(geometry))

# sauvegarde des données --------------------------------------------------------
use_data(communes_geo,internal=F, overwrite = T)
Expand Down
Binary file modified data/communes_geo.rda
Binary file not shown.
Binary file modified data/departements_geo.rda
Binary file not shown.
Binary file modified data/epci_geo.rda
Binary file not shown.
Binary file modified data/regions_geo.rda
Binary file not shown.
1 change: 1 addition & 0 deletions docs/reference/communes_geo.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions docs/reference/departements_geo.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions docs/reference/epci_geo.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions docs/reference/regions_geo.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions man/communes_geo.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions man/departements_geo.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions man/epci_geo.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions man/regions_geo.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit cb2d0c4

Please sign in to comment.