-
Notifications
You must be signed in to change notification settings - Fork 5
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
Use libspatialjoin for geometric relations, drop Boost dependency #92
base: master
Are you sure you want to change the base?
Conversation
…de, but code is still a bit hacked together
…by spatialjoin), also remove option for "reduced" geo triple output (also not supported by spatialjoin)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the work, some minor comments from just looking at the PR. Will test later.
include/osm2rdf/osm/Generic.h
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Lines could now be combined
bcdccea
to
b4d8112
Compare
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.