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

Replace Clipper With Wagyu #227

Merged
merged 39 commits into from
Mar 31, 2017
Merged

Replace Clipper With Wagyu #227

merged 39 commits into from
Mar 31, 2017

Conversation

flippmoke
Copy link
Member

No description provided.

@pnorman
Copy link
Contributor

pnorman commented Jan 13, 2017

I'd like to stay with c++11 until Mapnik core moves to c++14.

Is this blocked on 3.1.0 coming out then?

@flippmoke flippmoke mentioned this pull request Jan 30, 2017
Closed
flippmoke and others added 28 commits March 31, 2017 14:13
@flippmoke
intial commit for wagyu
c2d7249
@flippmoke
Added reserves
a97a5cb
@flippmoke
Updated tests with working version of wagyu
342a356
@flippmoke
Some other minor updates to tests
9f556ff
@flippmoke
Updated test fixtures again
9bd87fc
@flippmoke
Some modifications to completely remove clipper and only use the geom…
2012a5b 
…etry.hpp that is needed
@flippmoke
Updated wagy to use quick clip
13f721a
@flippmoke
Updated makefile
6854a2b
@flippmoke
Allow builds with gcc
1cb78b8
@flippmoke
Updated tests
5f052aa
@flippmoke
Update so that all tests hopefully pass
25bfe90
@flippmoke
Added return to appease gcc
22c2399
@flippmoke
Updated to use preprocessor directives for 3.0.x vs 3.1.x versions of…
8f44674 
… mapnik
@flippmoke
Removed angus clipper dependencies
26fe450
@flippmoke
Made quick clip a define to change quickly if needed, fixed bug in mu…
e4b7df1 
…ltipolygon processing
@flippmoke
Change to using master of wagyu
4f9e7be
@flippmoke
Updated version of mason and version of clang used
8aeae84
@flippmoke
Perhaps coverage will work now?
7df2d8b
@flippmoke
Properly fix name of clang in mason
5b4d123
@flippmoke
Update to use c++11 and remove optional from wagyu
9cf3edd
@flippmoke
Changed path for geometry.hpp so it doesn't include unrequired featur…
b1c18f8 
…es, fix for optional in vector_tile_strategy
@flippmoke
Updated to use 0.3.0 of wagyu specifically
3ac8338
@flippmoke
Update to bench so that it runs easier on OSX
a34e345
@flippmoke
pragma once on boost geometry adapters include and removed old defines
235f6bb
@flippmoke
Changed to use pragma once and other small clean up of includes
9c81013
@flippmoke
Update to newest version of protozero
3ba4e6e
@flippmoke
We also need geometry.hpp
74d04ec
@flippmoke
more compile fixes in tests
dd7099a
@flippmoke
Copy link
Member Author

@pnorman this branch now supports C++11 fully so we should have no issues and it isn't blocked by 3.1.0 of mapnik

@flippmoke
Copy link
Member Author

Travis is red, but going to merge this pull request anyhow. Travis is red due to the fact that our code coverage is not working properly, however, all tests are currently passing. I think we can handle coverage fixes at some point later.

@flippmoke flippmoke merged commit 03fef70 into master Mar 31, 2017
@springmeyer springmeyer deleted the wagyu branch September 1, 2017 19:35
springmeyer pushed a commit that referenced this pull request Sep 10, 2017
add back ability to build against external mapnik - refs #227
75dee8f
This was referenced Sep 10, 2017
Merged
Closed
springmeyer added a commit that referenced this pull request Sep 10, 2017
@springmeyer
Merge pull request #253 from mapbox/fix-external-build
06ee39f 
add back ability to build against external mapnik - refs #227
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@flippmoke @pnorman