Merge pull request #232 from Robinlovelace/master

Make updates ready for release

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: stplanr
 Type: Package
 Title: Sustainable Transport Planning
-Version: 0.1.9
+Version: 0.2.1
 Authors@R: c(
     person("Robin", "Lovelace", email = "rob00x@gmail.com", role = c("aut", "cre"),
     comment = c(ORCID = "0000-0001-5679-6536")),
@@ -53,9 +53,6 @@ Suggests:
     dodgr
 Enhances:
     tmap
-Remotes:
-    r-spatial/sf,
-    ATFutures/dodgr
 VignetteBuilder: knitr
 URL: https://github.com/ropensci/stplanr
 SystemRequirements: GNU make

NEWS.md

@@ -2,9 +2,18 @@
 
 ## NEW FEATURES
 
+* This is the largest release since the package was created, with dozens of changes to support simple features - see https://github.com/ropensci/stplanr/pull/198 for details.
 * Support for **sf**. The package now support the new spatial class system for most functions.
 * New function `geo_bb()` supercedes `bb2poly()`. The new function can return polygons, points and matrix objects determined by the `output` argument. It also allows bounding boxes to be extended in metres, and scaled in x and y dimensions.
+* `geo_code()` now uses nominatim by default to find locations on the maps.
+* New function `od_coords()` takes a wide range of input data types to return a consistent output representing OD data as a data frame of origin and destination coordinates. This is used behind the scenes to make other functions more modular.
+
+## WORK IN PROGRESS
+
+Plans for the next release
+
 * New generic `route()` function for routing. This is more flexible and user-friendly than the existing `line2route()` and `route_*()` functions it enhances.
+* Updated function names to make using **stplanr** easier and more intuitive.
 
 
 # stplanr 0.1.9

R/overline.R

@@ -142,6 +142,7 @@ lineLabels <- function(sl, attrib){
 #' rnet2 <- overline(sl = sl, attrib = "length", buff_dist = 1)
 #' plot(rnet1, lwd = rnet1$length / mean(rnet1$length))
 #' plot(rnet2, lwd = rnet2$length / mean(rnet2$length))
+#' \dontrun{
 #' routes_fast$group = rep(1:3, length.out = nrow(routes_fast))
 #' rnet_grouped = overline(routes_fast, attrib = "length", byvars = "group", buff_dist = 1)
 #' plot(rnet_grouped, col = rnet_grouped$group, lwd =
@@ -151,6 +152,7 @@ lineLabels <- function(sl, attrib){
 #' overline(sl = sl, attrib = "length", buff_dist = 10)
 #' rnet_sf = overline(routes_fast_sf, attrib = "length", buff_dist = 10)
 #' plot(rnet_sf$geometry, lwd = rnet_sf$length / mean(rnet_sf$length))
+#' }
 overline <- function(sl, attrib, fun = sum, na.zero = FALSE, byvars = NA, buff_dist = 0) {
   UseMethod("overline")
 }
@@ -306,9 +308,9 @@ onewaygeo <- function(x, attrib) {
 onewaygeo.sf <- function(x, attrib) {
   geq <- sf::st_equals(x, x, sparse = FALSE) | sf::st_equals_exact(x, x, sparse = FALSE, par = 0.0)
   sel1 <- !duplicated(geq) # repeated rows
-  x$matching_rows =  apply(geq, 1, function(x) paste0(formatC(which(x), width = 2, format = "d", flag = 0), collapse = "-"))
+  x$matching_rows =  apply(geq, 1, function(x) paste0(formatC(which(x), width = 4, format = "d", flag = 0), collapse = "-"))
 
-  singlelines <- aggregate(x[attrib], list(x$matching_rows), FUN = sum)
+  singlelines <- stats::aggregate(x[attrib], list(x$matching_rows), FUN = sum)
 
   return(singlelines)
 }

cran-comments.md

@@ -5,14 +5,20 @@
 * Linux
   - Local
   - Travis: https://travis-ci.org/ropensci/stplanr/builds/252840164?utm_source=github_status&utm_medium=notification
-  - r-devel-ubuntu: 
+
 * MacOS
-  - elcapitan on rhub: https://builder.r-hub.io/status/stplanr_0.1.9.tar.gz-a163aa51c4d243269fedcdba637339fb
+  - elcapitan on rhub: https://builder.r-hub.io/status/stplanr_0.2.1.tar.gz-bc643a88aeeb4be18dc13a1097a1ef38
 
 * Windows
-  - rhub (warning due to pandoc-citeproc): https://builder.r-hub.io/status/stplanr_0.1.9.tar.gz-e8f3870507504f3c8642d597d529f3f1
+  - rhub release (warning due to pandoc): https://builder.r-hub.io/status/stplanr_0.2.1.tar.gz-9a4bc29713d44514b6589b043ff5b15d
+  - rhub devel (fail due to dependency issues): https://builder.r-hub.io/status/stplanr_0.2.1.tar.gz-3655ad52ae97420bba8ad925eff71778
 
 
 ## R CMD check:
 
-OK
+OK - but a note about package reviewer:
+
+```
+Authors@R field gives persons with non-standard roles:
+  Scott  Chamberlin [rev] (Scott reviewed the package for rOpenSci, see https://github.com/ropensci/onboarding/issues/10): rev
+```