-
Notifications
You must be signed in to change notification settings - Fork 7
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
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.
bcdccea
to
b4d8112
Compare
* Uses ::util::geo::centroid for centroid calculation * Replace usage of X<double> types with DX in osm2rdf::osm namespace
…ut close(), decrease BZ2 block size factor from 6 to 3, same compression on my local tests, but around 40% faster
39a71c8
to
f9f6a8e
Compare
Three notes on the option
|
…r to binary dir to fix issues with running the tests
@lehmann-4178656ch, I have now fixed all the tests. I think this branch is now ready to be merged into master. We are already using it in production for the weekly TTL extracts. |
Well, I made the centroid writing the default as a last-minute change, and now all the tests are failing again because of the centroid output. Will fix this. |
…es (#95) The auxiliary geo files will be used in the computation of the geometric triples. The expected format is exactly the same as for spatialjoin (lines of <ID><TAB><WKT>).
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.
Thank you for this. I've added some remarks regarding the use of Dx
and x<double>
, these are not critical.
I'm having an issue trying to build this branch as the spatialjoin submodule fails:
-- Submodule update
Submodule 'vendor/spatialjoin' (https://github.com/ad-freiburg/spatialjoin.git) registered for path 'vendor/spatialjoin'
Cloning into '/app/vendor/spatialjoin'...
fatal: remote error: upload-pack: not our ref 43d5d781931d8f73e1820de0e11321fee75fd50b
fatal: the remote end hung up unexpectedly
Fetched in submodule path 'vendor/spatialjoin', but it did not contain 43d5d781931d8f73e1820de0e11321fee75fd50b. Direct fetching of that commit failed.
CMake Error at CMakeLists.txt:79 (message):
git submodule update --init failed with 1, please checkout submodules
Following the link in the webui pointing at https://github.com/ad-freiburg/spatialjoin/tree/43d5d781931d8f73e1820de0e11321fee75fd50b results in a "Page not found" error
…s as suggested by Axel
Sorry, my bad, I forgot to push the latest I changed the usage of the templated geometry types to their typedefs everywhere as suggested. |
I've successfully build the docker container now. Thanks again! |
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.