Skip to content

Commit

Permalink
Submitted to CRAN
Browse files Browse the repository at this point in the history
  • Loading branch information
rcarto committed Mar 29, 2017
1 parent cac04a3 commit d686a99
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 321 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: cartography
Title: Thematic Cartography
Version: 1.4.9000
Date: 2016-12-13
Version: 1.4.2
Date: 2017-03-29
Authors@R: c(
person("Timothée", "Giraud",
email = "[email protected]", role = c("cre","aut")),
Expand Down
6 changes: 5 additions & 1 deletion NEWS
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@

cartography version 1.4.9000 (Release date: )
cartography version 1.4.2 (Release date: 2017-03-29)
==============

Minor changes:

* Addition of 2 discretization methods (thanks to @MBunel): 'em' and 'arith'. The "arith" method is based on a arithmetic progression along the variable values. The "em" method is based on subset defined by the mean of a numeric vector.
* Update the list of the available tiles servers (getTiles). This list is reduced and could be extended again depanding on the rosm package evolution.



Expand Down
9 changes: 4 additions & 5 deletions R/getTiles.R
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
#' fetched from various open map servers.
#' @param spdf a Spatial*DataFrame with a valid projection attribute.
#' @param type the tile server from which to get the map, one of "hikebike",
#' "hotstyle", "lovinacycle", "lovinahike", "mapquestosm", "mapquestsat", "opencycle",
#' "openpiste", "osm", "osmgrayscale", "osmtransport", "stamenbw", "stamenwatercolor",
#' "thunderforestlandscape" and "thunderforestoutdoors".
#' "hotstyle", "lovinacycle", "lovinahike", "osmgrayscale", "stamenbw" and
#' "stamenwatercolor".
#' @param zoom the zoom level. If null, it is determined automatically
#' (see Details).
#' @param crop TRUE if results should be cropped to the specified spdf extent, FALSE otherwise.
Expand All @@ -27,14 +26,14 @@
#' # extract Denmark
#' spdf <- nuts0.spdf[nuts0.spdf$id=="DK",]
#' # Download the tiles, extent = Denmark
#' den <- getTiles(spdf = spdf, type = "osm", crop = TRUE)
#' den <- getTiles(spdf = spdf, type = "stamenwatercolor", crop = TRUE)
#' class(den)
#' # Plot the tiles
#' tilesLayer(den)
#' # Plot countries
#' plot(spdf, add=TRUE)
#' # Map tiles sources
#' mtext(text = "Map data © OpenStreetMap contributors, under CC BY SA.",
#' mtext(text = "Map tiles by Stamen Design, under CC BY 3.0. Data by OpenStreetMap, under CC BY SA.",
#' side = 1, adj = 0, cex = 0.7, font = 3)
#' }
getTiles <- function(spdf, type = "osm", zoom = NULL, crop = FALSE){
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ vignette(topic = "cartography")

[Demo codes in the R graph Gallery](http://www.r-graph-gallery.com/portfolio/maps/) (EN)
[Create and integrate maps in your R workflow with the cartography package](http://rgeomatic.hypotheses.org/842) (EN)
[De superbes cartes thématiques...](http://rgeomatic.hypotheses.org/1086)(FR)
[Le package cartography a un an](http://rgeomatic.hypotheses.org/1016)(FR)
[Cartographie avec R : le package cartography](http://rgeomatic.hypotheses.org/659) (FR)
[R pour les cartographes](http://neocarto.hypotheses.org/1859) (FR)
[Comment faire un carton avec R?](http://rgeomatic.hypotheses.org/category/cartography) (FR - *How to build inset maps*)
Expand Down
9 changes: 4 additions & 5 deletions man/getTiles.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

306 changes: 0 additions & 306 deletions vignettes/cartography.R

This file was deleted.

Loading

0 comments on commit d686a99

Please sign in to comment.