Use libspatialjoin for geometric relations, drop Boost dependency #92
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…de, but code is still a bit hacked together
…by spatialjoin), also remove option for "reduced" geo triple output (also not supported by spatialjoin)
include/osm2rdf/osm/Generic.h
Outdated
There was a problem hiding this comment.
This file could be removed as it is now empty?
src/osm/GeometryHandler.cpp
Outdated
| // points, discard | ||
| convexHull = osm2rdf::geometry::Polygon(); | ||
| for (const auto& v : rel.geom()) { | ||
| if (v.getType() == 0) { |
There was a problem hiding this comment.
Constants or Enum for getType() results?
| @@ -59,26 +57,20 @@ void osm2rdf::osm::OsmiumHandler<W>::handle() { | |||
| std::cerr << std::endl; | |||
| std::cerr << osm2rdf::util::currentTimeFormatted() | |||
| << "OSM Pass 1 ... (Count objects, Relations for areas" | |||
| #if BOOST_VERSION >= 107800 | |||
| << ", Relation members" | |||
There was a problem hiding this comment.
Lines could now be combined
patrickbr
force-pushed
the
use-libspatialjoin
branch
from
bcdccea
to
b4d8112
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR uses libspatialjoin to compute the geometric relations. It also completely drops the Boost dependency from osm2rdf (osmium still requires boost) by replacing all geometric stuff with its functional equivalent from util. Additionally, the Bzip2-zipping is now done manually (it was done via boost filtered streams previously).
Everything compiles and seems to work. The E2E tests are still failing, mainly because the mechanism to capture writes to stdout does not work anymore.
It would be great if anyone could test this and give some feedback.