Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove duplicated s2_cell_sentinel() definition #247

Merged
merged 1 commit into from
Aug 30, 2023
Merged

Remove duplicated s2_cell_sentinel() definition #247

merged 1 commit into from
Aug 30, 2023

Conversation

mikemahoney218
Copy link
Contributor

This PR removes a duplicated s2_cell_sentinel() definition. This function is originally defined on line 43-47, then defined (identically) for a second time on 55-60; this PR removes the latter definition.

Re-documenting then removes a duplicate \alias{s2_cell_sentinel()} from the man page (and website -- https://r-spatial.github.io/s2/ ). It also added \method{as_s2_cell}{integer64}(x, ...), which seems to be unrelated to this PR, but I left as a change (assuming it's caused by some other changes or package updates).

@codecov-commenter
Copy link

Codecov Report

Merging #247 (efe4cbf) into main (4fe0c97) will not change coverage.
The diff coverage is n/a.

❗ Current head efe4cbf differs from pull request most recent head 9248cdf. Consider uploading reports for the commit 9248cdf to get more accurate results

@@           Coverage Diff           @@
##             main     #247   +/-   ##
=======================================
  Coverage   94.04%   94.04%           
=======================================
  Files          46       46           
  Lines        3524     3524           
=======================================
  Hits         3314     3314           
  Misses        210      210           
Files Changed Coverage Δ
R/s2-cell.R 100.00% <ø> (ø)

@paleolimbot
Copy link
Collaborator

Good catch on both counts! Thank you!

@paleolimbot paleolimbot merged commit b28fb7f into r-spatial:main Aug 30, 2023
9 checks passed
@mikemahoney218
Copy link
Contributor Author

I should have mentioned that re-documenting also updated RcppExports.cpp:

diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp
index 927a6bf..6350151 100644
--- a/src/RcppExports.cpp
+++ b/src/RcppExports.cpp
@@ -1344,14 +1344,14 @@ BEGIN_RCPP
 END_RCPP
 }
 
-RcppExport SEXP c_s2_geography_writer_new(SEXP, SEXP, SEXP, SEXP);
-RcppExport SEXP c_s2_handle_geography(SEXP, SEXP);
-RcppExport SEXP c_s2_handle_geography_tessellated(SEXP, SEXP);
-RcppExport SEXP c_s2_projection_mercator(SEXP);
-RcppExport SEXP c_s2_projection_orthographic(SEXP);
-RcppExport SEXP c_s2_projection_plate_carree(SEXP);
-RcppExport SEXP c_s2_trans_s2_lnglat_new();
-RcppExport SEXP c_s2_trans_s2_point_new();
+RcppExport SEXP c_s2_geography_writer_new(void *, void *, void *, void *);
+RcppExport SEXP c_s2_handle_geography(void *, void *);
+RcppExport SEXP c_s2_handle_geography_tessellated(void *, void *);
+RcppExport SEXP c_s2_projection_mercator(void *);
+RcppExport SEXP c_s2_projection_orthographic(void *);
+RcppExport SEXP c_s2_projection_plate_carree(void *);
+RcppExport SEXP c_s2_trans_s2_lnglat_new(void);
+RcppExport SEXP c_s2_trans_s2_point_new(void);
 
 static const R_CallMethodDef CallEntries[] = {
     {"_s2_cpp_s2_init", (DL_FUNC) &_s2_cpp_s2_init, 0},

I don't understand what changed here, and it seemed unrelated, so I didn't include it in the PR -- but if this is important then it's probably worth flagging!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants