Skip to content

Commit 55c885e

Browse files
committed
Export all normalize methods
1 parent 5016d06 commit 55c885e

File tree

2 files changed

+40
-2
lines changed

2 files changed

+40
-2
lines changed

NAMESPACE

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,31 @@
22

33
S3method("[",leaflet_awesome_icon_set)
44
S3method("[",leaflet_icon_set)
5+
S3method(doResolveFormula,SharedData)
6+
S3method(doResolveFormula,SpatialLinesDataFrame)
7+
S3method(doResolveFormula,SpatialPointsDataFrame)
8+
S3method(doResolveFormula,SpatialPolygonsDataFrame)
9+
S3method(doResolveFormula,data.frame)
10+
S3method(doResolveFormula,list)
11+
S3method(doResolveFormula,map)
512
S3method(pointData,SharedData)
613
S3method(pointData,SpatialPoints)
714
S3method(pointData,SpatialPointsDataFrame)
815
S3method(pointData,data.frame)
916
S3method(pointData,default)
1017
S3method(pointData,matrix)
18+
S3method(polygonData,Line)
19+
S3method(polygonData,Lines)
20+
S3method(polygonData,Polygon)
21+
S3method(polygonData,Polygons)
1122
S3method(polygonData,SharedData)
23+
S3method(polygonData,SpatialLines)
24+
S3method(polygonData,SpatialLinesDataFrame)
25+
S3method(polygonData,SpatialPolygons)
26+
S3method(polygonData,SpatialPolygonsDataFrame)
27+
S3method(polygonData,default)
28+
S3method(polygonData,map)
29+
S3method(polygonData,matrix)
1230
export("%>%")
1331
export(JS)
1432
export(WMSTileOptions)

R/normalize.R

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,28 +32,37 @@ doResolveFormula <- function(data, f) {
3232
UseMethod("doResolveFormula")
3333
}
3434

35+
#' @export
3536
doResolveFormula.data.frame <- function(data, f) {
3637
eval(f[[2]], data, environment(f))
3738
}
3839

40+
#' @export
3941
doResolveFormula.SharedData <- function(data, f) {
4042
doResolveFormula(data$data(withSelection = TRUE, withFilter = FALSE, withKey = TRUE), f)
4143
}
4244

45+
#' @export
4346
doResolveFormula.map <- function(data, f) {
4447
eval(f[[2]], data, environment(f))
4548
}
4649

50+
#' @export
4751
doResolveFormula.list <- function(data, f) {
4852
eval(f[[2]], data, environment(f))
4953
}
5054

51-
doResolveFormula.SpatialLinesDataFrame <-
52-
doResolveFormula.SpatialPolygonsDataFrame <-
55+
#' @export
5356
doResolveFormula.SpatialPointsDataFrame <- function(data, f) {
5457
doResolveFormula(data@data, f)
5558
}
5659

60+
#' @export
61+
doResolveFormula.SpatialLinesDataFrame <- doResolveFormula.SpatialPointsDataFrame
62+
63+
#' @export
64+
doResolveFormula.SpatialPolygonsDataFrame <- doResolveFormula.SpatialPointsDataFrame
65+
5766
#' Given a data object and lng/lat arguments (which may be NULL [meaning infer
5867
#' from data], formula [which should be evaluated with respect to the data], or
5968
#' vector data [which should be used as-is]) return a lng/lat data frame.
@@ -172,30 +181,36 @@ polygonData <- function(obj) {
172181
UseMethod("polygonData")
173182
}
174183

184+
#' @export
175185
polygonData.default <- function(obj) {
176186
stop("Don't know how to get path data from object of class ", class(obj)[[1]])
177187
}
188+
#' @export
178189
polygonData.matrix <- function(obj) {
179190
makePolyList(pointData.matrix(obj))
180191
}
192+
#' @export
181193
polygonData.Polygon <- function(obj) {
182194
coords = polygon2coords(obj)
183195
structure(
184196
list(list(coords)),
185197
bbox = attr(coords, "bbox", exact = TRUE)
186198
)
187199
}
200+
#' @export
188201
polygonData.Polygons <- function(obj) {
189202
coords = polygons2coords(obj)
190203
structure(
191204
list(structure(coords, bbox = NULL)),
192205
bbox = attr(coords, "bbox", exact = TRUE)
193206
)
194207
}
208+
#' @export
195209
polygonData.SpatialPolygons <- function(obj) {
196210
lapply(obj@polygons, polygons2coords, bbox = FALSE) %>%
197211
structure(bbox = obj@bbox)
198212
}
213+
#' @export
199214
polygonData.SpatialPolygonsDataFrame <- function(obj) {
200215
#polygonData(sp::polygons(obj))
201216
if(length(obj@polygons)>0) {
@@ -205,28 +220,33 @@ polygonData.SpatialPolygonsDataFrame <- function(obj) {
205220
structure(list(), bbox=obj@bbox)
206221
}
207222
}
223+
#' @export
208224
polygonData.map <- function(obj) {
209225
polygonData(cbind(obj$x, obj$y))
210226
}
211227

228+
#' @export
212229
polygonData.Line <- function(obj) {
213230
coords = line2coords(obj)
214231
structure(
215232
list(list(coords)),
216233
bbox = attr(coords, "bbox", exact = TRUE)
217234
)
218235
}
236+
#' @export
219237
polygonData.Lines <- function(obj) {
220238
coords = lines2coords(obj)
221239
structure(
222240
list(structure(coords, bbox = NULL)),
223241
bbox = attr(coords, "bbox", exact = TRUE)
224242
)
225243
}
244+
#' @export
226245
polygonData.SpatialLines <- function(obj) {
227246
lapply(obj@lines, lines2coords, bbox = FALSE) %>%
228247
structure(bbox = obj@bbox)
229248
}
249+
#' @export
230250
polygonData.SpatialLinesDataFrame <- function(obj) {
231251
if(length(obj@lines)>0) {
232252
polygonData(sp::SpatialLines(obj@lines))

0 commit comments

Comments
 (0)