Methods for sf objects

.travis.yml

@@ -1,21 +1,25 @@
-language: c
-sudo: required
+language: r
 dist: trusty
-script: ./travis-tool.sh run_tests
+sudo: required
 
-before_script:
+apt_packages:
+  - libudunits2-dev
+
+before_install:
+  - sudo add-apt-repository ppa:ubuntugis/ubuntugis-unstable --yes
   - sudo apt-get --yes --force-yes update -qq
-  - sudo apt-get install -y gdal-bin libgdal-dev libgdal1-dev netcdf-bin libproj-dev libv8-dev
-  - curl -OL http://raw.github.com/craigcitro/r-travis/master/scripts/travis-tool.sh
-  - chmod 755 ./travis-tool.sh
-  - ./travis-tool.sh bootstrap
-  - ./travis-tool.sh install_deps
+  - sudo apt-get install -y libudunits2-dev libproj-dev libgeos-dev libgdal-dev netcdf-bin libv8-dev
 
-install_github:
- - ropensci/gistr
+compiler:
+  - clang
 
-after_failure:
-  - ./travis-tool.sh dump_logs
+warnings_are_errors: false
+
+r_packages:
+  - colorspace
+
+r_github_packages: 
+ - ropensci/gistr
 
 env:
    global:

DESCRIPTION

@@ -34,6 +34,7 @@ Suggests:
     gistr,
     testthat,
     knitr,
-    leaflet
+    leaflet,
+    sf
 Enhances: RColorBrewer
 RoxygenNote: 5.0.1

NAMESPACE

@@ -28,6 +28,9 @@ S3method(geojson_json,data.frame)
 S3method(geojson_json,geo_list)
 S3method(geojson_json,list)
 S3method(geojson_json,numeric)
+S3method(geojson_json,sf)
+S3method(geojson_json,sfc)
+S3method(geojson_json,sfg)
 S3method(geojson_list,SpatialCollections)
 S3method(geojson_list,SpatialGrid)
 S3method(geojson_list,SpatialGridDataFrame)
@@ -46,6 +49,9 @@ S3method(geojson_list,geo_list)
 S3method(geojson_list,json)
 S3method(geojson_list,list)
 S3method(geojson_list,numeric)
+S3method(geojson_list,sf)
+S3method(geojson_list,sfc)
+S3method(geojson_list,sfg)
 S3method(geojson_read,character)
 S3method(geojson_read,location)
 S3method(geojson_sp,geo_json)
@@ -71,6 +77,9 @@ S3method(geojson_write,geo_list)
 S3method(geojson_write,json)
 S3method(geojson_write,list)
 S3method(geojson_write,numeric)
+S3method(geojson_write,sf)
+S3method(geojson_write,sfc)
+S3method(geojson_write,sfg)
 S3method(lint,SpatialGrid)
 S3method(lint,SpatialGridDataFrame)
 S3method(lint,SpatialLines)

R/geojson_json.R

@@ -2,7 +2,7 @@
 #'
 #' @export
 #'
-#' @param input Input list, data.frame, or spatial class. Inputs can also be dplyr \code{tbl_df}
+#' @param input Input list, data.frame, spatial class, or sf class. Inputs can also be dplyr \code{tbl_df}
 #' class since it inherits from \code{data.frame}.
 #' @param lat (character) Latitude name. The default is \code{NULL}, and we attempt to guess.
 #' @param lon (character) Longitude name. The default is \code{NULL}, and we attempt to guess.
@@ -25,6 +25,15 @@
 #' Also note that with sp classes we do make a round-trip, using \code{\link[rgdal]{writeOGR}}
 #' to write GeoJSON to disk, then read it back in. This is fast and we don't have to think
 #' about it too much, but this disk round-trip is not ideal.
+#' 
+#' For sf classes (sf, sfc, sfg), the following conversions are made:
+#' 
+#' \itemize{
+#'  \item sfg: the approprite geometry \code{Point, LineString, Polygon, MultiPoint, 
+#'  MultiLineString, MultiPolygon, GeometryCollection}
+#'  \item sfc: \code{GeometryCollection}, unless the sfc is length 1, then the geometry as above
+#'  \item sf: \code{FeatureCollection}
+#' }
 #'
 #' @examples \dontrun{
 #' # From a numeric vector of length 2, making a point type
@@ -170,7 +179,29 @@
 #' poly <- SpatialPolygons(list(poly1, poly2), 1:2)
 #' dat <- SpatialCollections(pts, polygons = poly)
 #' geojson_json(dat)
-#'
+#' 
+#' # From sf classes:
+#' if (require(sf)) {
+#' ## sfg (a single simple features geometry)
+#'   p1 <- rbind(c(0,0), c(1,0), c(3,2), c(2,4), c(1,4), c(0,0))
+#'   poly <- rbind(c(1,1), c(1,2), c(2,2), c(1,1))
+#'   poly_sfg <-st_polygon(list(p1))
+#'   geojson_json(poly_sfg)
+#'   
+#' ## sfc (a collection of geometries)
+#'   p1 <- rbind(c(0,0), c(1,0), c(3,2), c(2,4), c(1,4), c(0,0))
+#'   p2 <- rbind(c(5,5), c(5,6), c(4,5), c(5,5))
+#'   poly_sfc <- st_sfc(st_polygon(list(p1)), st_polygon(list(p2)))
+#'   geojson_json(poly_sfc)
+#'   
+#' ## sf (collection of geometries with attributes)
+#'   p1 <- rbind(c(0,0), c(1,0), c(3,2), c(2,4), c(1,4), c(0,0))
+#'   p2 <- rbind(c(5,5), c(5,6), c(4,5), c(5,5))
+#'   poly_sfc <- st_sfc(st_polygon(list(p1)), st_polygon(list(p2)))
+#'   poly_sf <- st_sf(foo = c("a", "b"), bar = 1:2, poly_sfc)
+#'   geojson_json(poly_sf)
+#' }
+#' 
 #' ## Pretty print a json string
 #' geojson_json(c(-99.74,32.45))
 #' geojson_json(c(-99.74,32.45)) %>% pretty
@@ -242,10 +273,30 @@ geojson_json.SpatialPixelsDataFrame <- function(input, lat = NULL, lon = NULL, g
   class_json(geojson_rw(input, target = "char"), ...)
 }
 
+# sf classes ---------------------------------
+
+#' @export
+geojson_json.sf <- function(input, lat = NULL, lon = NULL, group = NULL,
+                            geometry = "point",  type='FeatureCollection', ...) {
+  as.json(geojson_list(input))
+}
+
+#' @export
+geojson_json.sfc <- function(input, lat = NULL, lon = NULL, group = NULL,
+                             geometry = "point",  type='FeatureCollection', ...) {
+  as.json(geojson_list(input))
+}
+
+#' @export
+geojson_json.sfg <- function(input, lat = NULL, lon = NULL, group = NULL,
+                             geometry = "point",  type='FeatureCollection', ...) {
+  as.json(geojson_list(input))
+}
+
 # spatial classes from rgeos --------------------------
 #' @export
 geojson_json.SpatialRings <- function(input, lat = NULL, lon = NULL, group = NULL,
-                                              geometry = "point",  type='FeatureCollection', ...) {
+                                      geometry = "point",  type='FeatureCollection', ...) {
   class_json(geojson_rw(input, target = "char"), ...)
 }
 
@@ -257,7 +308,7 @@ geojson_json.SpatialRingsDataFrame <- function(input, lat = NULL, lon = NULL, gr
 
 #' @export
 geojson_json.SpatialCollections <- function(input, lat = NULL, lon = NULL, group = NULL,
-                                                geometry = "point",  type='FeatureCollection', ...) {
+                                            geometry = "point",  type='FeatureCollection', ...) {
   lapply(geojson_rw(input, target = "char", ...), class_json)
 }
 
@@ -292,6 +343,6 @@ geojson_json.list <- function(input, lat = NULL, lon = NULL, group = NULL,
 #' @export
 geojson_json.geo_list <- function(input, lat = NULL, lon = NULL, group = NULL,
                                   geometry = "point", type = "FeatureCollection", ...) {
-
+  
   to_json(unclass(input), ...)
 }