Skip to content

Commit

Permalink
update to 1.16
Browse files Browse the repository at this point in the history
  • Loading branch information
agricolamz committed Feb 4, 2024
1 parent c36534a commit 865f535
Show file tree
Hide file tree
Showing 40 changed files with 28,209 additions and 675 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
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.2.3
RoxygenNote: 7.3.0
Encoding: UTF-8
Suggests:
knitr,
Expand Down
3 changes: 2 additions & 1 deletion NEWS
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
lingtypology 1.1.16
- fix not empty popup display whith minicharts
- fix empty line in multiple warnings in `is.glottolog()`

lingtypology 1.1.14
lingtypology 1.1.15
- update glottolog to v. 4.8

lingtypology 1.1.14
Expand Down
2 changes: 1 addition & 1 deletion R/frequency_list.feature.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#' Download frequency list
#'
#' This function downloads frequency list from OpenSubtitles2018 (\url{https://opus.nlpl.eu/OpenSubtitles2018.php}). You need the internet connection.
#' This function downloads frequency list from OpenSubtitles2018 (\url{https://opus.nlpl.eu/}). You need the internet connection.
#'
#' @param languages ISO 639-1 language code and some others ('ze_en', 'ze_zh', 'zh_cn', 'zh_tw', 'pt_br'). Possible values: 'af', 'ar', 'bg', 'bn', 'br', 'bs', 'ca', 'cs', 'da', 'de', 'el', 'en', 'eo', 'es', 'et', 'eu', 'fa', 'fi', 'fr', 'gl', 'he', 'hi', 'hr', 'hu', 'hy', 'id', 'is', 'it', 'ja', 'ka', 'kk', 'ko', 'lt', 'lv', 'mk', 'ml', 'ms', 'nl', 'no', 'pl', 'pt', 'pt_br', 'ro', 'ru', 'si', 'sk', 'sl', 'sq', 'sr', 'sv', 'ta', 'te', 'tl', 'tr', 'uk', 'ur', 'vi', 'ze_en', 'ze_zh', 'zh_cn', 'zh_tw'.
#' @param list_type Type of frequency list. Possible values: 'full', '50k', 'ignored'. By default is full.
Expand Down
4 changes: 2 additions & 2 deletions R/is.glottolog.R
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#'
#' \dontrun{
#' # Add warning message with sugestions
#' is.glottolog(c('Adygey', 'Russian'), response = TRUE)
#' is.glottolog(c('Adyge', 'Russian'), response = TRUE)
#' # > FALSE TRUE
#' # Warning message:
#' # In is.glottolog(c('Adyge', 'Russian'), response = TRUE) :
Expand Down Expand Up @@ -68,7 +68,7 @@ is.glottolog <-
" is absent in our version of the",
" Glottolog database. Did you mean ",
candidate,
"?",
"?\n",
sep = ""
),
call. = FALSE
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
`lingtypology` package connects R with the [Glottolog database (v. 4.8)](https://glottolog.org/) and provides additional functionality for linguistic mapping. The Glottolog database contains the catalogue of the world's languages. This package helps researchers to make linguistic maps, using philosophy of [the Cross-Linguistic Linked Data project](https://clld.org/), which uniform access to the data across publications. This package is based on [`leaflet` package](https://rstudio.github.io/leaflet/), so `lingtypology` package is a package for linguistic interactive mapping. You also might be interested in looking into some alternatives to lingtypology:

* [lingtypology](https://pypi.org/project/lingtypology/) in Python by Michael Voronov;
* [glottospace](https://github.com/SietzeN/glottospace) -- R package for the geospatial analysis based on Glottolog by Sietze Norder et al;
* [glottospace](https://github.com/glottospace/glottospace) -- R package for the geospatial analysis based on Glottolog by Sietze Norder et al;
* [`lingtypr`](https://gitlab.com/laurabecker/lingtypr) -- R package which partially intersects with `lingtypology` functionality by Laura Becker;
* [`glottoTrees`](https://github.com/erichround/glottoTrees) -- R package for visualising and modifing glottolog trees by Erich Round

Expand Down
2 changes: 1 addition & 1 deletion docs/index.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ author: "[George Moroz](mailto:[email protected]), [NRU HSE Linguistic Conver
The `lingtypology` package connects R with the [Glottolog database (v. 4.8)](https://glottolog.org/) and provides an additional functionality for linguistic typology. The Glottolog database contains a catalogue of the world's languages. This package helps researchers to make linguistic maps, using the philosophy of [the Cross-Linguistic Linked Data project](https://clld.org/), which is creating a uniform access to linguistic data across publications. This package is based on the [leaflet package](https://rstudio.github.io/leaflet/), so `lingtypology` is a package for interactive linguistic mapping. In addition, the package provides an ability to download data from typological databases such as WALS, AUTOTYP and others (see section 4). The functionality of this package intersects with

- [lingtypology](https://pypi.org/project/lingtypology/) in Python by Michael Voronov;
- [glottospace](https://github.com/SietzeN/glottospace) -- R package for the geospatial analysis based on Glottolog by Sietze Norder et al;
- [glottospace](https://github.com/glottospace/glottospace) -- R package for the geospatial analysis based on Glottolog by Sietze Norder et al;
- [`lingtypr`](https://gitlab.com/laurabecker/lingtypr) -- R package which partially intersects with `lingtypology` functionality by Laura Becker;
- [`glottoTrees`](https://github.com/erichround/glottoTrees) -- R package for visualising and modifing glottolog trees by Erich Round

Expand Down
10 changes: 5 additions & 5 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<title>lingtypology: introduction and installation</title>

<script src="site_libs/header-attrs-2.21/header-attrs.js"></script>
<script src="site_libs/header-attrs-2.25/header-attrs.js"></script>
<script src="site_libs/jquery-3.6.0/jquery-3.6.0.min.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link href="site_libs/bootstrap-3.3.5/css/lumen.min.css" rel="stylesheet" />
Expand All @@ -30,7 +30,7 @@
h6 {font-size: 12px;}
code {color: inherit; background-color: rgba(0, 0, 0, 0.04);}
pre:not([class]) { background-color: white }</style>
<script src="site_libs/jqueryui-1.11.4/jquery-ui.min.js"></script>
<script src="site_libs/jqueryui-1.13.2/jquery-ui.min.js"></script>
<link href="site_libs/tocify-1.9.1/jquery.tocify.css" rel="stylesheet" />
<script src="site_libs/tocify-1.9.1/jquery.tocify.js"></script>
<script src="site_libs/navigation-1.1/tabsets.js"></script>
Expand Down Expand Up @@ -464,9 +464,9 @@ <h3>What is <code>lingtypology</code>?</h3>
<ul>
<li><a href="https://pypi.org/project/lingtypology/">lingtypology</a> in
Python by Michael Voronov;</li>
<li><a href="https://github.com/SietzeN/glottospace">glottospace</a> – R
package for the geospatial analysis based on Glottolog by Sietze Norder
et al;</li>
<li><a href="https://github.com/glottospace/glottospace">glottospace</a>
– R package for the geospatial analysis based on Glottolog by Sietze
Norder et al;</li>
<li><a
href="https://gitlab.com/laurabecker/lingtypr"><code>lingtypr</code></a>
– R package which partially intersects with <code>lingtypology</code>
Expand Down
8 changes: 4 additions & 4 deletions docs/lingtypology_creating_maps.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -348,26 +348,26 @@ df <- data.frame(lang = c("Adyghe", "Kabardian", "Polish", "Russian", "Bulgarian
popup = c("Adyghe", "Adyghe", "Slavic", "Slavic", "Slavic"))
map.feature(df$lang, df$feature, df$popup,
tile = "Stamen.TonerLite")
tile = "Esri.WorldGrayCanvas")
```

It is possible to use different map tiles on the same map. Just add a vector with tiles.
```{r}
map.feature(df$lang, df$feature, df$popup,
tile = c("OpenStreetMap", "Stamen.TonerLite"))
tile = c("OpenStreetMap", "Esri.WorldGrayCanvas"))
```

It is possible to name tiles using the `tile.name` argument.
```{r}
map.feature(df$lang, df$feature, df$popup,
tile = c("OpenStreetMap", "Stamen.TonerLite"),
tile = c("OpenStreetMap", "Esri.WorldGrayCanvas"),
tile.name = c("colored", "b & w"))
```

It is possible to combine the tiles' control box with the features' control box.
```{r}
map.feature(df$lang, df$feature, df$popup,
tile = c("OpenStreetMap", "Stamen.TonerLite"),
tile = c("OpenStreetMap", "Esri.WorldGrayCanvas"),
control = TRUE)
```

Expand Down
Loading

0 comments on commit 865f535

Please sign in to comment.