diff --git a/DESCRIPTION b/DESCRIPTION index a3036cb49b..cd4db49974 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: plotly Title: Create Interactive Web Graphics via Plotly's JavaScript Graphing Library -Version: 2.0.15 +Version: 2.0.16 Authors@R: c(person("Carson", "Sievert", role = c("aut", "cre"), email = "cpsievert1@gmail.com"), person("Chris", "Parmer", role = c("aut", "cph"), diff --git a/NEWS b/NEWS index 94990cef96..2c1107b7fb 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,12 @@ + +Geo assests are now bundled with the package meaning that maps will now work entirely locally (without an internet connection) + +Default scale value in plotly_IMAGE() should be 1. + +2.0.16 -- 18 Dec 2015 + +Require ggplot2 2.0.0 or higher. For details, see #269. + 2.0.15 -- 13 Dec 2015 Fix #346 @@ -48,7 +57,7 @@ Fix #313. 2.0.3 -- 18 Nov 2015 -Fixed bug causing knitr options to be ignored. Also added VignetteBuilder to DESCRIPTION to vignette is available. +Fixed bug causing knitr options to be ignored. Also added VignetteBuilder to DESCRIPTION so vignette is available. 2.0.2 -- 17 Nov 2015 diff --git a/R/plotly_IMAGE.R b/R/plotly_IMAGE.R index 44042539c8..0a7216c5c1 100644 --- a/R/plotly_IMAGE.R +++ b/R/plotly_IMAGE.R @@ -21,7 +21,7 @@ #' plotly_IMAGE <- function(x, width = 1000, height = 500, format = "png", - scale = 4, out_file, ...) { + scale = 1, out_file, ...) { x <- plotly_build(x) bod <- list( diff --git a/inst/htmlwidgets/lib/plotlyjs/plotly-geo-assets.js b/inst/htmlwidgets/lib/plotlyjs/plotly-geo-assets.js new file mode 100644 index 0000000000..b9a9350b5f --- /dev/null +++ b/inst/htmlwidgets/lib/plotlyjs/plotly-geo-assets.js @@ -0,0 +1,178 @@ +/** +* plotly.js v1.2.1 +* Copyright 2012-2015, Plotly, Inc. +* All rights reserved. +* Licensed under the MIT license +*/ +(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.PlotlyGeoAssets = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o