Skip to content

Commit 95827a7

Browse files
committed
wrap filter in local to avoid dbplyr issue (see tidyverse/dbplyr#1480)
1 parent edf6397 commit 95827a7

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

R/read_layers.R

+10-12
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ read_vri <- function(dsn = NULL, layer = "VEG_R1_PLY_polygon", wkt_filter = NULL
3434
)
3535

3636
if(length(wkt_filter) > 0 ){
37-
vri_query <- vri_query |> bcdata::filter(bcdata::INTERSECTS(sf::st_as_sfc(wkt_filter)))
37+
vri_query <- vri_query |> bcdata::filter(local(bcdata::INTERSECTS(sf::st_as_sfc(wkt_filter))))
3838
}
3939

4040
vri <- bcdata::collect(vri_query)
@@ -99,14 +99,14 @@ read_bem <- function(dsn, layer = "BEM", wkt_filter = NULL) {
9999
dsn = dsn,
100100
layer = layer,
101101
quiet = TRUE,
102-
wkt_filter = if (is.null(wkt_filter)) {
102+
wkt_filter = if (is.null(wkt_filter)) {
103103
character(0)
104104
} else {
105-
sf::st_as_text(sf::st_as_sfc(wkt_filter))
105+
sf::st_as_text(sf::st_as_sfc(wkt_filter, crs = sf::st_crs(albers)))
106106
}
107107
)
108108
if(length(wkt_filter) > 0 ){
109-
bem <- sf::st_intersection(bem,wkt_filter)
109+
bem <- sf::st_intersection(bem, sf::st_as_sfc(wkt_filter, crs = sf::st_crs(albers)))
110110
}
111111
#Restructure bem while waiting for real info
112112
bem <- rename_geometry(bem, "Shape")
@@ -140,7 +140,7 @@ read_wetlands <- function(dsn = NULL, layer = "FWA_WETLANDS_POLY", wkt_filter =
140140
bcdata::select(GEOMETRY)
141141

142142
if(length(wkt_filter) > 0 ){
143-
wl_query <- wl_query |> bcdata::filter(bcdata::INTERSECTS(sf::st_as_sfc(wkt_filter)))
143+
wl_query <- wl_query |> bcdata::filter(local(bcdata::INTERSECTS(sf::st_as_sfc(wkt_filter))))
144144
}
145145
wetlands <- bcdata::collect(wl_query)
146146

@@ -177,7 +177,7 @@ read_rivers <- function(dsn = NULL, layer = "FWA_RIVERS_POLY", wkt_filter = cha
177177
bcdata::select(GEOMETRY)
178178

179179
if(length(wkt_filter) > 0 ){
180-
rivers_query <- rivers_query |> bcdata::filter(bcdata::INTERSECTS(sf::st_as_sfc(wkt_filter)))
180+
rivers_query <- rivers_query |> bcdata::filter(local(bcdata::INTERSECTS(sf::st_as_sfc(wkt_filter))))
181181
}
182182
rivers <- bcdata::collect(rivers_query)
183183

@@ -213,7 +213,7 @@ read_lakes <- function(dsn = NULL, layer = "FWA_LAKES_POLY", wkt_filter = chara
213213
bcdata::select(GEOMETRY)
214214

215215
if(length(wkt_filter) > 0 ){
216-
lakes_query <- lakes_query |> bcdata::filter(bcdata::INTERSECTS(sf::st_as_sfc(wkt_filter)))
216+
lakes_query <- lakes_query |> bcdata::filter(local(bcdata::INTERSECTS(sf::st_as_sfc(wkt_filter))))
217217
}
218218
lakes <- bcdata::collect(lakes_query)
219219

@@ -251,7 +251,7 @@ read_glaciers <- function(dsn = NULL, layer = "BTM_PLU_V1", wkt_filter = charac
251251
bcdata::select(GEOMETRY)
252252

253253
if(length(wkt_filter) > 0 ){
254-
glaciers_query <- glaciers_query |> bcdata::filter(bcdata::INTERSECTS(sf::st_as_sfc(wkt_filter)))
254+
glaciers_query <- glaciers_query |> bcdata::filter(local(bcdata::INTERSECTS(sf::st_as_sfc(wkt_filter))))
255255
}
256256
glaciers <- bcdata::collect(glaciers_query)
257257

@@ -287,7 +287,7 @@ read_ccb <- function(dsn = NULL, layer = "CNS_CUT_BL_polygon", wkt_filter = cha
287287
bcdata::select(HARVEST_YEAR)
288288

289289
if(length(wkt_filter) > 0 ){
290-
ccb_query <- ccb_query |> bcdata::filter(bcdata::INTERSECTS(sf::st_as_sfc(wkt_filter)))
290+
ccb_query <- ccb_query |> bcdata::filter(local(bcdata::INTERSECTS(sf::st_as_sfc(wkt_filter))))
291291
}
292292
ccb <- bcdata::collect(ccb_query)
293293

@@ -323,7 +323,7 @@ read_fire <- function(dsn = NULL, layer = "WHSE_FOREST_VEGETATION_VEG_BURN_SEVER
323323
bcdata::select(SHAPE)
324324

325325
if(length(wkt_filter) > 0 ){
326-
wl_query <- wl_query |> bcdata::filter(bcdata::INTERSECTS(sf::st_as_sfc(wkt_filter)))
326+
wl_query <- wl_query |> bcdata::filter(local(bcdata::INTERSECTS(sf::st_as_sfc(wkt_filter))))
327327
}
328328
fire <- bcdata::collect(wl_query)
329329

@@ -385,5 +385,3 @@ read_tsa <- function(tsa_name, Skeena_boundary=TRUE){
385385

386386
return(aoi)
387387
}
388-
389-

scripts/geodata.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,6 @@ ifelse(
5454
"Wetlands id found in search does not match the one in the package"
5555
)
5656
wetlands <- bcdata::bcdc_query_geodata(record = wetlands_id) |>
57-
bcdata::filter(bcdata::INTERSECTS(sf::st_as_sf(testing_aoi)))
57+
bcdata::filter(local(bcdata::INTERSECTS(sf::st_as_sf(testing_aoi))))
5858

5959
#

0 commit comments

Comments
 (0)