Refactor out responses data into method

michaelbarton · Feb 20, 2012 · cbd9ac7 · cbd9ac7
1 parent 9b5f3df
commit cbd9ac7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/2012/lib/responses.r b/2012/lib/responses.r
@@ -0,0 +1,11 @@
+country.data <- function(){
+  library(rworldmap)
+  data(countryExData)
+
+  responses <- read.csv('data/analytics.csv')
+  names(responses)[1] <- "Country"
+
+  subset(
+    merge(responses, countryExData[c('Country','ISO3V10')], by = "Country"),
+    Visits >= 5)
+}
diff --git a/2012/plot/response_map.r b/2012/plot/response_map.r
@@ -4,20 +4,12 @@ library(rworldmap)
 library(classInt)
 library(RColorBrewer)
 
-data(countryExData)
-
-responses <- read.csv('data/analytics.csv')
-names(responses)[1] <- "Country"
-
-country.data <-
-  subset(
-    merge(responses, countryExData[c('Country','ISO3V10')], by = "Country"),
-    Visits >= 5)
+source('lib/responses.r')
 
 n.categories <- 5
 
 intervals <- classIntervals(
-  country.data[["Visits"]],
+  country.data()[["Visits"]],
   n     = n.categories,
   style = "jenks")
 
@@ -27,7 +19,7 @@ par(mai = c(0, 0, 0.2, 0), xaxs = "i", yaxs = "i")
 
 mapCountryData(
   joinCountryData2Map(
-    country.data,
+    country.data(),
     joinCode         = "ISO3",
     mapResolution    = "coarse",
     nameJoinColumn   = "ISO3V10"),