Fixes subsetting in extract_related_topics and data processing for Namibia

R/related_topics.R

@@ -93,7 +93,7 @@ create_related_topics_payload <- function(i, widget, hl, tz) {
 extract_related_topics <- function(i, raw_data) {
 
   n <- length(raw_data)
-  end <- min(which(raw_data[i:n] == ""))
+  end <- i + min(which(raw_data[i:n] == "")) - 1
 
   df <- read.csv(textConnection(raw_data[i:end]), row.names = NULL)
   df$subject <- rownames(df)

R/zzz.R

@@ -102,7 +102,20 @@ get_widget <- function(comparison_item, category, gprop, hl, cookie_url, tz) {
   Encoding(temp) <- "UTF-8"
 
   myjs <- jsonlite::fromJSON(substring(temp, first = 6))
-
+
+  # The above will silently convert strings containing "NA" to 
+  # a logical NA (see: https://github.com/jeroen/jsonlite/issues/314)
+  # There currently is no way to fix this other than setting simplifyVector = F
+  # which likely breaks other things. Thus what follows is a hacky fix to
+  # catch the likely case that somebody is looking for searches with
+  # geo="NA"
+  if (is.logical(myjs$widgets$request$comparisonItem[[1]]$geo$country)) {
+    myjs$widgets$request$comparisonItem[[1]]$geo$country <- comparison_item$geo
+    myjs$widgets$request$geo$country <- comparison_item$geo
+    myjs$widgets$request$restriction$geo$country <- comparison_item$geo
+    myjs$widgets$geo <- comparison_item$geo
+  }
+
   widget <- myjs$widgets
 }
 

data-raw/process_data.R

@@ -33,7 +33,7 @@ get_countries <- function() {
   stopifnot(ret == 0)
 
   # , col.names = c("country_code", "sub_code", "country")
-  countries <- read.csv(destfile)
+  countries <- read.csv(destfile, na.strings = "")
 
   # Fix the encoding
   countries <- data.frame(sapply(countries, iconv, to = "ASCII//TRANSLIT"))