Version 0.6.0 as submitted to CRAN

DESCRIPTION

@@ -2,7 +2,7 @@ Package: googleVis
 Type: Package
 Title: R Interface to Google Charts
 Version: 0.6.0
-Date: 2016-07-02
+Date: 2016-07-04
 Authors@R: c(person("Markus", "Gesmann", role = c("aut", "cre"),
     email = "markus.gesmann@googlemail.com"),
     person("Diego", "de Castillo", role = "aut",
@@ -12,7 +12,7 @@ Authors@R: c(person("Markus", "Gesmann", role = c("aut", "cre"),
 Description: R interface to Google Charts API, allowing users
     to create interactive charts based on data frames. Charts
     are displayed locally via the R HTTP help server. A modern
-    browser with Internet connection is required and for some
+    browser with an Internet connection is required and for some
     charts a Flash player. The data remains local and is not
     uploaded to Google.
 Depends:

NEWS

@@ -1,9 +1,12 @@
-googleVis 0.6.0 [2016-07-02]
+googleVis 0.6.0 [2016-07-04]
 ----------------------------
 
 Changes
 
   * Changed package dependency from RJSONIO to jsonlite
+
+  * Change demo AnimatedGeoMap to AnimatedGeoChart
+
 
 googleVis 0.5.10 [2015-08-26]
 ----------------------------

demo/00Index

@@ -1,7 +1,6 @@
 googleVis		Examples of various googleVis functions and plots
-AnimatedGeoMap		Prototype of an animate a geo map with JavaScript
+AnimatedGeoChart		Prototype of an animate a geo map with JavaScript
 EventListener		Examples of basic JavaScript event handlers
 WorldBank		Visualising country level data sourced from the World Bank
-Rrsp			Demo showing how googleVis can work with the R.rsp package
 Trendlines    Adding trendlines to Scatter Charts, Bar Charts, Column Charts, and Line Charts
 Roles   Concept and use of roles with googleVis

demo/AnimatedGeoMap.R → demo/AnimatedGeoChart.R

@@ -24,8 +24,8 @@ presidentialElections <- rbind(presidentialElections[,1:3], df)
 gvisData <- by(presidentialElections, list(year=presidentialElections$year), function(x){
 
 	year <- x$year[1]	
-	g <- gvisGeoMap(x, "state", "demVote", 
-		options=list(region="US", dataMode="regions"),
+	g <- gvisGeoChart(x, "state", "demVote", 
+		options=list(region="US", dataMode="regions", resolution="provinces"),
 		 chartid=paste("[", year, "]", sep=""))
 	.data <- g$html$chart["jsData"]
 	.data <-gsub("function ", "", .data)
@@ -63,17 +63,18 @@ gvisChart <- '
 function drawChart() {
 	var chart = {};
 	var options ={};
-	options["dataMode"] = "regions";
+	options["displayMode"] = "regions";
 	options["width"] =   600;
 	options["region"] = "US";
 	options["height"] =  400;
-	options["colors"] = [0xFFFFFF, 0x00000FF];
+  options["resolution"] = "provinces"
+	options["colors"] = ["red", "blue"];
 	
 	for (var i = Animation.startYear; i<=Animation.endYear; i++) {
 	   Animation.divCharts[i] = document.createElement("div");
 	   Animation.divCharts[i].className = "pop-chart";
 	   document.body.appendChild(Animation.divCharts[i]);
-	   chart[i] = new google.visualization.GeoMap(Animation.divCharts[i]);
+	   chart[i] = new google.visualization.GeoChart(Animation.divCharts[i]);
 	   
 	   var data = gvisData[(1928+4*i)]();
 	   options["title"] = i;
@@ -87,7 +88,7 @@ function drawChart() {
  
 // jsDisplayChart 
 function displayChart() {
-  google.load("visualization", "1", { packages:["geomap"] }); 
+  google.load("visualization", "1", { packages:["geochart"] }); 
   google.setOnLoadCallback(drawChart);
 }
 // jsChart 
@@ -131,7 +132,7 @@ htmlFoot <-'
 '
 
 page <- structure(
-                  list(type="AnimatedGeoMap",
+                  list(type="AnimatedGeoChart",
                        chartid="presidentialElections",
                        html=list(
                          header=htmlHead,

demo/WorldBank.R

@@ -37,7 +37,7 @@ WorldBank <- droplevels(subset(wdiData, !region %in% "Aggregates"))
 M <- gvisMotionChart(WorldBank,
                      idvar="country", timevar="year",
                      xvar="life.expectancy", yvar="fertility.rate",
-                     colorvar="region", sizevar="population",
+                     sizevar="population", colorvar="region", 
                      options=list(width=700, height=600),
                      chartid="WorldBank")
 ## Display the chart in the browser