merge st_example

Author: Harry Zhu

NAMESPACE

@@ -1,7 +1,7 @@
 # Generated by roxygen2: do not edit by hand
 
 export(register_gis)
+export(st_example)
 export(st_join)
-export(st_pit_example)
-export(st_plg_example)
+import(dplyr)
 import(sparklyr)

R/st_example.R

@@ -1,33 +1,29 @@
-#' Spark polygons example.
+#' Spark geometry example.
 #'
 #' @examples
 #' \dontrun{
 #' library(sparklyr)
 #' sc <- spark_connect(master = "local")
 #' register_gis(sc)
-#' st_plg_example(sc)
+#' polygons_wkt <- st_example(sc, "polygons")
+#' point_wkt <- st_example(sc, "points")
 #' }
+#' @details geometry can be  "polygons" or "points"
+#' 
 #' @export
-st_plg_example <- function(sc) {
-    polygons <- read.table(system.file(package="geospark","examples/polygons.txt"), sep="|", col.names=c("area","geom"))
-    polygons_wkt <- copy_to(dest = sc, df = polygons, name = "geospark_example_polygons", overwrite = T) %>% 
+st_example <- function(sc, geom = "polygons") {
+    geoms <- read.table(system.file(package="geospark",sprintf("examples/%s.txt",geom)), sep="|")
+    switch (geom,
+        "polygons" = {
+            colnames(geoms) <- c("area","geom")
+        },
+        "points" = {
+            colnames(geoms) <- c("city","state","geom")
+        }
+    )
+    
+    geoms_wkt <- copy_to(dest = sc, df = geoms, name = sprintf("geospark_example_%s",geom), overwrite = T) %>% 
         mutate(geom = st_geomfromwkt(geom))
-    return(polygons_wkt)
+    return(geoms_wkt)
 }
 
-#' Spark points example.
-#'
-#' @examples
-#' \dontrun{
-#' library(sparklyr)
-#' sc <- spark_connect(master = "local")
-#' register_gis(sc)
-#' st_pit_example(sc)
-#' }
-#' @export
-st_pit_example <- function(sc) {
-    points <- read.table(system.file(package="geospark","examples/points.txt"), sep="|", col.names=c("city","state","geom"))
-    points_wkt <- copy_to(dest = sc, df = points, name = "geospark_example_points", overwrite = T) %>% 
-        mutate(geom = st_geomfromwkt(geom))
-    return(points_wkt)
-}

R/st_join.R

@@ -1,6 +1,6 @@
 #' @title spatial join
 #' @name st_join
-#' @import sparklyr
+#' @import dplyr
 #' @param x a spark spatial data frame
 #' @param y a spark spatial data frame
 #' @description 
@@ -28,7 +28,7 @@
 #' }
 #' @export
 st_join <- function(x, y, join = NULL) {
-    full_join(x  %>% mutate(dummy_s4pu629cnd=TRUE),
+    full_join(x %>% mutate(dummy_s4pu629cnd=TRUE),
               y %>% mutate(dummy_s4pu629cnd=TRUE),
               by = "dummy_s4pu629cnd") %>% 
         filter(join) %>%

man/st_example.Rd

@@ -6,9 +6,9 @@ test_requires("knitr")
 
 test_that("st_join() works", {
     expect_known_output({
-        
-        st_join(st_plg_example(sc) ,
-                st_pit_example(sc) , join = sql("st_contains(`geom.x`,`geom.y`)")) %>%
+        st_join(st_example(sc, "polygons") %>% select(area, geom_x = geom) ,
+                st_example(sc, "points") %>% select(city, state, geom_y = geom) ,
+                join = sql("st_contains(`geom_x`,`geom_y`)")) %>%
             collect() %>%
             knitr::kable()
     }