From af679948f0d86a234e360b9542e2e1d8ea6f63a8 Mon Sep 17 00:00:00 2001
From: Ari Lamstein <alamstein@trulia.com>
Date: Sun, 26 Oct 2014 23:32:53 -0700
Subject: [PATCH] for cran submission, need envir=environment() in data() calls

---
 R/choroplethr_wdi.R | 2 +-
 R/country.R         | 2 +-
 R/county.R          | 8 ++++----
 R/state.R           | 2 +-
 R/usa.R             | 6 +++---
 R/zip.R             | 2 +-
 choroplethr.Rproj   | 1 +
 7 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/R/choroplethr_wdi.R b/R/choroplethr_wdi.R
index 21f58eb..ccf539f 100644
--- a/R/choroplethr_wdi.R
+++ b/R/choroplethr_wdi.R
@@ -27,7 +27,7 @@
 #' @importFrom WDI WDI
 choroplethr_wdi = function(code="SP.POP.TOTL", year=2012, title="", buckets=7, zoom=NULL)
 {
-  data(country.regions, package="choroplethrMaps")
+  data(country.regions, package="choroplethrMaps", envir=environment())
   if (is.null(title))
   {
     title = paste0("WDI Indicator ", code, " for year ", year)    
diff --git a/R/country.R b/R/country.R
index 08b6a88..206c487 100644
--- a/R/country.R
+++ b/R/country.R
@@ -10,7 +10,7 @@ CountryChoropleth = R6Class("CountryChoropleth",
     # initialize with a world map
     initialize = function(user.df)
     {
-      data(country.map, package="choroplethrMaps")
+      data(country.map, package="choroplethrMaps", envir=environment())
       super$initialize(country.map, user.df)
       
       if (private$has_invalid_regions)
diff --git a/R/county.R b/R/county.R
index 372dd90..9076579 100644
--- a/R/county.R
+++ b/R/county.R
@@ -12,14 +12,14 @@ CountyChoropleth = R6Class("CountyChoropleth",
     # initialize with us state map
     initialize = function(user.df)
     {
-      data(county.map, package="choroplethrMaps")
-      data(county.regions, package="choroplethrMaps")
+      data(county.map, package="choroplethrMaps", envir=environment())
+      data(county.regions, package="choroplethrMaps", envir=environment())
       # USAChoropleth requires a column called "state" that has full lower case state name (e.g. "new york")
       county.map$state = merge(county.map, county.regions, sort=FALSE, by.x="region", by.y="region")$state.name
       super$initialize(county.map, user.df)
       
       # by default, show all states on the map
-      data(state.map, package="choroplethrMaps")
+      data(state.map, package="choroplethrMaps", envir=environment())
       private$zoom = unique(state.map$region)
       
       if (private$has_invalid_regions)
@@ -35,7 +35,7 @@ CountyChoropleth = R6Class("CountyChoropleth",
       # remove regions not on the map before doing the merge
       self$user.df = self$user.df[self$user.df$region %in% county.regions$region, ]
       
-      data(county.regions, package="choroplethrMaps")
+      data(county.regions, package="choroplethrMaps", envir=environment())
       self$user.df$state = merge(self$user.df, county.regions, sort=FALSE, all.X=TRUE, by.x="region", by.y="region")$state.name
       self$user.df = self$user.df[self$user.df$state %in% private$zoom, ]
       self$user.df$state = NULL
diff --git a/R/state.R b/R/state.R
index 52c161a..3f72586 100644
--- a/R/state.R
+++ b/R/state.R
@@ -11,7 +11,7 @@ StateChoropleth = R6Class("StateChoropleth",
     # initialize with us state map
     initialize = function(user.df)
     {
-      data(state.map, package="choroplethrMaps")
+      data(state.map, package="choroplethrMaps", envir=environment())
       state.map$state = state.map$region
       super$initialize(state.map, user.df)
       
diff --git a/R/usa.R b/R/usa.R
index b4479c1..dfe6493 100644
--- a/R/usa.R
+++ b/R/usa.R
@@ -91,8 +91,8 @@ USAChoropleth = R6Class("USAChoropleth",
     
     render_state_outline = function(states)
     {
-      data(state.map, package="choroplethrMaps")
-      data(state.regions, package="choroplethrMaps")
+      data(state.map, package="choroplethrMaps", envir=environment())
+      data(state.regions, package="choroplethrMaps", envir=environment())
       
       stopifnot(states %in% state.regions$region)
       
@@ -103,7 +103,7 @@ USAChoropleth = R6Class("USAChoropleth",
     # all maps of US states zoom at the unit of states.
     set_zoom = function(zoom)
     {
-      data(state.map, package="choroplethrMaps")
+      data(state.map, package="choroplethrMaps", envir=environment())
       all_states = unique(state.map$region)
       
       if (is.null(zoom))
diff --git a/R/zip.R b/R/zip.R
index 4171336..b2f26f6 100644
--- a/R/zip.R
+++ b/R/zip.R
@@ -44,7 +44,7 @@ ZipMap = R6Class("CountyChoropleth",
       super$initialize(zipcode, user.df)
             
       # by default, show all states on the map
-      data(state.map, package="choroplethrMaps")
+      data(state.map, package="choroplethrMaps", envir=environment())
       private$zoom = unique(state.map$region)      
     },
     
diff --git a/choroplethr.Rproj b/choroplethr.Rproj
index 3a76475..982c68b 100644
--- a/choroplethr.Rproj
+++ b/choroplethr.Rproj
@@ -14,3 +14,4 @@ LaTeX: pdfLaTeX
 
 BuildType: Package
 PackageInstallArgs: --no-multiarch --with-keep.source
+PackageCheckArgs: --as-cran