Skip to content

Commit

Permalink
update Glottolog to v. 5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
agricolamz committed Mar 13, 2024
1 parent 865f535 commit addf7a3
Show file tree
Hide file tree
Showing 59 changed files with 3,107 additions and 2,905 deletions.
4 changes: 2 additions & 2 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.16
Version: 1.1.17
Depends: R (>= 3.5.0)
Imports:
leaflet,
Expand Down Expand Up @@ -31,7 +31,7 @@ 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.0
RoxygenNote: 7.3.1
Encoding: UTF-8
Suggests:
knitr,
Expand Down
13 changes: 8 additions & 5 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
lingtypology 1.1.17
- update Glottolog to v. 5.0

lingtypology 1.1.16
- fix not empty popup display whith minicharts
- fix empty line in multiple warnings in `is.glottolog()`

lingtypology 1.1.15
- update glottolog to v. 4.8
- update Glottolog to v. 4.8

lingtypology 1.1.14
- add `description` and `feature_name` fields to `grambank.feature()`
Expand All @@ -21,7 +24,7 @@ lingtypology 1.1.12
- fast fix of the `wals.feature()` function

lingtypology 1.1.11
- update glottolog to v. 4.7
- update Glottolog to v. 4.7
- remove `rgeos` depndency see [details](https://r-spatial.org//r/2022/04/12/evolution.html)
- correct `contry.lang()`

Expand All @@ -41,7 +44,7 @@ lingtypology 1.1.9

lingtypology 1.1.8 (12.10.2021)
- fix `country.lang()` functions, close #70
- update glottolog to v. 4.5
- update Glottolog to v. 4.5
- add the `level.lang()` function

lingtypology 1.1.6 (12.10.2021)
Expand All @@ -58,12 +61,12 @@ lingtypology 1.1.5 (15.05.2021)
- change glottolog v. 4.3 to v. 4.4

lingtypology 1.1.4 (02.10.2020)
- change glottolog v. 4.2 to v. 4.3
- change Glottolog v. 4.2 to v. 4.3
- change `control` argument behaviour of the "map.feature()" function; now it is possible to specify independent variable to appear/disappear.

lingtypology 1.1.3 (26.04.2020)
- add "point.cluster" argument into the "map.feature()" function
- change glottolog v. 4.1 to v. 4.2
- change Glottolog v. 4.1 to v. 4.2

lingtypology 1.1.2 (29.02.2020)
- correct the sails.feature() function
Expand Down
4 changes: 2 additions & 2 deletions R/area.lang.R
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#' @author George Moroz <[email protected]>
#' @seealso \code{\link{aff.lang}}, \code{\link{country.lang}}, \code{\link{gltc.lang}}, \code{\link{iso.lang}}, \code{\link{lat.lang}}, \code{\link{long.lang}}, \code{\link{subc.lang}}, \code{\link{url.lang}}
#' @examples
#' area.lang('Adyghe')
#' area.lang(c('Adyghe', 'Aduge'))
#' area.lang('Kabardian')
#' area.lang(c('Kabardian', 'Aduge'))
#' @export

area.lang <- function(x) {
Expand Down
2 changes: 1 addition & 1 deletion R/circassian.R
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#' \item{village}{name of the village}
#' \item{district}{names of the subjects of the Russian Federation: kbr --- Kabardino--Balkar Republic, kch --- Karachay--Cherkess Republic, kk --- Krasnodar Krai, ra --- Republic of Adygea, stv --- Stavropol Krai}
#' \item{dialect}{names of the Circassian dialects}
#' \item{language}{according standard Circassian devision there are Adyghe and Kabardian languages}
#' \item{language}{according standard Circassian devision there are West Circassian and Kabardian languages}
#' }
#'

Expand Down
12 changes: 6 additions & 6 deletions R/glottolog.R
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
#' involving genealogical affiliation, macro-area, country, iso code,
#' and coordinates.
#'
#' Hammarstr{\"o}m, Harald and Forkel, Robert and Haspelmath, Martin and Bank, Sebastian. 2023.
#' Glottolog 4.8.
#' Hammarstrom, Harald and Forkel, Robert and Haspelmath, Martin and Bank, Sebastian. 2023.
#' Glottolog 5.0.
#' Leipzig: Max Planck Institute for Evolutionary Anthropology.
#' https://doi.org/10.5281/zenodo.6578297
#' (Available online at http://glottolog.org, Accessed on 2023-07-13.)
#' https://doi.org/10.5281/zenodo.10804357
#' (Available online at http://glottolog.org, Accessed on 2024-03-12.)
#'
#' @format A data frame with 26669 rows and 10 variables:
#' @format A data frame with 26879 rows and 10 variables:
#' \describe{
#' \item{glottocode}{languoid code from Glottolog 4.8}
#' \item{glottocode}{languoid code from Glottolog 5.0}
#' \item{language}{name of the language}
#' \item{iso}{code based on ISO 639--3 \url{https://iso639-3.sil.org/}}
#' \item{level}{languoid type: dialect or language (possible values are dialect, language, family, bookkeeping, pseudo family, sign language, unclassifiable, pidgin, unattested, artificial language, speech register, mixed language)}
Expand Down
4 changes: 2 additions & 2 deletions R/gltc.lang.R
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#' @author George Moroz <[email protected]>
#' @seealso \code{\link{aff.lang}}, \code{\link{area.lang}}, \code{\link{country.lang}}, \code{\link{iso.lang}}, \code{\link{lat.lang}}, \code{\link{long.lang}}, \code{\link{subc.lang}}, \code{\link{url.lang}}
#' @examples
#' gltc.lang('Adyghe')
#' gltc.lang(c('Adyghe', 'Udi'))
#' gltc.lang('Kabardian')
#' gltc.lang(c('Kabardian', 'Udi'))
#' @export

gltc.lang <- function(x) {
Expand Down
7 changes: 4 additions & 3 deletions R/is.glottolog.R
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,17 @@
#' @param response logical. If TRUE, when language is absent, return warnings with a possible candidates.
#' @author George Moroz <[email protected]>
#' @examples
#' is.glottolog(c('Adyghe', 'Russian'))
#' is.glottolog(c('Kabardian', 'Russian'))
#' is.glottolog('Buyaka')
#'
#' \dontrun{
#' # Add warning message with sugestions
#' is.glottolog(c('Adyge', 'Russian'), response = TRUE)
#' # > FALSE TRUE
#' # Warning message:
#' # In is.glottolog(c('Adyge', 'Russian'), response = TRUE) :
#' # Language Adyge is absent in our version of the Glottolog database. Did you mean Aduge, Adyghe?
#' # In is.glottolog(c('Kabardia', 'Russian'), response = TRUE) :
#' # Language Kabardia is absent in our version of the Glottolog database.
#' # Did you mean Kabardian, Greater Kabardian?
#' }
#' @export
#' @importFrom stringdist stringdist
Expand Down
4 changes: 2 additions & 2 deletions R/iso.lang.R
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#' @author George Moroz <[email protected]>
#' @seealso \code{\link{aff.lang}}, \code{\link{area.lang}}, \code{\link{country.lang}}, \code{\link{gltc.lang}}, \code{\link{lat.lang}}, \code{\link{long.lang}}, \code{\link{subc.lang}}, \code{\link{url.lang}}
#' @examples
#' iso.lang('Adyghe')
#' iso.lang(c('Adyghe', 'Udi'))
#' iso.lang('Kabardian')
#' iso.lang(c('Kabardian', 'Udi'))
#' @export

iso.lang <- function(x) {
Expand Down
8 changes: 4 additions & 4 deletions R/lat.lang.R
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
#' @author George Moroz <[email protected]>
#' @seealso \code{\link{aff.lang}}, \code{\link{area.lang}}, \code{\link{country.lang}}, \code{\link{gltc.lang}}, \code{\link{iso.lang}}, \code{\link{long.lang}}, \code{\link{subc.lang}}, \code{\link{url.lang}}
#' @examples
#' lat.lang('Adyghe')
#' long.lang('Adyghe')
#' lat.lang(c('Adyghe', 'Russian'))
#' long.lang(c('Adyghe', 'Russian'))
#' lat.lang('Kabardian')
#' long.lang('Kabardian')
#' lat.lang(c('Kabardian', 'Russian'))
#' long.lang(c('Kabardian', 'Russian'))
#' @export

lat.lang <- function(x) {
Expand Down
10 changes: 5 additions & 5 deletions R/long.lang.R
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
#' @author George Moroz <[email protected]>
#' @seealso \code{\link{aff.lang}}, \code{\link{area.lang}}, \code{\link{country.lang}}, \code{\link{gltc.lang}}, \code{\link{iso.lang}}, \code{\link{lat.lang}}, \code{\link{subc.lang}}, \code{\link{url.lang}}
#' @examples
#' lat.lang('Adyghe')
#' long.lang('Adyghe')
#' lat.lang(c('Adyghe', 'Russian'))
#' long.lang(c('Adyghe', 'Russian'))
#' long.lang(c('Adyghe', 'Aleut'), map.orientation = "Pacific")
#' lat.lang('Kabardian')
#' long.lang('Kabardian')
#' lat.lang(c('Kabardian', 'Russian'))
#' long.lang(c('Kabardian', 'Russian'))
#' long.lang(c('Kabardian', 'Aleut'), map.orientation = "Pacific")
#' @export

long.lang <- function(x,
Expand Down
2 changes: 1 addition & 1 deletion R/map.feature.R
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
#' @param radius deprecated argument
#' @author George Moroz <[email protected]>
#' @examples
#' map.feature(c("Adyghe", "Russian"))
#' map.feature(c("Kabardian", "Russian"))
#'
#' @export
#' @importFrom leaflet colorNumeric
Expand Down
2 changes: 1 addition & 1 deletion R/url.lang.R
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#' @seealso \code{\link{aff.lang}}, \code{\link{area.lang}}, \code{\link{country.lang}}, \code{\link{gltc.lang}}, \code{\link{iso.lang}}, \code{\link{lat.lang}}, \code{\link{long.lang}}, \code{\link{subc.lang}}
#' @examples
#' url.lang('Korean')
#' url.lang(c('Gangou', 'Hachijo', 'Adyghe', 'Ganai'))
#' url.lang(c('Gangou', 'Hachijo', 'West Circassian', 'Ganai'))
#' @export

url.lang <- function(x,
Expand Down
2 changes: 1 addition & 1 deletion R/zzz.r
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@

.onAttach <- function(libname = find.package("lingtypology"),
pkgname = "lingtypology") {
packageStartupMessage("Based on the Glottolog v. 4.8")
packageStartupMessage("Based on the Glottolog v. 5.0")
}
Binary file modified data/circassian.RData
Binary file not shown.
Binary file modified data/glottolog.RData
Binary file not shown.
110 changes: 55 additions & 55 deletions database_creation/circassian.csv
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
latitude,longitude,village,district,dialect,language
45.18333,39.66667,Khatukay,ra,Temirgoy,Adyghe
45.18333,39.66667,Khatukay,ra,Temirgoy,West Circassian
43.0925184,43.5220851,Psygansu,kbr,Baksan,Kabardian
43.2177484,43.7380201,Verkhny Lesken,kbr,Baksan,Kabardian
43.2602459,43.6537882,Zhemtala,kbr,Baksan,Kabardian
Expand Down Expand Up @@ -72,9 +72,9 @@ latitude,longitude,village,district,dialect,language
43.7999498,43.3276187,Malka,kbr,Malkin,Kabardian
43.8022258,43.1460561,Sovkhoznoe,kbr,Baksan,Kabardian
43.8034456,43.7706143,Karagach,kbr,Baksan,Kabardian
43.822786,39.500981,Malyy Kichmay,kk,Xakuch,Adyghe
43.822786,39.500981,Malyy Kichmay,kk,Xakuch,West Circassian
43.8229374,43.1114348,Dzhenal,kbr,Baksan,Kabardian
43.833917,39.508069,Bolshoy Kichmay,kk,Xakuch,Adyghe
43.833917,39.508069,Bolshoy Kichmay,kk,Xakuch,West Circassian
43.835631,43.1531165,Zalukodes,kbr,Baksan,Kabardian
43.8366461,43.6079187,Psykhurey,kbr,Baksan,Kabardian
43.8416125,43.2063942,Zolskoye,kbr,Baksan,Kabardian
Expand All @@ -84,76 +84,76 @@ latitude,longitude,village,district,dialect,language
43.8788349,43.1074819,Shordakovo,kbr,Baksan,Kabardian
43.9468945,43.1721222,Etoko,kbr,Malkin,Kabardian
43.959349,41.743847,Zhako,kch,Kuban,Kabardian
43.968217,39.447133,Tkhagapsh,kk,Shapsug,Adyghe
43.968217,39.447133,Tkhagapsh,kk,Shapsug,West Circassian
43.988333,41.738889,Ali-Berdukovskiy,kch,Kuban,Kabardian
44.009389,39.356639,Kalezh,kk,Xakuch,Adyghe
44.009397,39.335326,Khadzhiko,kk,Xakuch,Adyghe
44.00941,39.36232,Lygotkh,kk,Xakuch,Adyghe
44.009389,39.356639,Kalezh,kk,Xakuch,West Circassian
44.009397,39.335326,Khadzhiko,kk,Xakuch,West Circassian
44.00941,39.36232,Lygotkh,kk,Xakuch,West Circassian
44.042366,41.764098,Khabez,kch,Kuban,Kabardian
44.075833,39.3425,Bolshoye Pseushkho,kk,Temirgoy,Adyghe
44.075833,39.3425,Bolshoye Pseushkho,kk,Temirgoy,West Circassian
44.115278,41.828056,Zeyuko,kch,Kuban,Kabardian
44.116389,39.301667,Maloye Pseushkho,kk,Temirgoy,Adyghe
44.116389,39.301667,Maloye Pseushkho,kk,Temirgoy,West Circassian
44.139951,41.853875,Kosh-Khabl',kch,Kuban,Kabardian
44.184722,39.07,Aguy-Shapsug,kk,Shapsug,Adyghe
44.184722,39.07,Aguy-Shapsug,kk,Shapsug,West Circassian
44.1984238,41.6999648,Inzhichishkho,kch,Kuban,Kabardian
44.206622,41.87764,Psauchye-Dakhe,kch,Kuban,Kabardian
44.2125,43.7,Urazhaynoe,kbr,Terek,Kabardian
44.221558,41.899453,Novokhumarinskiy,kch,Kuban,Kabardian
44.246111,41.741389,Besleney,kch,Besleney,Kabardian
44.253272,41.900047,Abazakt,kch,Kuban,Kabardian
44.28361,38.953618,Psebe,kk,Shapsug,Adyghe
44.28361,38.953618,Psebe,kk,Shapsug,West Circassian
44.300777,41.742693,Vako-Zhile,kch,Besleney,Kabardian
44.331111,41.934722,Adyge-Khabl,kch,Kuban,Kabardian
44.350776,41.801334,Baralki,kch,Kuban,Kabardian
44.400833,41.935,Malyy Zelenchuk,kch,Kuban,Kabardian
44.431293,41.763092,Ersakon,kch,Kuban,Kabardian
44.519722,40.710278,Khodz',ra,Kuban,Kabardian
44.631132,40.072682,Zapadnyy,ra,Bzhedukh,Adyghe
44.644722,40.225833,Oktyabrskiy,ra,Bzhedukh,Adyghe
44.631132,40.072682,Zapadnyy,ra,Bzhedukh,West Circassian
44.644722,40.225833,Oktyabrskiy,ra,Bzhedukh,West Circassian
44.821667,40.501667,Blechepsin,ra,Kuban,Kabardian
44.835,39.208056,Psekups,ra,Bzhedukh,Adyghe
44.835,41.38389,Uspenskoye,kk,Temirgoy,Adyghe
44.835,39.208056,Psekups,ra,Bzhedukh,West Circassian
44.835,41.38389,Uspenskoye,kk,Temirgoy,West Circassian
44.839167,41.486111,Kurgokovskiy,kk,Besleney,Kabardian
44.845,39.467778,Assokolay,ra,Bzhedukh,Adyghe
44.845,39.467778,Assokolay,ra,Bzhedukh,West Circassian
44.86152,41.335,Konokovo,kk,Besleney,Kabardian
44.865,38.988056,Natukhay,ra,Shapsug,Adyghe
44.866667,39.283333,Vochepshiy,ra,Bzhedukh,Adyghe
44.87391,39.153554,Chetuk,ra,Bzhedukh,Adyghe
44.874722,39.457778,Krasnoye,ra,Bzhedukh,Adyghe
44.883056,39.383056,Ponezhukay,ra,Bzhedukh,Adyghe
44.883942,39.066682,Shendzhiy,ra,Bzhedukh,Adyghe
44.887778,39.266111,Pchegatlukay,ra,Bzhedukh,Adyghe
44.892527,39.233689,Gatlukay,ra,Bzhedukh,Adyghe
44.865,38.988056,Natukhay,ra,Shapsug,West Circassian
44.866667,39.283333,Vochepshiy,ra,Bzhedukh,West Circassian
44.87391,39.153554,Chetuk,ra,Bzhedukh,West Circassian
44.874722,39.457778,Krasnoye,ra,Bzhedukh,West Circassian
44.883056,39.383056,Ponezhukay,ra,Bzhedukh,West Circassian
44.883942,39.066682,Shendzhiy,ra,Bzhedukh,West Circassian
44.887778,39.266111,Pchegatlukay,ra,Bzhedukh,West Circassian
44.892527,39.233689,Gatlukay,ra,Bzhedukh,West Circassian
44.9,40.483,Koshekhabl,ra,Kuban,Kabardian
44.9025,39.174722,Kazazovo,ra,Bzhedukh,Adyghe
44.905,39.4175,Neshukay,ra,Bzhedukh,Adyghe
44.905,39.275,Novovochepshiy,ra,Bzhedukh,Adyghe
44.915421,39.39023,Kolos,ra,Bzhedukh,Adyghe
44.921111,38.992778,Takhtamukay,ra,Bzhedukh,Adyghe
44.9225,39.382778,Nachereziy,ra,Bzhedukh,Adyghe
44.926111,39.566944,Gabukay,ra,Bzhedukh,Adyghe
44.933889,38.836944,Novobzhegokay,ra,Bzhedukh,Adyghe
44.941667,39.369444,Pshikuykhabl',ra,Bzhedukh,Adyghe
44.946389,39.41,Dzhidzhikhabl',ra,Bzhedukh,Adyghe
44.950833,39.114444,Tugurgoy,ra,Bzhedukh,Adyghe
44.954747,40.317685,Khachemziy,ra,Temirgoy,Adyghe
44.965,39.367778,Tauykhabl',ra,Bzhedukh,Adyghe
44.983056,39.476111,Kunchukokhabl',ra,Bzhedukh,Adyghe
44.987351,38.715489,Panakhes,ra,Shapsug,Adyghe
44.993333,40.311389,Dzherokay,ra,Temirgoy,Adyghe
44.994444,39.0025,Kozet,ra,Bzhedukh,Adyghe
44.9975,40.392222,Egerukhay,ra,Temirgoy,Adyghe
44.999167,38.781944,Afipsip,ra,Shapsug,Adyghe
45.011389,40.217222,Mamkheg,ra,Temirgoy,Adyghe
45.02,40.23,Khakurinokhabl,ra,Abadzex,Adyghe
45.023972,38.936994,Novaya Adygeya,ra,Bzhedukh,Adyghe
45.034167,38.894722,Starobzhegokay,ra,Bzhedukh,Adyghe
45.045278,38.756111,Khashtuk,ra,Shapsug,Adyghe
45.046111,40.183056,Kabekhabl',ra,Temirgoy,Adyghe
45.051111,38.706389,Pseytuk,ra,Shapsug,Adyghe
44.9025,39.174722,Kazazovo,ra,Bzhedukh,West Circassian
44.905,39.4175,Neshukay,ra,Bzhedukh,West Circassian
44.905,39.275,Novovochepshiy,ra,Bzhedukh,West Circassian
44.915421,39.39023,Kolos,ra,Bzhedukh,West Circassian
44.921111,38.992778,Takhtamukay,ra,Bzhedukh,West Circassian
44.9225,39.382778,Nachereziy,ra,Bzhedukh,West Circassian
44.926111,39.566944,Gabukay,ra,Bzhedukh,West Circassian
44.933889,38.836944,Novobzhegokay,ra,Bzhedukh,West Circassian
44.941667,39.369444,Pshikuykhabl',ra,Bzhedukh,West Circassian
44.946389,39.41,Dzhidzhikhabl',ra,Bzhedukh,West Circassian
44.950833,39.114444,Tugurgoy,ra,Bzhedukh,West Circassian
44.954747,40.317685,Khachemziy,ra,Temirgoy,West Circassian
44.965,39.367778,Tauykhabl',ra,Bzhedukh,West Circassian
44.983056,39.476111,Kunchukokhabl',ra,Bzhedukh,West Circassian
44.987351,38.715489,Panakhes,ra,Shapsug,West Circassian
44.993333,40.311389,Dzherokay,ra,Temirgoy,West Circassian
44.994444,39.0025,Kozet,ra,Bzhedukh,West Circassian
44.9975,40.392222,Egerukhay,ra,Temirgoy,West Circassian
44.999167,38.781944,Afipsip,ra,Shapsug,West Circassian
45.011389,40.217222,Mamkheg,ra,Temirgoy,West Circassian
45.02,40.23,Khakurinokhabl,ra,Abadzex,West Circassian
45.023972,38.936994,Novaya Adygeya,ra,Bzhedukh,West Circassian
45.034167,38.894722,Starobzhegokay,ra,Bzhedukh,West Circassian
45.045278,38.756111,Khashtuk,ra,Shapsug,West Circassian
45.046111,40.183056,Kabekhabl',ra,Temirgoy,West Circassian
45.051111,38.706389,Pseytuk,ra,Shapsug,West Circassian
45.054167,39.946389,Ulyap,ra,Besleney,Kabardian
45.065556,40.174167,Pshicho,ra,Temirgoy,Adyghe
45.068889,39.4975,Adamiy,ra,Temirgoy,Adyghe
45.072222,40.188611,Khatazhukay,ra,Temirgoy,Adyghe
45.083889,39.861389,Dzhambichi,ra,Temirgoy,Adyghe
45.092222,40.110278,Pshizov,ra,Temirgoy,Adyghe
45.065556,40.174167,Pshicho,ra,Temirgoy,West Circassian
45.068889,39.4975,Adamiy,ra,Temirgoy,West Circassian
45.072222,40.188611,Khatazhukay,ra,Temirgoy,West Circassian
45.083889,39.861389,Dzhambichi,ra,Temirgoy,West Circassian
45.092222,40.110278,Pshizov,ra,Temirgoy,West Circassian
Loading

0 comments on commit addf7a3

Please sign in to comment.