Regions overhaul: add LI, remove federal states for AT, CH
Change-Id: If25eadeec07ae6c0457ecc3453624b6369a9379a
diff --git a/examples/geo/data/regions.rds b/examples/geo/data/regions.rds
index 9b59d92..cee9038 100644
--- a/examples/geo/data/regions.rds
+++ b/examples/geo/data/regions.rds
Binary files differ
diff --git a/examples/geo/regional.R b/examples/geo/regional.R
index 59e7e7f..0ecb2b0 100644
--- a/examples/geo/regional.R
+++ b/examples/geo/regional.R
@@ -4,7 +4,7 @@
library(raster)
library(broom)
-mapfile <- "examples/geo/data/cache/map.rds"
+mapfile <- "examples/geo/data/cache/map-v2.rds"
fetchAndPrepareMap <- function(map, pick) {
cat("Downloading GADM map data for ", map, "\n")
@@ -29,7 +29,7 @@
df
}
-map <- fetchMaps(c("DEU_1", "AUT_1", "CHE_1", "LUX_0", "BEL_3", "ITA_1"), c(0,0,0,0,34,17))
+map <- fetchMaps(c("DEU_1", "AUT_0", "CHE_0", "LUX_0", "BEL_3", "ITA_1", "LIE_0"), c(0, 0, 0, 0, 34, 17, 0))
geoDistrib <- function(query, kco = new("KorAPConnection", verbose=TRUE)) {
regions <- readRDS("examples/geo/data/regions.rds")
@@ -38,7 +38,7 @@
vc <- ""
for (i in 1:nrow(regions)) {
if (!is.na(regions[i,]$query)) {
- cat(as.character(regions[i,]$land), "\n")
+ cat(as.character(regions[i,]$region), "\n")
regions[i,]$total <- corpusStats(kco, vc=paste0(vc, regions[i,]$query))@tokens
if (regions[i,]$total == 0) {
regions[i,]$afreq <- 0