Skip to content

Commit fda944d

Browse files
dcooleydcooley
committed
ready fror cran
1 parent c06f599 commit fda944d

15 files changed

+61
-76
lines changed

‎R/RcppExports.R

-8
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,6 @@ rcpp_point_polyline <- function(data, params, geometry_columns, layer_name) {
6565
.Call(`_mapdeck_rcpp_point_polyline`, data, params, geometry_columns, layer_name)
6666
}
6767

68-
rcpp_polygon_df_columnar <- function(data, params, geometry_columns, digits) {
69-
.Call(`_mapdeck_rcpp_polygon_df_columnar`, data, params, geometry_columns, digits)
70-
}
71-
72-
rcpp_polygon_sf_columnar <- function(data, params, geometry_columns, digits) {
73-
.Call(`_mapdeck_rcpp_polygon_sf_columnar`, data, params, geometry_columns, digits)
74-
}
75-
7668
rcpp_polygon_geojson <- function(data, params, geometry_columns, digits) {
7769
.Call(`_mapdeck_rcpp_polygon_geojson`, data, params, geometry_columns, digits)
7870
}

‎R/data.R

+5-5
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
#'
4545
"melbourne_mesh"
4646

47-
#' #' garmin
48-
#' #'
49-
#' #' An sf object of my cycling activities from my Garmin
50-
#' #'
51-
#' "garmin"
47+
#' city_trail
48+
#'
49+
#' An sf object of a cyclist cycling around Melbourne's Capital City Trail
50+
#'
51+
"city_trail"
5252

‎R/map_layer_arc.R

+13-2
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,19 @@ mapdeckArcDependency <- function() {
176176
#' ## Using a 2-sfc-column sf object
177177
#' library(sfheaders)
178178
#'
179-
#' sf_flights <- sfheaders::sf_point( flights, x = "start_lon", y = "start_lat", z = "start_elev", keep = TRUE )
180-
#' destination <- sfheaders::sfc_point( flights, x = "end_lon", y = "end_lat", z = "start_elev" )
179+
#' sf_flights <- sfheaders::sf_point(
180+
#' flights
181+
#' , x = "start_lon"
182+
#' , y = "start_lat"
183+
#' , z = "start_elev"
184+
#' , keep = TRUE
185+
#' )
186+
#' destination <- sfheaders::sfc_point(
187+
#' flights
188+
#' , x = "end_lon"
189+
#' , y = "end_lat"
190+
#' , z = "start_elev"
191+
#' )
181192
#'
182193
#' sf_flights$destination <- destination
183194
#'

‎R/mapdeck_map.R

+1-3
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ mapdeck <- function(
5050
zoom = 0,
5151
bearing = 0,
5252
location = c(0, 0),
53-
show_view_state = FALSE,
54-
view_id = "default_view"
53+
show_view_state = FALSE
5554
) {
5655

5756
# forward options using x
@@ -63,7 +62,6 @@ mapdeck <- function(
6362
, location = force( as.numeric( location ) )
6463
, bearing = force( bearing )
6564
, show_view_state = force( show_view_state )
66-
, view_id = view_id
6765
)
6866

6967
# deps <- list(

‎inst/htmlwidgets/lib/map/legend.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ function md_placeControl( map_id, map_type, object ) {
318318
var ledge = {};
319319
var position = "BOTTOM_RIGHT";
320320

321-
if( map_type == "google_map" ) {
321+
if( map_type == "google_map") {
322322
window[map_id + 'map'].controls[google.maps.ControlPosition.BOTTOM_LEFT].push( object );
323323
}
324324

‎inst/htmlwidgets/lib/scatterplot/scatterplot.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ function add_scatterplot_geo_columnar( map_id, map_type, scatter_data, data_coun
66
extensions.push( new deck.BrushingExtension() );
77
}
88

9-
console.log( scatter_data );
9+
//console.log( scatter_data );
1010

1111
const binaryLocation = new Float32Array(scatter_data.geometry);
1212
const binaryRadius = new Float32Array(scatter_data.radius);

‎inst/htmlwidgets/mapdeck_functions.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ function md_update_overlay( map_id, layer_id, layer ) {
190190
}
191191

192192
if ( window[ map_id + 'GoogleMapsOverlay'] == null ) {
193-
window[ map_id + 'GoogleMapsOverlay'] = new GoogleMapsOverlay();
193+
window[ map_id + 'GoogleMapsOverlay'] = new deck.GoogleMapsOverlay();
194194
}
195195

196196
var elem = md_findObjectElementByKey( window[map_id + 'layers'], 'id', layer_id );

‎man/add_arc.Rd

+13-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎man/city_trail.Rd

+14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎man/mapdeck.Rd

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/RcppExports.cpp

-30
Original file line numberDiff line numberDiff line change
@@ -233,34 +233,6 @@ BEGIN_RCPP
233233
return rcpp_result_gen;
234234
END_RCPP
235235
}
236-
// rcpp_polygon_df_columnar
237-
Rcpp::List rcpp_polygon_df_columnar(Rcpp::DataFrame data, Rcpp::List params, std::string geometry_columns, int digits);
238-
RcppExport SEXP _mapdeck_rcpp_polygon_df_columnar(SEXP dataSEXP, SEXP paramsSEXP, SEXP geometry_columnsSEXP, SEXP digitsSEXP) {
239-
BEGIN_RCPP
240-
Rcpp::RObject rcpp_result_gen;
241-
Rcpp::RNGScope rcpp_rngScope_gen;
242-
Rcpp::traits::input_parameter< Rcpp::DataFrame >::type data(dataSEXP);
243-
Rcpp::traits::input_parameter< Rcpp::List >::type params(paramsSEXP);
244-
Rcpp::traits::input_parameter< std::string >::type geometry_columns(geometry_columnsSEXP);
245-
Rcpp::traits::input_parameter< int >::type digits(digitsSEXP);
246-
rcpp_result_gen = Rcpp::wrap(rcpp_polygon_df_columnar(data, params, geometry_columns, digits));
247-
return rcpp_result_gen;
248-
END_RCPP
249-
}
250-
// rcpp_polygon_sf_columnar
251-
Rcpp::List rcpp_polygon_sf_columnar(Rcpp::DataFrame data, Rcpp::List params, std::string geometry_columns, int digits);
252-
RcppExport SEXP _mapdeck_rcpp_polygon_sf_columnar(SEXP dataSEXP, SEXP paramsSEXP, SEXP geometry_columnsSEXP, SEXP digitsSEXP) {
253-
BEGIN_RCPP
254-
Rcpp::RObject rcpp_result_gen;
255-
Rcpp::RNGScope rcpp_rngScope_gen;
256-
Rcpp::traits::input_parameter< Rcpp::DataFrame >::type data(dataSEXP);
257-
Rcpp::traits::input_parameter< Rcpp::List >::type params(paramsSEXP);
258-
Rcpp::traits::input_parameter< std::string >::type geometry_columns(geometry_columnsSEXP);
259-
Rcpp::traits::input_parameter< int >::type digits(digitsSEXP);
260-
rcpp_result_gen = Rcpp::wrap(rcpp_polygon_sf_columnar(data, params, geometry_columns, digits));
261-
return rcpp_result_gen;
262-
END_RCPP
263-
}
264236
// rcpp_polygon_geojson
265237
Rcpp::List rcpp_polygon_geojson(Rcpp::DataFrame data, Rcpp::List params, Rcpp::StringVector geometry_columns, int digits);
266238
RcppExport SEXP _mapdeck_rcpp_polygon_geojson(SEXP dataSEXP, SEXP paramsSEXP, SEXP geometry_columnsSEXP, SEXP digitsSEXP) {
@@ -347,8 +319,6 @@ static const R_CallMethodDef CallEntries[] = {
347319
{"_mapdeck_rcpp_point_sf_columnar", (DL_FUNC) &_mapdeck_rcpp_point_sf_columnar, 5},
348320
{"_mapdeck_rcpp_point_geojson_df", (DL_FUNC) &_mapdeck_rcpp_point_geojson_df, 5},
349321
{"_mapdeck_rcpp_point_polyline", (DL_FUNC) &_mapdeck_rcpp_point_polyline, 4},
350-
{"_mapdeck_rcpp_polygon_df_columnar", (DL_FUNC) &_mapdeck_rcpp_polygon_df_columnar, 4},
351-
{"_mapdeck_rcpp_polygon_sf_columnar", (DL_FUNC) &_mapdeck_rcpp_polygon_sf_columnar, 4},
352322
{"_mapdeck_rcpp_polygon_geojson", (DL_FUNC) &_mapdeck_rcpp_polygon_geojson, 4},
353323
{"_mapdeck_rcpp_polygon_polyline", (DL_FUNC) &_mapdeck_rcpp_polygon_polyline, 3},
354324
{"_mapdeck_rcpp_text_geojson", (DL_FUNC) &_mapdeck_rcpp_text_geojson, 4},

‎src/polygon.cpp

-20
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,6 @@ Rcpp::List polygon_defaults(int n) {
1212
);
1313
}
1414

15-
// [[Rcpp::export]]
16-
Rcpp::List rcpp_polygon_df_columnar(
17-
Rcpp::DataFrame data,
18-
Rcpp::List params,
19-
std::string geometry_columns,
20-
int digits
21-
) {
22-
23-
}
24-
25-
// [[Rcpp::export]]
26-
Rcpp::List rcpp_polygon_sf_columnar(
27-
Rcpp::DataFrame data,
28-
Rcpp::List params,
29-
std::string geometry_columns,
30-
int digits
31-
) {
32-
33-
}
34-
3515
// [[Rcpp::export]]
3616
Rcpp::List rcpp_polygon_geojson(
3717
Rcpp::DataFrame data,

‎tests/testthat/test-layer_line.R

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ test_that("add_line accepts multiple objects", {
2424
sf_to <- setNames( object = sf_to, c("country_to", "geometry.1"))
2525

2626
sf <- cbind( sf_from, sf_to )
27+
attr( sf, "class" ) <- c("sf", "data.frame")
2728

2829
p <- add_line(map = m, data = sf, origin = "geometry", destination = "geometry.1")
2930
expect_equal( as.character( p$x$calls[[1]]$args[[2]] ), geo )

‎tests/testthat/test-layer_path.R

+4-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ test_that("add_path accepts multiple objects", {
99
set_token("abc")
1010
m <- mapdeck()
1111

12-
sf <- roads[1:2, ]
12+
df <- sfheaders::sf_to_df( roads )
13+
df <- df[ df$linestring_id %in% c(1,2), ]
14+
sf <- sfheaders::sf_linestring( df, linestring_id = "linestring_id", x = "x", y = "y")
15+
1316
p <- add_path(map = m, data = sf)
1417
expect_equal( as.character( p$x$calls[[1]]$args[[2]] ), geo )
1518

‎tests/testthat/test-layer_polygon.R

+6
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ test_that("add_polygon accepts multiple objects", {
1616
m <- mapdeck()
1717

1818
sf <- spatialwidget::widget_melbourne[ spatialwidget::widget_melbourne$SA2_NAME == "South Yarra - West", ]
19+
attr( sf, "class" ) <- c("sf", "data.frame")
20+
21+
df <- sfheaders::sf_to_df( spatialwidget::widget_melbourne, fill = T )
22+
df <- df[ df$SA2_NAME == "South Yarra - West", ]
23+
sf <- sfheaders::sf_polygon( df, polygon_id = "polygon_id", linestring_id = "linestring_id", x = "x", y = "y")
24+
1925
p <- add_polygon(map = m, data = sf, digits = 7)
2026
expect_equal( as.character( p$x$calls[[1]]$args[[2]] ), geo )
2127

0 commit comments

Comments
 (0)