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.

Sign up for GitHub

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

Jump to bottom

Extract simple features-like interface into a C++ only API #165

Merged
merged 88 commits into from
May 3, 2022
Merged

Extract simple features-like interface into a C++ only API #165

Changes from 1 commit
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
fd1645b
separate existing c utility into one folder
paleolimbot Jan 30, 2022
6a47443
start on rewriting geography abstraction
paleolimbot Jan 31, 2022
80334a0
scaffold some new geography bits in
paleolimbot Feb 4, 2022
a716f5e
check with C API def
paleolimbot Feb 4, 2022
323a516
in theory, construct objects
paleolimbot Feb 4, 2022
439bfa9
add the "status" object
paleolimbot Feb 5, 2022
ced79eb
rename 'capi' to 'geography'
paleolimbot Feb 5, 2022
d4e3033
implement accessors
paleolimbot Feb 8, 2022
631bd1e
don't make the new geography conditional on comnpile
paleolimbot Feb 11, 2022
1f3e493
actually use new geography accessor API
paleolimbot Feb 11, 2022
0562ca7
use overloads for geog-specific methods
paleolimbot Feb 12, 2022
6c0307f
try to fix R 3.6 on Windows
paleolimbot Feb 12, 2022
8b4f656
a few more operators
paleolimbot Feb 12, 2022
46c3d50
move distance and max_distance
paleolimbot Feb 13, 2022
843764e
implement s2_boundary in new api
paleolimbot Feb 14, 2022
5e79b0a
slightly better boundary logic
paleolimbot Feb 14, 2022
2e9909e
fix R 3.6 for windows
paleolimbot Feb 14, 2022
826cc6e
undo kludge that cause segfault
paleolimbot Feb 14, 2022
2b9e709
remove non-functional stub
paleolimbot Feb 14, 2022
6a98cf7
make s2_dimension() cheaper
paleolimbot Feb 17, 2022
ed0506e
add s2_centroid() to new API
paleolimbot Feb 17, 2022
f9f0642
s2_centroid_agg() use new s2_centroid()
paleolimbot Feb 17, 2022
5978ca2
move s2_closest_point() and s2_clearance_line_between() to new api
paleolimbot Feb 17, 2022
8dc5272
use new API for boolean operations
paleolimbot Feb 21, 2022
263d126
remove old boolean operation code
paleolimbot Feb 21, 2022
db1a68b
move rebuild to new api
paleolimbot Feb 22, 2022
4801922
move rebuild_agg to new api
paleolimbot Feb 22, 2022
1f99873
remove one more reference to the old rebuildGeography
paleolimbot Feb 22, 2022
04a8de3
remove a few more references
paleolimbot Feb 23, 2022
ce9e556
centroid aggregator
paleolimbot Feb 24, 2022
f966edf
prepare for more aggregators
paleolimbot Mar 5, 2022
ccc1733
prepare s2_geography_from_layers
paleolimbot Mar 5, 2022
9becb38
allow builder to rebuild bits
paleolimbot Mar 5, 2022
4ed1fde
enable building polygon as a fallback
paleolimbot Mar 5, 2022
033b49e
separate aggregate rebuild logic
paleolimbot Mar 5, 2022
2d63704
coverage union agg logic
paleolimbot Mar 5, 2022
26d34aa
sketch union_agg solution
paleolimbot Mar 6, 2022
ee63077
use and test new aggregator
paleolimbot Mar 6, 2022
5f5add8
migrate s2_point_on_surface to new api
paleolimbot Mar 6, 2022
3906ba6
move s2_find_validation_error() to new API
paleolimbot Mar 9, 2022
f36e518
move unary union to new API
paleolimbot Mar 9, 2022
eea70c3
shuffle accessors that return a geography to their own file
paleolimbot Mar 11, 2022
f47c55f
swap out convex hull query
paleolimbot Mar 11, 2022
dc22028
more flexible s2_project_normalized(), sketch s2_interpolate_normaliz…
paleolimbot Mar 17, 2022
d43d258
use new api for interpolate_normalized
paleolimbot Mar 17, 2022
f29bc24
use new API for buffer_cells()
paleolimbot Mar 17, 2022
afbdd0c
remove unused headers
paleolimbot Mar 17, 2022
1fcd5c4
bounds use new geographies
paleolimbot Mar 18, 2022
636ce8b
coverings
paleolimbot Mar 18, 2022
9374f15
add basic indexer
paleolimbot Mar 20, 2022
75b3e1e
more using new API for matrix
paleolimbot Mar 21, 2022
a8e5743
remove old index infrastructure, use new index for matrix predicates
paleolimbot Mar 21, 2022
a2a9005
add preeicates
paleolimbot Mar 25, 2022
13d7000
fix touches
paleolimbot Mar 25, 2022
98b0862
actually use new s2_intersects_box()
paleolimbot Mar 27, 2022
69690ca
use new predicates in s2-matrix
paleolimbot Mar 27, 2022
a6e36d2
wrap regions instead of copying data
paleolimbot Mar 27, 2022
b605e14
explain the S2RegionWrapper
paleolimbot Mar 27, 2022
0ad573d
remove mutable shape index accessor
paleolimbot Mar 29, 2022
934b1c8
move ownership of index set outside index
paleolimbot Mar 29, 2022
f34774e
start on new constructors
paleolimbot Apr 3, 2022
34cbb87
maybe fix Windows/R 3.6 error
paleolimbot Apr 4, 2022
a22fd04
fix wiring for wk handler
paleolimbot Apr 4, 2022
f71ba7f
basics of the constructor work
paleolimbot Apr 8, 2022
72fc88c
valid output for collections
paleolimbot Apr 9, 2022
ad63656
small progress towards builder working
paleolimbot Apr 9, 2022
ae789f5
maybe fix linestring construction
paleolimbot Apr 9, 2022
7dbc2b6
better linestrings maybe but still segfaulting
paleolimbot Apr 10, 2022
6c2fd45
fix export of truly empty (multi)linestring
paleolimbot Apr 10, 2022
f1bcd09
add the example wkt as package data
paleolimbot Apr 12, 2022
5daae43
using the new constructor for wkt
paleolimbot Apr 12, 2022
7326d3f
use writer for make_polygon
paleolimbot Apr 13, 2022
5301092
superceed previous s2-constructors-formatters
paleolimbot Apr 13, 2022
67c1c29
remove previous builder implementation
paleolimbot Apr 13, 2022
6846652
fix C++ errors on gcc
paleolimbot Apr 13, 2022
84f4a26
fix constructors
paleolimbot Apr 13, 2022
47f37bf
remove superceeded methods
paleolimbot Apr 13, 2022
fe05448
fix include
paleolimbot Apr 14, 2022
b4f2070
include fewer headers, fix compile and test
paleolimbot Apr 14, 2022
201c0bb
wk_handle method for geography
paleolimbot Apr 17, 2022
731f313
actually use new exporters
paleolimbot Apr 17, 2022
553acc5
simplify Geography class and use it
paleolimbot Apr 21, 2022
b93cc48
fix point constructor
paleolimbot Apr 21, 2022
e7cb711
S2GeographyOwningPoint -> PointGeography
paleolimbot Apr 21, 2022
8176023
more renaming to saner names
paleolimbot Apr 21, 2022
1b4137b
more renaming
paleolimbot Apr 21, 2022
7c8e602
rename index
paleolimbot Apr 21, 2022
3d33c13
stop pretending that there will be a C API
paleolimbot Apr 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove non-functional stub
  • Loading branch information
@paleolimbot
paleolimbot committed Feb 14, 2022
commit 2b9e709c3a6919059ebcc32d3902ff18dbc13f85
7 changes: 1 addition & 6 deletions src/s2-geography/accessors.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,12 +190,7 @@ double s2_y(const S2Geography& geog) {


S2Point s2_centroid(const S2Geography& geog) {
int dimension = s2_dimension(geog);
if (dimension <= 0) {
return S2Point(NAN, NAN, NAN);
}


throw S2GeographyException("Not implemented: s2_centroid()");
}

std::unique_ptr<S2Geography> s2_boundary(const S2Geography& geog) {
Expand Down