Merge branch 'develop' of github.com:miraisolutions/sparkgeo into develop

Author: lambiase

DESCRIPTION

@@ -13,7 +13,7 @@ Authors@R: c(person(family = "Mirai Solutions GmbH", role = "aut",
 Description: The 'sparkgeo' package is a 'sparklyr' extension package providing geospatial
   analytics capabilities to Spark and R.
 Depends: R (>= 3.3.2)
-Imports: sparklyr, dplyr
+Imports: sparklyr (>= 0.6.4), dplyr (>= 0.7.0)
 License: GPL-3 | file LICENSE
 SystemRequirements: Java (>= 1.8), Spark 2.x
 Encoding: UTF-8

R/spatial_join.R

@@ -26,7 +26,7 @@ spatial_join <- function(x, y, latitude, longitude, polygon) {
 
   x %>%
     mutate(dummy = TRUE) %>% # https://github.com/tidyverse/dplyr/issues/1841
-    inner_join(y %>% mutate(dummy = TRUE)) %>%
+    inner_join(y %>% mutate(dummy = TRUE), by = "dummy") %>%
     mutate(is_within = within(point(!!latitude, !!longitude), !!polygon)) %>%
     filter(is_within) %>%
     select(-one_of("dummy", "is_within"))