Binary files 0.6.2-3/build/googleVis.pdf and 0.6.3+dfsg-1/build/googleVis.pdf differ Binary files 0.6.2-3/build/vignette.rds and 0.6.3+dfsg-1/build/vignette.rds differ diff -pruN 0.6.2-3/debian/changelog 0.6.3+dfsg-1/debian/changelog --- 0.6.2-3/debian/changelog 2018-06-01 05:59:36.000000000 +0000 +++ 0.6.3+dfsg-1/debian/changelog 2018-12-04 10:05:35.000000000 +0000 @@ -1,3 +1,11 @@ +r-cran-googlevis (0.6.3+dfsg-1) unstable; urgency=medium + + * New upstream version + * Standards-Version: 4.2.1 + * Remove autogenerated HTML docs since it is including compressed JS + + -- Andreas Tille Tue, 04 Dec 2018 11:05:35 +0100 + r-cran-googlevis (0.6.2-3) unstable; urgency=medium * Rebuild for R 3.5 transition diff -pruN 0.6.2-3/debian/control 0.6.3+dfsg-1/debian/control --- 0.6.2-3/debian/control 2018-06-01 05:59:36.000000000 +0000 +++ 0.6.3+dfsg-1/debian/control 2018-12-04 10:05:35.000000000 +0000 @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 11~), dh-r, r-base-dev, r-cran-jsonlite -Standards-Version: 4.1.4 +Standards-Version: 4.2.1 Vcs-Browser: https://salsa.debian.org/r-pkg-team/r-cran-googlevis Vcs-Git: https://salsa.debian.org/r-pkg-team/r-cran-googlevis.git Homepage: https://cran.r-project.org/package=googleVis diff -pruN 0.6.2-3/debian/copyright 0.6.3+dfsg-1/debian/copyright --- 0.6.2-3/debian/copyright 2018-06-01 05:59:36.000000000 +0000 +++ 0.6.3+dfsg-1/debian/copyright 2018-12-04 10:05:35.000000000 +0000 @@ -2,6 +2,7 @@ Format: https://www.debian.org/doc/packa Upstream-Name: googleVis Upstream-Contact: Markus Gesmann Source: https://cran.r-project.org/package=googleVis +Files-Excluded: */inst/doc/*.html Files: * Copyright: 2013-2016 Markus Gesmann, Diego de Castillo, Joe Cheng diff -pruN 0.6.2-3/debian/watch 0.6.3+dfsg-1/debian/watch --- 0.6.2-3/debian/watch 2018-06-01 05:59:36.000000000 +0000 +++ 0.6.3+dfsg-1/debian/watch 2018-12-04 10:05:35.000000000 +0000 @@ -1,3 +1,4 @@ version=4 +opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg[0-9]*//g,repack,compression=xz" \ https://cran.r-project.org/src/contrib/googleVis_([-\d.]*)\.tar\.gz diff -pruN 0.6.2-3/demo/AnimatedGeoChart.R 0.6.3+dfsg-1/demo/AnimatedGeoChart.R --- 0.6.2-3/demo/AnimatedGeoChart.R 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/demo/AnimatedGeoChart.R 2018-11-10 19:25:35.000000000 +0000 @@ -103,7 +103,7 @@ htmlHead <- ' US Presidential Election by State: 1932 - 2008 - + - - - - - - - - - - - - - - - - - - -

googleVis examples

- -

- -

It may take a little while to load all charts. Please be patient. -All charts require an Internet connection.

- -

These examples are taken from the googleVis demo. -You can execute the demo via

- -
library(googleVis)
-demo(googleVis)
-
- -

For more details about the charts and further examples see the -helpfiles of the individual googleVis function and review the -Google Charts API documentation and Terms of Service.

- -

Line chart

- -
df=data.frame(country=c("US", "GB", "BR"), 
-              val1=c(10,13,14), 
-              val2=c(23,12,32))
-
- -
Line <- gvisLineChart(df)
-plot(Line)
-
- - - - - - - - - - - - - - - - - -
-
- -

Line chart with two axis

- -
Line2 <- gvisLineChart(df, "country", c("val1","val2"),
-                       options=list(
-                         series="[{targetAxisIndex: 0},
-                                 {targetAxisIndex:1}]",
-                         vAxes="[{title:'val1'}, {title:'val2'}]"
-                       ))
-plot(Line2)
-
- - - - - - - - - - - - - - - - - -
-
- -

Bar chart

- -
Bar <- gvisBarChart(df)
-plot(Bar)
-
- - - - - - - - - - - - - - - - - -
-
- -

Column chart

- -
Column <- gvisColumnChart(df)
-plot(Column)
-
- - - - - - - - - - - - - - - - - -
-
- -

Area chart

- -
Area <- gvisAreaChart(df)
-plot(Area)
-
- - - - - - - - - - - - - - - - - -
-
- -

Stepped Area chart

- -
SteppedArea <- gvisSteppedAreaChart(df, xvar="country", 
-                                    yvar=c("val1", "val2"),
-                                    options=list(isStacked=TRUE))
-plot(SteppedArea)
-
- - - - - - - - - - - - - - - - - -
-
- -

Combo chart

- -
Combo <- gvisComboChart(df, xvar="country",
-                        yvar=c("val1", "val2"),
-                        options=list(seriesType="bars",
-                                     series='{1: {type:"line"}}'))
-plot(Combo)
-
- - - - - - - - - - - - - - - - - -
-
- -

Scatter chart

- -
Scatter <- gvisScatterChart(women, 
-                            options=list(
-                              legend="none",
-                              lineWidth=2, pointSize=0,
-                              title="Women", vAxis="{title:'weight (lbs)'}",
-                              hAxis="{title:'height (in)'}", 
-                              width=300, height=300))
-plot(Scatter)
-
- - - - - - - - - - - - - - - - - -
-
- -

Bubble chart

- -
Bubble <- gvisBubbleChart(Fruits, idvar="Fruit", 
-                          xvar="Sales", yvar="Expenses",
-                          colorvar="Year", sizevar="Profit",
-                          options=list(
-                            hAxis='{minValue:75, maxValue:125}'))
-plot(Bubble)
-
- - - - - - - - - - - - - - - - - -
-
- -

Customizing Lines

- -
Dashed <-  gvisLineChart(df, xvar="country", yvar=c("val1","val2"),
-                        options=list(
-                          series="[{color:'green', targetAxisIndex: 0, 
-                          lineWidth: 1, lineDashStyle: [2, 2, 20, 2, 20, 2]}, 
-                          {color: 'blue',targetAxisIndex: 1, 
-                          lineWidth: 2, lineDashStyle: [4, 1]}]",
-                          vAxes="[{title:'val1'}, {title:'val2'}]"
-                        ))
-plot(Dashed)
-
- - - - - - - - - - - - - - - - - -
-
- -

Customizing points

- -
M <- matrix(nrow=6,ncol=6)
-M[col(M)==row(M)] <- 1:6
-dat <- data.frame(X=1:6, M)
-SC <- gvisScatterChart(dat, 
-                       options=list(
-                         title="Customizing points",
-                         legend="right",
-                         pointSize=30,
-                         series="{
-                              0: { pointShape: 'circle' },
-                              1: { pointShape: 'triangle' },
-                              2: { pointShape: 'square' },
-                              3: { pointShape: 'diamond' },
-                              4: { pointShape: 'star' },
-                              5: { pointShape: 'polygon' }
-                              }"))
-plot(SC)
-
- - - - - - - - - - - - - - - - - -
-
- -

Add edit button for on the fly customisation

- -
Line4 <-  gvisLineChart(df, "country", c("val1","val2"),
-                        options=list(gvis.editor="Edit me!"))
-plot(Line4)
-
- - - - - - - - - - - - - - - - - -

- -
-
- -

The same option is available for all other charts as well.

- -

A chart with many options set

- -
Line3 <-  gvisLineChart(df, xvar="country", yvar=c("val1","val2"),
-                        options=list(
-                          title="Hello World",
-                          titleTextStyle="{color:'red', 
-                                           fontName:'Courier', 
-                                           fontSize:16}",                         
-                          backgroundColor="#D3D3D3",                          
-                          vAxis="{gridlines:{color:'red', count:3}}",
-                          hAxis="{title:'Country', titleTextStyle:{color:'blue'}}",
-                          series="[{color:'green', targetAxisIndex: 0}, 
-                                   {color: 'orange',targetAxisIndex:1}]",
-                          vAxes="[{title:'val1'}, {title:'val2'}]",
-                          legend="bottom",
-                          curveType="function",
-                          width=500,
-                          height=300                         
-                        ))
-plot(Line3)
-
- - - - - - - - - - - - - - - - - -
-
- -

Candlestick chart

- -
Candle <- gvisCandlestickChart(OpenClose, 
-                               options=list(legend='none'))
-plot(Candle)
-
- - - - - - - - - - - - - - - - - -
-
- -

Pie chart

- -
Pie <- gvisPieChart(CityPopularity)
-plot(Pie)
-
- - - - - - - - - - - - - - - - - -
-
- -

Gauge

- -
Gauge <-  gvisGauge(CityPopularity, 
-                    options=list(min=0, max=800, greenFrom=500,
-                                 greenTo=800, yellowFrom=300, yellowTo=500,
-                                 redFrom=0, redTo=300, width=400, height=300))
-plot(Gauge)
-
- - - - - - - - - - - - - - - - - -
-
- -

Intensity Map

- -
Intensity <- gvisIntensityMap(df)
-plot(Intensity)
-
- - - - - - - - - - - - - - - - - -
-
- -

Geo Chart

- -
Geo=gvisGeoChart(Exports, locationvar="Country", 
-                 colorvar="Profit",
-                 options=list(projection="kavrayskiy-vii"))
-plot(Geo)
-
- - - - - - - - - - - - - - - - - -
-
- -

Example showing US data by state

- -
require(datasets)
-states <- data.frame(state.name, state.x77)
-GeoStates <- gvisGeoChart(states, "state.name", "Illiteracy",
-                          options=list(region="US", 
-                                       displayMode="regions", 
-                                       resolution="provinces",
-                                       width=600, height=400))
-plot(GeoStates)
-
- - - - - - - - - - - - - - - - - -
-
- -

Show Hurricane Andrew (1992) storm track with markers

- -
GeoMarker <- gvisGeoChart(Andrew, "LatLong", 
-                          sizevar='Speed_kt',
-                          colorvar="Pressure_mb", 
-                          options=list(region="US"))
-plot(GeoMarker)
-
- - - - - - - - - - - - - - - - - -
-
- -

Google Maps

- -
AndrewMap <- gvisMap(Andrew, "LatLong" , "Tip", 
-                     options=list(showTip=TRUE, 
-                                  showLine=TRUE, 
-                                  enableScrollWheel=TRUE,
-                                  mapType='terrain', 
-                                  useMapTypeControl=TRUE))
-plot(AndrewMap)
-
- - - - - - - - - - - - - - - - - -
-
- -

Table

- -
Table <- gvisTable(Stock, 
-                   formats=list(Value="#,###"))
-plot(Table)
-
- - - - - - - - - - - - - - - - - -
-
- -

Click on the column header to sort the rows

- -

Table with pages

- -
PopTable <- gvisTable(Population, 
-                      formats=list(Population="#,###",
-                                   '% of World Population'='#.#%'),
-                      options=list(page='enable'))
-plot(PopTable)
-
- - - - - - - - - - - - - - - - - -
-
- -

Org chart

- -
Org <- gvisOrgChart(Regions, 
-                    options=list(width=600, height=250,
-                                 size='large', allowCollapse=TRUE))
-plot(Org)
-
- - - - - - - - - - - - - - - - - -
-
- -

Double click on a parent to collapse all its children.

- -

Tree Map

- -
Tree <- gvisTreeMap(Regions,  
-                    "Region", "Parent", 
-                    "Val", "Fac", 
-                    options=list(fontSize=16))
-plot(Tree)
-
- - - - - - - - - - - - - - - - - -
-
- -

Left mouse-click to drill down, right mouse-click to move up a level.

- -

Annotation chart

- -
Anno <- gvisAnnotationChart(Stock, 
-                            datevar="Date",
-                            numvar="Value", 
-                            idvar="Device",
-                            titlevar="Title", 
-                            annotationvar="Annotation",
-                            options=list(
-                              width=600, height=350,
-                              fill=10, displayExactValues=TRUE,
-                              colors="['#0000ff','#00ff00']")
-)
-plot(Anno)
-
- - - - - - - - - - - - - - - - - -
-
- -

Sankey chart

- -
datSK <- data.frame(From=c(rep("A",3), rep("B", 3)),
-                    To=c(rep(c("X", "Y", "Z"),2)),
-                    Weight=c(5,7,6,2,9,4))
-
-Sankey <- gvisSankey(datSK, from="From", to="To", weight="Weight",
-                     options=list(
-                       sankey="{link: {color: { fill: '#d799ae' } },
-                            node: { color: { fill: '#a61d4c' },
-                            label: { color: '#871b47' } }}"))
-plot(Sankey)
-
- - - - - - - - - - - - - - - - - -
-
- -

Histogram

- -
set.seed(123)
-datHist=data.frame(A=rpois(100, 20),
-                   B=rpois(100, 5),
-                   C=rpois(100, 50))
-
-Hist <- gvisHistogram(datHist, options=list(
-  legend="{ position: 'top', maxLines: 2 }",
-  colors="['#5C3292', '#1A8763', '#871B47']",
-  width=400, height=360))
-plot(Hist)
-
- - - - - - - - - - - - - - - - - -
-
- -

Calendar chart

- -
Cal <- gvisCalendar(Cairo, 
-                    datevar="Date", 
-                    numvar="Temp",
-                    options=list(
-                      title="Daily temperature in Cairo",
-                      height=320,
-                      calendar="{yearLabel: { fontName: 'Times-Roman',
-                               fontSize: 32, color: '#1A8763', bold: true},
-                               cellSize: 10,
-                               cellColor: { stroke: 'red', strokeOpacity: 0.2 },
-                               focusedCellColor: {stroke:'red'}}")
-)
-plot(Cal)
-
- - - - - - - - - - - - - - - - - -
-
- -

Timeline chart

- -
datTL <- data.frame(Position=c(rep("President", 3), rep("Vice", 3)),
-                    Name=c("Washington", "Adams", "Jefferson",
-                           "Adams", "Jefferson", "Burr"),
-                    start=as.Date(x=rep(c("1789-03-29", "1797-02-03", 
-                                          "1801-02-03"),2)),
-                    end=as.Date(x=rep(c("1797-02-03", "1801-02-03", 
-                                        "1809-02-03"),2)))
-
-Timeline <- gvisTimeline(data=datTL, 
-                         rowlabel="Name",
-                         barlabel="Position",
-                         start="start", 
-                         end="end",
-                         options=list(timeline="{groupByRowLabel:false}",
-                                      backgroundColor='#ffd', 
-                                      height=350,
-                                      colors="['#cbb69d', '#603913', '#c69c6e']"))
-plot(Timeline)
-
- - - - - - - - - - - - - - - - - -
-
- -

Merging charts

- -
G <- gvisGeoChart(Exports, "Country", "Profit", 
-                  options=list(width=300, height=300))
-T <- gvisTable(Exports, 
-               options=list(width=220, height=300))
-
-GT <- gvisMerge(G,T, horizontal=TRUE) 
-plot(GT)
-
- - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
-
- -
- - - -
-
- -
- -

Flash charts

- -

All the following charts require a Flash player.

- -

Motion chart

- -
Motion=gvisMotionChart(Fruits, 
-                       idvar="Fruit", 
-                       timevar="Year")
-plot(Motion)
-
- - - - - - - - - - - - - - - - - -
-
- -

You can change some of displaying settings via the browser, -e.g. the level of opacity of non-selected items, or the chart type. -The state string from the 'Advanced' tab can be used to set those -settings via R. Just copy and past the string from the browser into -the argument state of the options list. -Here is an example of a motion chart, with an initial line chart -displayed.

- -
myStateSettings <-'
-{"xZoomedDataMin":1199145600000,"colorOption":"2",
-"duration":{"timeUnit":"Y","multiplier":1},"yLambda":1,
-"yAxisOption":"4","sizeOption":"_UNISIZE",
-"iconKeySettings":[],"xLambda":1,"nonSelectedAlpha":0,
-"xZoomedDataMax":1262304000000,"iconType":"LINE",
-"dimensions":{"iconDimensions":["dim0"]},
-"showTrails":false,"uniColorForNonSelected":false,
-"xAxisOption":"_TIME","orderedByX":false,"playDuration":15000,
-"xZoomedIn":false,"time":"2010","yZoomedDataMin":0,
-"yZoomedIn":false,"orderedByY":false,"yZoomedDataMax":100}
-'
-M <- gvisMotionChart(Fruits, "Fruit", "Year", options=list(state=myStateSettings))
-plot(M)
-
- - - - - - - - - - - - - - - - - -
-
- -
## See demo(package='googleVis') for other available demos.
-
- -

Geo Map

- -
AndrewGeo <- gvisGeoMap(Andrew, 
-                        locationvar="LatLong", 
-                        numvar="Speed_kt", 
-                        hovervar="Category", 
-                        options=list(height=350, 
-                                     region="US", 
-                                     dataMode="markers"))
-
- -
## Warning in gvisGeoMap(Andrew, locationvar = "LatLong", numvar = "Speed_kt", : GeoMap (gvisGeoMap) is Flash based, conisder using GeoChart (gvisGeoChart) instead.
-## For more details visit: goo.gl/tkiEV8
-
- -
plot(AndrewGeo)
-
- - - - - - - - - - - - - - - - - -
-
- -

Annotated time line chart

- -
AnnoTimeLine  <- gvisAnnotatedTimeLine(Stock, 
-                                       datevar="Date",
-                                       numvar="Value", 
-                                       idvar="Device",
-                                       titlevar="Title", 
-                                       annotationvar="Annotation",
-                                       options=list(displayAnnotations=TRUE,
-                                                    width="600px", height="350px"))
-
- -
## Warning in gvisAnnotatedTimeLine(Stock, datevar = "Date", numvar = "Value", : AnnotatedTimeline (gvisAnnotatedTimeLine) is Flash based, conisder using  AnnotationChart (gvisAnnotationChart) instead.
-## For more details visit: goo.gl/tkiEV8
-
- -
plot(AnnoTimeLine)
-
- - - - - - - - - - - - - - - - - -
-
- - - - diff -pruN 0.6.2-3/inst/doc/googleVis_examples.Rmd 0.6.3+dfsg-1/inst/doc/googleVis_examples.Rmd --- 0.6.2-3/inst/doc/googleVis_examples.Rmd 2017-01-01 09:36:44.000000000 +0000 +++ 0.6.3+dfsg-1/inst/doc/googleVis_examples.Rmd 2017-09-08 08:01:56.000000000 +0000 @@ -17,7 +17,7 @@ demo(googleVis) For more details about the charts and further examples see the helpfiles of the individual googleVis function and review the -[Google Charts API documentation](https://developers.google.com/chart/interactive/docs/gallery) and [Terms of Service](https://developers.google.com/terms). +[Google Charts API documentation](https://google-developers.appspot.com/chart/interactive/docs/gallery) and [Terms of Service](https://google-developers.appspot.com/chart/terms). ## Line chart ```{r setOptions, message=FALSE, echo=FALSE} Binary files 0.6.2-3/inst/doc/googleVis.pdf and 0.6.3+dfsg-1/inst/doc/googleVis.pdf differ diff -pruN 0.6.2-3/inst/doc/googleVis.R 0.6.3+dfsg-1/inst/doc/googleVis.R --- 0.6.2-3/inst/doc/googleVis.R 2017-01-01 09:36:44.000000000 +0000 +++ 0.6.3+dfsg-1/inst/doc/googleVis.R 2018-11-12 14:44:03.000000000 +0000 @@ -402,7 +402,7 @@ G <- createGoogleGadget(M) ################################################### ### code chunk number 43: googleVis.Rnw:1301-1307 (eval = FALSE) ################################################### -## jscode <- "window.open('http://en.wikipedia.org/wiki/' +## jscode <- "window.open('https://en.wikipedia.org/wiki/' ## + data.getValue(chart.getSelection()[0].row,0)); " ## ## J1 <- gvisGeoMap(Exports, locationvar='Country', numvar='Profit', diff -pruN 0.6.2-3/inst/doc/googleVis.Rnw 0.6.3+dfsg-1/inst/doc/googleVis.Rnw --- 0.6.2-3/inst/doc/googleVis.Rnw 2017-01-01 09:36:44.000000000 +0000 +++ 0.6.3+dfsg-1/inst/doc/googleVis.Rnw 2018-11-10 19:45:27.000000000 +0000 @@ -147,7 +147,7 @@ generates output similar to Figure~\ref{ 1 2 3 6 - - - - - - - - - - - - - - - - - - -

Markdown example with knitr and googleVis

- -

- -

This is a little Markdown example output. The Markdown source file is hosted on GitHub.

- -

Set the googleVis options first to change the behaviour of plot.gvis, so that only the chart component of the HTML file is written into the output file.

- -
library(googleVis)
-op <- options(gvis.plot.tag='chart')
-
- -

The following plot statements will automatically return the HTML -required for the 'knitted' output.

- -

Combo chart

- -
## Add the mean
-CityPopularity$Mean=mean(CityPopularity$Popularity)
-CC <- gvisComboChart(CityPopularity, xvar='City',
-          yvar=c('Mean', 'Popularity'),
-          options=list(seriesType='bars',
-                       width=450, height=300,
-                       title='City Popularity',
-                       series='{0: {type:\"line\"}}'))
-plot(CC)
-
- - - - - - - - - - - - - - - - - -
-
- -

Example of gvisComboChart with R code shown above.

- -

Place two charts next to each other

- - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
-
- -
- - - -
-
- -
- -

Example of a gvisGeoChart with gvisTable and R code hidden.

- -

Motion Chart

- -
M <- gvisMotionChart(Fruits, 'Fruit', 'Year',
-         options=list(width=400, height=350))
-plot(M)
-
- - - - - - - - - - - - - - - - - -
-
- -

Please note that the Motion Chart is only displayed when hosted on a -web server, or if placed in a directory which has been added to the -trusted sources in the security settings of Macromedia. -See the googleVis package vignette for more details.

- -
## Set options back to original options
-options(op)
-
- - - - diff -pruN 0.6.2-3/inst/doc/Using_googleVis_with_knitr.Rmd 0.6.3+dfsg-1/inst/doc/Using_googleVis_with_knitr.Rmd --- 0.6.2-3/inst/doc/Using_googleVis_with_knitr.Rmd 2017-01-01 09:36:44.000000000 +0000 +++ 0.6.3+dfsg-1/inst/doc/Using_googleVis_with_knitr.Rmd 2018-11-10 19:35:47.000000000 +0000 @@ -35,7 +35,7 @@ Geo <- gvisGeoChart(Exports, locationvar options=list(height=300, width=350)) Tbl <- gvisTable(Exports, options=list(height=300, width=200)) plot(gvisMerge(Geo, Tbl, horizontal=TRUE)) -`````` +``` Example of a gvisGeoChart with gvisTable and R code hidden. ## Motion Chart @@ -47,7 +47,7 @@ plot(M) Please note that the Motion Chart is only displayed when hosted on a web server, or if placed in a directory which has been added to the trusted sources in the [security settings of Macromedia] -(http://www.macromedia.com/support/documentation/en/flashplayer/help/settings_manager04.html). +(https://www.macromedia.com/support/documentation/en/flashplayer/help/settings_manager04.html). See the googleVis package vignette for more details. ```{r resetOptions} diff -pruN 0.6.2-3/inst/doc/Using_Roles_via_googleVis.html 0.6.3+dfsg-1/inst/doc/Using_Roles_via_googleVis.html --- 0.6.2-3/inst/doc/Using_Roles_via_googleVis.html 2017-01-01 09:36:44.000000000 +0000 +++ 0.6.3+dfsg-1/inst/doc/Using_Roles_via_googleVis.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,1746 +0,0 @@ - - - - - -Using Roles via googleVis - - - - - - - - - - - - - - - - - - - - -

Using Roles via googleVis

- -

Roles add the ability to pass columns for further processing downstream. -Role columns must follow column they pertain to. Proper naming -conventions must be observed. For example, roles fulfilling tooltip -roles and must be called “foo.blah.tooltip”. For more details see the Google documentation.

- -

The following examples should help to illustrate the concept.

- -

The first example uses a data set that has the additional column -pop.html.tooltip with the first 11 letters of the Latin alphabet. -This column is mapped automatically as a tooltip when the user hovers -over the chart point.

- -
df <- data.frame(year=1:11,pop=1:11,
-                 pop.html.tooltip=letters[1:11])
-plot( 
-  gvisScatterChart(df)
-)
-
- - - - - - - - - - - - - - - - - -
-
- -

HTML code can be embedded into the tooltip as well, if the option -isHtml is set to true.

- -
levels(df$pop.html.tooltip)[1] <- 
-  '<a href="http://www.r-project.com"><img src="http://www.r-project.org/Rlogo.jpg" alt="R logo" /></a>'
-plot( 
-  gvisScatterChart(df,
-                   options=list(tooltip="{isHtml:'true'}"))
-)
-
- - - - - - - - - - - - - - - - - -
-
- -

Often it is helpful to highlight certain parts of the data. The Google API -distinguishes between certainty and emphasis. -In a similar way to above additional columns with boolean values -have to be added to the data.

- -
df <- data.frame(year=1:11, x=1:11,
-                 x.scope=c(rep(TRUE, 8), rep(FALSE, 3)),
-                 y=11:1, y.html.tooltip=LETTERS[11:1],                 
-                 y.certainty=c(rep(TRUE, 5), rep(FALSE, 6)),
-                 y.emphasis=c(rep(FALSE, 4), rep(TRUE, 7)))
-plot(
-  gvisScatterChart(df,options=list(lineWidth=2))
-)
-
- - - - - - - - - - - - - - - - - -
-
- -

Using roles with column or bar charts has some specifics. -Instead of 'emphasize' use 'style' to change the colours.

- -
dat <- data.frame(Year=2010:2013,
-                  Sales=c(600, 1500, 800, 1000),
-                  Sales.html.tooltip=c('$600K in our first year!',
-                                       'Sunspot activity made this our best year ever!',
-                                       '$800K in 2012.',
-                                       '$1M in sales last year.'),
-                  Sales.certainty=c(TRUE, FALSE, TRUE, FALSE))
-plot(
-  gvisColumnChart(dat, xvar='Year', 
-                  yvar=c('Sales', 'Sales.certainty')
-  )
-)
-
- - - - - - - - - - - - - - - - - -
-
- -
df <- data.frame(country=c("US", "GB", "BR"), 
-                 val1=c(1,3,4), 
-                 val1.emphasis=c(TRUE, TRUE, FALSE),
-                 val2=c(23,12,32))
-plot(
-  gvisLineChart(df, xvar="country", 
-                yvar=c("val1", "val1.emphasis")
-  )
-)
-
- - - - - - - - - - - - - - - - - -
-
- -
plot(
-  gvisLineChart(df, xvar="country", 
-                yvar=c("val1", "val1.emphasis", "val2")
-  )
-)
-
- - - - - - - - - - - - - - - - - -
-
- -

Setting the annotations style to 'line' allows adding little reference lines -to the plot.

- -
dat <- data.frame(Year=2010:2013, 
-                  Sales=c(600, 1500, 800, 1000),
-                  Sales.annotation=c('First year', NA, NA, 'Last Year'),
-                  Sales.annotationText=c('$600K in our first year!',
-                                       NA,
-                                       NA,
-                                       '$1M in sales last year.'))      
-
-plot(
-  gvisLineChart(dat, xvar='Year', 
-                  yvar=c('Sales',
-                         'Sales.annotation',
-                         'Sales.annotationText'),
-                         options=list(annotations = "{style:'line'}")
-  )
-)
-
- - - - - - - - - - - - - - - - - -
-
- -

Intervals help to add error bars, confidence levels, etc. -Note that the options are set either via interval or intervals, -if set to all intervals. The examples below give an indication of what -can be achieved with intervals. -For more details visit the Google documentation.

- -
df <- data.frame(Year=2013:2014, Sales=c(120, 130), 
-                 Sales.interval.1=c(100,110), 
-                 Sales.interval.2=c(140, 150),
-                 Sales.interval.3=c(90, 100),
-                 Sales.interval.4=c(150, 170),
-                 Sales.style=c('red', 'gold'),
-                 Sales.annotation=c("North", "South"),
-                 check.names=FALSE)
-
-plot(
-  gvisBarChart(df, xvar='Year', 
-               yvar=c('Sales',                       
-                      'Sales.interval.1', 
-                      'Sales.interval.2',
-                      'Sales.style',
-                      'Sales.annotation')
-  )
-)
-
- - - - - - - - - - - - - - - - - -
-
- -
plot(
-  gvisLineChart(df, xvar='Year', 
-               yvar=c('Sales', 
-                      'Sales.interval.1', 
-                      'Sales.interval.2'),
-               options=list(series="[{color:'purple'}]")
-  )
-)
-
- - - - - - - - - - - - - - - - - -
-
- -
plot(
-  gvisLineChart(df, xvar='Year', 
-                yvar=c('Sales', 
-                       'Sales.interval.1', 
-                       'Sales.interval.2', 
-                       'Sales.interval.3', 
-                       'Sales.interval.4'),
-                options=list(series="[{color:'purple'}]",
-                             lineWidth=4,
-                             interval="{
-            'i1': { 'style':'line', 'color':'#D3362D', 'lineWidth': 0.5 },
-            'i2': { 'style':'line', 'color':'#F1CA3A', 'lineWidth': 1 },
-            'i3': { 'style':'line', 'color':'#5F9654', 'lineWidth': 2 },
-            'i4': { 'style':'line', 'color':'#5F9654', 'lineWidth': 3 }
-        }")
-  )
-)
-
- - - - - - - - - - - - - - - - - -
-
- -
plot(
-  gvisLineChart(df, xvar='Year', 
-                yvar=c('Sales', 
-                       'Sales.interval.1', 
-                       'Sales.interval.2', 
-                       'Sales.interval.3', 
-                       'Sales.interval.4'),
-                options=list(series="[{color:'purple'}]",
-                             lineWidth=4,
-                             intervals="{ 'style':'area' }",
-                             interval="{
-                               'i1': { 'color': '#4374E0', 'style':'bars', 'barWidth':0, 'lineWidth':4, 'pointSize':10, 'fillOpacity':1 },
-                               'i2': { 'color': '#E49307', 'style':'bars', 'barWidth':0, 'lineWidth':4, 'pointSize':10, 'fillOpacity':1 }}"                                                          
-                             )
-  )
-)
-
- - - - - - - - - - - - - - - - - -
-
- - - - diff -pruN 0.6.2-3/inst/doc/Using_Roles_via_googleVis.R 0.6.3+dfsg-1/inst/doc/Using_Roles_via_googleVis.R --- 0.6.2-3/inst/doc/Using_Roles_via_googleVis.R 2017-01-01 09:36:44.000000000 +0000 +++ 0.6.3+dfsg-1/inst/doc/Using_Roles_via_googleVis.R 2018-11-12 14:43:53.000000000 +0000 @@ -13,7 +13,7 @@ plot( ## ----TooltipHTML, results='asis', tidy=FALSE----------------------------- levels(df$pop.html.tooltip)[1] <- - 'R logo' + 'R logo' plot( gvisScatterChart(df, options=list(tooltip="{isHtml:'true'}")) diff -pruN 0.6.2-3/inst/doc/Using_Trendlines_with_googleVis.html 0.6.3+dfsg-1/inst/doc/Using_Trendlines_with_googleVis.html --- 0.6.2-3/inst/doc/Using_Trendlines_with_googleVis.html 2017-01-01 09:36:44.000000000 +0000 +++ 0.6.3+dfsg-1/inst/doc/Using_Trendlines_with_googleVis.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,814 +0,0 @@ - - - - - -Using Trendlines with googleVis - - - - - - - - - - - - - - - - - - - - -

Using Trendlines with googleVis

- -

A trendline is a line superimposed on a chart revealing the overall -direction of the data. Google Charts can automatically generate -trendlines for Scatter Charts, Bar Charts, Column Charts and Line Charts.

- -

For more details visit: -https://developers.google.com/chart/interactive/docs/gallery/trendlines

- -

Linear trend line

- -
plot(
-  gvisScatterChart(women, options=list(trendlines="0"))
-)
-
- - - - - - - - - - - - - - - - - -
-
- -

Exponential trend line with equation shown in legend

- -
plot(
-  gvisScatterChart(women, options=list(
-    trendlines="{0: { type: 'exponential',  
-                     visibleInLegend: 'true', 
-                     color: 'green',
-                     lineWidth: 10,
-                     opacity: 0.5}}",
-    chartArea="{left:50,top:20,width:'50%',height:'75%'}"))
-)
-
- - - - - - - - - - - - - - - - - -
-
- -

Add trend line to column chart

- -
dat <- data.frame(val1=c(1,3,4,5,6,8), 
-                  val2=c(12,23,32,40,50,55))
-plot(
-  gvisColumnChart(dat,
-                  options=list(trendlines="{0: {}}"))
-)
-
- - - - - - - - - - - - - - - - - -
-
- -

Changing labels in legend

- -
dat$val3 <- c(5,6,10,12,15,20)
-plot(
-  gvisColumnChart(dat,
-                  options=list(trendlines="{
-                          0: {
-                            labelInLegend: 'Trendline 1',
-                            visibleInLegend: true,}, 
-                          1:{
-                            labelInLegend: 'Trendline 2',
-                            visibleInLegend: true}
-                          }",
-                          chartArea="{left:50,top:20,
-                                      width:'50%',height:'75%'}"
-                  ))
-)
-
- - - - - - - - - - - - - - - - - -
-
- - - - diff -pruN 0.6.2-3/inst/mansections/GoogleChartToolsURLConfigOptions.txt 0.6.3+dfsg-1/inst/mansections/GoogleChartToolsURLConfigOptions.txt --- 0.6.2-3/inst/mansections/GoogleChartToolsURLConfigOptions.txt 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/inst/mansections/GoogleChartToolsURLConfigOptions.txt 2017-09-08 07:58:27.000000000 +0000 @@ -1,2 +1,2 @@ -\url{https://developers.google.com/chart/interactive/docs/gallery/CHARTNAME#Configuration_Options} +\url{https://google-developers.appspot.com/chart/interactive/docs/gallery/CHARTNAME#Configuration_Options} diff -pruN 0.6.2-3/inst/mansections/GoogleChartToolsURL.txt 0.6.3+dfsg-1/inst/mansections/GoogleChartToolsURL.txt --- 0.6.2-3/inst/mansections/GoogleChartToolsURL.txt 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/inst/mansections/GoogleChartToolsURL.txt 2017-09-08 07:56:22.000000000 +0000 @@ -1,2 +1,2 @@ -\url{http://developers.google.com/chart/interactive/docs/gallery/CHARTNAME} +\url{https://google-developers.appspot.com/chart/interactive/docs/gallery/CHARTNAME} diff -pruN 0.6.2-3/inst/rsp/index.rsp 0.6.3+dfsg-1/inst/rsp/index.rsp --- 0.6.2-3/inst/rsp/index.rsp 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/inst/rsp/index.rsp 2018-11-10 19:50:55.000000000 +0000 @@ -1,158 +1,158 @@ - - - <%title="Using the Google visualisation API with R"%> - - - <%@include file="src/simpleHead.rsp"%> - - - <%@include file="src/simpleHeader.rsp"%> - <%require(googleVis)%> -

- Welcome -

- Welcome - to googleVis - version <%=packageDescription("googleVis")$Version%> by: - Markus Gesmann - and Diego de Castillo -

- Introduction -

-

- googleVis is a package - for R which provides - functions to visualise data in R with - the Google - Visualisation API. -
- Please read - Google's terms - of use and data policy. -
The visual output will be rendered in your browser using Flash. -

-

- Type ?googleVis in the R console to see the overall documentation - and vignette('googleVis') to access the package - vignette. -
- This page provides some examples of the package. You find more - as part of the demo; to execute the demo type into the R - console: demo(googleVis). -

-

- Embedding googleVis charts into your web page with R.rsp -

-

- The R - package R.rsp - provides a lightweight web-server which we are using here to - display these pages. Additionally the R.rsp - package allows us to dynamically generate documents into - static content using R Server Pages. This means we can mix html and R - code to create content on the fly. -

-

- For more information - on R.rsp see here. -

-

Examples with googleVis

- You can embed googleVis charts quite easily in your rsp page. -

- For example -

-<%=gvisGeoMap(Exports, locationvar='Country',
-numvar='Profit',options=list(height=350,
-dataMode='regions'))$html$chart%> 
-      
- gives you a Geo Map: -

-

- <%=gvisGeoMap(Exports, locationvar='Country', numvar='Profit',options=list(height=350, dataMode='regions'))$html$chart%> - See also: Google - Geo Map API -

-

- A Google Map can be create e.g. via -

-<%=gvisMap(Andrew, "LatLong" , "Tip", options=list(showTip=TRUE,
-showLine=TRUE, enableScrollWheel=TRUE,  mapType='terrain',
-useMapTypeControl=TRUE))$html$chart%>
-     
-

-

-<%=gvisMap(as.list(Andrew), "LatLong" , "Tip", options=list(showTip=TRUE, showLine=TRUE, enableScrollWheel=TRUE, mapType='terrain', useMapTypeControl=TRUE))$html$chart%> - See also: Google - Map API -

-

- For a Motion Chart we would write something like -

-<%=gvisMotionChart(Fruits, idvar="Fruit", timevar="Year",
-options=list(width=600, height=500))$html$chart%>
-      
-

-

- <%=gvisMotionChart(Fruits, idvar="Fruit", timevar="Year", options=list(width=600, height=500))$html$chart%> - See also: Google - Motion Chart API -

-

- A Tree Map can be generated with -

-<%=gvisTreeMap(Regions, idvar="Region", parentvar="Parent",
-sizevar="Val", colorvar="Fac", options=list(width=600, height=500,
-showScale=TRUE, fontSize=16))$html$chart%>
-      
-

-

- <%=gvisTreeMap(Regions, "Region", "Parent", "Val", "Fac", options=list(width=600, height=500, showScale=TRUE, fontSize=16))$html$chart%> - See also: Google - Tree Map API -

-

- To display a Table we write -

-<%=gvisTable(Exports, options=list(width=600, height=300))$html$chart%>
-     
-

-

- <%=gvisTable(Exports, options=list(width=600, height=300))$html$chart%> - See also: Google - Table API -

- - -

- For an Annotated Time Line an example could look like -

-<%=gvisAnnotatedTimeLine(Stock, datevar="Date", numvar="Value",
-idvar="Device",  titlevar="Title", annotationvar="Annotation",
-options=list(displayAnnotations=TRUE, width=600, height=350))$html$chart%> 
-     
-

-

- <%=gvisAnnotatedTimeLine(Stock, datevar="Date", numvar="Value", idvar="Device", titlevar="Title", annotationvar="Annotation", options=list(displayAnnotations=TRUE, width=600, height=350))$html$chart%> - See also: Google - Annotated Time Line API -

- -

- We hope these examples show you how you can generate content - with functions from the googleVis - packages. -

-

-

- - If a page is loading "forever", that is, the internal web server seems to be stuck, try to press ENTER in the main R window. This normally helps. - - - - - <%@include file="src/simpleFooter.rsp"%> - - - - + + + <%title="Using the Google visualisation API with R"%> + + + <%@include file="src/simpleHead.rsp"%> + + + <%@include file="src/simpleHeader.rsp"%> + <%require(googleVis)%> +

+ Welcome +

+ Welcome + to googleVis + version <%=packageDescription("googleVis")$Version%> by: + Markus Gesmann + and Diego de Castillo +

+ Introduction +

+

+ googleVis is a package + for R which provides + functions to visualise data in R with + the Google + Visualisation API. +
+ Please read + Google's terms + of use and data policy. +
The visual output will be rendered in your browser using Flash. +

+

+ Type ?googleVis in the R console to see the overall documentation + and vignette('googleVis') to access the package + vignette. +
+ This page provides some examples of the package. You find more + as part of the demo; to execute the demo type into the R + console: demo(googleVis). +

+

+ Embedding googleVis charts into your web page with R.rsp +

+

+ The R + package R.rsp + provides a lightweight web-server which we are using here to + display these pages. Additionally the R.rsp + package allows us to dynamically generate documents into + static content using R Server Pages. This means we can mix html and R + code to create content on the fly. +

+

+ For more information + on R.rsp see here. +

+

Examples with googleVis

+ You can embed googleVis charts quite easily in your rsp page. +

+ For example +

+<%=gvisGeoMap(Exports, locationvar='Country',
+numvar='Profit',options=list(height=350,
+dataMode='regions'))$html$chart%> 
+      
+ gives you a Geo Map: +

+

+ <%=gvisGeoMap(Exports, locationvar='Country', numvar='Profit',options=list(height=350, dataMode='regions'))$html$chart%> + See also: Google + Geo Map API +

+

+ A Google Map can be create e.g. via +

+<%=gvisMap(Andrew, "LatLong" , "Tip", options=list(showTip=TRUE,
+showLine=TRUE, enableScrollWheel=TRUE,  mapType='terrain',
+useMapTypeControl=TRUE))$html$chart%>
+     
+

+

+<%=gvisMap(as.list(Andrew), "LatLong" , "Tip", options=list(showTip=TRUE, showLine=TRUE, enableScrollWheel=TRUE, mapType='terrain', useMapTypeControl=TRUE))$html$chart%> + See also: Google + Map API +

+

+ For a Motion Chart we would write something like +

+<%=gvisMotionChart(Fruits, idvar="Fruit", timevar="Year",
+options=list(width=600, height=500))$html$chart%>
+      
+

+

+ <%=gvisMotionChart(Fruits, idvar="Fruit", timevar="Year", options=list(width=600, height=500))$html$chart%> + See also: Google + Motion Chart API +

+

+ A Tree Map can be generated with +

+<%=gvisTreeMap(Regions, idvar="Region", parentvar="Parent",
+sizevar="Val", colorvar="Fac", options=list(width=600, height=500,
+showScale=TRUE, fontSize=16))$html$chart%>
+      
+

+

+ <%=gvisTreeMap(Regions, "Region", "Parent", "Val", "Fac", options=list(width=600, height=500, showScale=TRUE, fontSize=16))$html$chart%> + See also: Google + Tree Map API +

+

+ To display a Table we write +

+<%=gvisTable(Exports, options=list(width=600, height=300))$html$chart%>
+     
+

+

+ <%=gvisTable(Exports, options=list(width=600, height=300))$html$chart%> + See also: Google + Table API +

+ + +

+ For an Annotated Time Line an example could look like +

+<%=gvisAnnotatedTimeLine(Stock, datevar="Date", numvar="Value",
+idvar="Device",  titlevar="Title", annotationvar="Annotation",
+options=list(displayAnnotations=TRUE, width=600, height=350))$html$chart%> 
+     
+

+

+ <%=gvisAnnotatedTimeLine(Stock, datevar="Date", numvar="Value", idvar="Device", titlevar="Title", annotationvar="Annotation", options=list(displayAnnotations=TRUE, width=600, height=350))$html$chart%> + See also: Google + Annotated Time Line API +

+ +

+ We hope these examples show you how you can generate content + with functions from the googleVis + packages. +

+

+

+ + If a page is loading "forever", that is, the internal web server seems to be stuck, try to press ENTER in the main R window. This normally helps. + + + + + <%@include file="src/simpleFooter.rsp"%> + + + + diff -pruN 0.6.2-3/inst/rsp/myAnalysis/index.rsp 0.6.3+dfsg-1/inst/rsp/myAnalysis/index.rsp --- 0.6.2-3/inst/rsp/myAnalysis/index.rsp 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/inst/rsp/myAnalysis/index.rsp 2018-11-10 19:58:05.000000000 +0000 @@ -1,5 +1,5 @@ + "https://www.w3.org/TR/REC-html40/loose.dtd"> <%title="Google Motion Chart Pages"%> diff -pruN 0.6.2-3/inst/rsp/src/simpleFooter.rsp 0.6.3+dfsg-1/inst/rsp/src/simpleFooter.rsp --- 0.6.2-3/inst/rsp/src/simpleFooter.rsp 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/inst/rsp/src/simpleFooter.rsp 2018-11-10 19:51:26.000000000 +0000 @@ -1,6 +1,6 @@ <%-- F o o t e r --%>
-
Generated on <%=date()%> with googleVis. +
Generated on <%=date()%> with googleVis.
- +
diff -pruN 0.6.2-3/man/Andrew.Rd 0.6.3+dfsg-1/man/Andrew.Rd --- 0.6.2-3/man/Andrew.Rd 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/man/Andrew.Rd 2018-11-10 19:31:18.000000000 +0000 @@ -25,7 +25,7 @@ %% ~~ If necessary, more details than the __description__ above ~~ %%} \source{ - National Hurricane Center: \url{http://www.nhc.noaa.gov/1992andrew.html} + National Hurricane Center: \url{https://www.nhc.noaa.gov/1992andrew.html} } %%\references{ %% ~~ possibly secondary sources and usages ~~ diff -pruN 0.6.2-3/man/createGoogleGadget.Rd 0.6.3+dfsg-1/man/createGoogleGadget.Rd --- 0.6.2-3/man/createGoogleGadget.Rd 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/man/createGoogleGadget.Rd 2018-11-10 19:28:13.000000000 +0000 @@ -36,7 +36,7 @@ the menu "Insert" -> "More gadgets ..." In a Google Code wiki the gadget can be embedded via -\code{} +\code{} } diff -pruN 0.6.2-3/man/googleVis-package.Rd 0.6.3+dfsg-1/man/googleVis-package.Rd --- 0.6.2-3/man/googleVis-package.Rd 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/man/googleVis-package.Rd 2018-11-10 20:08:55.000000000 +0000 @@ -14,10 +14,10 @@ Google. Please visit the project web site for more information: - \url{http://github.com/mages/googleVis}. + \url{https://github.com/mages/googleVis}. You find further notes on Markus' blog: - \url{http://www.magesblog.com/search/label/googleVis} + \url{https://magesblog.com/tags/googlevis/} } %\details{ % } diff -pruN 0.6.2-3/man/gvisAnnotatedTimeLine.Rd 0.6.3+dfsg-1/man/gvisAnnotatedTimeLine.Rd --- 0.6.2-3/man/gvisAnnotatedTimeLine.Rd 2016-08-31 03:28:50.000000000 +0000 +++ 0.6.3+dfsg-1/man/gvisAnnotatedTimeLine.Rd 2018-11-10 19:31:35.000000000 +0000 @@ -78,9 +78,9 @@ For more details visit: goo.gl/tkiEV8 Because of Flash security settings the chart might not work correctly when accessed from a file location in the browser (e.g., file:///c:/webhost/myhost/myviz.html) rather than from a web server URL -(e.g. http://www.myhost.com/myviz.html). See the googleVis package vignette +(e.g. https://www.myhost.com/myviz.html). See the googleVis package vignette and the Macromedia web site -(\url{http://www.macromedia.com/support/documentation/en/flashplayer/help/}) +(\url{https://www.macromedia.com/support/documentation/en/flashplayer/help/}) for more details. Important: To use this visualization, you must specify the height and width @@ -89,6 +89,7 @@ options=list(width="600px", height="350p Use code{\link{gvisAnnotationChart}} for a non-Flash version of this plot. } + \examples{ ## Please note that by default the googleVis plot command @@ -169,7 +170,7 @@ month <- ifelse(month < 10, paste("0",mo ## Get weekly stock prices from Apple Inc. tckr <- 'AAPL' -yahoo <- 'http://ichart.finance.yahoo.com/table.csv' +yahoo <- 'https://ichart.finance.yahoo.com/table.csv' fn <- sprintf('\%s?s=\%s&a=08&b=7&c=1984&d=\%s&e=\%s&f=\%s&g=w&ignore=.csv', yahoo, tckr, month, current.day, current.year) @@ -204,11 +205,6 @@ plot(aapl) } } -\author{ -Markus Gesmann \email{markus.gesmann@gmail.com}, - -Diego de Castillo \email{decastillo@gmail.com} -} \references{ Google Chart Tools API: \Sexpr[results=rd]{gsub("CHARTNAME", @@ -223,5 +219,9 @@ See also \code{\link{print.gvis}}, \code plotting methods. Further see \code{\link{reshape}} for reshaping data, e.g. from a wide format into a long format. } -\keyword{iplot} +\author{ +Markus Gesmann \email{markus.gesmann@gmail.com}, +Diego de Castillo \email{decastillo@gmail.com} +} +\keyword{iplot} diff -pruN 0.6.2-3/man/gvisAnnotationChart.Rd 0.6.3+dfsg-1/man/gvisAnnotationChart.Rd --- 0.6.2-3/man/gvisAnnotationChart.Rd 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/man/gvisAnnotationChart.Rd 2018-11-10 19:27:11.000000000 +0000 @@ -145,7 +145,7 @@ month <- ifelse(month < 10, paste("0",mo ## Get weekly stock prices from Apple Inc. tckr <- 'AAPL' -yahoo <- 'http://ichart.finance.yahoo.com/table.csv' +yahoo <- 'https://ichart.finance.yahoo.com/table.csv' fn <- sprintf('\%s?s=\%s&a=08&b=7&c=1984&d=\%s&e=\%s&f=\%s&g=w&ignore=.csv', yahoo, tckr, month, current.day, current.year) @@ -180,10 +180,6 @@ plot(aapl) } } -\author{ -Markus Gesmann \email{markus.gesmann@gmail.com}, -Diego de Castillo \email{decastillo@gmail.com} -} \references{ Google Chart Tools API: \Sexpr[results=rd]{gsub("CHARTNAME", @@ -198,5 +194,8 @@ See also \code{\link{print.gvis}}, \code plotting methods. Further see \code{\link{reshape}} for reshaping data, e.g. from a wide format into a long format. } +\author{ +Markus Gesmann \email{markus.gesmann@gmail.com}, +Diego de Castillo \email{decastillo@gmail.com} +} \keyword{iplot} - diff -pruN 0.6.2-3/man/gvisAreaChart.Rd 0.6.3+dfsg-1/man/gvisAreaChart.Rd --- 0.6.2-3/man/gvisAreaChart.Rd 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/man/gvisAreaChart.Rd 2017-09-08 07:56:30.000000000 +0000 @@ -79,11 +79,6 @@ plot(Area3) } } -\author{ -Markus Gesmann \email{markus.gesmann@gmail.com}, - -Diego de Castillo \email{decastillo@gmail.com} -} \references{ Google Chart Tools API: \Sexpr[results=rd]{gsub("CHARTNAME", @@ -97,5 +92,9 @@ readLines(file.path(".", "inst", "manse See also \code{\link{print.gvis}}, \code{\link{plot.gvis}} for printing and plotting methods } -\keyword{iplot} +\author{ +Markus Gesmann \email{markus.gesmann@gmail.com}, +Diego de Castillo \email{decastillo@gmail.com} +} +\keyword{iplot} diff -pruN 0.6.2-3/man/gvisBarChart.Rd 0.6.3+dfsg-1/man/gvisBarChart.Rd --- 0.6.2-3/man/gvisBarChart.Rd 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/man/gvisBarChart.Rd 2018-11-10 19:30:25.000000000 +0000 @@ -83,7 +83,7 @@ plot(Bar4) library(XML) ## Get the data of the biggest ISO container companies from Wikipedia ##(table 3): -df=readHTMLTable(readLines("http://en.wikipedia.org/wiki/Intermodal_freight_transport"))[[3]][,1:2] +df=readHTMLTable(readLines("https://en.wikipedia.org/wiki/Intermodal_freight_transport"))[[3]][,1:2] ## Rename the second column names(df)[2]="TEU capacity" ## The numbers are displayed with commas to separate thousands, so let's @@ -101,11 +101,6 @@ plot(Bar5) } } -\author{ -Markus Gesmann \email{markus.gesmann@gmail.com}, - -Diego de Castillo \email{decastillo@gmail.com} -} \references{ Google Chart Tools API: \Sexpr[results=rd]{gsub("CHARTNAME", @@ -119,5 +114,9 @@ readLines(file.path(".", "inst", "manse See also \code{\link{print.gvis}}, \code{\link{plot.gvis}} for printing and plotting methods } -\keyword{iplot} +\author{ +Markus Gesmann \email{markus.gesmann@gmail.com}, +Diego de Castillo \email{decastillo@gmail.com} +} +\keyword{iplot} diff -pruN 0.6.2-3/man/gvisBubbleChart.Rd 0.6.3+dfsg-1/man/gvisBubbleChart.Rd --- 0.6.2-3/man/gvisBubbleChart.Rd 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/man/gvisBubbleChart.Rd 2018-11-09 15:01:43.000000000 +0000 @@ -6,8 +6,8 @@ \Sexpr{googleChartName <- "bubblechart"} \Sexpr{gvisChartName <- "gvisBubbleChart"}} \usage{ -gvisBubbleChart(data, idvar = "", xvar = "", yvar = "", colorvar = "", - sizevar = "", options = list(), chartid) +gvisBubbleChart(data, idvar = "", xvar = "", yvar = "", + colorvar = "", sizevar = "", options = list(), chartid) } \arguments{ \item{data}{a \code{\link{data.frame}} to be displayed as a bubble chart. @@ -101,11 +101,6 @@ plot(M) } -\author{ -Markus Gesmann \email{markus.gesmann@gmail.com}, - -Diego de Castillo \email{decastillo@gmail.com} -} \references{ Google Chart Tools API: \Sexpr[results=rd]{gsub("CHARTNAME", @@ -120,5 +115,9 @@ See also \code{\link{gvisMotionChart}} f over time, and \code{\link{print.gvis}}, \code{\link{plot.gvis}} for printing and plotting methods. } -\keyword{iplot} +\author{ +Markus Gesmann \email{markus.gesmann@gmail.com}, +Diego de Castillo \email{decastillo@gmail.com} +} +\keyword{iplot} diff -pruN 0.6.2-3/man/gvisCalendar.Rd 0.6.3+dfsg-1/man/gvisCalendar.Rd --- 0.6.2-3/man/gvisCalendar.Rd 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/man/gvisCalendar.Rd 2018-11-09 15:01:43.000000000 +0000 @@ -3,10 +3,11 @@ \name{gvisCalendar} \alias{gvisCalendar} \title{Google Calendar Chart with R -\Sexpr{googleChartName <- "Calendar"} +\Sexpr{googleChartName <- "calendar"} \Sexpr{gvisChartName <- "gvisCalendar"}} \usage{ -gvisCalendar(data, datevar = "", numvar = "", options = list(), chartid) +gvisCalendar(data, datevar = "", numvar = "", options = list(), + chartid) } \arguments{ \item{data}{a \code{data.frame}. The data has to have at least two columns, @@ -52,6 +53,7 @@ the week, or how it trends over time. The calendar chart may be undergoing substantial revisions in future Google Charts releases. } + \examples{ cl1 <- gvisCalendar(Cairo, datevar="Date", numvar="Temp") plot(cl1) @@ -83,11 +85,6 @@ cl4 <- gvisCalendar(Cairo, datevar="Date plot(cl4) } -\author{ -Markus Gesmann \email{markus.gesmann@gmail.com}, - -Diego de Castillo \email{decastillo@gmail.com} -} \references{ Google Chart Tools API: \Sexpr[results=rd]{gsub("CHARTNAME", @@ -101,5 +98,9 @@ readLines(file.path(".", "inst", "manse See also \code{\link{print.gvis}}, \code{\link{plot.gvis}} for printing and plotting methods. } -\keyword{iplot} +\author{ +Markus Gesmann \email{markus.gesmann@gmail.com}, +Diego de Castillo \email{decastillo@gmail.com} +} +\keyword{iplot} diff -pruN 0.6.2-3/man/gvisCandlestickChart.Rd 0.6.3+dfsg-1/man/gvisCandlestickChart.Rd --- 0.6.2-3/man/gvisCandlestickChart.Rd 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/man/gvisCandlestickChart.Rd 2018-11-09 15:01:43.000000000 +0000 @@ -6,8 +6,8 @@ \Sexpr{googleChartName <- "candlestickchart"} \Sexpr{gvisChartName <- "gvisCandlestickChart"}} \usage{ -gvisCandlestickChart(data, xvar = "", low = "", open = "", close = "", - high = "", options = list(), chartid) +gvisCandlestickChart(data, xvar = "", low = "", open = "", + close = "", high = "", options = list(), chartid) } \arguments{ \item{data}{a \code{\link{data.frame}} to be displayed as a candlestick @@ -86,11 +86,6 @@ plot(C1) } -\author{ -Markus Gesmann \email{markus.gesmann@gmail.com}, - -Diego de Castillo \email{decastillo@gmail.com} -} \references{ Google Chart Tools API: \Sexpr[results=rd]{gsub("CHARTNAME", @@ -104,5 +99,9 @@ readLines(file.path(".", "inst", "manse See also \code{\link{print.gvis}}, \code{\link{plot.gvis}} for printing and plotting methods } -\keyword{iplot} +\author{ +Markus Gesmann \email{markus.gesmann@gmail.com}, +Diego de Castillo \email{decastillo@gmail.com} +} +\keyword{iplot} diff -pruN 0.6.2-3/man/gvisColumnChart.Rd 0.6.3+dfsg-1/man/gvisColumnChart.Rd --- 0.6.2-3/man/gvisColumnChart.Rd 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/man/gvisColumnChart.Rd 2018-11-09 15:01:43.000000000 +0000 @@ -6,7 +6,8 @@ \Sexpr{googleChartName <- "columnchart"} \Sexpr{gvisChartName <- "gvisColumnChart"}} \usage{ -gvisColumnChart(data, xvar = "", yvar = "", options = list(), chartid) +gvisColumnChart(data, xvar = "", yvar = "", options = list(), + chartid) } \arguments{ \item{data}{a \code{\link{data.frame}} to be displayed as a column chart} @@ -78,11 +79,6 @@ plot(Col4) } -\author{ -Markus Gesmann \email{markus.gesmann@gmail.com}, - -Diego de Castillo \email{decastillo@gmail.com} -} \references{ Google Chart Tools API: \Sexpr[results=rd]{gsub("CHARTNAME", @@ -96,5 +92,9 @@ readLines(file.path(".", "inst", "manse See also \code{\link{print.gvis}}, \code{\link{plot.gvis}} for printing and plotting methods } -\keyword{iplot} +\author{ +Markus Gesmann \email{markus.gesmann@gmail.com}, +Diego de Castillo \email{decastillo@gmail.com} +} +\keyword{iplot} diff -pruN 0.6.2-3/man/gvisComboChart.Rd 0.6.3+dfsg-1/man/gvisComboChart.Rd --- 0.6.2-3/man/gvisComboChart.Rd 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/man/gvisComboChart.Rd 2017-09-08 07:56:30.000000000 +0000 @@ -78,11 +78,6 @@ plot(C2) } -\author{ -Markus Gesmann \email{markus.gesmann@gmail.com}, - -Diego de Castillo \email{decastillo@gmail.com} -} \references{ Google Chart Tools API: \Sexpr[results=rd]{gsub("CHARTNAME", @@ -96,5 +91,9 @@ readLines(file.path(".", "inst", "manse See also \code{\link{print.gvis}}, \code{\link{plot.gvis}} for printing and plotting methods } -\keyword{iplot} +\author{ +Markus Gesmann \email{markus.gesmann@gmail.com}, +Diego de Castillo \email{decastillo@gmail.com} +} +\keyword{iplot} diff -pruN 0.6.2-3/man/gvisGauge.Rd 0.6.3+dfsg-1/man/gvisGauge.Rd --- 0.6.2-3/man/gvisGauge.Rd 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/man/gvisGauge.Rd 2018-11-09 15:01:43.000000000 +0000 @@ -6,7 +6,8 @@ \Sexpr{googleChartName <- "gauge"} \Sexpr{gvisChartName <- "gvisGauge"}} \usage{ -gvisGauge(data, labelvar = "", numvar = "", options = list(), chartid) +gvisGauge(data, labelvar = "", numvar = "", options = list(), + chartid) } \arguments{ \item{data}{a \code{\link{data.frame}} to be displayed as a gauge} @@ -57,11 +58,6 @@ Gauge1 <- gvisGauge(CityPopularity, opti plot(Gauge1) } -\author{ -Markus Gesmann \email{markus.gesmann@gmail.com}, - -Diego de Castillo \email{decastillo@gmail.com} -} \references{ Google Chart Tools API: \Sexpr[results=rd]{gsub("CHARTNAME", @@ -75,5 +71,9 @@ readLines(file.path(".", "inst", "manse See also \code{\link{print.gvis}}, \code{\link{plot.gvis}} for printing and plotting methods } -\keyword{iplot} +\author{ +Markus Gesmann \email{markus.gesmann@gmail.com}, +Diego de Castillo \email{decastillo@gmail.com} +} +\keyword{iplot} diff -pruN 0.6.2-3/man/gvisGeoChart.Rd 0.6.3+dfsg-1/man/gvisGeoChart.Rd --- 0.6.2-3/man/gvisGeoChart.Rd 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/man/gvisGeoChart.Rd 2018-11-10 19:55:01.000000000 +0000 @@ -20,7 +20,7 @@ analysed. The locations can be provide i \item{Format 1}{'latitude:longitude'. See the example below.} \item{Format 2}{Address, country name, region name locations, or US metropolitan area codes, see -\url{http://code.google.com/apis/adwords/docs/developer/adwords_api_us_metros.html}. +\url{https://developers.google.com/adwords/api/docs/appendix/geotargeting?csw=1}. This format works with the \code{dataMode} option set to either 'markers' or 'regions'. The following formats are accepted: A specific address (for example, "1600 Pennsylvania Ave"). A country name as a string (for example, @@ -157,7 +157,7 @@ plot(G7) # Plot S&P countries' credit rating sourced from Wikipedia # Use the hovervar to show the rating library(XML) -url <- "http://en.wikipedia.org/wiki/List_of_countries_by_credit_rating" +url <- "https://en.wikipedia.org/wiki/List_of_countries_by_credit_rating" x <- readHTMLTable(readLines(url), which=3) levels(x$Rating) <- substring(levels(x$Rating), 4, nchar(levels(x$Rating))) @@ -175,10 +175,14 @@ plot(G8) ## Plot world wide earth quakes of the last 30 days with magnitude >= 4.0 library(XML) ## Get earthquake data of the last 30 days -eq <- read.csv("http://earthquake.usgs.gov/earthquakes/feed/v0.1/summary/2.5_week.csv") -eq$loc=paste(eq$Latitude, eq$Longitude, sep=":") - -G9 <- gvisGeoChart(eq, "loc", "Depth", "Magnitude", +url <- "https://ds.iris.edu/seismon/eventlist/index.phtml" +eq <- readHTMLTable(readLines(url), + colClasses=c("factor", rep("numeric", 4), "factor"))$evTable + names(eq) <- c("DATE", "LAT", "LON", "MAG", + "DEPTH", "LOCATION_NAME", "IRIS_ID") +##Format location data +eq$loc=paste(eq$LAT, eq$LON, sep=":") +G9 <- gvisGeoChart(eq, "loc", "DEPTH", "MAG", options=list(displayMode="Markers", colorAxis="{colors:['purple', 'red', 'orange', 'grey']}", backgroundColor="lightblue"), chartid="EQ") @@ -186,10 +190,6 @@ plot(G9) } } -\author{ -Markus Gesmann \email{markus.gesmann@gmail.com}, -Diego de Castillo \email{decastillo@gmail.com} -} \references{ Google Chart Tools API: \Sexpr[results=rd]{gsub("CHARTNAME", @@ -203,5 +203,8 @@ readLines(file.path(".", "inst", "manse See also \code{\link{print.gvis}}, \code{\link{plot.gvis}} for printing and plotting methods. } +\author{ +Markus Gesmann \email{markus.gesmann@gmail.com}, +Diego de Castillo \email{decastillo@gmail.com} +} \keyword{iplot} - diff -pruN 0.6.2-3/man/gvisGeoMap.Rd 0.6.3+dfsg-1/man/gvisGeoMap.Rd --- 0.6.2-3/man/gvisGeoMap.Rd 2016-08-31 03:28:50.000000000 +0000 +++ 0.6.3+dfsg-1/man/gvisGeoMap.Rd 2018-11-10 19:32:12.000000000 +0000 @@ -22,7 +22,7 @@ analysed. The locations can be provide i \item{Format 1}{'latitude:longitude'. See the example below.} \item{Format 2}{Address, country name, region name locations, or US metropolitan area codes, see -\url{http://code.google.com/apis/adwords/docs/developer/adwords_api_us_metros.html}. +\url{https://developers.google.com/adwords/api/docs/appendix/geotargeting?csw=1}. This format works with the \code{dataMode} option set to either 'markers' or 'regions'. The following formats are accepted: A specific address (for example, "1600 Pennsylvania Ave"). @@ -81,11 +81,12 @@ For more details visit: goo.gl/tkiEV8 Because of Flash security settings the chart might not work correctly when accessed from a file location in the browser (e.g., file:///c:/webhost/myhost/myviz.html) rather than -from a web server URL (e.g. http://www.myhost.com/myviz.html). +from a web server URL (e.g. https://www.myhost.com/myviz.html). See the googleVis package vignette and the Macromedia web -site (\url{http://www.macromedia.com/support/documentation/en/flashplayer/help/}) +site (\url{https://www.macromedia.com/support/documentation/en/flashplayer/help/}) for more details. } + \examples{ ## Please note that by default the googleVis plot command ## will open a browser window and requires Internet @@ -139,10 +140,6 @@ G5 <- gvisGeoMap(WorldPopulation, "Count plot(G5) } -\author{ -Markus Gesmann \email{markus.gesmann@gmail.com}, -Diego de Castillo \email{decastillo@gmail.com} -} \references{ Google Chart Tools API: \Sexpr[results=rd]{gsub("CHARTNAME", @@ -152,5 +149,8 @@ readLines(file.path(".", "inst", "manse % END DYNAMIC CONTENT } +\author{ +Markus Gesmann \email{markus.gesmann@gmail.com}, +Diego de Castillo \email{decastillo@gmail.com} +} \keyword{iplot} - diff -pruN 0.6.2-3/man/gvisHistogram.Rd 0.6.3+dfsg-1/man/gvisHistogram.Rd --- 0.6.2-3/man/gvisHistogram.Rd 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/man/gvisHistogram.Rd 2017-09-08 07:56:30.000000000 +0000 @@ -68,11 +68,6 @@ hist3 <- gvisHistogram(dat, options=list plot(hist3) } -\author{ -Markus Gesmann \email{markus.gesmann@gmail.com}, - -Diego de Castillo \email{decastillo@gmail.com} -} \references{ Google Chart Tools API: \Sexpr[results=rd]{gsub("CHARTNAME", @@ -86,5 +81,9 @@ readLines(file.path(".", "inst", "manse See also \code{\link{print.gvis}}, \code{\link{plot.gvis}} for printing and plotting methods } -\keyword{iplot} +\author{ +Markus Gesmann \email{markus.gesmann@gmail.com}, +Diego de Castillo \email{decastillo@gmail.com} +} +\keyword{iplot} diff -pruN 0.6.2-3/man/gvisIntensityMap.Rd 0.6.3+dfsg-1/man/gvisIntensityMap.Rd --- 0.6.2-3/man/gvisIntensityMap.Rd 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/man/gvisIntensityMap.Rd 2018-11-09 15:01:43.000000000 +0000 @@ -6,8 +6,8 @@ \Sexpr{googleChartName <- "intensitymap"} \Sexpr{gvisChartName <- "gvisIntensityMap"}} \usage{ -gvisIntensityMap(data, locationvar = "", numvar = "", options = list(), - chartid) +gvisIntensityMap(data, locationvar = "", numvar = "", + options = list(), chartid) } \arguments{ \item{data}{a \code{data.frame}. The data has to have at least two columns @@ -56,6 +56,7 @@ the maximum width is 440. For more detai % END DYNAMIC CONTENT } + \examples{ ## Please note that by default the googleVis plot command @@ -74,11 +75,6 @@ plot(Intensity2) } -\author{ -Markus Gesmann \email{markus.gesmann@gmail.com}, - -Diego de Castillo \email{decastillo@gmail.com} -} \references{ Google Chart Tools API: \Sexpr[results=rd]{gsub("CHARTNAME", @@ -91,5 +87,9 @@ See also \code{\link{print.gvis}}, \code plotting methods, \code{\link{gvisMap}} and \code{\link{gvisGeoMap}} for an alternative to \code{gvisIntensityMap}. } -\keyword{iplot} +\author{ +Markus Gesmann \email{markus.gesmann@gmail.com}, +Diego de Castillo \email{decastillo@gmail.com} +} +\keyword{iplot} diff -pruN 0.6.2-3/man/gvisLineChart.Rd 0.6.3+dfsg-1/man/gvisLineChart.Rd --- 0.6.2-3/man/gvisLineChart.Rd 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/man/gvisLineChart.Rd 2017-09-08 07:56:30.000000000 +0000 @@ -97,11 +97,6 @@ Dashed <- gvisLineChart(df, xvar="count plot(Dashed) } -\author{ -Markus Gesmann \email{markus.gesmann@gmail.com}, - -Diego de Castillo \email{decastillo@gmail.com} -} \references{ Google Chart Tools API: \Sexpr[results=rd]{gsub("CHARTNAME", @@ -115,5 +110,9 @@ readLines(file.path(".", "inst", "manse See also \code{\link{print.gvis}}, \code{\link{plot.gvis}} for printing and plotting methods } -\keyword{iplot} +\author{ +Markus Gesmann \email{markus.gesmann@gmail.com}, +Diego de Castillo \email{decastillo@gmail.com} +} +\keyword{iplot} diff -pruN 0.6.2-3/man/gvisMap.Rd 0.6.3+dfsg-1/man/gvisMap.Rd --- 0.6.2-3/man/gvisMap.Rd 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/man/gvisMap.Rd 2018-11-10 19:30:47.000000000 +0000 @@ -6,7 +6,8 @@ \Sexpr{googleChartName <- "map"} \Sexpr{gvisChartName <- "gvisMap"}} \usage{ -gvisMap(data, locationvar = "", tipvar = "", options = list(), chartid) +gvisMap(data, locationvar = "", tipvar = "", options = list(), + chartid) } \arguments{ \item{data}{a \code{data.frame}. The data has to have at least two columns @@ -73,8 +74,8 @@ plot(M1) ## Example with address, here UK post-code and some html code in tooltip df <- data.frame(Postcode=c("EC3M 7HA", "EC2P 2EJ"), - Tip=c("Lloyd's", - "Guildhall")) + Tip=c("Lloyd's", + "Guildhall")) M2 <- gvisMap(df, "Postcode", "Tip", options=list(showTip=TRUE, mapType='normal', @@ -87,21 +88,16 @@ M3 <- gvisMap(df, "Postcode", "Tip", options=list(showTip=TRUE, mapType='normal', enableScrollWheel=TRUE, icons=paste0("{", - "'default': {'normal': 'http://icons.iconarchive.com/", + "'default': {'normal': 'https://icons.iconarchive.com/", "icons/icons-land/vista-map-markers/48/", "Map-Marker-Ball-Azure-icon.png',\\n", - "'selected': 'http://icons.iconarchive.com/", + "'selected': 'https://icons.iconarchive.com/", "icons/icons-land/vista-map-markers/48/", "Map-Marker-Ball-Right-Azure-icon.png'", "}}"))) plot(M3) } -\author{ -Markus Gesmann \email{markus.gesmann@gmail.com}, - -Diego de Castillo \email{decastillo@gmail.com} -} \references{ Google Chart Tools API: \Sexpr[results=rd]{gsub("CHARTNAME", @@ -116,5 +112,9 @@ See also \code{\link{print.gvis}}, \code plotting methods, \code{\link{gvisGeoMap}} and \code{\link{gvisIntensityMap}} for an alternative to \code{gvisMap}. } -\keyword{iplot} +\author{ +Markus Gesmann \email{markus.gesmann@gmail.com}, +Diego de Castillo \email{decastillo@gmail.com} +} +\keyword{iplot} diff -pruN 0.6.2-3/man/gvisMethods.Rd 0.6.3+dfsg-1/man/gvisMethods.Rd --- 0.6.2-3/man/gvisMethods.Rd 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/man/gvisMethods.Rd 2018-11-10 19:28:07.000000000 +0000 @@ -226,7 +226,7 @@ plot(M) Please note that the Motion Chart is only displayed when hosted on a web server, or is placed in a directory which has been added to the trusted sources in the [security settings of Macromedia] -(http://www.macromedia.com/support/documentation/en/flashplayer/help/settings_manager04.html). +(https://www.macromedia.com/support/documentation/en/flashplayer/help/settings_manager04.html). See the googleVis package vignette for more details. ```{r resetOptions} @@ -304,7 +304,7 @@ cat(M$html$chart[c('jsDrawChart', 'jsDis html <- sprintf(' - diff -pruN 0.6.2-3/man/gvisMotionChart.Rd 0.6.3+dfsg-1/man/gvisMotionChart.Rd --- 0.6.2-3/man/gvisMotionChart.Rd 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/man/gvisMotionChart.Rd 2018-11-10 19:31:43.000000000 +0000 @@ -7,8 +7,8 @@ \Sexpr{gvisChartName <- "gvisMotionChart"}} \usage{ gvisMotionChart(data, idvar = "id", timevar = "time", xvar = "", - yvar = "", colorvar = "", sizevar = "", date.format = "\%Y/\%m/\%d", - options = list(), chartid) + yvar = "", colorvar = "", sizevar = "", + date.format = "\%Y/\%m/\%d", options = list(), chartid) } \arguments{ \item{data}{a \code{data.frame}. The data has to have at least four @@ -83,9 +83,9 @@ time. Because of Flash security settings the chart might not work correctly when accessed from a file location in the browser (e.g., file:///c:/webhost/myhost/myviz.html) rather than -from a web server URL (e.g. http://www.myhost.com/myviz.html). +from a web server URL (e.g. https://www.myhost.com/myviz.html). See the googleVis package vignette and the Macromedia web -site (\url{http://www.macromedia.com/support/documentation/en/flashplayer/help/}) +site (\url{https://www.macromedia.com/support/documentation/en/flashplayer/help/}) for more details. } @@ -94,6 +94,7 @@ for more details. Please note that a \code{timevar} with values less than 100 will be shown as years 19xx. } + \examples{ ## Please note that by default the googleVis plot command ## will open a browser window and requires Flash and Internet @@ -168,10 +169,6 @@ plot(M7) ## plots. } -\author{ -Markus Gesmann \email{markus.gesmann@gmail.com}, -Diego de Castillo \email{decastillo@gmail.com} -} \references{ Google Chart Tools API: \Sexpr[results=rd]{gsub("CHARTNAME", @@ -185,5 +182,8 @@ readLines(file.path(".", "inst", "manse See also \code{\link{print.gvis}}, \code{\link{plot.gvis}} for printing and plotting methods. } +\author{ +Markus Gesmann \email{markus.gesmann@gmail.com}, +Diego de Castillo \email{decastillo@gmail.com} +} \keyword{iplot} - diff -pruN 0.6.2-3/man/gvisOrgChart.Rd 0.6.3+dfsg-1/man/gvisOrgChart.Rd --- 0.6.2-3/man/gvisOrgChart.Rd 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/man/gvisOrgChart.Rd 2017-09-08 07:56:30.000000000 +0000 @@ -77,11 +77,6 @@ Org2 <- gvisOrgChart(Regions, idvar = "R plot(Org2) } -\author{ -Markus Gesmann \email{markus.gesmann@gmail.com}, - -Diego de Castillo \email{decastillo@gmail.com} -} \references{ Google Chart Tools API: \Sexpr[results=rd]{gsub("CHARTNAME", @@ -95,5 +90,9 @@ readLines(file.path(".", "inst", "manse See also \code{\link{print.gvis}}, \code{\link{plot.gvis}} for printing and plotting methods. } -\keyword{iplot} +\author{ +Markus Gesmann \email{markus.gesmann@gmail.com}, +Diego de Castillo \email{decastillo@gmail.com} +} +\keyword{iplot} diff -pruN 0.6.2-3/man/gvisPieChart.Rd 0.6.3+dfsg-1/man/gvisPieChart.Rd --- 0.6.2-3/man/gvisPieChart.Rd 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/man/gvisPieChart.Rd 2018-11-09 15:01:43.000000000 +0000 @@ -6,7 +6,8 @@ \Sexpr{googleChartName <- "piechart"} \Sexpr{gvisChartName <- "gvisPieChart"}} \usage{ -gvisPieChart(data, labelvar = "", numvar = "", options = list(), chartid) +gvisPieChart(data, labelvar = "", numvar = "", options = list(), + chartid) } \arguments{ \item{data}{a \code{\link{data.frame}} to be displayed as a pie chart} @@ -65,11 +66,6 @@ plot(Pie2) } -\author{ -Markus Gesmann \email{markus.gesmann@gmail.com}, - -Diego de Castillo \email{decastillo@gmail.com} -} \references{ Google Chart Tools API: \Sexpr[results=rd]{gsub("CHARTNAME", @@ -83,5 +79,9 @@ readLines(file.path(".", "inst", "manse See also \code{\link{print.gvis}}, \code{\link{plot.gvis}} for printing and plotting methods } -\keyword{iplot} +\author{ +Markus Gesmann \email{markus.gesmann@gmail.com}, +Diego de Castillo \email{decastillo@gmail.com} +} +\keyword{iplot} diff -pruN 0.6.2-3/man/gvisSankey.Rd 0.6.3+dfsg-1/man/gvisSankey.Rd --- 0.6.2-3/man/gvisSankey.Rd 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/man/gvisSankey.Rd 2017-09-08 07:56:30.000000000 +0000 @@ -54,6 +54,7 @@ proportional to heat loss. The sankey chart may be undergoing substantial revisions in future Google Charts releases. } + \examples{ dat <- data.frame(From=c(rep("A",3), rep("B", 3)), To=c(rep(c("X", "Y", "Z"),2)), @@ -69,9 +70,6 @@ sk2 <- gvisSankey(dat, from="From", to=" plot(sk2) } -\author{ -Markus Gesmann \email{markus.gesmann@gmail.com} -} \references{ Google Chart Tools API: \Sexpr[results=rd]{gsub("CHARTNAME", @@ -81,5 +79,7 @@ readLines(file.path(".", "inst", "manse % END DYNAMIC CONTENT } +\author{ +Markus Gesmann \email{markus.gesmann@gmail.com} +} \keyword{iplot} - diff -pruN 0.6.2-3/man/gvisScatterChart.Rd 0.6.3+dfsg-1/man/gvisScatterChart.Rd --- 0.6.2-3/man/gvisScatterChart.Rd 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/man/gvisScatterChart.Rd 2017-09-08 07:56:30.000000000 +0000 @@ -103,11 +103,6 @@ SC <- gvisScatterChart(dat, plot(SC) } -\author{ -Markus Gesmann \email{markus.gesmann@gmail.com}, - -Diego de Castillo \email{decastillo@gmail.com} -} \references{ Google Chart Tools API: \Sexpr[results=rd]{gsub("CHARTNAME", @@ -121,5 +116,9 @@ readLines(file.path(".", "inst", "manse See also \code{\link{print.gvis}}, \code{\link{plot.gvis}} for printing and plotting methods } -\keyword{iplot} +\author{ +Markus Gesmann \email{markus.gesmann@gmail.com}, +Diego de Castillo \email{decastillo@gmail.com} +} +\keyword{iplot} diff -pruN 0.6.2-3/man/gvisSteppedAreaChart.Rd 0.6.3+dfsg-1/man/gvisSteppedAreaChart.Rd --- 0.6.2-3/man/gvisSteppedAreaChart.Rd 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/man/gvisSteppedAreaChart.Rd 2017-09-08 07:56:30.000000000 +0000 @@ -81,11 +81,6 @@ plot(SteppedArea3) } } -\author{ -Markus Gesmann \email{markus.gesmann@gmail.com}, - -Diego de Castillo \email{decastillo@gmail.com} -} \references{ Google Chart Tools API: \Sexpr[results=rd]{gsub("CHARTNAME", @@ -99,5 +94,9 @@ readLines(file.path(".", "inst", "manse See also \code{\link{print.gvis}}, \code{\link{plot.gvis}} for printing and plotting methods } -\keyword{iplot} +\author{ +Markus Gesmann \email{markus.gesmann@gmail.com}, +Diego de Castillo \email{decastillo@gmail.com} +} +\keyword{iplot} diff -pruN 0.6.2-3/man/gvisTable.Rd 0.6.3+dfsg-1/man/gvisTable.Rd --- 0.6.2-3/man/gvisTable.Rd 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/man/gvisTable.Rd 2017-09-08 07:56:30.000000000 +0000 @@ -78,11 +78,6 @@ tbl4 <- gvisTable(Population, formats=li plot(tbl4) } -\author{ -Markus Gesmann \email{markus.gesmann@gmail.com}, - -Diego de Castillo \email{decastillo@gmail.com} -} \references{ Google Chart Tools API: \Sexpr[results=rd]{gsub("CHARTNAME", @@ -96,5 +91,9 @@ readLines(file.path(".", "inst", "manse See also \code{\link{print.gvis}}, \code{\link{plot.gvis}} for printing and plotting methods. } -\keyword{iplot} +\author{ +Markus Gesmann \email{markus.gesmann@gmail.com}, +Diego de Castillo \email{decastillo@gmail.com} +} +\keyword{iplot} diff -pruN 0.6.2-3/man/gvisTimeline.Rd 0.6.3+dfsg-1/man/gvisTimeline.Rd --- 0.6.2-3/man/gvisTimeline.Rd 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/man/gvisTimeline.Rd 2018-11-09 15:01:43.000000000 +0000 @@ -6,8 +6,8 @@ \Sexpr{googleChartName <- "timeline"} \Sexpr{gvisChartName <- "gvisTimeline"}} \usage{ -gvisTimeline(data, rowlabel = "", barlabel = "", start = "", end = "", - options = list(), chartid) +gvisTimeline(data, rowlabel = "", barlabel = "", start = "", + end = "", options = list(), chartid) } \arguments{ \item{data}{data.frame that contains the data to be visualised} @@ -108,9 +108,6 @@ plot(gvisTimeline(ww2, barlabel="Person" ) } } -\author{ -Markus Gesmann \email{markus.gesmann@gmail.com} -} \references{ Google Chart Tools API: \Sexpr[results=rd]{gsub("CHARTNAME", @@ -120,5 +117,7 @@ readLines(file.path(".", "inst", "manse % END DYNAMIC CONTENT } +\author{ +Markus Gesmann \email{markus.gesmann@gmail.com} +} \keyword{iplot} - diff -pruN 0.6.2-3/man/gvisTreeMap.Rd 0.6.3+dfsg-1/man/gvisTreeMap.Rd --- 0.6.2-3/man/gvisTreeMap.Rd 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/man/gvisTreeMap.Rd 2017-09-08 07:56:30.000000000 +0000 @@ -88,6 +88,7 @@ unique parent. Values in column \code{sizevar} should be greater than zero and finite. } + \examples{ ## Please note that by default the googleVis plot command @@ -188,11 +189,6 @@ plot(statesTree3) } -\author{ -Markus Gesmann \email{markus.gesmann@gmail.com}, - -Diego de Castillo \email{decastillo@gmail.com} -} \references{ Google Chart Tools API: \Sexpr[results=rd]{gsub("CHARTNAME", @@ -209,5 +205,9 @@ plotting methods. Please note that the \code{treemap} package offeres a static version of tree maps via its \code{tmPlot} function. } -\keyword{iplot} +\author{ +Markus Gesmann \email{markus.gesmann@gmail.com}, +Diego de Castillo \email{decastillo@gmail.com} +} +\keyword{iplot} diff -pruN 0.6.2-3/man/OpenClose.Rd 0.6.3+dfsg-1/man/OpenClose.Rd --- 0.6.2-3/man/OpenClose.Rd 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/man/OpenClose.Rd 2018-11-10 19:27:35.000000000 +0000 @@ -23,7 +23,7 @@ %%} \source{ Google Visualisation: Candlestick Chart - \url{http://code.google.com/apis/chart/interactive/docs/gallery/candlestickchart.html} + \url{https://developers.google.com/chart/interactive/docs/gallery/candlestickchart?csw=1} } %%\references{ %% ~~ possibly secondary sources and usages ~~ diff -pruN 0.6.2-3/man/Population.Rd 0.6.3+dfsg-1/man/Population.Rd --- 0.6.2-3/man/Population.Rd 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/man/Population.Rd 2018-11-10 19:31:13.000000000 +0000 @@ -22,7 +22,7 @@ } \source{ Sourced from Wikipedia (columns 1 to 5): -\url{http://en.wikipedia.org/wiki/List_of_countries_by_population}, +\url{https://en.wikipedia.org/wiki/List_of_countries_by_population}, 9 October 2010. } \examples{ diff -pruN 0.6.2-3/man/renderGvis.Rd 0.6.3+dfsg-1/man/renderGvis.Rd --- 0.6.2-3/man/renderGvis.Rd 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/man/renderGvis.Rd 2018-11-10 20:17:47.000000000 +0000 @@ -30,10 +30,11 @@ Use a googleVis Chart as Shiny Output \section{Details}{ More information about shiny is available online: - \url{http://www.rstudio.com/shiny/}. + \url{https://www.rstudio.com/shiny/}. You find further examples with googleVis on shiny on mages' blog: - \url{http://lamages.blogspot.co.uk/search/label/shiny} + \url{https://magesblog.com/tags/shiny/} } + \examples{ \dontrun{ @@ -75,4 +76,3 @@ shinyUI(pageWithSidebar( Joe Cheng, \email{joe@rstudio.com} } \keyword{shiny} - diff -pruN 0.6.2-3/MD5 0.6.3+dfsg-1/MD5 --- 0.6.2-3/MD5 2017-01-01 12:15:12.000000000 +0000 +++ 0.6.3+dfsg-1/MD5 2018-11-12 16:10:03.000000000 +0000 @@ -1,33 +1,33 @@ -0bbcce384569b7043d2415cb94dcf605 *DESCRIPTION -dabf610cd334a715593c726108738f04 *NAMESPACE -f160398e9ae5806bbd43aa147789130d *NEWS +482956110313fb654a989757f73366ca *DESCRIPTION +05bccbb6cc2af4212bf652887867c1cb *NAMESPACE +523782f9afbfd7926b91640c4dfba32b *NEWS e3be3e4cf3c043e4fe8ba406b5f0b3a7 *R/gadget.R -4ddebae838bf69fb5c9b5af43933dcb6 *R/gvis.R -af9bfafdb426c6b67534949056819fb2 *R/gvisAnnotatedTimeLine.R -7819d7f4459f4bd4b0c1ab2dd9b9e68b *R/gvisAnnotationChart.R -81e09ca728dca0a0da0a3cb08f52a3a4 *R/gvisBubbleChart.R -925ffbee67b743f53808a5780f9c719a *R/gvisCalendar.R +3adc4741706fdacea06a3f24142b2808 *R/gvis.R +0e4f6a0af81d7896a73545e63c76dd70 *R/gvisAnnotatedTimeLine.R +6948791075c4e4963bde75122de1ffc4 *R/gvisAnnotationChart.R +a7f4542ab35b41d38ab2df69f80eff82 *R/gvisBubbleChart.R +da68bec9767303823d1d3826ece54294 *R/gvisCalendar.R ef907f89877ca91af78ed842226ff2ef *R/gvisChartEditor.R -fe82ebf94facfc3ec44164a81765d0ad *R/gvisCoreCharts.R -bee61af6869b77c8a64fdff73b58b211 *R/gvisGeoChart.R -3439f75b8a3f9ee3a7fd7f997e0b1f33 *R/gvisGeoMap.R +65ea039f47c7fe71d09dcf3d1bcdafea *R/gvisCoreCharts.R +74f1104a29cdc539b3f4ed546ed65c7c *R/gvisGeoChart.R +e12d0e7999615b9e6294cae24cf1ee3d *R/gvisGeoMap.R dc168599816e1f78cdac47d734b419fa *R/gvisHistogram.R 1ef6669a03fdf36b004b4809791b8246 *R/gvisIntensityMap.R -14e9f08f3770ed5b1c15604734cbc092 *R/gvisMap.R -8b04f6218e60bd6838ada520e0a314f3 *R/gvisMethods.R -498255452553e0f40c68e2c377826831 *R/gvisMotionChart.R +c2734c85260880f4e842da3d2762d132 *R/gvisMap.R +6525eab52f33f62287d1d1c5f49b57f5 *R/gvisMethods.R +e2fa06adbf78a270b51916292d7b1413 *R/gvisMotionChart.R cfe327f6e80262823c3af785a7255671 *R/gvisOrgChart.R cf3d3adcd7f20039573ca900ca24df8e *R/gvisPieGaugeChart.R -8b1f3eef308a57adf205268cb49e07ab *R/gvisSankey.R +63bc7e4fb337f64dcfd2c3ff2cd08ba7 *R/gvisSankey.R a7946e4e91e922e1311349df2ac13d06 *R/gvisTable.R -feb01155621a32f59bc4d02beca4fca0 *R/gvisTimeLine.R +d04a866b6f627d603461cc0f9f1d3452 *R/gvisTimeLine.R b306c3f1ddbebb4954427210a6c1ca08 *R/gvisTreeMap.R -3cb7f0d7784626dd08c62cf654002a7c *R/shiny.R -11479094dd7d48ec36a06861d44574bf *R/zzz.R -a3fcba290103702be5c6343f979e64c3 *README.md +db9dae5644b011e9bbaaa992c022f038 *R/shiny.R +3497a6d5eab2afb768a643ff75738d5b *R/zzz.R +376f7edef24d790b3b8e76fc51d86805 *README.md 2b2c926ae2970ffa848190f7088693db *THANKS -97b63aba1f8fba05a3b6739b90751d24 *build/googleVis.pdf -2f23fd3fc61d0c9ee5a093b57de47886 *build/vignette.rds +a1bf02443f89b068611c6078ec220f64 *build/googleVis.pdf +d4762e9833c6f0fb9253404cc288a917 *build/vignette.rds 91d0506c4220a2d76d3b266771c52f4f *data/Andrew.RData e66d6f02a338720ff56db4bd6fdfb45d *data/Cairo.RData 9ede3722aaebc936f558114245a773a3 *data/CityPopularity.RData @@ -39,85 +39,85 @@ e66d6f02a338720ff56db4bd6fdfb45d *data/C 4d88f26391a249cf96b9185421d004d3 *data/Stock.RData fc5f40ff03b9367e36e8809a5e04063f *data/dino.RData 2a7e430a547349e3a9bddce45ebe6c05 *demo/00Index -59669c21bc899ea56ddf64ef7adf8d7d *demo/AnimatedGeoChart.R -fb793493a4732d83932e19a1fac5a55f *demo/EventListener.R -dca3f09bbd1f423bc5e85ce7b85d0080 *demo/Roles.R +4a3d72d4c5f6e1082dcb9e46a9a82bcb *demo/AnimatedGeoChart.R +b91ef9efe9978858dcdffb43eb9d18f8 *demo/EventListener.R +7d7ddf7cae44d9bba82ca933e875f35f *demo/Roles.R 434dc999b2aa1c770ebebc82118aa3de *demo/Trendlines.R -734e8e453cbb54cae65f58b4fc2bbaae *demo/WorldBank.R +c1ba022b0ea3de66558f16f63840a044 *demo/WorldBank.R 6e4fa9135a5fae0cbdd661054b7400fa *demo/googleVis.R 3d422a5fc8b614f85d8d3dbc24167222 *inst/CITATION -621850237bec2e1ec35c18b5bbad0a71 *inst/brew/Stock.html +559fac0ea382fb30855b1808090ada50 *inst/brew/Stock.html 7d32eb1b8e26daacf08eefd3077ce114 *inst/brew/andrew.html -55690fc11a0aa76f867cbecde6f2ff9b *inst/doc/Using_Roles_via_googleVis.R +70879c19539fc1bfd9439ba69a03b3b2 *inst/doc/Using_Roles_via_googleVis.R 4e4d7dc8e7c02caa0ae936196995b569 *inst/doc/Using_Roles_via_googleVis.Rmd -8bf0f143d89673d206c9581636e06f00 *inst/doc/Using_Roles_via_googleVis.html +80b01b096f0cf35480cd97cee6c85382 *inst/doc/Using_Roles_via_googleVis.html 3c4b3a0b03bb21ffdbf5c699b60c9bbb *inst/doc/Using_Trendlines_with_googleVis.R ca37eea7fdee3ad583ae2d3135a58336 *inst/doc/Using_Trendlines_with_googleVis.Rmd -97dfe7e37c2d383c9e7aee23ed092c60 *inst/doc/Using_Trendlines_with_googleVis.html +107cf22709c46fc9ee9288ff7007cd26 *inst/doc/Using_Trendlines_with_googleVis.html f38eee773b68bf6fe2adcc477e9818a8 *inst/doc/Using_googleVis_with_knitr.R -eb377f26d0f44e6e3ea16d2b808ef6c5 *inst/doc/Using_googleVis_with_knitr.Rmd -2c365db85cbb4adae5f438c74b328f98 *inst/doc/Using_googleVis_with_knitr.html -6090e99f3698206c3751fefa87a84865 *inst/doc/googleVis.R -ffa12ad06488958398972715478777aa *inst/doc/googleVis.Rnw -c58b2ccd1ad5b17f02221b30a677103e *inst/doc/googleVis.pdf +bd3af017264629a5668c5ca96548c357 *inst/doc/Using_googleVis_with_knitr.Rmd +b9ef2f7708e4fa990bb36a7a314294ec *inst/doc/Using_googleVis_with_knitr.html +3c8a1a975b4812b9d2b2600523bff1d0 *inst/doc/googleVis.R +0f60a275157455a312a7d005d72f9fce *inst/doc/googleVis.Rnw +16a572ae5cf034b07ffaf4dc22593f27 *inst/doc/googleVis.pdf a5c68079990d73cb07e60d3ecf758894 *inst/doc/googleVis_examples.R -2588285da0540ecd38e39fe5f1b90b6e *inst/doc/googleVis_examples.Rmd -1adf025b7bed62b618d6881f2f64a06b *inst/doc/googleVis_examples.html +e369873c55ef8254d5d7c51b5f769e7a *inst/doc/googleVis_examples.Rmd +f94ad084128eca2434bf8a8af945c0e1 *inst/doc/googleVis_examples.html 39089905a8af75c4f11c6f053d18480c *inst/gadgets/gadgets.R -fa75729496b1fbfa042235c6e1c8fdf4 *inst/mansections/GoogleChartToolsURL.txt -ddb7656486c4a2924d00c2e6cffb69ab *inst/mansections/GoogleChartToolsURLConfigOptions.txt +ff626bbe10fd3634103b30fe8d2bcbaa *inst/mansections/GoogleChartToolsURL.txt +6503f0dd34a9da6984edcc45ae392437 *inst/mansections/GoogleChartToolsURLConfigOptions.txt 8c59446a39186a10a0fa0fc8242f3681 *inst/mansections/gvisOptions.txt 054f7bdacf7f2dc9dd67ff02db578fc0 *inst/mansections/gvisOutputStructure.txt -8c799777c345cb22716f05d6e45aa7fa *inst/rsp/index.rsp -a575c102a95e1406ef31bcffb78f50d1 *inst/rsp/myAnalysis/index.rsp -590d5702e05b18d50af0d53c7c7860aa *inst/rsp/src/simpleFooter.rsp +59aa4303050d1c9e4413925b9c8108ac *inst/rsp/index.rsp +a8a99e17a1a069a7af938666b7e24047 *inst/rsp/myAnalysis/index.rsp +d803bb77ad83a501e45af67e5c9f004f *inst/rsp/src/simpleFooter.rsp 0ec4d2885bd1c2204847eeb7d0ac2d74 *inst/rsp/src/simpleHead.rsp 6abee172b1c53548031523940cc57bdb *inst/rsp/src/simpleHeader.rsp 5c2c2e115ad0a9faae1bc4ac20dc1ae6 *inst/shiny/server.R 36327b9b981c5803e8a40882a844d39f *inst/shiny/ui.R -bc2c03dfa42c10ef292829b749ead3d4 *man/Andrew.Rd +1cb2d688cb0c223a385168d24171d11a *man/Andrew.Rd 55cab09ac1092e6f963d67fd476b8213 *man/Cairo.Rd 68491a8d95cad3a6bbde41a546d5b4d0 *man/CityPopularity.Rd 8229021483aabfef4519b4ad9b8c1bee *man/Exports.Rd 7eb095ffc2c02f25789d0584c2022cbe *man/Fruits.Rd -57cf56506046fbad388a9136d57b8760 *man/OpenClose.Rd -760679ec7c9f9e6b33477d3a9b45d177 *man/Population.Rd +f607672c34517c32a7dd56d156ee7ceb *man/OpenClose.Rd +3ecbe995ae8a296c4cc87fcaf9f1cefb *man/Population.Rd 29f086889764fe20a10eb1162a6c1849 *man/Regions.Rd 3abceaa3ff2ea1308c903b3a683fdfc7 *man/Stock.Rd -e64ea200e91c9ea8b622695c7ecd972e *man/createGoogleGadget.Rd +e242b4aaa81695841f8b11ca4d98eff9 *man/createGoogleGadget.Rd 014b4ee5222f5d83fddd92364d421089 *man/dino.Rd -02286d7770b6c68baa1022ea8468211d *man/googleVis-package.Rd -a4f173276052f87e3cb7e45fcb484f41 *man/gvisAnnotatedTimeLine.Rd -9173b2572802fc0fd7f1d39dcc44de58 *man/gvisAnnotationChart.Rd -83e178607bfb6087b994883ebd2876c0 *man/gvisAreaChart.Rd -a6d59a421c0804d1ffaef0d7ea930e32 *man/gvisBarChart.Rd -90870e1c5b86c11c378c5828af393a07 *man/gvisBubbleChart.Rd -e37f2f7426c5595c6a3cc7b1cd505846 *man/gvisCalendar.Rd -6e712bf9e650d11f7d3cde94f442d038 *man/gvisCandlestickChart.Rd -8e32188ddb1789a2b2d4f533ae8dc332 *man/gvisColumnChart.Rd -75ac448e5eb1765e92d49e0fd71acb33 *man/gvisComboChart.Rd -c25a30f2fb340647f7cf83736e6327a0 *man/gvisGauge.Rd -b714282edd242e7a9ed146b7e042c0c6 *man/gvisGeoChart.Rd -680c44f7fa941320b9756c06204c1e3c *man/gvisGeoMap.Rd -d0521290aa23c6b56e5701b78f340337 *man/gvisHistogram.Rd -dc45eef67e3eeaa37f4f3800a65b952d *man/gvisIntensityMap.Rd -5b607c14326b2457ebfbf4a8bd7ad500 *man/gvisLineChart.Rd -9d7be5548095b755c38b4791903a1769 *man/gvisMap.Rd +dd8bcb1ec514c0996683862810a2c308 *man/googleVis-package.Rd +46e732597938d1ad117542b2b54bbf61 *man/gvisAnnotatedTimeLine.Rd +575d25acdc7c07178a11b1ea1274fb51 *man/gvisAnnotationChart.Rd +b841f640743f0352c608503a538c9685 *man/gvisAreaChart.Rd +5255fd1e3d01f369eb04eaf8e4b08f92 *man/gvisBarChart.Rd +6b37850074233ae05be7a8543a03b0aa *man/gvisBubbleChart.Rd +12f6ead4309dbe03bf3950f855773772 *man/gvisCalendar.Rd +ef0b7e8fe0e8c5531bd3fd58d2681ece *man/gvisCandlestickChart.Rd +b68ae0555e2016d7f08f0ff6f1487080 *man/gvisColumnChart.Rd +719e82336bd439aa49eee69e60f9fb30 *man/gvisComboChart.Rd +cacffe0bcf219d71d5a84ec551dbf74c *man/gvisGauge.Rd +4bd6f66a370546b6aa6bb9d72cfa11e3 *man/gvisGeoChart.Rd +e4401f902ac621ba865bce36c9b1b494 *man/gvisGeoMap.Rd +fef4707376a1534298d54a0c15b3d5c4 *man/gvisHistogram.Rd +6fe2775caeb91cd272cdf800f4c47199 *man/gvisIntensityMap.Rd +f3129f83ed210177e4e76e1cd8ffe870 *man/gvisLineChart.Rd +c925b1622021c29bdfb5b8be8970730c *man/gvisMap.Rd 6c50f41272fd946af1902ad1824ed5b9 *man/gvisMerge.Rd -40169bb74e3496baac38e21fb99dc7e3 *man/gvisMethods.Rd -fca42ab833506a3fbf4856e8188a8875 *man/gvisMotionChart.Rd -563a4041f48b37b9b6734b8d7977debf *man/gvisOrgChart.Rd -6da9a072896f64472b4bcac24e70a8e7 *man/gvisPieChart.Rd -2f4b6626768cab9d56a15c80b56ede2d *man/gvisSankey.Rd -ab531f5f990284b76e3be3f61f39a0cc *man/gvisScatterChart.Rd -83e69a4223888823017a71cf67f3a37a *man/gvisSteppedAreaChart.Rd -e15d9488b7893a4187c184fbe063a058 *man/gvisTable.Rd -970d933ff5a95c641d4c840e7de43351 *man/gvisTimeline.Rd -229aa0e7df11b1ac66dda1eb0e9c6cd5 *man/gvisTreeMap.Rd -ed79ea21d3dfb05af7dd869f02dddbce *man/renderGvis.Rd +61186bd509f711df8e7592770d0f1f2b *man/gvisMethods.Rd +9056dbe008f1b763a286244f77c277bf *man/gvisMotionChart.Rd +68ae9efefb1bd55bd0a62e95c5ab9d99 *man/gvisOrgChart.Rd +a9fa1a85af5f3c25947a586d03edc1ab *man/gvisPieChart.Rd +03c3202b100b9012e5dbf433efcd2fd2 *man/gvisSankey.Rd +bd837583d49ed396bbffd655e23b5491 *man/gvisScatterChart.Rd +e059e8bfa40a7ce95b8471a5a4eadab6 *man/gvisSteppedAreaChart.Rd +091d519fbd57f8ed0356f8012678b43a *man/gvisTable.Rd +94561ee25390508bb995e62d71d0a57c *man/gvisTimeline.Rd +3776e7ee53ee641b57eb507c3e9239ba *man/gvisTreeMap.Rd +59b2b4e2a762c0402f950473f64f9de6 *man/renderGvis.Rd 4e4d7dc8e7c02caa0ae936196995b569 *vignettes/Using_Roles_via_googleVis.Rmd ca37eea7fdee3ad583ae2d3135a58336 *vignettes/Using_Trendlines_with_googleVis.Rmd -eb377f26d0f44e6e3ea16d2b808ef6c5 *vignettes/Using_googleVis_with_knitr.Rmd +bd3af017264629a5668c5ca96548c357 *vignettes/Using_googleVis_with_knitr.Rmd 9a220ccb7b806e759f0b366055f679ef *vignettes/figures/Apostrophe.pdf 21186eae6d903150212c6b658fbd6bd6 *vignettes/figures/CambR_googleVis_29_May_2012.pdf 62d907e42fbdb2a9fe4544360fe16add *vignettes/figures/CreatePost.pdf @@ -132,7 +132,7 @@ e93ed3610543c927ad6f94ea00a53b07 *vignet 58d76fb5cc723136740574364acf1fc9 *vignettes/figures/gvisMerge.pdf ad4ec306dc1769a1027904fba825964b *vignettes/figures/gvisObject.pdf 1a650e324b037aaff1ca6aedd3d51c84 *vignettes/figures/shiny.pdf -ffa12ad06488958398972715478777aa *vignettes/googleVis.Rnw -27fa4abf5c1bf09f56a8586f50894677 *vignettes/googleVis.bib -2588285da0540ecd38e39fe5f1b90b6e *vignettes/googleVis_examples.Rmd +0f60a275157455a312a7d005d72f9fce *vignettes/googleVis.Rnw +5da58fe5a1cb8ecedb377e6efd0a9bb4 *vignettes/googleVis.bib +e369873c55ef8254d5d7c51b5f769e7a *vignettes/googleVis_examples.Rmd 6b242c633f8815370a8fd2c86a45b1bf *vignettes/mystyle.css diff -pruN 0.6.2-3/NAMESPACE 0.6.3+dfsg-1/NAMESPACE --- 0.6.2-3/NAMESPACE 2016-08-31 06:39:23.000000000 +0000 +++ 0.6.3+dfsg-1/NAMESPACE 2018-11-10 20:16:11.000000000 +0000 @@ -29,7 +29,6 @@ export(gvisColumnChart) export(gvisComboChart) export(gvisCandlestickChart) export(gvisSteppedAreaChart) - export(gvisCalendar) export(gvisHistogram) export(gvisAnnotationChart) diff -pruN 0.6.2-3/NEWS 0.6.3+dfsg-1/NEWS --- 0.6.2-3/NEWS 2017-01-01 08:51:52.000000000 +0000 +++ 0.6.3+dfsg-1/NEWS 2018-11-10 19:57:31.000000000 +0000 @@ -1,9 +1,19 @@ +googleVis 0.6.3 [2017-11-09] +---------------------------- + +Bug fixes + + o Corrected URL for gvisCalendar documentation by Google + o Allow for numeric colorvar input for gvisBubbleChart to create + a gradient color scale + + googleVis 0.6.2 [2017-01-01] ---------------------------- Changes - o Update links to omegahat from omegahat.org + o Updated links to omegahat from omegahat.org to omegahat.net as requested by CRAN @@ -422,7 +432,7 @@ Bug Fixes Thanks to Oliver Jay and Wai Tung Ho for reporting this issue. * Fixed earth quake example, using data from - http://www.iris.edu/seismon/last30.html, + https://ds.iris.edu/seismon/eventlist/index.phtml, Mag was read as factor rather than numeric googleVis 0.2.16 [2012-06-01] @@ -453,7 +463,7 @@ Changes NEW FEATURES * Quoted from Google - http://code.google.com/apis/chart/interactive/docs/release_notes.html: + https://developers.google.com/chart/interactive/docs/release_notes?csw=1: - Added gradient color mode to bubble chart. - Geo chart: o Region interactivity in marker mode is now disabled by @@ -488,7 +498,7 @@ Changes * Fixed typos in vignette. Thanks to Pat Burns for pointing them out * Updated links to Google's updated API Terms of Use: - http://code.google.com/apis/terms/index.html + https://developers.google.com/terms/site-terms NEW FEATURES @@ -559,7 +569,7 @@ NEW FEATURES * New demo WorldBank. It demonstrates how country level data can be accessed from the World Bank via their API and displayed with a Motion Chart. Inspired by Google's Public Data Explorer, see - http://www.google.com/publicdata/home + https://www.google.com/publicdata/home googleVis 0.2.9 [2011-09-01] @@ -570,7 +580,7 @@ Changes * The documentation of googleVis has been update to reflect a new version of the Google Visualisation API which was published on 13 July, see - http://code.google.com/apis/chart/interactive/docs/release_notes.html#72011. + https://developers.google.com/chart/interactive/docs/release_notes?csw=1#july-13-2011. Here are some of the most interesting features: - Support for dual Y axes - Ability to crop and zoom chart area to specific ranges diff -pruN 0.6.2-3/R/gvisAnnotatedTimeLine.R 0.6.3+dfsg-1/R/gvisAnnotatedTimeLine.R --- 0.6.2-3/R/gvisAnnotatedTimeLine.R 2016-08-31 03:27:30.000000000 +0000 +++ 0.6.3+dfsg-1/R/gvisAnnotatedTimeLine.R 2018-11-10 19:36:31.000000000 +0000 @@ -85,9 +85,9 @@ #' Because of Flash security settings the chart might not work correctly when #' accessed from a file location in the browser (e.g., #' file:///c:/webhost/myhost/myviz.html) rather than from a web server URL -#' (e.g. http://www.myhost.com/myviz.html). See the googleVis package vignette +#' (e.g. https://www.myhost.com/myviz.html). See the googleVis package vignette #' and the Macromedia web site -#' (\url{http://www.macromedia.com/support/documentation/en/flashplayer/help/}) +#' (\url{https://www.macromedia.com/support/documentation/en/flashplayer/help/}) #' for more details. #' #' Important: To use this visualization, you must specify the height and width @@ -185,7 +185,7 @@ #' #' ## Get weekly stock prices from Apple Inc. #' tckr <- 'AAPL' -#' yahoo <- 'http://ichart.finance.yahoo.com/table.csv' +#' yahoo <- 'https://ichart.finance.yahoo.com/table.csv' #' #' fn <- sprintf('%s?s=%s&a=08&b=7&c=1984&d=%s&e=%s&f=%s&g=w&ignore=.csv', #' yahoo, tckr, month, current.day, current.year) diff -pruN 0.6.2-3/R/gvisAnnotationChart.R 0.6.3+dfsg-1/R/gvisAnnotationChart.R --- 0.6.2-3/R/gvisAnnotationChart.R 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/R/gvisAnnotationChart.R 2018-11-10 19:38:46.000000000 +0000 @@ -162,7 +162,7 @@ #' #' ## Get weekly stock prices from Apple Inc. #' tckr <- 'AAPL' -#' yahoo <- 'http://ichart.finance.yahoo.com/table.csv' +#' yahoo <- 'https://ichart.finance.yahoo.com/table.csv' #' #' fn <- sprintf('%s?s=%s&a=08&b=7&c=1984&d=%s&e=%s&f=%s&g=w&ignore=.csv', #' yahoo, tckr, month, current.day, current.year) diff -pruN 0.6.2-3/R/gvisBubbleChart.R 0.6.3+dfsg-1/R/gvisBubbleChart.R --- 0.6.2-3/R/gvisBubbleChart.R 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/R/gvisBubbleChart.R 2018-11-09 15:04:02.000000000 +0000 @@ -155,7 +155,7 @@ gvisCheckBubbleChartData <- function(dat idvar = list(mode="required", FUN=check.char), xvar = list(mode="required", FUN=check.num), yvar = list(mode="required", FUN=check.num), - colorvar = list(mode="optional", FUN=check.char), + colorvar = list(mode="optional", FUN=check.char.num), sizevar = list(mode="optional", FUN=check.num)) x <- gvisCheckData(data=data,options=options,data.structure=data.structure) diff -pruN 0.6.2-3/R/gvisCalendar.R 0.6.3+dfsg-1/R/gvisCalendar.R --- 0.6.2-3/R/gvisCalendar.R 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/R/gvisCalendar.R 2017-07-03 10:24:45.000000000 +0000 @@ -19,7 +19,7 @@ #' Google Calendar Chart with R -#' \Sexpr{googleChartName <- "Calendar"} +#' \Sexpr{googleChartName <- "calendar"} #' \Sexpr{gvisChartName <- "gvisCalendar"} #' #' A calendar chart is a visualization used to show activity over the course diff -pruN 0.6.2-3/R/gvisCoreCharts.R 0.6.3+dfsg-1/R/gvisCoreCharts.R --- 0.6.2-3/R/gvisCoreCharts.R 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/R/gvisCoreCharts.R 2018-11-10 19:37:06.000000000 +0000 @@ -397,7 +397,7 @@ gvisSteppedAreaChart <- function(data, x #' library(XML) #' ## Get the data of the biggest ISO container companies from Wikipedia #' ##(table 3): -#' df=readHTMLTable(readLines("http://en.wikipedia.org/wiki/Intermodal_freight_transport"))[[3]][,1:2] +#' df=readHTMLTable(readLines("https://en.wikipedia.org/wiki/Intermodal_freight_transport"))[[3]][,1:2] #' ## Rename the second column #' names(df)[2]="TEU capacity" #' ## The numbers are displayed with commas to separate thousands, so let's diff -pruN 0.6.2-3/R/gvisGeoChart.R 0.6.3+dfsg-1/R/gvisGeoChart.R --- 0.6.2-3/R/gvisGeoChart.R 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/R/gvisGeoChart.R 2018-11-10 20:25:24.000000000 +0000 @@ -43,7 +43,7 @@ #' \item{Format 1}{'latitude:longitude'. See the example below.} \item{Format #' 2}{Address, country name, region name locations, or US metropolitan area #' codes, see -#' \url{http://code.google.com/apis/adwords/docs/developer/adwords_api_us_metros.html}. +#' \url{https://developers.google.com/adwords/api/docs/appendix/geotargeting?csw=1l}. #' This format works with the \code{dataMode} option set to either 'markers' or #' 'regions'. The following formats are accepted: A specific address (for #' example, "1600 Pennsylvania Ave"). A country name as a string (for example, @@ -99,8 +99,6 @@ #' See also \code{\link{print.gvis}}, \code{\link{plot.gvis}} #' for printing and plotting methods. #' -#' @export -#' #' @keywords iplot #' #' @examples @@ -180,7 +178,7 @@ #' # Plot S&P countries' credit rating sourced from Wikipedia #' # Use the hovervar to show the rating #' library(XML) -#' url <- "http://en.wikipedia.org/wiki/List_of_countries_by_credit_rating" +#' url <- "https://en.wikipedia.org/wiki/List_of_countries_by_credit_rating" #' x <- readHTMLTable(readLines(url), which=3) #' levels(x$Rating) <- substring(levels(x$Rating), 4, #' nchar(levels(x$Rating))) @@ -198,10 +196,14 @@ #' ## Plot world wide earth quakes of the last 30 days with magnitude >= 4.0 #' library(XML) #' ## Get earthquake data of the last 30 days -#' eq <- read.csv("http://earthquake.usgs.gov/earthquakes/feed/v0.1/summary/2.5_week.csv") -#' eq$loc=paste(eq$Latitude, eq$Longitude, sep=":") -#' -#' G9 <- gvisGeoChart(eq, "loc", "Depth", "Magnitude", +#' url <- "https://ds.iris.edu/seismon/eventlist/index.phtml" +#' eq <- readHTMLTable(readLines(url), +#' colClasses=c("factor", rep("numeric", 4), "factor"))$evTable +#' names(eq) <- c("DATE", "LAT", "LON", "MAG", +#' "DEPTH", "LOCATION_NAME", "IRIS_ID") +#' ##Format location data +#' eq$loc=paste(eq$LAT, eq$LON, sep=":") +#' G9 <- gvisGeoChart(eq, "loc", "DEPTH", "MAG", #' options=list(displayMode="Markers", #' colorAxis="{colors:['purple', 'red', 'orange', 'grey']}", #' backgroundColor="lightblue"), chartid="EQ") diff -pruN 0.6.2-3/R/gvisGeoMap.R 0.6.3+dfsg-1/R/gvisGeoMap.R --- 0.6.2-3/R/gvisGeoMap.R 2016-08-31 03:26:27.000000000 +0000 +++ 0.6.3+dfsg-1/R/gvisGeoMap.R 2018-11-10 20:25:15.000000000 +0000 @@ -45,7 +45,7 @@ #' \item{Format 1}{'latitude:longitude'. See the example below.} #' \item{Format 2}{Address, country name, region name locations, or #' US metropolitan area codes, see -#' \url{http://code.google.com/apis/adwords/docs/developer/adwords_api_us_metros.html}. +#' \url{https://developers.google.com/adwords/api/docs/appendix/geotargeting?csw=1}. #' This format works with the \code{dataMode} option set to either #' 'markers' or 'regions'. The following formats are accepted: #' A specific address (for example, "1600 Pennsylvania Ave"). @@ -99,13 +99,11 @@ #' Because of Flash security settings the chart #' might not work correctly when accessed from a file location in the #' browser (e.g., file:///c:/webhost/myhost/myviz.html) rather than -#' from a web server URL (e.g. http://www.myhost.com/myviz.html). +#' from a web server URL (e.g. https://www.myhost.com/myviz.html). #' See the googleVis package vignette and the Macromedia web -#' site (\url{http://www.macromedia.com/support/documentation/en/flashplayer/help/}) +#' site (\url{https://www.macromedia.com/support/documentation/en/flashplayer/help/}) #' for more details. #' -#' @export -#' #' @keywords iplot #' #' @examples diff -pruN 0.6.2-3/R/gvisMap.R 0.6.3+dfsg-1/R/gvisMap.R --- 0.6.2-3/R/gvisMap.R 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/R/gvisMap.R 2018-11-10 19:44:59.000000000 +0000 @@ -100,8 +100,8 @@ #' ## Example with address, here UK post-code and some html code in tooltip #' #' df <- data.frame(Postcode=c("EC3M 7HA", "EC2P 2EJ"), -#' Tip=c("Lloyd's", -#' "Guildhall")) +#' Tip=c("Lloyd's", +#' "Guildhall")) #' #' M2 <- gvisMap(df, "Postcode", "Tip", #' options=list(showTip=TRUE, mapType='normal', @@ -114,10 +114,10 @@ #' options=list(showTip=TRUE, mapType='normal', #' enableScrollWheel=TRUE, #' icons=paste0("{", -#' "'default': {'normal': 'http://icons.iconarchive.com/", +#' "'default': {'normal': 'https://icons.iconarchive.com/", #' "icons/icons-land/vista-map-markers/48/", #' "Map-Marker-Ball-Azure-icon.png',\n", -#' "'selected': 'http://icons.iconarchive.com/", +#' "'selected': 'https://icons.iconarchive.com/", #' "icons/icons-land/vista-map-markers/48/", #' "Map-Marker-Ball-Right-Azure-icon.png'", #' "}}"))) diff -pruN 0.6.2-3/R/gvisMethods.R 0.6.3+dfsg-1/R/gvisMethods.R --- 0.6.2-3/R/gvisMethods.R 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/R/gvisMethods.R 2018-11-10 19:39:55.000000000 +0000 @@ -77,8 +77,8 @@ plot.gvis <- function(x, tag=NULL, ...){ if('gvis' %in% class(x)){ ## Write the pure chart html code into a separate file chart.txt <- ' - + "https://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + %s diff -pruN 0.6.2-3/R/gvisMotionChart.R 0.6.3+dfsg-1/R/gvisMotionChart.R --- 0.6.2-3/R/gvisMotionChart.R 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/R/gvisMotionChart.R 2018-11-10 20:25:30.000000000 +0000 @@ -95,9 +95,9 @@ #' Because of Flash security settings the chart #' might not work correctly when accessed from a file location in the #' browser (e.g., file:///c:/webhost/myhost/myviz.html) rather than -#' from a web server URL (e.g. http://www.myhost.com/myviz.html). +#' from a web server URL (e.g. https://www.myhost.com/myviz.html). #' See the googleVis package vignette and the Macromedia web -#' site (\url{http://www.macromedia.com/support/documentation/en/flashplayer/help/}) +#' site (\url{https://www.macromedia.com/support/documentation/en/flashplayer/help/}) #' for more details. #' #' @section Note: @@ -108,8 +108,6 @@ #' See also \code{\link{print.gvis}}, \code{\link{plot.gvis}} #' for printing and plotting methods. #' -#' @export -#' #' @keywords iplot #' #' @examples diff -pruN 0.6.2-3/R/gvis.R 0.6.3+dfsg-1/R/gvis.R --- 0.6.2-3/R/gvis.R 2016-08-31 03:34:12.000000000 +0000 +++ 0.6.3+dfsg-1/R/gvis.R 2018-11-10 19:39:36.000000000 +0000 @@ -254,7 +254,7 @@ var options = {}; ############### ## Thanks to Sebastian Kranz for this function -## Thanks also to Wei Luo: http://theweiluo.wordpress.com/2011/09/30/r-to-json-for-d3-js-and-protovis +## Thanks also to Wei Luo: https://theweiluo.wordpress.com/2011/09/30/r-to-json-for-d3-js-and-protovis # Transforms a vector into a vector of JSON strings that # can be pasted together afterwards @@ -292,7 +292,7 @@ toJsonSONvec <- function(vec) { toJsonSONarray <- function(dtf){ ## Thanks to Sebastian Kranz for this function - ## Thanks also to Wei Luo: http://theweiluo.wordpress.com/2011/09/30/r-to-json-for-d3-js-and-protovis + ## Thanks also to Wei Luo: https://theweiluo.wordpress.com/2011/09/30/r-to-json-for-d3-js-and-protovis #restore.point("toJsonSONarray") clnms <- colnames(dtf) @@ -424,6 +424,12 @@ check.num.pos <- function(x){ y } +check.char.num <- function(x){ + if(!(( is.numeric(x) | is.character(x)) | is.factor(x))) + stop(paste("The column has to be of numeric or character format. Currently it is", class(x))) + x +} + gvisCheckData <- function(data="", options=list(), data.structure=list()){ ## Convert data.frame to list x <- as.list(data) @@ -565,8 +571,8 @@ checkSquareCurlBracketOps <- function(ch gvisHtmlWrapper <- function(title, dataName, chartid, type){ htmlHeader <- ' - + "https://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + %s diff -pruN 0.6.2-3/R/gvisSankey.R 0.6.3+dfsg-1/R/gvisSankey.R --- 0.6.2-3/R/gvisSankey.R 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/R/gvisSankey.R 2018-11-10 20:25:35.000000000 +0000 @@ -61,8 +61,6 @@ #' #' @author Markus Gesmann \email{markus.gesmann@@gmail.com} #' -#' @export -#' #' @section Warning: #' The sankey chart may be undergoing substantial revisions in #' future Google Charts releases. diff -pruN 0.6.2-3/R/gvisTimeLine.R 0.6.3+dfsg-1/R/gvisTimeLine.R --- 0.6.2-3/R/gvisTimeLine.R 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/R/gvisTimeLine.R 2018-11-10 20:41:24.000000000 +0000 @@ -63,8 +63,6 @@ #' #' @author Markus Gesmann \email{markus.gesmann@@gmail.com} #' -#' @export -#' #' @keywords iplot #' #' @examples diff -pruN 0.6.2-3/R/shiny.R 0.6.3+dfsg-1/R/shiny.R --- 0.6.2-3/R/shiny.R 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/R/shiny.R 2018-11-10 20:25:09.000000000 +0000 @@ -33,9 +33,9 @@ #' #' @section Details: #' More information about shiny is available online: -#' \url{http://www.rstudio.com/shiny/}. +#' \url{https://www.rstudio.com/shiny/}. #' You find further examples with googleVis on shiny on mages' blog: -#' \url{http://lamages.blogspot.co.uk/search/label/shiny} +#' \url{https://magesblog.com/search/label/shiny} #' #' @return Returns a function that can be assigned to a Shiny \code{output} #' element. @@ -44,8 +44,6 @@ #' #' @keywords shiny #' -#' @export -#' #' @examples #' \dontrun{ #' # To run this example: diff -pruN 0.6.2-3/R/zzz.R 0.6.3+dfsg-1/R/zzz.R --- 0.6.2-3/R/zzz.R 2017-01-01 09:34:03.000000000 +0000 +++ 0.6.3+dfsg-1/R/zzz.R 2018-11-10 19:39:46.000000000 +0000 @@ -100,7 +100,7 @@ gvisWelcomeMessage <- function(){ display, "\n", "See the googleVis package vignettes for more details,\n", - "or visit http://github.com/mages/googleVis.\n", + "or visit https://github.com/mages/googleVis.\n", "\n", "To suppress this message use:\n", "suppressPackageStartupMessages(library(googleVis))\n", diff -pruN 0.6.2-3/README.md 0.6.3+dfsg-1/README.md --- 0.6.2-3/README.md 2017-01-01 09:35:19.000000000 +0000 +++ 0.6.3+dfsg-1/README.md 2018-11-10 20:57:47.000000000 +0000 @@ -1,5 +1,5 @@ # googleVis -[![Travis-CI Build Status](https://travis-ci.org/mages/googleVis.svg?branch=master)](https://travis-ci.org/mages/googleVis) [![CRAN\_Status\_Badge](http://www.r-pkg.org/badges/version/googleVis)](https://cran.r-project.org/package=googleVis/) ![downloads](http://cranlogs.r-pkg.org/badges/grand-total/googleVis) +[![Travis-CI Build Status](https://travis-ci.org/mages/googleVis.svg?branch=master)](https://travis-ci.org/mages/googleVis) [![CRAN\_Status\_Badge](https://www.r-pkg.org/badges/version/googleVis)](https://cran.r-project.org/package=googleVis/) ![downloads](https://cranlogs.r-pkg.org/badges/grand-total/googleVis) The googleVis package provides an interface between R and the [Google's charts tools](https://developers.google.com/chart/). @@ -8,7 +8,7 @@ A modern browser with Internet connectio charts a Flash player. The data remains local and is not uploaded to Google. -You find [examples](https://CRAN.R-project.org/package=googleVis/vignettes/googleVis_examples.html) of all googleVis function on [CRAN](https://cran.r-project.org/package=googleVis/). Perhaps the best known example is the [motion chart](http://mages.github.io/googleVis/WorldBank.html), popularised by [Hans Rosling](http://www.gapminder.org) in his [2006 TED talk](http://www.ted.com/talks/hans_rosling_shows_the_best_stats_you_ve_ever_seen). +You find [examples](https://CRAN.R-project.org/package=googleVis/vignettes/googleVis_examples.html) of all googleVis function on [CRAN](https://cran.r-project.org/package=googleVis/). Perhaps the best known example is the [motion chart](https://mages.github.io/googleVis/WorldBank.html), popularised by [Hans Rosling](https://www.gapminder.org) in his [2006 TED talk](https://www.ted.com/talks/hans_rosling_shows_the_best_stats_you_ve_ever_seen). Please read [Google's Terms of Use](https://developers.google.com/terms/) before you start using the package. @@ -41,15 +41,15 @@ library(googleVis) demo(googleVis) ``` -See the googleVis package [vignettes](https://cran.r-project.org/package=googleVis/) for more details. For a brief introduction read the five page [R Journal article](https://journal.r-project.org/archive/2011-2/RJournal_2011-2_Gesmann+de~Castillo.pdf) and go through our [tutorial](http://decastillo.github.io/googleVis_Tutorial). More examples have been posted on Markus' [blog](http://lamages.blogspot.co.uk/search/label/googleVis). +See the googleVis package [vignettes](https://cran.r-project.org/package=googleVis/) for more details. For a brief introduction read the five page [R Journal article](https://journal.r-project.org/archive/2011-2/RJournal_2011-2_Gesmann+de~Castillo.pdf) and go through our [tutorial](https://decastillo.github.io/googleVis_Tutorial). More examples have been posted on Markus' [blog](https://magesblog.com/tags/googlevis/). -[Tutorial](http://decastillo.github.io/googleVis_Tutorial) +[Tutorial](https://decastillo.github.io/googleVis_Tutorial) [![Donate](https://www.paypal.com/en_GB/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=HHPMW8TXCCRSC&lc=GB&item_name=googleVis¤cy_code=GBP&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted) ## License -This package is free and open source software, licensed under [GPL 2 or later](http://opensource.org/licenses/gpl-license). +This package is free and open source software, licensed under [GPL 2 or later](https://opensource.org/licenses/gpl-license). -Creative Commons Licence
-googleVis documentation by Markus Gesmann & Diego de Castillo is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License. Based on a work at https://developers.google.com/chart/interactive/docs/gallery. +Creative Commons Licence
+googleVis documentation by Markus Gesmann & Diego de Castillo is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License. Based on a work at https://developers.google.com/chart/interactive/docs/gallery. diff -pruN 0.6.2-3/vignettes/googleVis.bib 0.6.3+dfsg-1/vignettes/googleVis.bib --- 0.6.2-3/vignettes/googleVis.bib 2017-01-01 09:02:46.000000000 +0000 +++ 0.6.3+dfsg-1/vignettes/googleVis.bib 2018-11-12 14:41:43.000000000 +0000 @@ -6,7 +6,7 @@ Keywords = {Motion Chart}, Lastchecked = {2010/07/27}, Title = {Juice Analytics}, - Howpublished = {\url{http://www.juiceanalytics.com/writing/better-know-visualization-motion-charts/}}, + Howpublished = {\url{https://www.juiceanalytics.com/writing/better-know-visualization-motion-charts/}}, Year = {2010}} @Article{jsonlite, @@ -15,7 +15,7 @@ author = {Jeroen Ooms}, journal = {arXiv:1403.2805}, year = {2014}, - url = {http://arxiv.org/abs/1403.2805}, + url = {https://arxiv.org/abs/1403.2805}, } @misc{GapminderData, @@ -36,7 +36,7 @@ Keywords = {Gapminder}, Lastchecked = {2010/07/27}, Title = {Gapminder}, - Howpublished = {\url{http://www.gapminder.org}}, + Howpublished = {\url{https://www.gapminder.org}}, Year = {2010} } @@ -45,7 +45,7 @@ Keywords = {Hans Rosling, Gapminder, Ted Talk}, Organization = {TED Talk}, Title = {{TED} {T}alk: Hans {R}osling shows the best stats you've ever seen}, - Howpublished = {\url{http://www.ted.com/talks/hans_rosling_shows_the_best_stats_you_ve_ever_seen.html}}, + Howpublished = {\url{https://www.ted.com/talks/hans_rosling_shows_the_best_stats_you_ve_ever_seen.html}}, Year = {2006}} @misc{GoogleVisApi, @@ -103,7 +103,7 @@ @misc{GooglePublicData, - Howpublished = {\url{http://www.google.com/publicdata/directory}}, + Howpublished = {\url{https://www.google.com/publicdata/directory}}, Author = {Google Inc.}, Date-Added = {2010-07-27 21:30:53 +0100}, Date-Modified = {2010-10-17 09:12:16 +0100}, @@ -126,7 +126,7 @@ Date-Modified = {2011-01-12 16:57:00 +0100}, Keywords = {R, rapache}, Title = {{RA}pache: {W}eb application development with {R} and {A}pache.}, - Howpublished = {\url{http://rapache.net}}, + Howpublished = {\url{https://rapache.net}}, Year = {2011} } @@ -146,9 +146,9 @@ Keywords = {json, R}, Note = {R package version 1.0-1}, Title = {{RJSONIO}: Serialize {R} objects to {J}{S}{O}{N}, {J}ava{S}cript {O}bject {N}otation}, - Howpublished = {\url{http://www.omegahat.net/RJSONIO/}}, + Howpublished = {\url{https://www.omegahat.net/RJSONIO/}}, Year = {2012}, - Bdsk-Url-1 = {http://www.omegahat.net/RJSONIO/}} + Bdsk-Url-1 = {https://www.omegahat.net/RJSONIO/}} @manual{Saaibi2010, Address = {https://www.rmetrics.org/}, @@ -176,7 +176,7 @@ Date-Modified = {2010-10-17 09:11:29 +0100}, Keywords = {Flash}, Title = {Adobe {F}lash {P}layer}, - Howpublished = {\url{http://get.adobe.com/flashplayer/}} + Howpublished = {\url{https://get.adobe.com/flashplayer/}} } @misc{json, @@ -185,14 +185,14 @@ Keywords = {json}, Note = {RFC 4627 application/json}, Title = {{JSON}}, - Howpublished = {\url{http://www.json.org/}}, + Howpublished = {\url{https://www.json.org/}}, Year = {2006} } @misc{d3js, Author = {Mike Bostock}, Title = {{D}ata-{D}riven {D}ocuments (D3.js), a visualization framework for internet browsers running {JavaScript}}, - Howpublished = {\url{http://d3js.org}}, + Howpublished = {\url{https://d3js.org}}, Year = {2012} } @@ -207,9 +207,9 @@ @misc{googleVis, title = {google{V}is: Using the {G}oogle {C}harts {API} with {R}}, author = {Markus Gesmann and Diego de Castillo}, - year = {2014}, - note ={R package version 0.5.8}, - Howpublished = {\url{http://github.com/mages/googleVis}} + year = {2018}, + note ={R package version 0.6.3}, + Howpublished = {\url{https://github.com/mages/googleVis}} } @misc{brew2010, @@ -233,7 +233,7 @@ editor = {Wolfgang H{\"a}rdle and Bernd R{\"o}nz}, publisher = {Physica Verlag, Heidelberg}, note = {ISBN 3-7908-1517-9}, - url = {\url{http://www.stat.uni-muenchen.de/~leisch/Sweave}} + url = {\url{https://www.stat.uni-muenchen.de/~leisch/Sweave}} } @@ -248,28 +248,28 @@ title = {Many Eyes}, author = {IBM Research and the IBM Cognos software group}, year = {2010}, - Howpublished = {\url{http://www-958.ibm.com/software/data/cognos/manyeyes/}} + Howpublished = {\url{https://www-958.ibm.com/software/data/cognos/manyeyes/}} } @misc{OpenFlashChart, title = {Open Flash Chart}, author = {John Glazebrook and Guenther Harrasser and George Neusse}, year = {2010}, - Howpublished = {\url{http://teethgrinder.co.uk/open-flash-chart/}} + Howpublished = {\url{https://teethgrinder.co.uk/open-flash-chart/}} } @misc{OpenLayers, title = {OpenLayers: Free Maps for the Web}, author = {Open Source Geospatial Foundation}, year = {2010}, - Howpublished = {\url{http://www.openlayers.org/}} + Howpublished = {\url{https://www.openlayers.org/}} } @misc{Processing, title = {Processing an open source programming language and environment to create images, animations, and interactions}, author = {Ben Fry and Casey Reas}, year = {2010}, - Howpublished = {\url{http://processing.org/}} + Howpublished = {\url{https://processing.org/}} } @@ -277,7 +277,7 @@ title = {flare: {D}ata visualisation for the web}, author = {{UC} Berkeley Visualization Lab.}, year = {2010}, - Howpublished = {\url{http://flare.prefuse.org}} + Howpublished = {\url{https://flare.prefuse.org}} } @Misc{Apache2.0, @@ -285,7 +285,7 @@ author = {Apache {F}oundation}, title = {Apache {HTTP S}erver 2.2}, year = {2010}, - Howpublished = {\url{http://httpd.apache.org}}, + Howpublished = {\url{https://httpd.apache.org}}, } @Manual{gridSVG, @@ -326,7 +326,7 @@ Animations}, author = {Caleb Troughton}, year = {2011}, note = {j{Q}uery framework for creating {HTML} presentations}, - url = {http://imakewebthings.github.com/deck.js}, + url = {https://imakewebthings.github.com/deck.js}, } @article{RJournal:2011-2:GesmannCastillo, @@ -338,7 +338,7 @@ Animations}, number = 2, pages = {40--44}, month = {December}, - url = {http://journal.r-project.org/archive/2011-2/RJournal_2011-2_Gesmann+de~Castillo.pdf} + url = {https://journal.r-project.org/archive/2011-2/RJournal_2011-2_Gesmann+de~Castillo.pdf} } @Manual{knitr, @@ -362,7 +362,7 @@ Animations}, author = {{RStudio} and {Inc.}}, year = {2013}, note = {R package version 0.4.0}, - url = {\url{http://www.rstudio.com/shiny/}}, + url = {\url{https://www.rstudio.com/shiny/}}, } @Manual{slidify, @@ -370,13 +370,13 @@ Animations}, author = {Ramnath Vaidyanathan}, year = {2012}, note = {R package version 0.3.3}, - url = {http://ramnathv.github.com/slidify/}, + url = {https://ramnathv.github.com/slidify/}, } @Manual{googleVisTutorial, author = {Markus Gesmann and Diego de Castillo}, institution = {useR! 2013, University of Castilla-La Mancha, Albacete, Spain}, title = {googleVis Tutorial}, - uowpublished = {\url{http://decastillo.github.io/googleVis_Tutorial}}, + uowpublished = {\url{https://decastillo.github.io/googleVis_Tutorial}}, Year = {2013}, } \ No newline at end of file diff -pruN 0.6.2-3/vignettes/googleVis_examples.Rmd 0.6.3+dfsg-1/vignettes/googleVis_examples.Rmd --- 0.6.2-3/vignettes/googleVis_examples.Rmd 2016-07-06 06:38:44.000000000 +0000 +++ 0.6.3+dfsg-1/vignettes/googleVis_examples.Rmd 2017-09-08 08:01:56.000000000 +0000 @@ -17,7 +17,7 @@ demo(googleVis) For more details about the charts and further examples see the helpfiles of the individual googleVis function and review the -[Google Charts API documentation](https://developers.google.com/chart/interactive/docs/gallery) and [Terms of Service](https://developers.google.com/terms). +[Google Charts API documentation](https://google-developers.appspot.com/chart/interactive/docs/gallery) and [Terms of Service](https://google-developers.appspot.com/chart/terms). ## Line chart ```{r setOptions, message=FALSE, echo=FALSE} diff -pruN 0.6.2-3/vignettes/googleVis.Rnw 0.6.3+dfsg-1/vignettes/googleVis.Rnw --- 0.6.2-3/vignettes/googleVis.Rnw 2016-12-31 21:00:14.000000000 +0000 +++ 0.6.3+dfsg-1/vignettes/googleVis.Rnw 2018-11-10 19:45:27.000000000 +0000 @@ -147,7 +147,7 @@ generates output similar to Figure~\ref{ 1 2 3 6