Skip to content

Commit

Permalink
fix #89 and some other problems
Browse files Browse the repository at this point in the history
  • Loading branch information
agricolamz committed Jul 29, 2024
1 parent addf7a3 commit aea0277
Show file tree
Hide file tree
Showing 12 changed files with 2,717 additions and 27 deletions.
5 changes: 2 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: lingtypology
Type: Package
Title: Linguistic Typology and Mapping
Version: 1.1.17
Version: 1.1.18
Depends: R (>= 3.5.0)
Imports:
leaflet,
Expand Down Expand Up @@ -31,13 +31,12 @@ License: GPL (>= 2)
URL: https://CRAN.R-project.org/package=lingtypology, https://github.com/ropensci/lingtypology/, https://ropensci.github.io/lingtypology/
BugReports: https://github.com/ropensci/lingtypology/issues
LazyData: TRUE
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
Encoding: UTF-8
Suggests:
knitr,
rmarkdown,
testthat,
covr,
MASS,
sp,
sf,
Expand Down
3 changes: 3 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
lingtypology 1.1.18
- update `wals` dataset after Michael Cysouw's comment #89

lingtypology 1.1.17
- update Glottolog to v. 5.0

Expand Down
2 changes: 1 addition & 1 deletion R/wals.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#'
#' Language identifiers from WALS (\url{https://wals.info/}). This dataset is created for \code{\link{wals.feature}} function.
#'
#' @format A data frame with 2950 rows and 2 variables:
#' @format A data frame with 2678 rows and 2 variables:
#' \describe{
#' \item{wals.code}{WALS language identifier}
#' \item{glottocode}{Glottocode}
Expand Down
Binary file modified data/wals.RData
Binary file not shown.
1 change: 0 additions & 1 deletion database_creation/.~lock.data_countries_altern_codes.tsv#

This file was deleted.

10 changes: 10 additions & 0 deletions database_creation/glottolog_database_creation_v3.R
Original file line number Diff line number Diff line change
Expand Up @@ -148,3 +148,13 @@ setwd("/home/agricolamz/work/packages/lingtypology/database_creation")
countries <- read_csv("country.data.csv")
setwd("/home/agricolamz/work/packages/lingtypology/data/")
save(countries, file="countries.RData", compress='xz')


# wals --------------------------------------------------------------------
setwd("/home/agricolamz/work/packages/lingtypology/database_creation")
wals <- read_csv("wals.csv")
setwd("/home/agricolamz/work/packages/lingtypology/data/")
save(wals, file="wals.RData", compress='xz')



Loading

0 comments on commit aea0277

Please sign in to comment.